diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 1c58efb161f..6faf8772a67 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': [],
@@ -61,6 +65,8 @@
         'sequence_view.xml',
         'company_view.xml',
         'account_installer.xml',
+        'report/account_invoice_report_view.xml',
+        'report/account_report_view.xml',
     ],
     'demo_xml': [
         #'demo/price_accuracy00.yml',
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..c74868c342c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -144,20 +144,26 @@
                     <group col="6" colspan="4">
                         <field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
                         <field name="type" readonly="1" select="2"/>
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" select="2"/>
+                        <field name="number" select="1" readonly="1"/>
                         <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" select="1" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
+
+                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" select="2"/>
+                        <field name="date_invoice" select="1"/>
+                        <field name="period_id" groups="base.group_user"/>
+                        <group colspan="2" col="1" groups="base.group_user">
+                            <label align="0.0" string="(keep empty to use the current period)"/>
+                        </group>                        
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                            <field name="date_due" select="1"/>
-                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)" select="2"/>
+                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
                             <field name="reference_type" nolabel="1" select="2" size="0"/>
                             <field name="reference" nolabel="1" select="1"/>
+                            <field name="date_due" select="1"/>
                             <field name="check_total" required="2"/>
                             <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
-                                <tree string="Invoice lines" editable="top">
+                                <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
@@ -200,19 +206,17 @@
                             </group>
                         </page>
                         <page string="Other Info">
+                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)" select="2"/>
+
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
                             <field name="name" select="2"/>
                             <newline/>
-                            <field name="number" select="2"/>
                             <field name="origin" select="2"/>
                             <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
                             <field name="move_id"/>
-                            <field name="date_invoice"/>
-                            <field name="period_id"/>
-                            <label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
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 = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5"%s>\n\t''' % (title, state)
-            xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="_on_create_write"%s>\n\t''' % (title, state)
+            xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write"%s>\n\t''' % (title, state)
             fields = []
 
             widths = {
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d865823e9cd..e43b2249ae5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -159,7 +159,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">List of Accounts</field>
             <field name="res_model">account.account</field>
@@ -681,7 +681,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Account Entry Line" editable="top" on_write="_on_create_write">
+                <tree string="Account Entry Line" editable="top" on_write="on_create_write">
                     <field name="date"/>
                     <field name="period_id"/>
                     <field name="move_id"/>
@@ -1334,7 +1334,7 @@
                         <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                     </group>
                     <separator colspan="4" string="Subscription Lines"/>
-                    <field colspan="4" name="lines_id" widget="one2many_list"/>
+                    <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
 
                     <separator colspan="4" string="State"/>
                     <field name="state" select="2"/>
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 b1394d47d19..cdaf9f2aad9 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-01-13 11:48+0000\n"
-"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
+"PO-Revision-Date: 2010-04-01 22:39+0000\n"
+"Last-Translator: mitev.dmitry <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-02 03:42+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
@@ -154,7 +154,7 @@ msgstr "Položky"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Debetní Centralizace"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
@@ -257,7 +257,7 @@ msgstr "Celkový dluh"
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr ""
+msgstr "Účetní zápisy"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -299,7 +299,7 @@ msgstr "Zpožděné platby"
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Vyberte období"
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -384,7 +384,7 @@ msgstr "Celkové částky"
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Zdroj účtu"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -415,12 +415,12 @@ msgstr "Datum:"
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Negative"
-msgstr ""
+msgstr "Negativ"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "(Účet / Partner) Název"
 
 #. module: account
 #: selection:account.move,type: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..67e71fd81a4 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-01 17:22+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-04-02 03:42+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 f2364683845..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 <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-02 11:01+0000\n"
-"Last-Translator: smii <Unknown>\n"
+"PO-Revision-Date: 2010-03-22 15:02+0000\n"
+"Last-Translator: Henri Kovalainen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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
@@ -90,14 +90,14 @@ 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
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "Perustekoodi"
+msgstr "Peruskoodi"
 
 #. module: account
 #: view:account.account:0
@@ -131,7 +131,7 @@ msgstr "Jäännös"
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "Perustekoodin merkki"
+msgstr "Peruskoodin merkki"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@@ -183,7 +183,7 @@ msgstr "Summa kredit"
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr "Tilikartta"
+msgstr "Tilikartat"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -334,7 +334,7 @@ msgstr "Viite"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr "Ennakkomaksun arvio"
+msgstr "Laske ennakkomaksut"
 
 #. module: account
 #: rml:account.central.journal: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
@@ -500,8 +500,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
-"Aseta jos veromäärä täytyy sisältyä perusmäärään ennen seuraavien verojen "
-"laskemista"
+"Aseta jos veron määrä täytyy sisällyttää perusmäärään ennen seuraavien "
+"verojen laskemista."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -517,7 +517,7 @@ msgstr "Analyyttisten merkintöjen tilastot"
 #: 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 "Verokoodipohjat"
+msgstr "Verokoodimallit"
 
 #. module: account
 #: view:account.invoice:0
@@ -528,7 +528,7 @@ msgstr "Toimittajan lasku"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr "Kirjaa maksetut tapahtumat"
+msgstr "Suorita maksetut"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
@@ -539,12 +539,12 @@ msgstr "Kohteen liikkeet"
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
 msgid "Tax Templates"
-msgstr "Veropohjat"
+msgstr "Veromallit"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr "Maksettu/kirjattu"
+msgstr "Maksettu/Suoritettu"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -554,7 +554,7 @@ msgstr "Jaksotusmenetelmä"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "Sisällytä pohjamäärään"
+msgstr "Sisällytä perusmäärään"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -601,7 +601,7 @@ msgstr "Tulostuspäivämäärä"
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Mvt"
-msgstr ""
+msgstr "Mvt"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
@@ -632,7 +632,7 @@ msgstr "Jätä tyhjäksi avataksesi nykyisen tilanteen"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Fiscal Position Accounts Mapping"
-msgstr "Verotuksen sijainti tilikartoituksessa"
+msgstr "Talouskannan tilien kartoitus"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -648,12 +648,12 @@ msgstr "Kumppani maksutermi"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr "Tilin merkintä sovittelu"
+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
@@ -664,12 +664,12 @@ msgstr "Alennus (%)"
 #: 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 "Poiston määrä"
+msgstr "Arvonalennuksen määrä"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
 msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr "Jätä tyhjäksi jos verovuosi kuuluu useammalle yritykselle."
+msgstr "Jätä tyhjäksi jos tilikausi kuuluu useammalle yritykselle."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -751,7 +751,7 @@ msgstr "Kentän nimi"
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr "Kirjaudu tämänhetkiseen"
+msgstr "Etumerkki ylemmälle"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -762,12 +762,12 @@ msgstr "Päätösmerkintöjen päiväkirja"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr "Osto tarpeisto"
+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
@@ -819,12 +819,12 @@ msgstr "Maksu tilikirja"
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "(Keep empty for all open fiscal years)"
-msgstr "(Jätä tyhjäksi kaikille avoimille verovuosille)"
+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,12 +854,12 @@ 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
 msgid "Templates for Accounts"
-msgstr "Tilipohjat"
+msgstr "Tilimallit"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
@@ -905,7 +905,7 @@ msgstr "Menotili"
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr "Poistojen päiväkirja"
+msgstr "Arvonalennuspäiväkirja"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
@@ -921,7 +921,7 @@ msgstr "Menoluokkatili"
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr "Uusi verovuosi"
+msgstr "Uusi tilikausi"
 
 #. module: account
 #: help:account.tax,tax_group:0
@@ -935,12 +935,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "Verovuoden avaus"
+msgstr "Avattava tilikausi"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr "Valitse kaavio tileistä"
+msgstr "Valitse tilikartta"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -1035,18 +1035,18 @@ msgstr "Netto:"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Verosijainti"
+msgstr "Talouskanta"
 
 #. module: account
 #: 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
@@ -1057,7 +1057,7 @@ msgstr "Alatilit"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Fiscal Position Taxes Mapping"
-msgstr "Verosijainin verokartoitus"
+msgstr "Talouskannan verojen kartoitus"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1080,7 +1080,7 @@ msgstr "Asiakaslasku"
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr "Valitse verovuosi"
+msgstr "Valitse tilikausi"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -1110,7 +1110,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr "Poistot yhteensä"
+msgstr "Arvonalennus yhteensä"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1129,7 +1129,7 @@ msgstr "Varokoodit"
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "Tilikartan mallipohja"
+msgstr "Tilikarttamalli"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -1146,7 +1146,7 @@ msgstr "Uusi analyyttinen tili"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "Talouskantojen mallit"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1172,13 +1172,13 @@ msgstr "Myyntipäiväkirja"
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "Määrä valinnaisena valuuttana."
+msgstr "Summa ilmoitettuna valinnaisessa toisessa valuutassa."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Talouskannan malli"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1194,12 +1194,12 @@ msgstr "Veroraportti"
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr "Avoimet kaaviot"
+msgstr "Avoimet kartat"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid "Are you sure you want to close the fiscal year ?"
-msgstr "Oletko varma että haluat sulkea verovuoden?"
+msgstr "Oletko varma että haluat sulkea tilikauden?"
 
 #. module: account
 #: selection:account.move,type:0
@@ -1249,17 +1249,17 @@ msgstr "Yritysvaluutta"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Fiscal Position Template Account Mapping"
-msgstr ""
+msgstr "Talouskannan mallin tilien kartoitukset"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Ylempi analyyttinen tili"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Suorita arvonalennuksella"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -1300,12 +1300,12 @@ msgstr "Analyyttinen luotto"
 #: field:account.move.line,reconcile_partial_id:0
 #: wizard_button:account.move.line.reconcile,init_partial,partial:0
 msgid "Partial Reconcile"
-msgstr "Osittainen sovitus"
+msgstr "Osittaissuoritus"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Ei sovitettu transaktio"
+msgstr "Suorittamattomat tapahtumat"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1328,7 +1328,7 @@ msgstr "Arvo"
 #: 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 "Poistotili"
+msgstr "Arvonalennustili"
 
 #. module: account
 #: field:account.model.line,model_id:0
@@ -1340,12 +1340,12 @@ msgstr "Malli"
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr "Sulje verovuosi"
+msgstr "Sulje tilikausi"
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Keskitetty vastine"
 
 #. module: account
 #: view:wizard.company.setup:0
@@ -1398,6 +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 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
@@ -1417,7 +1419,7 @@ msgstr "Verorivit"
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Sarjat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -1451,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
@@ -1472,7 +1474,7 @@ msgstr "Näytä tilit "
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr "Tiliotteen sovittelurivi"
+msgstr "Tiliotteen suoritusrivi"
 
 #. module: account
 #: view:account.tax:0
@@ -1486,7 +1488,7 @@ msgstr "Jätä tyhjäksi käyttääksesi tulotiliä"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr "Poisto"
+msgstr "Arvonalennus"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1500,7 +1502,7 @@ msgstr ""
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "Maksettava yhteensä"
+msgstr "Maksettavat yhteensä"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
@@ -1520,7 +1522,7 @@ msgstr "account.analytic.line.extended"
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr "Hyvitysloki"
+msgstr "Hyvityspäiväkirja"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
@@ -1558,7 +1560,7 @@ msgstr "Tulosta yleinen päiväkirja"
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr "Tilikarttapohjat"
+msgstr "Tilikarttamallit"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1570,23 +1572,23 @@ msgstr "Laskun liikehdintä"
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Luo tilikartta mallipohjasta"
+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
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+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
@@ -1613,20 +1615,20 @@ msgstr "Jätä tyhjäksi jos haluat käyttää kulutiliä"
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
 msgid "Account to reconcile"
-msgstr "Tili jolle kirjaukset tehdään"
+msgstr "Tili suorituksille"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Kumppanin viite"
 
 #. module: account
 #: 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 "Vastaavien ja vastattavien tilit"
+msgstr "Saatavat ja maksettavat tilit"
 
 #. module: account
 #: view:account.subscription:0
@@ -1757,7 +1759,7 @@ msgstr "Sivuluotto"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr "Ei sovitetut merkinnät"
+msgstr "Poista merkintöjen suoritukset"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1779,13 +1781,13 @@ msgstr "Uusi tiliote"
 #: wizard_field:account.analytic.account.chart,init,from_date:0
 #: wizard_field:account.analytic.line,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Mistä"
 
 #. module: account
 #: 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
@@ -1809,7 +1811,7 @@ msgstr "Prosentti"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "Kaaviot"
+msgstr "Tilikartat"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1830,7 +1832,7 @@ msgstr "Seuraava"
 msgid ""
 "The fiscal position will determine taxes and the accounts used for the the "
 "partner."
-msgstr ""
+msgstr "Talouskanta määrittelee kumppaniin sovellettavat verot ja tilit."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -1883,7 +1885,7 @@ msgstr "Aloituspäivä"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "Hyvityslaskujen kulupäiväkirja"
+msgstr "x Hyvityslaskujen kulupäiväkirja"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1926,13 +1928,13 @@ msgstr "Maksa lasku"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Virhe: Virheellinen BVR-numero (väärä tarkistussumma)."
 
 #. module: account
 #: 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
@@ -1960,7 +1962,7 @@ msgstr "Kumppanin viite tässä laskussa."
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
 msgid "Sort by:"
-msgstr ""
+msgstr "Järjestys:"
 
 #. module: account
 #: field:account.move,to_check:0
@@ -1990,7 +1992,7 @@ msgstr "Li"
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr "Tilikaaviot"
+msgstr "Tilikartat"
 
 #. module: account
 #: help:account.tax,name:0
@@ -2032,7 +2034,7 @@ msgstr "Verotili"
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "J.C. / Siirron nimi"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -2052,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
@@ -2078,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
@@ -2149,13 +2150,13 @@ msgstr "Maksamattomat laskut"
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment Reconcile"
-msgstr "Maksun sovittelu"
+msgstr "Maksun suoritusmerkinnät"
 
 #. module: account
 #: 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
@@ -2192,7 +2193,7 @@ msgstr "Arvon määrä"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "Sovitetut merkinnät"
+msgstr "Suoritetut merkinnät"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
@@ -2213,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
@@ -2229,7 +2230,7 @@ msgstr "Yksityiskohdat"
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Consolidation"
-msgstr "Vahvistaminen"
+msgstr "Yhdistetty"
 
 #. module: account
 #: field:account.chart.template,account_root_id:0
@@ -2243,6 +2244,8 @@ msgid ""
 "stay unpaid. Please, take appropriate measures in order to carry out this "
 "payment in the next 8 days."
 msgstr ""
+"Seuraavat laskut ovat edelleen maksamatta. Ole hyvä ja maksa nämä laskut "
+"seuraavan 8 päivän kuluessa."
 
 #. module: account
 #: rml:account.invoice:0
@@ -2256,28 +2259,28 @@ msgstr "ALV:"
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr "Tilikaaviot"
+msgstr "Tilikartat"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr ""
+msgstr "x Shekkipäiväkirja"
 
 #. 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 "Luo ennakkomaksukohdat"
+msgstr "Luo ennakkomaksun merkinnät"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr "Avataan merkintälokea"
+msgstr "Avauspäiväkirja"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr "Luo verovuosi"
+msgstr "Luo uusi tilikausi"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -2311,7 +2314,7 @@ msgstr "2"
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr "(Jos et valitse verovuotta se ottaa kaikki avoimet verovuodet)"
+msgstr "(Jos et valitse tilikautta, käytetään kaikkia avoimia tilikausia)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
@@ -2347,7 +2350,7 @@ msgstr "Viitetyyppi"
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr "Sovittelematon"
+msgstr "Poista suoritukset"
 
 #. module: account
 #: field:account.tax,type:0
@@ -2375,12 +2378,12 @@ msgstr "Tilimallit"
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "Tilimallikartat"
+msgstr "Tilikarttamalli"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
 msgid "Journal d'extourne"
-msgstr "Lokikirja d'extourne"
+msgstr "Palautuspäiväkirja"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -2391,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
@@ -2401,7 +2404,7 @@ msgstr "Tuo lasku"
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "and Journals"
-msgstr ""
+msgstr "ja päiväkirjat"
 
 #. module: account
 #: view:account.tax:0
@@ -2424,13 +2427,12 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
-"Aseta jos verolaskelmat perustuvat mieluummin alaverokohtiin kuin "
-"lopulliseen määrään."
+"Määritä perustuuko verojen laskenta alemmille veroille vai loppusummaan."
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr "Lokikoodi"
+msgstr "Päiväkirjakoodi"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -2468,7 +2470,7 @@ msgstr "Soveltuva koodi (jos tyyppi=koodi)"
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
 msgid "Open Journal"
-msgstr "Avoin loki"
+msgstr "Avaa päiväkirja"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2481,7 +2483,7 @@ msgstr ""
 #: 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 "Kohdat riveittäin"
+msgstr "Merkinnät riveittäin"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -2511,12 +2513,12 @@ msgstr "Lisäsopimustiedot"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Entries Reconcile"
-msgstr "Merkintä sovittelu"
+msgstr "Merkintöjen suoritus"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr ""
+msgstr "Summa tämän päiväkirjan valuutassa"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2615,7 +2617,7 @@ msgstr "Veroraportit"
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "Tili maksukelvollinen"
+msgstr "Tili maksettavat"
 
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
@@ -2635,13 +2637,14 @@ msgstr "Oletus luottotili"
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr "Maksujärjestys"
+msgstr "Maksumääräys"
 
 #. module: account
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "Valitse tämä jos haluat käyttäjän sovittelevan kohdat tällä tilillä."
+msgstr ""
+"Valitse tämä jos haluat käyttäjän tekevän suoritusmerkinnät tällä tilillä."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2685,6 +2688,11 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
+"Tyyppiä käytetään erottamaan tilejä joilla on OpenERP:ssä erityisiä "
+"ominaisuuksia: \"näkymä\" ei voi sisältää merkintöjä, \"yhdistetty\" tili "
+"muodostuu useammasta alatilistä (esim. useammasta yrityksestä), "
+"\"maksettavat\" / \"saatavat\" ovat kumppanien tilejä (käytetään velka-"
+"/luottolaskelmiin) ja \"suljettu\" tili on poistettu käytöstä."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2730,17 +2738,17 @@ msgstr ""
 #: 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 "Analyyttienn kaavio tileistä"
+msgstr "Analyyttinen tilikartat"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "View Account Analytic Lines"
-msgstr "Näytä tilien analyyttisetrivit"
+msgstr "Näytä tilin analyyttiset rivit"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Select Period and Journal for Validation"
-msgstr ""
+msgstr "Valitse jakso ja päiväkirja hyväksymistä varten"
 
 #. module: account
 #: field:account.invoice,number:0
@@ -2772,7 +2780,7 @@ msgstr "Vastaava analyyttinen saldo"
 #: field:account.tax,applicable_type:0
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr ""
+msgstr "Sovellettava tyyppi"
 
 #. module: account
 #: field:account.invoice,reference:0
@@ -2799,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
@@ -2838,7 +2846,7 @@ msgstr ""
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "Lokinäkymä"
+msgstr "Päiväkirjanäkymä"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2860,7 +2868,7 @@ msgstr "Kumppani tunnus"
 #: wizard_view:account.invoice.pay,addendum:0
 #: wizard_view:account.move.line.reconcile,addendum:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Arvonalennussiirto"
 
 #. module: account
 #: view:account.move.line:0
@@ -2908,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
@@ -2944,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
@@ -2972,13 +2980,13 @@ 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
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Reconcilation of entries from payment order."
-msgstr ""
+msgstr "Suoritusten kirjaus maksumääräyksestä."
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -2996,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
@@ -3015,7 +3023,7 @@ msgstr "Verokoodi"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Analytic Journal -"
-msgstr "Analyyttinen loki -"
+msgstr "Analyyttinen päiväkirja -"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -3031,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
@@ -3045,6 +3053,9 @@ msgid ""
 "between the date of the creation action or the the date of the creation of "
 "the entries plus the partner payment terms."
 msgstr ""
+"Luotujen merkintöjen erääntymispäivä tässä mallissa. Voit valita "
+"päivämääräksi joko luomispäivän, tai luomispäivän päivämäärän johon lisätään "
+"kumppanin maksuehdon mukainen aika."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3061,7 +3072,7 @@ msgstr "Dokumentti"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "Siirry pois tältä merkintäriviltä"
+msgstr "Merkinnän rivin siirto."
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -3071,7 +3082,7 @@ msgstr "Yksikön mitta"
 #. module: account
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "Saatavien tili"
+msgstr "Saatavat tili"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -3100,17 +3111,17 @@ msgstr "Peruuta valitut laskut"
 #: 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 "Analyyttinen loki"
+msgstr "Analyyttinen päiväkirja"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Entry Label"
-msgstr ""
+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
@@ -3135,7 +3146,7 @@ msgstr "Dokumentin viite joka on luonut tämän laskun."
 #: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
-msgstr "Maksettava"
+msgstr "Maksettavat"
 
 #. module: account
 #: rml:account.invoice:0
@@ -3180,7 +3191,7 @@ msgstr "Ehdotus laskusta tarkistusta, vahvistusta ja tulostusta varten"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_select
 msgid "account.move.line.select"
-msgstr ""
+msgstr "account.move.line.select"
 
 #. module: account
 #: view:account.account:0
@@ -3203,7 +3214,7 @@ msgstr "Tili"
 #. module: account
 #: model:account.journal,name:account.bank_journal
 msgid "Journal de Banque CHF"
-msgstr ""
+msgstr "Pankkipäiväkirja CHF"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3230,6 +3241,8 @@ msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
 msgstr ""
+"Laskun tilisiirtomerkinnät on suoritettu maksun (maksujen) "
+"tilisiirtomerkinnöillä."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3244,7 +3257,7 @@ msgstr "Verot"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Close Fiscal Year with new entries"
-msgstr "Sulje verovuosi uusilla merkinnöillä"
+msgstr "Sulje tilikausi uusilla merkinnöillä"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3255,7 +3268,7 @@ msgstr "Keskimääräinen kurssi"
 #: model:process.node,note:account.process_node_bankstatement0
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Statement encoding produces payment entries"
-msgstr "Tiliotekoodaus tuottaa maksurivit"
+msgstr "Tiliotteen syöttäminen tuottaa maksumerkinnät"
 
 #. module: account
 #: field:account.account,code:0
@@ -3292,17 +3305,17 @@ msgstr "Ei mikään"
 #: 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 "Luo merkinnät tilikauden avaukselle"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
-msgstr "Sovitellut merkinnät"
+msgstr "Tee suoritusmerkintöjä"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(Laskun sovitus täytyisi purkaa jos haluat avata sen)"
+msgstr "(Laskun suoritusmerkinnät tulisi poistaa jos se halutaan avata)"
 
 #. module: account
 #: view:account.invoice:0
@@ -3319,7 +3332,7 @@ msgstr "Veronimi"
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid " Close states of Fiscal year and periods"
-msgstr ""
+msgstr " Sulje tilikauden ja jaksojen tilat"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
@@ -3334,7 +3347,7 @@ msgstr "Juuriverokoodi"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Virhe: BVR-viite on pakollinen."
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3367,7 +3380,7 @@ msgstr "Kokonais debet"
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottaa"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -3398,7 +3411,7 @@ msgstr "Kolmannen osapuolen tilikirja"
 msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
-msgstr "Tätä tiliä käytetään oletuksen sijaan kumppanin saataville"
+msgstr "Tätä tiliä käytetään oletustilin sijasta tämän kumppanin saataville."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -3446,12 +3459,12 @@ msgstr "Tuo lasku"
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
-msgstr ""
+msgstr "Luo"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr "Luo tapahtuma"
+msgstr "Luo merkintä"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_line
@@ -3470,8 +3483,8 @@ 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 ""
-"Kaikki tilin luonnoskohdat tässä lokissa ja jaksossa tarkistetaan. Se "
-"tarkoittaa ettet voi muokata niiden tilikenttiä."
+"Kaikki luonnostilassa olevat tilimerkinnät tässä päiväkirjassa hyväksytään. "
+"Tämä tarkoittaa ettet voi enää muokata niiden tilikenttiä."
 
 #. module: account
 #: selection:account.model.line,date:0
@@ -3485,7 +3498,8 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"Määrä on pakotettu valinnaisessa valuutassa jos se on monivaluutta kohta."
+"Summa on ilmoitettu valinnaisessa toisessa valuutassa jos tämä on "
+"monivaluuttainen merkintä."
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3518,18 +3532,18 @@ msgstr "Jaksojen suodatin"
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr "Saatava -tili"
+msgstr "Tili saatavat"
 
 #. module: account
 #: wizard_button:account.invoice.pay,addendum,reconcile:0
 msgid "Pay and reconcile"
-msgstr "Maksa ja sovita"
+msgstr "Maksa ja suorita"
 
 #. module: account
 #: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "Keskitetty päiväkirja"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -3540,7 +3554,7 @@ msgstr "Saldoa tuotu eteenpäin"
 #. module: account
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr "Vahvistettu alajaos"
+msgstr "Yhdistetyt alatilit"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,fiscalyear:0
@@ -3549,7 +3563,7 @@ msgstr "Vahvistettu alajaos"
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Tilikausi"
 
 #. module: account
 #: rml:account.overdue:0
@@ -3565,7 +3579,7 @@ msgstr "Saldo ei ole tasan 0"
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -3575,7 +3589,7 @@ msgstr "Veroraportti"
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr ""
+msgstr "Tulostettu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4_new
@@ -3586,7 +3600,7 @@ msgstr "Uusi toimittajahyvitys"
 #. module: account
 #: view:account.model:0
 msgid "Entry Model"
-msgstr "Kohdemalli"
+msgstr "Merkintämalli"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
@@ -3606,7 +3620,7 @@ msgstr "Ennakkomaksu"
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal code"
-msgstr ""
+msgstr "Päiväkirjakoodi"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close,init,close:0
@@ -3622,12 +3636,12 @@ msgstr "Projektirivi"
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "Suurin alennusmäärä"
+msgstr "Maksimi arvonalennuksen määrä"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
 msgid "Manual"
-msgstr ""
+msgstr "Manuaalinen"
 
 #. module: account
 #: view:account.invoice:0
@@ -3650,7 +3664,7 @@ msgstr "Tätä maksuehtoa käytetään oletuksen sijaan nykyiselle kumppanille"
 #: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
-msgstr ""
+msgstr "Merkinnän nimi"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -3676,17 +3690,17 @@ msgstr "Valitse tämä jos et halua ALV:tä liitettävän verokoodeihin laskuill
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sarja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "Malli talouskannalle"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Entry encoding"
-msgstr "Kohdan laittaminen"
+msgstr "Merkinnän syöttäminen"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
@@ -3697,17 +3711,17 @@ msgstr "Luottoilmoitus"
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
 msgid "Define Fiscal Years and Select Charts of Account"
-msgstr ""
+msgstr "Määrittele tilikausi ja valitse tilikartat"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,period_id:0
 msgid "Write-Off Period"
-msgstr "Alennusjakso"
+msgstr "Arvonalennusjakso"
 
 #. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
-msgstr ""
+msgstr "3 kuukautta"
 
 #. module: account
 #: wizard_view:account.move.journal,init:0
@@ -3732,7 +3746,7 @@ msgstr "Maksuehtorivi"
 #: selection:account.config.wizard,period:0
 #: field:report.hr.timesheet.invoice.journal,name:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -3749,7 +3763,7 @@ msgstr "Eräpäivä"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "Ennakkomaksukohta"
+msgstr "Ennakkomaksun merkintä"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -3766,7 +3780,7 @@ msgstr "Tilin ohjattu konfigurointi toiminto "
 #: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
@@ -3777,34 +3791,34 @@ msgstr "Valitse kartta"
 #: selection:account.chart,init,target_move:0
 #: model:ir.actions.report.xml,name:account.account_move_line_list
 msgid "All Entries"
-msgstr ""
+msgstr "Kaikki merkinnät"
 
 #. module: account
 #: 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
 msgid "Fiscal Position Template Tax Mapping"
-msgstr ""
+msgstr "Talouskannan mallin veron kartoitukset"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Laskun päivämäärä"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Unreconciled"
-msgstr "Sovittelematon"
+msgstr "Suorittamaton"
 
 #. module: account
 #: field:account.account,note:0
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr ""
+msgstr "Huomautus"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -3832,23 +3846,23 @@ msgstr ""
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr ""
+msgstr "Merkinnän sarja"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 msgid "Payment Entries"
-msgstr ""
+msgstr "Maksumerkinnät"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or tax code account."
-msgstr ""
+msgstr "Tili voi olla joko perusveron tai verokoodin tili."
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
@@ -3856,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
@@ -3869,7 +3883,7 @@ msgstr "Myöhästyneen maksun viesti"
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "Other"
-msgstr ""
+msgstr "Muu"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_general_ledger
@@ -3882,12 +3896,12 @@ msgstr "Yleinen tilikirja"
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "Sarakkeet"
 
 #. module: account
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 msgid "Movement"
-msgstr ""
+msgstr "Siirto"
 
 #. module: account
 #: help:account.period,special:0
@@ -3900,17 +3914,19 @@ msgid ""
 "This account will be used instead of the default one to value outgoing stock "
 "for the current product"
 msgstr ""
+"Tätä tiliä käytetään oletustilin sijasta tämän tuotteen lähtevän varaston "
+"arvottamiseen."
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 msgid "Encode manually the statement"
-msgstr ""
+msgstr "Syötä tiliote manuaalisesti"
 
 #. module: account
 #: 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 "Talouden päiväkirjat"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3928,7 +3944,7 @@ msgstr "Jätä tyhjäksi käyttääksesi nykyistä päivämäärää"
 #. module: account
 #: rml:account.overdue:0
 msgid "."
-msgstr ""
+msgstr "."
 
 #. module: account
 #: field:account.analytic.account,quantity_max:0
@@ -3938,7 +3954,7 @@ msgstr "Maksimimäärä"
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Jakson nimi"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -3947,11 +3963,14 @@ msgid ""
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
 msgstr ""
+"Asettaa päiväkirjan tyypin analyyttiseksi. Kun jokin dokumentti (esim. "
+"lasku) vaatii analyyttisten merkintöjen kirjausta, OpenERP etsii tämän "
+"tyyppisen vastaavan päiväkirjan."
 
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -3967,7 +3986,7 @@ msgstr "Koodi/Päivämäärä"
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -3977,7 +3996,7 @@ msgstr "Tuo pankkisi tiliotteista"
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr ""
+msgstr "Ominaisuudet"
 
 #. module: account
 #: view:res.partner:0
@@ -3987,17 +4006,17 @@ msgstr "Asiakkaan kirjanpidon asetukset"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Select entries"
-msgstr ""
+msgstr "Valitse merkinnät"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
 msgid "All Posted Entries"
-msgstr ""
+msgstr "Kaikki viedyt merkinnät"
 
 #. module: account
 #: wizard_field:account.vat.declaration,init,based_on:0
 msgid "Base on"
-msgstr ""
+msgstr "Peruste"
 
 #. module: account
 #: selection:account.move,type:0
@@ -4007,7 +4026,7 @@ msgstr "Käteismaksu"
 #. module: account
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "Maksukelpoinen tili"
+msgstr "Maksettavat tili"
 
 #. module: account
 #: field:account.account,currency_id:0
@@ -4033,7 +4052,7 @@ msgstr "Toissijainen valuutta"
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account
 #: help:account.tax.template,child_depend:0
@@ -4041,6 +4060,7 @@ msgid ""
 "Indicate if the tax computation is based on the value computed for the "
 "computation of child taxes or based on the total amount."
 msgstr ""
+"Määritä perustuuko verojen laskenta alemmille veroille vai loppusummaan."
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -4073,17 +4093,17 @@ msgstr "Verotettu määrä"
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal w/o tax"
-msgstr ""
+msgstr "Välisumma ilman veroa"
 
 #. module: account
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "Laskun viite"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Yleinen tili"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -4091,14 +4111,14 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very usefull for some reports."
 msgstr ""
-"Valinnainen määrä täytetään tälle riville, esim. myytyjen tuotteiden määrä. "
-"Tämä ei ole laillinen vaatimus, mutta käytännöllinen esimerkiksi joissakin "
+"Valinnainen lukumäärä tälle riville, esim. myytyjen tuotteiden lukumäärä. "
+"Lukumäärä ei ole lain vaatima, mutta se on käytännöllinen joissain "
 "raporteissa."
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,reconcil:0
 msgid "       Include Reconciled Entries"
-msgstr ""
+msgstr "       Sisällytä suoritetut merkinnät"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -4106,6 +4126,7 @@ msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
 msgstr ""
+"Tämä laatikko voidaan valita jos merkintä on riidanalainen kumppanin kanssa."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4116,7 +4137,7 @@ msgstr "Asiakas Laskutus"
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "Maksettavat raja"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,state:0
@@ -4132,28 +4153,28 @@ msgstr "Päivämäärä/Jakso suodatin"
 #: selection:account.bank.statement.line,type:0
 #: selection:account.journal,type:0
 msgid "General"
-msgstr ""
+msgstr "Yleinen"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Credit Trans."
-msgstr ""
+msgstr "Kredit siirt."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "Erotellut lokijaksot"
+msgstr "Erotellut päiväkirjan sarjat"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
 msgid "The currency of the journal"
-msgstr ""
+msgstr "Päiväkirjan valuutta"
 
 #. module: account
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr ""
+msgstr "Päiväkirjan sarake"
 
 #. module: account
 #: selection:account.fiscalyear,state:0
@@ -4162,7 +4183,7 @@ msgstr ""
 #: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
@@ -4177,7 +4198,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
 msgid "Periods"
-msgstr ""
+msgstr "Jaksot"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4186,7 +4207,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Lasku"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -4194,7 +4215,7 @@ msgstr ""
 #: wizard_button:account.open_closed_fiscalyear,init,open:0
 #: wizard_button:account_use_models,create,open_move:0
 msgid "Open"
-msgstr ""
+msgstr "Avoin"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
@@ -4206,7 +4227,7 @@ msgstr "Etsintäkohteet"
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
 msgstr ""
-"Analyyttiset kustannukset myynnin uudelleen laskutuksesta, tuntilistat, ..."
+"Analyyttiset kustannukset uudelleenlaskuttaa ostoja, tuntilistoja jne."
 
 #. module: account
 #: field:account.account,tax_ids:0
@@ -4218,7 +4239,7 @@ msgstr "Oletusverot"
 #: 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
 #: help:account.account.type,sign:0
@@ -4228,12 +4249,12 @@ msgid ""
 "expenses accounts."
 msgstr ""
 "Sallii saldon etumerkin muuttamisen raporteilla, joten voit nähdä "
-"positiivisia lukuja negatiivisten sijaan kustannuksissa."
+"positiivisia lukuja negatiivisten sijasta esim. kustannuksissa."
 
 #. module: account
 #: help:account.config.wizard,code:0
 msgid "Name of the fiscal year as displayed in reports."
-msgstr ""
+msgstr "Tilikauden nimi siten kun se näytetään raporteissa."
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -4241,6 +4262,8 @@ msgid ""
 "This field is used for payable and receivable entries. You can put the limit "
 "date for the payment of this entry line."
 msgstr ""
+"Tätä kenttää käytetään merkintöihin maksettavista ja saatavista. Voit "
+"asettaa rajapäivämäärän merkintärivin maksulle."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -4255,7 +4278,7 @@ msgstr "Ylävasen"
 #. module: account
 #: help:account.journal,sequence_id:0
 msgid "The sequence gives the display order for a list of journals"
-msgstr ""
+msgstr "Sarja määrää päiväkirjojen järjestyksen niitä listattaessa"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
@@ -4268,7 +4291,7 @@ msgstr "Tyyppihallinnat"
 #: rml:account.analytic.account.balance:0
 #: rml:account.central.journal:0
 msgid "Account Name"
-msgstr ""
+msgstr "Tilin nimi"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
@@ -4278,12 +4301,12 @@ msgstr "Maksu päivämäärä"
 #. module: account
 #: wizard_button:account_use_models,create,end:0
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Verot:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree7
@@ -4302,17 +4325,17 @@ msgstr "Toimittajan laskut"
 #: field:account.invoice.line,product_id:0
 #: field:account.move.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Tuote"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr "Kaikki saatavat"
+msgstr "Saatavat yhteensä"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -4322,12 +4345,12 @@ msgstr "Tilijakso"
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr ""
+msgstr "Päiväkirja-/maksutyyppi"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Peruutettu lasku"
 
 #. module: account
 #: view:account.subscription:0
@@ -4349,7 +4372,7 @@ msgstr "Tilimalli"
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr ""
+msgstr "Vuoden summa"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -4365,13 +4388,13 @@ msgstr "Sisäinen tyyppi"
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #. module: account
 #: 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 "Juoksevat ennakkomaksut"
+msgstr "Voimassa olevat ennakkomaksut"
 
 #. module: account
 #: selection:account.move,type:0
@@ -4393,13 +4416,13 @@ msgstr "Luottotiedot"
 #: field:account.config.wizard,date2:0
 #: field:account.fiscalyear,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. module: account
 #: 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 "Peruuta avausmerkinnät"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoicemanually0
@@ -4415,7 +4438,7 @@ msgstr "Kuukaudenpäivä"
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "Rivit"
 
 #. module: account
 #: rml:account.overdue:0
@@ -4447,12 +4470,12 @@ msgstr "Arkistotiliote"
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr "Tilivuoden Sekvenssit"
+msgstr "Tilikausien sarjat"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Entry Model Line"
-msgstr ""
+msgstr "Merkintämallin rivi"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4462,7 +4485,7 @@ msgstr "Tiliveron malli"
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr ""
+msgstr "Tämä on malli toistuvasta kirjanpidon merkinnästä"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
@@ -4492,26 +4515,26 @@ msgstr "Toimittajan velat"
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Valinnainen merkintöjen määrä"
 
 #. module: account
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "JNRL"
-msgstr ""
+msgstr "JNRL"
 
 #. module: account
 #: view:account.fiscalyear:0
 #: view:account.period:0
 msgid "States"
-msgstr ""
+msgstr "Tilat"
 
 #. module: account
 #: view:account.move:0
 #: model:process.node,name:account.process_node_accountingentries0
 #: model:process.node,name:account.process_node_supplieraccountingentries0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Kirjanpidon merkinnät"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
@@ -4526,12 +4549,12 @@ msgstr "Yleinen Tilikirja -"
 #. module: account
 #: field:report.hr.timesheet.invoice.journal,quantity:0
 msgid "Quantities"
-msgstr ""
+msgstr "Määrät"
 
 #. module: account
 #: field:account.analytic.account,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -4541,13 +4564,13 @@ msgstr ""
 #: field:account.invoice,amount_total:0
 #: field:account.invoice,check_total:0
 msgid "Total"
-msgstr ""
+msgstr "Yhteensä"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Number of entries are generated"
-msgstr ""
+msgstr "Luotavien merkintöjen lukumäärä"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
@@ -4560,12 +4583,12 @@ msgstr "Sallitut merkinnät"
 #: 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 ""
+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
@@ -4573,7 +4596,7 @@ msgstr "Salli sovittelu"
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date"
-msgstr ""
+msgstr "Päivämäärän mukaan"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -4584,7 +4607,7 @@ msgstr "Toimittajan hyvitykset"
 #. module: account
 #: help:account.model.line,date:0
 msgid "The date of the generated entries"
-msgstr ""
+msgstr "Luotujen merkintöjen päivämäärä"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,modify_invoice:0
@@ -4594,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
@@ -4607,21 +4630,21 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
-"Toiminto konfiguroi automaattisesti kirjapitokartat, pankkitilit, verot ja "
-"lokit valitun mallin mukaan"
+"Tämä toiminto konfiguroi automaattisesti kirjanpidon tilikartat, "
+"pankkitilit, verot ja päiväkirjat valitun mallin mukaan"
 
 #. 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 "Tiliote"
 
 #. 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 "Merkinnät siirroittain"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -4642,13 +4665,13 @@ msgstr "Vero lisätty hintaan"
 #: 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 "Analyyttiset merkinnät päiväkirjoittain"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Valid entries from invoice"
-msgstr ""
+msgstr "Hyväksytyt merkinnät laskulta"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -4668,17 +4691,17 @@ msgstr ""
 #: field:wizard.company.setup,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Crebit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "Käytössä"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -4686,8 +4709,8 @@ msgid ""
 "Indicate if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
-"Kerro jos veronmäärä pitää olla sisällytettynä perusmäärään seuraavissa "
-"verolaskelmissa"
+"Ilmoita jos veron määrä täytyy sisällyttää perusmäärään seuraavia veroja "
+"laskettaessa"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
@@ -4697,7 +4720,7 @@ msgstr "Luonnostiliote"
 #. module: account
 #: field:account.analytic.journal,name:0
 msgid "Journal name"
-msgstr "Lokinimi"
+msgstr "Päiväkirjan nimi"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
@@ -4707,7 +4730,7 @@ msgstr "Tuo lasku tiliotteesta"
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -4725,22 +4748,22 @@ msgstr "Tuo laskuista tai maksuista"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
 #: model:ir.ui.menu,name:account.menu_reconcile_select
 msgid "Reconcile entries"
-msgstr ""
+msgstr "Tee suoritusmerkinnät"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Change"
-msgstr ""
+msgstr "Muuta"
 
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Icon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal - Period"
-msgstr "Loki - Jakso"
+msgstr "Päiväkirja - Jakso"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,credit:0
@@ -4756,7 +4779,7 @@ msgstr "Luo kuukausijaksot"
 #. module: account
 #: wizard_button:account.aged.trial.balance,init,print:0
 msgid "Print Aged Trial Balance"
-msgstr ""
+msgstr "Tulosta välitase"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -4766,7 +4789,7 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Ref."
-msgstr ""
+msgstr "Viite"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
@@ -4785,11 +4808,14 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
+"Valitse määrittääksesi että jokainen merkintä tähän päiväkirjaan ei luo "
+"uutta vastinetta vaan käyttää jaettua vastinetta. Tätä käytetään tilikauden "
+"päätökseen."
 
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Peruttu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -4805,24 +4831,24 @@ msgstr "Maksupäivä"
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "A/c No."
-msgstr ""
+msgstr "Tilinumero"
 
 #. module: account
 #: 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 "Tilin kustannukset ja tuotot lokin mukaan (Tässä kuussa)"
+msgstr "Tilin kustannukset ja tuotot päiväkirjan mukaan (Tässä kuussa)"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable Accounts"
-msgstr "Saatavat kirjanpidot"
+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
@@ -4833,7 +4859,7 @@ msgstr "Pankin tiliotteen rivi"
 #. module: account
 #: wizard_button:account.automatic.reconcile,reconcile,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
@@ -4845,7 +4871,7 @@ msgstr "Ohjaa laskua"
 #: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
-msgstr "Saatava"
+msgstr "Saatavat"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
@@ -4873,12 +4899,12 @@ msgstr "ALV:"
 #: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Yhteensä:"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
-msgstr ""
+msgstr "account.analytic.journal"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4895,13 +4921,13 @@ 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
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr ""
+msgstr "Vahvista"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
@@ -4938,12 +4964,12 @@ msgstr "Analyyttinen kirjanpito"
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Toimittajan lasku"
 
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Voimassa"
 
 #. module: account
 #: field:account.account,debit:0
@@ -4964,12 +4990,12 @@ msgstr ""
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
-msgstr ""
+msgstr "Debet"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
 msgid "All Months"
-msgstr ""
+msgstr "Kaikki kuukaudet"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,date:0
@@ -4979,7 +5005,7 @@ msgstr "Toimenpiteen päivämäärä"
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Laskurivit"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -4989,12 +5015,12 @@ msgstr "Jakson alku"
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,report_name:0
 msgid "Name of new entries"
-msgstr ""
+msgstr "Uusien merkintöjen nimi"
 
 #. module: account
 #: wizard_button:account_use_models,init_form,create:0
 msgid "Create Entries"
-msgstr ""
+msgstr "Luo merkinnät"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5015,24 +5041,24 @@ msgstr "Linkitä automaattisesti luotuihin tilisiirtoihin"
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "Sovitellut liiketoimet"
+msgstr "Suoritetut tapahtumat"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Raportointi"
 
 #. module: account
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Have a number and entries are generated"
-msgstr ""
+msgstr "On numero ja merkinnät luotu"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -5052,28 +5078,28 @@ msgstr "Ryhmittele laskurivit"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguraatio"
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:account.invoice:0
 msgid "Total amount"
-msgstr ""
+msgstr "Yhteensä"
 
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr ""
+msgstr "Tilipäiväkirja"
 
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr "Tilausrivit"
+msgstr "Ennakkomaksun rivit"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Tili tuloille tuotteen mallissa"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -5085,7 +5111,7 @@ msgstr "Pakota kaikille siirroille tällä tilillä toissijainen valuutta."
 #: wizard_button:populate_statement_from_inv,go,end:0
 #: wizard_button:populate_statement_from_inv,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Peruuta"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,checktype:0
@@ -5129,8 +5155,8 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
-"Valitse tämä jos haluat käyttää eri sekvenssiä jokaiselle luodulle lokille. "
-"Muutoin kaikki käyttävät samaa sekvenssiä."
+"Valitse tämä jos haluat käyttää eri sarjaa jokaiselle luodulle "
+"päiväkirjalle. Muuten kaikki käyttävät samaa sarjaa."
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
@@ -5142,18 +5168,18 @@ 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
 msgid "Maintains Invoice sequences with Fiscal Year"
-msgstr "Ylläpitää laskusekvenssejä Tilikauden kanssa"
+msgstr "Ylläpitää laskusarjoja tilikauden kanssa"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
 #: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With movements"
-msgstr ""
+msgstr "Siirtojen kanssa"
 
 #. module: account
 #: field:account.tax,domain:0
@@ -5169,17 +5195,17 @@ msgstr "Tilitiedot"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr ""
+msgstr "Tilin verokoodin malli"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr "Ennakkomaksujaksot"
+msgstr "Ennakkomaksun jaksot"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr ""
+msgstr "Manuaalisesti"
 
 #. module: account
 #: view:account.invoice:0
@@ -5192,24 +5218,24 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_finance_invoice
 #: wizard_field:populate_statement_from_inv,go,lines:0
 msgid "Invoices"
-msgstr ""
+msgstr "Laskut"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Payable Accounts"
-msgstr ""
+msgstr "Maksettavat tilit"
 
 #. module: account
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
-msgstr ""
+msgstr "Laskun rivi"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr "Arvonalennusloki"
+msgstr "Arvonalennuspäiväkirja"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
@@ -5219,7 +5245,7 @@ msgstr "Kokonaismaksu"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Purchase"
-msgstr ""
+msgstr "Päiväkirja osto"
 
 #. module: account
 #: selection:account.move,type:0
@@ -5235,34 +5261,34 @@ msgstr "Korvaava vero"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "Encode manually statement comes into the draft statement"
-msgstr ""
+msgstr "Manuaalisesti syötetty tiliote tulee luonnostiliotteeseen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr ""
+msgstr "Tässä kuussa"
 
 #. module: account
 #: field:account.account.type,sign:0
 msgid "Sign on Reports"
-msgstr ""
+msgstr "Etumerkki raporteissa"
 
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
+msgstr "Valinnainen toinen valuutta jos merkintä on monivaluuttainen."
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Maksut"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Accounting entries at statement's confirmation"
-msgstr ""
+msgstr "Kirjanpidon merkinnät tiliotteen vahvistuksessa"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -5272,12 +5298,12 @@ msgstr "käytä mallia"
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
 msgid "No"
-msgstr ""
+msgstr "Ei"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
 msgid "All account entries"
-msgstr ""
+msgstr "Kaikki tilin merkinnät"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -5295,7 +5321,7 @@ msgstr "Päivämääräsuodatin"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr ""
+msgstr "Valitse päiväkirja ja maksupäivä"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5308,12 +5334,12 @@ msgstr ""
 #: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Paid"
-msgstr ""
+msgstr "Maksettu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
@@ -5335,17 +5361,17 @@ msgstr "Oletko varma?"
 #: rml:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "Osittaiset merkintärivit"
 
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "Pankkisuorituksiin käytettävä pankkitiliote"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -5355,18 +5381,18 @@ msgstr "Tilikausi"
 #. module: account
 #: wizard_button:account.analytic.line,init,open:0
 msgid "Open Entries"
-msgstr ""
+msgstr "Avoimet merkinnät"
 
 #. module: account
 #: selection:account.analytic.account,type:0
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+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
@@ -5380,19 +5406,19 @@ msgstr "Toimittajan laskutus prosessi"
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
-msgstr ""
+msgstr "Sivu"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr ""
+msgstr "Lisätiedot"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr ""
+msgstr "Maksuehdot"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
@@ -5403,12 +5429,12 @@ msgstr "Saatavat ja maksettavat"
 #: rml:account.account.balance:0
 #: rml:account.general.journal:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: account
 #: field:account.bank.statement.line,reconcile_amount:0
 msgid "Amount reconciled"
-msgstr "Soviteltu määrä"
+msgstr "Suoritukset yhteensä"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -5422,13 +5448,16 @@ msgid ""
 "amount.If the tax account is base tax code,                    this field "
 "will contain the basic amount(without tax)."
 msgstr ""
+"Jos verotili on verokooditili, tässä kentässä on veron määrä. Jos verotili "
+"on perusverokoodi, tämä kenttä sisältää perusteena olevan summan (ilman "
+"veroa)."
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr ""
+msgstr "Laske"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -5444,7 +5473,7 @@ msgstr "Verosovellus"
 #: 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 "Ennakkomaksun merkinnät"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5466,19 +5495,19 @@ msgstr "Jaksojen määrä"
 #: 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 "Jakson loppu"
 
 #. module: account
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Tilimerkintä"
 
 #. module: account
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "Yleinen loki"
+msgstr "Yleinen päiväkirja"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5498,7 +5527,7 @@ msgstr "Yleinen loki"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5514,17 +5543,17 @@ msgstr "Laskuta vero"
 #: 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 "Analyyttisen lokin määritys"
+msgstr "Analyyttisen päiväkirjan määritys"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr ""
+msgstr "account.tax.template"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Pankkitilit"
 
 #. module: account
 #: constraint:account.period:0
@@ -5532,13 +5561,13 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
-"Virheellinen jakso ! Jotkin jaksot ovat päällekkäisiä tai jakson päivämäärä "
-"ei ole tilikauden käsittävällä laajuudella. "
+"Jakso on virheellinen! Jotkin jaksot ovat päällekkäisiä tai jakson "
+"päivämäärä ei ole tilikaudella. "
 
 #. module: account
 #: help:account.journal,invoice_sequence_id:0
 msgid "The sequence used for invoice numbers in this journal."
-msgstr ""
+msgstr "Sarja jota käytetään laskujen numeroihin tässä päiväkirjassa."
 
 #. module: account
 #: view:account.account:0
@@ -5547,7 +5576,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Yleistiedot"
 
 #. module: account
 #: help:populate_statement_from_inv,init,journal_id:0
@@ -5556,21 +5585,23 @@ msgid ""
 "filtering the invoices. If you left this field empty, it will search on all "
 "sale, purchase and cash journals."
 msgstr ""
+"Tällä kentällä voidaan valita päiväkirja josta laskuja etsitään. Jos tämä on "
+"tyhjä, etsitään kaikista myynti-, osto- ja kassapäiväkirjoista."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr "Virhe ! Tilikauden kesto on epäkelpo. "
+msgstr "Virhe! Tilikauden pituus on virheellinen. "
 
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr ""
+msgstr "Siirrot"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5587,7 +5618,7 @@ msgstr "Tililistaus"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Myynnin ominaisuudet"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -5603,7 +5634,7 @@ msgstr "Kustannustilikirja (Vain määrät)"
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr ""
+msgstr "Hyväksy tilimerkinnät"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -5619,12 +5650,12 @@ msgstr "Kaikkiaan myöhässä:"
 #: wizard_field:account.analytic.account.chart,init,to_date:0
 #: wizard_field:account.analytic.line,init,to_date:0
 msgid "To"
-msgstr ""
+msgstr "päättyen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr ""
+msgstr "Avoimien analyyttisten päiväkirjojen merkinnät"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -5634,12 +5665,12 @@ msgstr "Laskuta verot manuaalisesti"
 #. module: account
 #: field:account.model.line,date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Nykyinen päivämäärä"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Sale"
-msgstr "Myynnin loki"
+msgstr "Päiväkirja myynti"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy_id:0
@@ -5657,12 +5688,12 @@ msgstr "Suljettava tilikausi"
 #: 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 "Jakson alku"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr ""
+msgstr "Mallit"
 
 #. module: account
 #: wizard_button:account.vat.declaration,init,report:0
@@ -5688,7 +5719,7 @@ msgstr "IntraCom"
 #: field:account.tax.code,info:0
 #: field:account.tax.code.template,info:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: account
 #: help:product.template,property_account_income:0
@@ -5702,7 +5733,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Alemmat verotilit"
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -5729,7 +5760,8 @@ msgstr "Tilikonfigurointi"
 msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
-msgstr "Tätä tiliä käytetään oletuksen sijaan kumppanin maksutilinä"
+msgstr ""
+"Tätä tiliä käytetään oletustilin sijasta tämän kumppanin maksettaville."
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -5788,17 +5820,17 @@ msgstr "Kirjanpidon ominaisuudet"
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr ""
+msgstr "account.sequence.fiscalyear"
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Merkintöjen järjestelyn peruste"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Print Journal -"
-msgstr "Tulosta loki -"
+msgstr "Tulosta päiväkirja -"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -5839,7 +5871,7 @@ msgstr "Erääntyneet"
 #: field:fiscalyear.seq,fiscalyear_id:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr "Tilivuosi"
+msgstr "Tilikausi"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
@@ -5853,7 +5885,7 @@ msgstr "Tulevat"
 #: 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 "Pidä tyhjänä avoimien tilivuosien aikana"
+msgstr "Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5865,12 +5897,12 @@ msgstr "Toimittajan hyvitys"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr ""
+msgstr "Suoritusmerkinnät."
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr ""
+msgstr "Merkintä"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5878,7 +5910,7 @@ msgstr ""
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr "Maksettu lasku soviteltaessa."
+msgstr "Lasku maksettu kun suoritukset on tehty."
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
@@ -5889,7 +5921,7 @@ msgstr "Python -koodi (vastakohta)"
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management"
-msgstr "Kirjanpidon -ja taloudenhallinta"
+msgstr "Kirjanpidon- ja taloudenhallinta"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -5938,7 +5970,7 @@ msgstr "Tilikoodi"
 #. module: account
 #: help:account.config.wizard,name:0
 msgid "Name of the fiscal year as displayed on screens."
-msgstr "Tilivuoden nimi (näkymä ruudulla)"
+msgstr "Tilikauden nimi siten kun se näytetään ruudulla."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -5955,7 +5987,7 @@ msgstr "Maksuehto"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr ""
+msgstr "Talouskannat"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
@@ -5965,7 +5997,7 @@ msgstr "Tilioteprosessi"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr "Tiliote sovittelu"
+msgstr "Tiliotteen suoritukset"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0
@@ -6004,11 +6036,13 @@ msgstr "Kyllä"
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
+"Valitse tämä jos käyttäjän on sallittua tehdä suoritusmerkintöjä tässä "
+"tilissä."
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
-msgstr "Lasketut merkintäpäivät"
+msgstr "Laske merkintäpäivät"
 
 #, python-format
 #~ msgid "No period found !"
@@ -6021,23 +6055,6 @@ msgstr "Lasketut merkintäpäivät"
 #~ msgid "You must first select a partner !"
 #~ msgstr "Sinun täytyy ensiksi valita yhteistyökumppani!"
 
-#~ msgid ""
-#~ "Would your payment have been carried out after this mail was sent, please "
-#~ "consider the present one as void. Do not hesitate to contact our accounting "
-#~ "departement at +32 81 81 37 00."
-#~ msgstr ""
-#~ "Oliko maksusi suoritettu kun tämä sähköposti lähetettiin, ota huomioon "
-#~ "nykyinen mitätöidyksi. Älä epäröi ottaa yhteyttä kirjanpito-osastoon +32 81 "
-#~ "81 37 00"
-
-#, python-format
-#~ msgid ""
-#~ "You can not do this modification on a reconciled entry ! Please note that "
-#~ "you can just change some non important fields !"
-#~ msgstr ""
-#~ "Et voi tehdä tätä muokkausta sovitetulle merkinnälle! Huomioi että voit "
-#~ "muuttaa vain joitain ei tärkeitä kenttiä!"
-
 #, python-format
 #~ msgid "No Data Available"
 #~ msgstr "Ei tietoa saatavilla"
@@ -6049,14 +6066,6 @@ msgstr "Lasketut merkintäpäivät"
 #~ msgid "No Partner Defined !"
 #~ msgstr "Ei kumppania määriteltynä!"
 
-#, python-format
-#~ msgid ""
-#~ "You can not do this modification on a confirmed entry ! Please note that you "
-#~ "can just change some non important fields !"
-#~ msgstr ""
-#~ "Et voi muokata tätä hyväksyttyä merkintää! Ota huomioon että voit muuttaa "
-#~ "ainoastaan ei tärkeitä kenttiä"
-
 #, python-format
 #~ msgid "Cannot delete invoice(s) that are already opened or paid !"
 #~ msgstr "Laskua(laskuja) jotka ovat avatuja tai maksettuja ei voida poistaa"
@@ -6072,18 +6081,6 @@ msgstr "Lasketut merkintäpäivät"
 #~ msgid "Configration Error !"
 #~ msgstr "Asetusvirhe"
 
-#, python-format
-#~ msgid "Some entries are already reconciled !"
-#~ msgstr "Jotkut merkinnät ovat jo soviteltuja"
-
-#, python-format
-#~ msgid "No Analytic Journal !"
-#~ msgstr "Ei analyyttinen loki"
-
-#, python-format
-#~ msgid "Already Reconciled"
-#~ msgstr "Jo soviteltu"
-
 #, python-format
 #~ msgid "Unable to change tax !"
 #~ msgstr "Veroa ei voida muuttaa!"
@@ -6092,10 +6089,6 @@ msgstr "Lasketut merkintäpäivät"
 #~ msgid "No records found for your selection!"
 #~ msgstr "Tietoja ei löydy valinnalle"
 
-#, python-format
-#~ msgid "Unable to reconcile entry \"%s\": %.2f"
-#~ msgstr "Merkintöä \"%s\": %.2f ei voida sovittaa"
-
 #~ msgid "Move name"
 #~ msgstr "Siirrä nimi"
 
@@ -6103,22 +6096,6 @@ msgstr "Lasketut merkintäpäivät"
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "Päiväys täytyy asettaa välille %s ja %s"
 
-#, python-format
-#~ msgid "Sales Journal"
-#~ msgstr "Myyntiloki"
-
-#, python-format
-#~ msgid "You can not modify/delete a journal with entries for this period !"
-#~ msgstr "Et voi muokata/poistaa lokikirjaa jossa merkintöjä tälle kaudelle"
-
-#, python-format
-#~ msgid "Invoice is already reconciled"
-#~ msgstr "Lasku on jo sovitettu"
-
-#, python-format
-#~ msgid "The account is not defined to be reconcile !"
-#~ msgstr "Tiliä ei ole määritelty sovitelluksi"
-
 #, python-format
 #~ msgid "Entries: "
 #~ msgstr "Merkinnät: "
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 <davide.corio@domsense.com>\n"
+"PO-Revision-Date: 2010-03-29 15:32+0000\n"
+"Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <EMAIL@ADDRESS>\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 <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <Unknown>\n"
+"PO-Revision-Date: 2010-03-24 00:57+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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..de27f983cc7 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/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: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/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 <anders.wallenquist@vertel.se>\n"
+"PO-Revision-Date: 2010-03-24 14:33+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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/invoice.py b/addons/account/invoice.py
index 47561e57aaf..e79774e36e4 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1136,7 +1136,8 @@ class account_invoice_line(osv.osv):
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
         'note': fields.text('Notes', translate=True),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
-        'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
+        'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
+        'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
     _defaults = {
         'quantity': lambda *a: 1,
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 5954c4e80b0..e53047b8718 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -139,6 +139,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Entry">
+                <separator string="General Information" colspan="4"/>
                     <field colspan="4" name="name" select="1"/>
                     <field name="amount" select="2"/>
                     <field name="date" select="1"/>
@@ -146,6 +147,7 @@
                     <field name="journal_id" select="2"/>
                     <field name="general_account_id" select="2"/>
                     <field name="move_id" select="2"/>
+                <separator string="Optionnal Information" colspan="4"/>
                     <field name="unit_amount" select="2"/>
                     <field name="ref" select="2"/>
                     <field name="currency_id" select="2"/>
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/report/__init__.py b/addons/account/report/__init__.py
index 0311398420b..71f612e0329 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -34,7 +34,8 @@ import general_ledger_landscape
 import account_tax_code
 import account_balance_landscape
 import compare_account_balance
-
+import account_invoice_report
+import account_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
new file mode 100644
index 00000000000..0d4ac30323d
--- /dev/null
+++ b/addons/account/report/account_invoice_report.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields,osv
+
+class account_invoice_report(osv.osv):
+    _name = "account.invoice.report"
+    _description = "Invoices Statistics"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.date('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'product_qty':fields.float('Qty', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
+        'price_total':fields.float('Total Price', readonly=True),
+        'price_average':fields.float('Average Price', readonly=True),
+        'nbr':fields.integer('# of Lines', readonly=True),
+        'type': fields.selection([
+            ('out_invoice','Customer Invoice'),
+            ('in_invoice','Supplier Invoice'),
+            ('out_refund','Customer Refund'),
+            ('in_refund','Supplier Refund'),
+            ],'Type', readonly=True),
+        'state': fields.selection([
+            ('draft','Draft'),
+            ('proforma','Pro-forma'),
+            ('proforma2','Pro-forma'),
+            ('open','Open'),
+            ('paid','Done'),
+            ('cancel','Cancelled')
+            ], 'Order State', readonly=True),
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'account_invoice_report')
+        cr.execute("""
+            create or replace view account_invoice_report as (
+                 select
+                     min(l.id) as id,
+                     s.date_invoice as date,
+                     to_char(s.date_invoice, 'YYYY') as year,
+                     to_char(s.date_invoice, 'MM') as month,
+                     l.product_id as product_id,
+                     sum(l.quantity * u.factor) as product_qty,
+                     s.partner_id as partner_id,
+                     s.user_id as user_id,
+                     s.company_id as company_id,
+                     sum(l.quantity*l.price_unit) as price_total,
+                     (sum(l.quantity*l.price_unit)/sum(l.quantity * u.factor))::decimal(16,2) as price_average,
+                     count(*) as nbr,
+                     s.type as type,
+                     s.state
+                     from
+                 account_invoice_line l
+                 left join
+                     account_invoice s on (s.id=l.invoice_id)
+                     left join product_uom u on (u.id=l.uos_id)
+                 group by
+                     s.type,s.date_invoice, s.partner_id, l.product_id,
+                     l.uos_id, s.user_id, s.state,
+                     s.company_id
+            )
+        """)
+account_invoice_report()
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
new file mode 100644
index 00000000000..de046de6211
--- /dev/null
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_account_invoice_report_tree" model="ir.ui.view">
+        <field name="name">account.invoice.report.tree</field>
+        <field name="model">account.invoice.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Invoices Statistics">
+                <field name="date"/>
+                <field name="user_id"/>
+                <field name="year" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="type" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <field name="product_qty"/>
+                <!--field name="delay" avg="Days to Close"/-->
+                <field name="nbr" sum="# of Lines"/>
+                <field name="price_average" avg="Average Price"/>
+                <field name="price_total" sum="Total Price"/>
+                <field name="state" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_account_invoice_report_graph" model="ir.ui.view">
+         <field name="name">account.invoice.report.graph</field>
+         <field name="model">account.invoice.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Invoices Statistics" type="bar">
+                 <field name="product_id"/>
+                 <field name="price_total"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_account_invoice_report_search" model="ir.ui.view">
+        <field name="name">account.invoice.report.search</field>
+        <field name="model">account.invoice.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Invoices">
+                <filter icon="terp-account"
+                    string="This Year"
+                    domain="[('year','=',time.strftime('%%Y'))]"
+                    help="Invoices of the year"/>
+                <filter icon="terp-account"
+                    string="This Month"
+                    domain="[('month','=',time.strftime('%%m'))]"
+                    help="Invoices of this month"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-account"
+                    string="Draft"
+                    domain="[('state','=','draft')]"/>
+                <filter icon="terp-account"
+                    string="Invoices"
+                    domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                <separator orientation="vertical"/>
+                <field name="product_id"/>
+                <field name="user_id" widget="selection">
+                    <filter icon="terp-account"
+                        string="My Invoices"
+                        domain="[('user_id','=',uid)]"/>
+                </field>
+                <field name="partner_id"/>
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+
+                <newline/>
+                <group expand="1" string="Extended options..." colspan="10" col="12">
+                    <filter icon="terp-account"
+                    		string="Customer Invoices"
+                    		domain="[('type','=','out_invoice')]"/>
+                    <filter icon="terp-account"
+                    		string="Supplier Invoices"
+                    		domain="[('type','=','in_invoice')]"/>
+                    <filter icon="terp-account"
+                    		string="Customer Refunds"
+                    		domain="[('type','=','out_refund')]"/>
+                    <filter icon="terp-account"
+                    		string="Supplier Refunds"
+                    		domain="[('type','=','in_refund')]"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}"/>
+                    <filter string="Salesman" icon="terp-account" context="{'group_by':'user_id'}" default="1"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-account" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_account_invoice_report_all" model="ir.actions.act_window">
+        <field name="name">Invoices</field>
+        <field name="res_model">account.invoice.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_account_invoice_report_search"/>
+    </record>
+
+    <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_reporting" sequence="0"/>
+
+</data>
+</openerp>
diff --git a/addons/report_account/report_receivable.py b/addons/account/report/account_report.py
similarity index 100%
rename from addons/report_account/report_receivable.py
rename to addons/account/report/account_report.py
diff --git a/addons/report_account/report_receivable_view.xml b/addons/account/report/account_report_view.xml
similarity index 100%
rename from addons/report_account/report_receivable_view.xml
rename to addons/account/report/account_report_view.xml
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 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-		<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>        
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>        
         <field name="rule_group" ref="account_move_comp_rule_group"/>
     </record>
 
@@ -60,7 +60,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move.line'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-		<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="account_move_line_comp_rule_group"/>
     </record>
     <record id="journal_period_comp_rule_group" model="ir.rule.group">
@@ -72,7 +72,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal.period'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="journal_period_comp_rule_group"/>
     </record>
 
@@ -85,7 +85,7 @@
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="journal_comp_rule_group"/>
     </record>
     <record id="analytic_journal_comp_rule_group" model="ir.rule.group">
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 271a4efe0ab..656e05e2a9b 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -88,3 +88,10 @@
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
 "access_account_installer","account.installer","model_account_installer","base.group_user",1,0,0,0
+"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,0,0,0
+"access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
+"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0
+"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,0,0,0
+"access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
+"access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
+"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
index ca8153f3ce7..ae6b29b0f43 100644
--- a/addons/account/wizard/wizard_account_chart.py
+++ b/addons/account/wizard/wizard_account_chart.py
@@ -24,7 +24,7 @@ import pooler
 
 class wizard_account_chart(wizard.interface):
     _account_chart_arch = '''<?xml version="1.0"?>
-    <form string="Account charts">
+    <form string="Open account charts">
         <field name="fiscalyear"/>
         <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
         <field name="target_move"/>
@@ -67,7 +67,7 @@ class wizard_account_chart(wizard.interface):
     states = {
         'init': {
             'actions': [_get_defaults],
-            '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', 'gtk-ok')]}
         },
         'open': {
             'actions': [],
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 = """<?xml version="1.0"?>
-<form string="Aged Trial Balance">
+<form string="Print Aged Trial Balance">
     <field name="company_id"/>
     <newline/>
     <field name="date1"/>
@@ -101,7 +101,7 @@ class wizard_report(wizard.interface):
     states = {
         'init': {
             'actions': [_get_defaults],
-            'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel'),('print','Print Aged Trial Balance')]},
+            'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel', 'gtk-cancel'),('print','Print', 'gtk-ok')]},
         },
         'print': {
             'actions': [_calc_dates],
diff --git a/addons/account/wizard/wizard_automatic_reconcile.py b/addons/account/wizard/wizard_automatic_reconcile.py
index 7a0f5a8c465..ac26b6c44fe 100644
--- a/addons/account/wizard/wizard_automatic_reconcile.py
+++ b/addons/account/wizard/wizard_automatic_reconcile.py
@@ -308,11 +308,11 @@ class wiz_reconcile(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type':'form', 'arch':_reconcile_form, 'fields':_reconcile_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
+            'result': {'type':'form', 'arch':_reconcile_form, 'fields':_reconcile_fields, 'state':[('end','Cancel', 'gtk-cancel'),('reconcile','Reconcile', 'gtk-ok')]}
         },
         'reconcile': {
             'actions': [_reconcile],
-            'result': {'type':'form', 'arch':_result_form, 'fields':_result_fields, 'state':[('end','OK')]}
+            'result': {'type':'form', 'arch':_result_form, 'fields':_result_fields, 'state':[('end','OK', 'gtk-cancel')]}
         }
     }
 wiz_reconcile('account.automatic.reconcile')
diff --git a/addons/account/wizard/wizard_bank_reconcile.py b/addons/account/wizard/wizard_bank_reconcile.py
index c081657304a..8770af7c535 100644
--- a/addons/account/wizard/wizard_bank_reconcile.py
+++ b/addons/account/wizard/wizard_bank_reconcile.py
@@ -25,7 +25,7 @@ from tools.translate import _
 _journal_form = '''<?xml version="1.0"?>
 <form string="%s">
     <field name="journal_id"/>
-</form>''' % ('Bank reconciliation',)
+</form>''' % ('Open Bank reconciliation',)
 
 _journal_fields = {
     'journal_id': {'string':'Journal', 'type':'many2one', 'relation':'account.journal', 'required':True},
@@ -53,7 +53,7 @@ class wiz_journal(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel'),('open','Open for bank reconciliation')]}
+            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel', 'gtk-cancel'),('open','Open', 'gtk-ok')]}
         },
         'open': {
             'actions': [],
diff --git a/addons/account/wizard/wizard_central_journal.py b/addons/account/wizard/wizard_central_journal.py
index 8a6e1645a6f..32fb02f3230 100644
--- a/addons/account/wizard/wizard_central_journal.py
+++ b/addons/account/wizard/wizard_central_journal.py
@@ -59,7 +59,7 @@ class wizard_print_journal(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
+            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))},
         },
         'print': {
             'actions': [_check_data],
diff --git a/addons/account/wizard/wizard_change_currency.py b/addons/account/wizard/wizard_change_currency.py
index 69fbd8c85ed..45b23e49022 100644
--- a/addons/account/wizard/wizard_change_currency.py
+++ b/addons/account/wizard/wizard_change_currency.py
@@ -92,7 +92,7 @@ class wizard_change_currency(wizard.interface):
         },
         'change': {
             'actions': [],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('next', 'Change Currency'))},
+            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('next', 'Change Currency', 'gtk-go-forward'))},
         },
         'next': {
             'actions': [_change_currency],
@@ -100,7 +100,7 @@ class wizard_change_currency(wizard.interface):
         },
         'message': {
             'actions': [],
-            'result': {'type': 'form', 'arch': message, 'fields': {}, 'state': [('end', 'Ok')]},
+            'result': {'type': 'form', 'arch': message, 'fields': {}, 'state': [('end', 'Ok', 'gtk-cancel')]},
         },
     }
 wizard_change_currency('account.invoice.currency_change')
diff --git a/addons/account/wizard/wizard_compare_account_balance_report.py b/addons/account/wizard/wizard_compare_account_balance_report.py
index 1928e82c41d..8000d37536d 100755
--- a/addons/account/wizard/wizard_compare_account_balance_report.py
+++ b/addons/account/wizard/wizard_compare_account_balance_report.py
@@ -146,7 +146,7 @@ class wizard_report(wizard.interface):
     states = {
         'init': {
             'actions': [_get_defaults],
-            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('checkyear','Print')]}
+            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('checkyear','Print', 'gtk-ok')]}
         },
         'backtoinit': {
             'actions': [],
diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py
index 42e35276802..cbf4b8d0529 100644
--- a/addons/account/wizard/wizard_fiscalyear_close.py
+++ b/addons/account/wizard/wizard_fiscalyear_close.py
@@ -214,7 +214,7 @@ class wiz_journal_close(wizard.interface):
     states = {
         'init': {
             'actions': [_data_load],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Create entries')]}
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel', 'gtk-cancel'),('close','Create', 'gtk-ok')]}
         },
         'close': {
             'actions': [_data_save],
diff --git a/addons/account/wizard/wizard_fiscalyear_close_state.py b/addons/account/wizard/wizard_fiscalyear_close_state.py
index 2f8331f2d3e..5d876f9b0a3 100644
--- a/addons/account/wizard/wizard_fiscalyear_close_state.py
+++ b/addons/account/wizard/wizard_fiscalyear_close_state.py
@@ -57,7 +57,7 @@ class wiz_journal_close_state(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Close states')]}
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel', 'gtk-cancel'),('close','Close states', 'gtk-ok')]}
         },
         'close': {
             'actions': [_data_save],
diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py
index 4d23624edab..26935aa80d6 100644
--- a/addons/account/wizard/wizard_general_journal.py
+++ b/addons/account/wizard/wizard_general_journal.py
@@ -57,7 +57,7 @@ class wizard_print_journal(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
+            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))},
         },
         'print': {
             'actions': [_check_data],
diff --git a/addons/account/wizard/wizard_journal.py b/addons/account/wizard/wizard_journal.py
index fd2b012863e..093c22f10e8 100644
--- a/addons/account/wizard/wizard_journal.py
+++ b/addons/account/wizard/wizard_journal.py
@@ -85,7 +85,7 @@ class wiz_journal(wizard.interface):
     states = {
         'init': {
             'actions': [_period_get],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel'),('open','Open Journal')]}
+            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel', 'gtk-cancel'),('open','Open Journal', 'gtk-ok')]}
         },
         'open': {
             'actions': [],
diff --git a/addons/account/wizard/wizard_open_closed_fiscalyear.py b/addons/account/wizard/wizard_open_closed_fiscalyear.py
index cbc46316484..18ac86c8107 100644
--- a/addons/account/wizard/wizard_open_closed_fiscalyear.py
+++ b/addons/account/wizard/wizard_open_closed_fiscalyear.py
@@ -63,7 +63,7 @@ class open_closed_fiscal(wizard.interface):
                 'type': 'form',
                 'arch': form,
                 'fields': fields,
-                'state':[('end','Cancel'),('open','Open')]
+                'state':[('end','Cancel', 'gtk-cancel'),('open','Open', 'gtk-ok')]
             }
         },
         'open': {
diff --git a/addons/account/wizard/wizard_period_close.py b/addons/account/wizard/wizard_period_close.py
index d6ba73683f2..abdbb9c815e 100644
--- a/addons/account/wizard/wizard_period_close.py
+++ b/addons/account/wizard/wizard_period_close.py
@@ -43,7 +43,7 @@ class wiz_journal_close(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Close Period')]}
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel', 'gtk-cancel'),('close','Close Period', 'gtk-ok')]}
         },
         'close': {
             'actions': [_data_save],
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
index 2f61b76f14a..8cd95608256 100644
--- a/addons/account/wizard/wizard_print_journal.py
+++ b/addons/account/wizard/wizard_print_journal.py
@@ -66,7 +66,7 @@ class wizard_print_journal(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
+            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))},
         },
         'print': {
             'actions': [_check_data],
diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index 9debe7afbef..ba7cf7eaef0 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -124,15 +124,15 @@ class wiz_reconcile(wizard.interface):
         },
         'init_full': {
             'actions': [_trans_rec_get],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel', 'gtk-cancel'),('reconcile','Reconcile', 'gtk-ok')]}
         },
         'init_partial': {
             'actions': [_trans_rec_get],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('addendum','Reconcile With Write-Off'),('partial','Partial Reconcile')]}
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel', 'gtk-cancel'),('addendum','Reconcile With Write-Off', 'gtk-ok'),('partial','Partial Reconcile', 'gtk-ok')]}
         },
         'addendum': {
             'actions': [_trans_rec_addendum],
-            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
+            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end','Cancel', 'gtk-cancel'),('reconcile','Reconcile', 'gtk-ok')]}
         },
         'reconcile': {
             'actions': [_trans_rec_reconcile],
diff --git a/addons/account/wizard/wizard_statement_from_invoice.py b/addons/account/wizard/wizard_statement_from_invoice.py
index 92d33f329c7..6e9f912380f 100644
--- a/addons/account/wizard/wizard_statement_from_invoice.py
+++ b/addons/account/wizard/wizard_statement_from_invoice.py
@@ -176,8 +176,8 @@ class PopulateStatementFromInv(wizard.interface):
                 'arch': FORM,
                 'fields': FIELDS,
                 'state': [
-                    ('end', '_Cancel','', True),
-                    ('finish', 'O_k','', True)
+                    ('end', '_Cancel','', True, 'gtk-cancel'),
+                    ('finish', 'O_k','', True, 'gtk-ok')
                 ]
             },
         },
diff --git a/addons/account/wizard/wizard_subscription_generate.py b/addons/account/wizard/wizard_subscription_generate.py
index 51cbad9ec3a..1df25b219cd 100644
--- a/addons/account/wizard/wizard_subscription_generate.py
+++ b/addons/account/wizard/wizard_subscription_generate.py
@@ -47,7 +47,7 @@ class wiz_subscription(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_subscription_form, 'fields':_subscription_fields, 'state':[('end','Cancel'),('generate','Compute Entry Dates')]}
+            'result': {'type': 'form', 'arch':_subscription_form, 'fields':_subscription_fields, 'state':[('end','Cancel', 'gtk-cancel'),('generate','Compute', 'gtk-ok')]}
         },
         'generate': {
             'actions': [_action_generate],
diff --git a/addons/account/wizard/wizard_unreconcile.py b/addons/account/wizard/wizard_unreconcile.py
index 42d2d2d967f..e42a1bc080b 100644
--- a/addons/account/wizard/wizard_unreconcile.py
+++ b/addons/account/wizard/wizard_unreconcile.py
@@ -42,7 +42,7 @@ class wiz_unreconcile(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel'), ('unrec', 'Unreconcile')]}
+            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel', 'gtk-cancel'), ('unrec', 'Unreconcile', 'gtk-ok')]}
         },
         'unrec': {
             'actions': [_trans_unrec],
@@ -62,7 +62,7 @@ class wiz_unreconcile_reconcile(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel'), ('unrec', 'Unreconcile')]}
+            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel', 'gtk-cancel'), ('unrec', 'Unreconcile', 'gtk-ok')]}
         },
         'unrec': {
             'actions': [_trans_unrec_reconcile],
diff --git a/addons/account/wizard/wizard_unreconcile_select.py b/addons/account/wizard/wizard_unreconcile_select.py
index 2f347d495a9..998be07a5f2 100644
--- a/addons/account/wizard/wizard_unreconcile_select.py
+++ b/addons/account/wizard/wizard_unreconcile_select.py
@@ -45,7 +45,7 @@ class wiz_unrec_select(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel'),('open','Open for unreconciliation')]}
+            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel', 'gtk-cancel'),('open','Open for unreconciliation', 'gtk-ok')]}
         },
         'open': {
             'actions': [],
diff --git a/addons/account/wizard/wizard_use_model.py b/addons/account/wizard/wizard_use_model.py
index 7ce32c6d330..ef3a4ba1310 100644
--- a/addons/account/wizard/wizard_use_model.py
+++ b/addons/account/wizard/wizard_use_model.py
@@ -26,7 +26,7 @@ import pooler
 from tools.translate import _
 
 model_form = """<?xml version="1.0"?>
-<form string="Select Message">
+<form string="Create entries from models">
     <field name="model"/>
 </form>"""
 
@@ -113,7 +113,7 @@ class use_model(wizard.interface):
         },
         'init_form': {
             'actions': [],
-            'result': {'type':'form', 'arch':model_form, 'fields':model_fields, 'state':[('end','Cancel'),('create','Create Entries')]},
+            'result': {'type':'form', 'arch':model_form, 'fields':model_fields, 'state':[('end','Cancel', 'gtk-cancel'),('create','Create', 'gtk-ok')]},
         },
         'create': {
             'actions': [_create_entries],
diff --git a/addons/account/wizard/wizard_validate_account_move.py b/addons/account/wizard/wizard_validate_account_move.py
index 11dcac86d53..1b56431b4b9 100644
--- a/addons/account/wizard/wizard_validate_account_move.py
+++ b/addons/account/wizard/wizard_validate_account_move.py
@@ -52,7 +52,7 @@ class validate_account_move(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel'),('validate','Validate')]}
+            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel', 'gtk-cancel'),('validate','Validate', 'gtk-ok')]}
         },
         'validate': {
             'actions': [_validate_move],
diff --git a/addons/account/wizard/wizard_vat.py b/addons/account/wizard/wizard_vat.py
index f9d015df336..6c14402c701 100755
--- a/addons/account/wizard/wizard_vat.py
+++ b/addons/account/wizard/wizard_vat.py
@@ -69,8 +69,8 @@ class wizard_report(wizard.interface):
 				'arch': dates_form,
 				'fields': dates_fields,
 				'state': [
-					('end', 'Cancel'),
-					('report', 'Print VAT Decl.')
+					('end', 'Cancel', 'gtk-cancel'),
+					('report', 'Print VAT Decl.', 'gtk-ok')
 				]
 			}
 		},
diff --git a/addons/account_analytic_analysis/__terp__.py b/addons/account_analytic_analysis/__terp__.py
index 2f44e0cd62a..276f8e1dd65 100644
--- a/addons/account_analytic_analysis/__terp__.py
+++ b/addons/account_analytic_analysis/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,9 +24,14 @@
     'name': 'report_account_analytic',
     'version': '1.0',
     'category': 'Generic Modules/Accounting',
-    'description': """Modify account analytic view to show
-important data for project manager of services companies.
-Add menu to show relevant information for each manager.""",
+    'description': """
+    This module is for modifying account analytic view to show
+    important data to project manager of services companies.
+    Adds menu to show relevant information to each manager..
+
+    You can also view the report of account analytic summary
+    user-wise as well as month wise.
+""",
     "version" : "1.1",
     "author" : "Camptocamp",
     "category" : "Generic Modules/Accounting",
diff --git a/addons/account_analytic_analysis/i18n/ar.po b/addons/account_analytic_analysis/i18n/ar.po
index 17d955ceb36..cff80317df8 100644
--- a/addons/account_analytic_analysis/i18n/ar.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 3453206529d..cf8abe95aa8 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index cd4e541df02..bb594254b41 100644
--- a/addons/account_analytic_analysis/i18n/bs.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/ca.po b/addons/account_analytic_analysis/i18n/ca.po
index 7947f5836b0..69c7783bebf 100644
--- a/addons/account_analytic_analysis/i18n/ca.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/cs.po b/addons/account_analytic_analysis/i18n/cs.po
index d9bb074d490..0f198759360 100644
--- a/addons/account_analytic_analysis/i18n/cs.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index ce1df67ea44..6f83b3d423d 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index 6f0447c164f..0335fbd053b 100644
--- a/addons/account_analytic_analysis/i18n/el.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index c313c47c5e3..e89c800fac3 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es_AR.po b/addons/account_analytic_analysis/i18n/es_AR.po
index 66bbfab96b4..ec66e636e0e 100644
--- a/addons/account_analytic_analysis/i18n/es_AR.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/et.po b/addons/account_analytic_analysis/i18n/et.po
index 732130f026a..02e21181c00 100644
--- a/addons/account_analytic_analysis/i18n/et.po
+++ b/addons/account_analytic_analysis/i18n/et.po
@@ -7,13 +7,13 @@ 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-11-09 15:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-19 13:21+0000\n"
+"Last-Translator: bushido <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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_analysis
@@ -21,7 +21,7 @@ msgstr ""
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr ""
+msgstr "Arveldatavate tundide arv pluss juba arveldatud tunnid."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index ab8b884f3bf..8454be3a280 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po
index efadbd06449..0815cb24b0a 100644
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/gl.po b/addons/account_analytic_analysis/i18n/gl.po
index aa6cc6cb14f..7e94464275b 100644
--- a/addons/account_analytic_analysis/i18n/gl.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/hr.po b/addons/account_analytic_analysis/i18n/hr.po
index 27f389d320d..55a7265b657 100644
--- a/addons/account_analytic_analysis/i18n/hr.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/hu.po b/addons/account_analytic_analysis/i18n/hu.po
index e8bf1c24d6f..8cf4ac295ab 100644
--- a/addons/account_analytic_analysis/i18n/hu.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/id.po b/addons/account_analytic_analysis/i18n/id.po
index 65c8f66ebc8..780baee7f09 100644
--- a/addons/account_analytic_analysis/i18n/id.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index de81ad5585f..bbfad35e8ca 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ko.po b/addons/account_analytic_analysis/i18n/ko.po
index dfc653f4e72..d0394a488ce 100644
--- a/addons/account_analytic_analysis/i18n/ko.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 521eef27196..57d8d28df22 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lv.po b/addons/account_analytic_analysis/i18n/lv.po
index 230b5f18926..42f53fe4726 100644
--- a/addons/account_analytic_analysis/i18n/lv.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index b6058763bb8..6948ce6e713 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index 1aa96ead4bb..88de012f341 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/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_analysis
diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po
index 6f15877199b..f3983b94ed0 100644
--- a/addons/account_analytic_analysis/i18n/oc.po
+++ b/addons/account_analytic_analysis/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-03-12 13:35+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po
index 6e0905c050f..c799306c378 100644
--- a/addons/account_analytic_analysis/i18n/pl.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index de2a204eb8d..72f0ed2275c 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index a598bccd298..5ea183a9bfc 100644
--- a/addons/account_analytic_analysis/i18n/pt_BR.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ro.po b/addons/account_analytic_analysis/i18n/ro.po
index ee0b8d23a48..343165b4c83 100644
--- a/addons/account_analytic_analysis/i18n/ro.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 146059be926..5795904f66c 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sl.po b/addons/account_analytic_analysis/i18n/sl.po
index f316f3c14b5..b9d4a3ac2f6 100644
--- a/addons/account_analytic_analysis/i18n/sl.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index 0f3ef378436..c1d741773d3 100644
--- a/addons/account_analytic_analysis/i18n/sv.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tlh.po b/addons/account_analytic_analysis/i18n/tlh.po
index fe8cce87f7f..808c50e0292 100644
--- a/addons/account_analytic_analysis/i18n/tlh.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 034c89ed45c..106ef688ea2 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/uk.po b/addons/account_analytic_analysis/i18n/uk.po
index b6484bbb102..50332984606 100644
--- a/addons/account_analytic_analysis/i18n/uk.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 07a64fd7d85..f40bcc9fadc 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 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: 2010-01-08 03:52+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-19 10:22+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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_analysis
@@ -21,113 +21,113 @@ msgstr ""
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr "可开据加已开据的小时数"
+msgstr "小时数能加在已开的发票上"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours summary by user"
-msgstr "按用户汇总小时数"
+msgstr "用户的小时数合计"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr "最后开据时间"
+msgstr "最近开票日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr "计算公式: 最大开据价格 - 已开据总计"
+msgstr "计算公式为:最高发票价格 -  发票金额"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr "使用以下公式计算: 最大数量 - 总时间"
+msgstr "计算公式为:最大数量 - 小时合计"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
 msgid "All Analytic Accounts"
-msgstr "所有分析科目列表"
+msgstr "所有辅助核算项目"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
 msgid "My Current Accounts"
-msgstr "我的当前科目列表"
+msgstr "我当前的项目"
 
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+msgstr "这辅助核算项目的最近开票日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theorical Revenue"
-msgstr "理论收益"
+msgstr "理论收入"
 
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中输入的对象名称错误"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr ""
+msgstr "计算公式为:收入 - 总成本"
 
 #. module: account_analytic_analysis
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
 msgid "New Analytic Account"
-msgstr ""
+msgstr "新的辅助核算项目"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
-msgstr ""
+msgstr "理论利润"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "实际利润(%)"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
 msgid "Current Analytic Accounts"
-msgstr "当前分析科目列表"
+msgstr "当前辅助核算项目"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr ""
+msgstr "这科目的最近的工作完成日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
-msgstr ""
+msgstr "如果是成本发票,最近工作或成本的时间已开出的发票"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "计价折扣"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr "最后工作日期"
+msgstr "最近的成本/工作 日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -139,12 +139,12 @@ msgstr "总成本"
 msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
-msgstr "在当前核算项目上的工时数。根据类型为总账的凭证计算而来。"
+msgstr "你的小时数在辅助核算项目(根据时间表).它计算所有普通分类帐."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "剩余小时数"
+msgstr "剩余的小时数"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -152,7 +152,7 @@ msgid ""
 "Based on the costs you had on the project, what would have been the revenue "
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
-msgstr "根据项目的当前成本测算出来的利润，这些成本对应的收入是按价格表中的一般销售单价计算出来的。"
+msgstr "如果所有这些成本开发票按普通销售价目表.你项目的成本,将按这计算收入."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -164,24 +164,24 @@ msgstr "用户"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
 msgid "My Pending Accounts"
-msgstr ""
+msgstr "我未决的项目"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
 msgid "My Uninvoiced Entries"
-msgstr "未开发票条目"
+msgstr "我未开票项目"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "计算公式：发票数量 - 总成本"
+msgstr "计算公式为:发票金额 - 总成本"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr "我的科目列表"
+msgstr "我的项目"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -190,16 +190,18 @@ msgid ""
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
+"修改核算到显示服务公司的项目管理主要时间\n"
+"添加菜单显示每个管理的有关信息"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
-msgstr "未开发票工时"
+msgstr "未开票小时数"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Hours Tot"
-msgstr "工时总计"
+msgstr "总小时"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_account
@@ -214,17 +216,17 @@ msgstr "核算项目报表"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "已开票数量"
+msgstr "已开票金额"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
 msgid "Financial Project Management"
-msgstr ""
+msgstr "财务项目管理"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "最后开票日期"
+msgstr "最近的发票成本日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -235,12 +237,12 @@ msgstr "未开票金额"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
 msgid "Pending Analytic Accounts"
-msgstr "未决分析科目列表"
+msgstr "未决的辅助核算项目"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
-msgstr "已开票小时数"
+msgstr "已开票小时"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -250,51 +252,51 @@ msgstr "实际利润"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "这科目的客户发票合计"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr "按月汇总工时数"
+msgstr "月的小时数合计"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr "计算公式： (实际利润 / 总成本) * 100."
+msgstr "计算公式为:(实际利润/总成本×100)"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
 msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
-msgstr ""
+msgstr "如果你的发票基于这辅助核算项目"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "剩余的收入"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
 msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
-msgstr ""
+msgstr "如果是辅助核算项目的发票,剩余金额你能给客户开基于总成本的发票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr ""
+msgstr "计算公式为:发票金额/小时合计"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "每小时收入(真实)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -306,29 +308,29 @@ msgstr "总时间"
 #: field:account.analytic.account,month_ids:0
 #: field:account_analytic_analysis.summary.month,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr ""
+msgstr "已废弃项目"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "All Uninvoiced Entries"
-msgstr ""
+msgstr "所有未开发票凭证"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
-msgstr ""
+msgstr "这科目的成本合计,它包括实际成本(发票)和间接成本,如花费的时间表"
diff --git a/addons/account_analytic_analysis/i18n/zh_TW.po b/addons/account_analytic_analysis/i18n/zh_TW.po
index c52f76e1e76..4a0b47329ce 100644
--- a/addons/account_analytic_analysis/i18n/zh_TW.po
+++ b/addons/account_analytic_analysis/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po
index 8af89022ec6..80376ff9dc3 100644
--- a/addons/account_analytic_default/i18n/ar.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/bg.po b/addons/account_analytic_default/i18n/bg.po
index 80c3388fe73..ef8cb6e1c15 100644
--- a/addons/account_analytic_default/i18n/bg.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/bs.po b/addons/account_analytic_default/i18n/bs.po
index 19de5133fc6..774078afeb2 100644
--- a/addons/account_analytic_default/i18n/bs.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/ca.po b/addons/account_analytic_default/i18n/ca.po
index c8162ae4fa4..86a85160993 100644
--- a/addons/account_analytic_default/i18n/ca.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/cs.po b/addons/account_analytic_default/i18n/cs.po
index dbb28cdaf04..dfa694a3454 100644
--- a/addons/account_analytic_default/i18n/cs.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index 9126601844f..7e796ad28ed 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 0b0057959ef..8b59bd06ec5 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index b7e6f62b3ba..de66ca4a43c 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/es_AR.po b/addons/account_analytic_default/i18n/es_AR.po
index 6eb6914047d..f1100a9141b 100644
--- a/addons/account_analytic_default/i18n/es_AR.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po
index d622e4fd18b..9a1488eeefd 100644
--- a/addons/account_analytic_default/i18n/et.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/fi.po b/addons/account_analytic_default/i18n/fi.po
index c51ded59d9a..014fa323f7c 100644
--- a/addons/account_analytic_default/i18n/fi.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index f8d8075494b..34c6d37d38f 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/gl.po b/addons/account_analytic_default/i18n/gl.po
index f547208a2c5..5003c4172ea 100644
--- a/addons/account_analytic_default/i18n/gl.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index c1a2e228e05..fb5e0a6a990 100644
--- a/addons/account_analytic_default/i18n/hr.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index 85c8a4941c1..e13982ec5b3 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/id.po b/addons/account_analytic_default/i18n/id.po
index ebac06f5e44..454b4181f12 100644
--- a/addons/account_analytic_default/i18n/id.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index 240660bebe9..c46966e1835 100644
--- a/addons/account_analytic_default/i18n/it.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/ko.po b/addons/account_analytic_default/i18n/ko.po
index 2a77be97cb7..3f2108fabc7 100644
--- a/addons/account_analytic_default/i18n/ko.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index c785ba07775..329d334cc64 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/lv.po b/addons/account_analytic_default/i18n/lv.po
index 384899d2f2a..1ffc2c7b974 100644
--- a/addons/account_analytic_default/i18n/lv.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 5d793142293..972ce61d392 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/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: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index ff8a1ee06a9..ef98ada68ee 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/oc.po b/addons/account_analytic_default/i18n/oc.po
new file mode 100644
index 00000000000..86bcd773da6
--- /dev/null
+++ b/addons/account_analytic_default/i18n/oc.po
@@ -0,0 +1,115 @@
+# 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-19 09:41+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
+msgid "Analytic Defaults"
+msgstr "Analitic per defaut"
+
+#. module: account_analytic_default
+#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
+msgid "Account Analytic Default"
+msgstr "Compte Analitic per Defaut"
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_analytic_default
+#: 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_default
+#: view:account.analytic.default:0
+msgid "Seq"
+msgstr "Seq"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Data de fin"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Entrepresa"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Produch"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distributions"
+msgstr "Distribucions Analiticas"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Utilizaire"
+
+#. module: account_analytic_default
+#: 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_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr "Escrituras"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "Data de començament"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "Condicions"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr "Règlas Analiticas"
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index 7365d7e32bd..3f71c185d06 100644
--- a/addons/account_analytic_default/i18n/pl.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/pt.po b/addons/account_analytic_default/i18n/pt.po
index 9d660d1adf6..f09ebbc205e 100644
--- a/addons/account_analytic_default/i18n/pt.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po
index 0c62f14b84b..7da2c02723f 100644
--- a/addons/account_analytic_default/i18n/pt_BR.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/ro.po b/addons/account_analytic_default/i18n/ro.po
index 9bc642df96f..9271a77bd72 100644
--- a/addons/account_analytic_default/i18n/ro.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po
index 87dd3ca5f65..951a06da61f 100644
--- a/addons/account_analytic_default/i18n/ru.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/sk.po b/addons/account_analytic_default/i18n/sk.po
index 0032104849f..ccc6a92f601 100644
--- a/addons/account_analytic_default/i18n/sk.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/sl.po b/addons/account_analytic_default/i18n/sl.po
index 1f1d1395b29..ac9f097b973 100644
--- a/addons/account_analytic_default/i18n/sl.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index 02dd626dd89..a15cd22a1f8 100644
--- a/addons/account_analytic_default/i18n/sv.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tlh.po b/addons/account_analytic_default/i18n/tlh.po
index 611920f15f9..0e2de9073b7 100644
--- a/addons/account_analytic_default/i18n/tlh.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index ff98fc2a36f..dd35ade0116 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/uk.po b/addons/account_analytic_default/i18n/uk.po
index 1e492079eae..1e1039f138f 100644
--- a/addons/account_analytic_default/i18n/uk.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index c2da43c8346..eb281c1bd95 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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-01-30 12:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-29 00:37+0000\n"
+"Last-Translator: digitalsatori <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,68 +21,68 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
 msgid "Analytic Defaults"
-msgstr ""
+msgstr "默认辅助核算科目"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
-msgstr ""
+msgstr "默认科目辅助核算"
 
 #. module: account_analytic_default
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "这对象名必须以x_开头并且不能包含特殊的字符!"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Seq"
-msgstr ""
+msgstr "序号"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算科目"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distributions"
-msgstr ""
+msgstr "辅助核算分配"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "动作定义里模块名无效"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
@@ -92,21 +92,21 @@ msgstr "条目"
 #. module: account_analytic_default
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr ""
+msgstr "情况"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr ""
+msgstr "辅助核算规则"
diff --git a/addons/account_analytic_default/i18n/zh_TW.po b/addons/account_analytic_default/i18n/zh_TW.po
index 946197e6a3a..3c77323635d 100644
--- a/addons/account_analytic_default/i18n/zh_TW.po
+++ b/addons/account_analytic_default/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/__terp__.py b/addons/account_analytic_plans/__terp__.py
index 63b09bf1dc0..b3067358a62 100644
--- a/addons/account_analytic_plans/__terp__.py
+++ b/addons/account_analytic_plans/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -51,6 +51,8 @@ Plan2:
 
 So when this line of invoice will be confirmed, it will generate 3 analytic lines,
 for one account entry.
+The analytic plan validates the minimum and maximum percentage at the time of creation
+of distribution models.
         """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index af197076c23..7f1e3854f6a 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -404,7 +404,6 @@ class sale_order_line(osv.osv):
 
                 if rec:
                     pool_inv_line.write(cr, uid, [line.id], {'analytics_id':rec.analytics_id.id}, context=context)
-                    cr.commit()
         return create_ids
 
 sale_order_line()
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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-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 <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-03-24 17:25+0000\n"
+"Last-Translator: relojero <relojero28@gmail.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-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
new file mode 100644
index 00000000000..1d3021be1f9
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/hi.po
@@ -0,0 +1,64 @@
+# Hindi 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-03-16 23:00+0000\n"
+"Last-Translator: Neetesh Biswas <Unknown>\n"
+"Language-Team: Hindi <hi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. 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 "संरचना देखने के लिए अमान्य XML!"
+
+#. 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 ""
+
+#. 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 ""
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 <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 12:50+0000\n"
 "PO-Revision-Date: 2010-02-27 18:15+0000\n"
-"Last-Translator: phede92 <phede92@yahoo.it>\n"
+"Last-Translator: phede92 <phede92@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <EMAIL@ADDRESS>\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 <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 39d22acf820..eafa265f751 100644
--- a/addons/account_balance/i18n/pt_BR.po
+++ b/addons/account_balance/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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:49+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-18 02:19+0000\n"
+"Last-Translator: Zergar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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
@@ -24,56 +24,56 @@ msgstr ""
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "Todas as Contas"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr ""
+msgstr "Seleção de entradas baseada em"
 
 #. 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 "Notificação"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "Período Financeiro"
 
 #. 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 "Saldo da Conta"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Name"
-msgstr ""
+msgstr "Nome da Conta"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Debit"
-msgstr ""
+msgstr "Débito"
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,init,checkyear:0
 msgid "Print"
-msgstr ""
+msgstr "Impressão"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "Selecione o(s) Período(s)"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentagem"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
@@ -83,17 +83,17 @@ msgstr ""
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "Selecione Ano(s) Fiscal(is) (máximo três anos)"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "Selecione conta de referência (para comparação %)"
 
 #. module: account_balance
 #: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Conta Saldo Comparar Anos"
 
 #. module: account_balance
 #: model:ir.module.module,description:account_balance.module_meta_information
@@ -125,70 +125,70 @@ msgstr ""
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Mostrar relatório em formato de paisagem"
 
 #. module: account_balance
 #: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Todos os períodos se vazio"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "Com saldo diferente de zero"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Saldo da conta -"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "Mostrar comparação em %"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period"
-msgstr ""
+msgstr "Selecione o Período"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Opções de Relatório"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With movements"
-msgstr ""
+msgstr "Com movimentos"
 
 #. 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 "Ok"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "Dinheiro"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "Não Comparar"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "Mostrar Contas"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
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) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 06:56+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 06:58+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -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 <nickyk@gmx.net>\n"
+"PO-Revision-Date: 2010-03-29 11:00+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <EMAIL@ADDRESS>\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 <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <pedro.bicudo@tgtconsult.com.br>\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 <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:00+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <EMAIL@ADDRESS>\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 <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-24 01:05+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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 <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:01+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 07:04+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -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 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<xpath expr="/form/notebook/page/field[@name='name']" position="before">
-					<field name="state" select="1" on_change="_onchange_invoice_line_view(state)" />
+					<field name="state" select="1" on_change="onchange_invoice_line_view(state)" />
 					<field name="sequence"/>
 				</xpath>
 			</field>
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 <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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 <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <Unknown>\n"
+"PO-Revision-Date: 2010-03-24 01:02+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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 <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:13+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:14+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <caih2000@163.com>\n"
+"PO-Revision-Date: 2010-03-20 07:15+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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
new file mode 100644
index 00000000000..45b0f27e316
--- /dev/null
+++ b/addons/account_tax_include/i18n/fi.po
@@ -0,0 +1,53 @@
+# Finnish 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-17 10:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-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 "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Hinnan tyyppi"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Laskut ja hinnat veroilla"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Vero sisältyy"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Ilman veroa"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Laske koodi hinnoille joissa on vero mukana"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Välisumma"
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 <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -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 <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 <drazen.bosak@gmail.com>, 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ć <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 00:56+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -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..61e91802f44 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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,16 +24,33 @@
     '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_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..1687980c029 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -478,13 +478,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):
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 @@
 <data>
 	<menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase"/>
 	<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
-
+	<menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
+    <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
 	=======================================================
 	Auction Management/Configuration/artist
 	=======================================================
@@ -203,6 +204,7 @@
 				<field name="lot_est2"/>
 				<field name="product_id"/>
 				<field name="state" readonly="1"/>
+				
 			</form>
 		</field>
 	</record>
@@ -277,7 +279,7 @@
 					<separator string="Description" colspan="4"/>
 					<field name="obj_desc" colspan="4" nolabel="1" select="2"/>
 					<field name="state" colspan="1" select="2"/>
-				 	<group col="4" colspan="2">
+				 	<group col="8" colspan="2">
 				 	   <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
                        <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
                        <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
@@ -330,7 +332,6 @@
 							<field name="date"/>
 						</tree>
 					</field>
-
 				</page>
 			<page string="Bids">
 				<field name="bid_lines" colspan="4" nolabel="1" editable="top">
@@ -340,9 +341,7 @@
 							<field name="call"/>
 						</tree>
 					</field>
-
 			</page>
-
 				</notebook>
 			</form>
 		</field>
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 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-	    <!--<delete model="ir.actions.wizard" search="[('wiz_name','like','auction.lots.')]"/>-->
-
+<!--	Following wizard is remaining to implement in osv_memory-->
+		<!--  
 		<wizard string="Send to website"
 			model="auction.lots"
 			name="auction.lots.send.aie"
@@ -20,45 +20,6 @@
 		multi="1"
 		id="wizard_map_user"/>
 
-		<wizard string="Change Auction Date"
-		 model="auction.lots"
-		 name="auction.lots.auction_move"
-		multi="1"
-		 id="wizard_change_auction"/>
-
-		<!--wizard string="Pay objects of the seller"
-		model="auction.lots"
-		name="auction.pay.sel"
-		id="wizard_lots_pay"/-->
-		<wizard string="Pay objects of the buyer"
-		model="auction.lots"
-		name="auction.pay.buy"
-		id="wizard_pay"/>
-
-		<wizard
-			string="Gestion emporte"
-			model="auction.dates"
-			name="auction.taken"
-			multi="1"
-			id="wizard_emporte"/>
-
-	<menuitem name="Tools Bar Codes"
-		id="auction_outils_menu"
-		parent="auction_menu_root" sequence="5"
-		/>
-
-	<menuitem name="Deliveries Management"
-		action="wizard_emporte"
-		type="wizard"
-		id="menu_wizard_emporte"
-		parent="auction_outils_menu"
-		/>
-
-		<!--wizard string="Cancel payment"
-		model="auction.lots"
-		name="auction.lots.cancel"
-		multi="1"
-		id="wizard_cancel_pay"/-->
 
 		<wizard string="Numerotation (per lot)"
 		model="auction.lots"
@@ -72,56 +33,13 @@
 		 multi="1"
 		id="wizard_numerotate_automatic"/>
 
-		<wizard string="SMS Send"
-		 model="auction.lots"
-		 name="auction.lots.sms_send"
-		multi="1"
- 		id="wizard_sms"/>
-
-		 <!--wizard string="Invoice"
-		 model="auction.lots"
-		 name="auction.lots.invoice"
-		 multi="1"
-		 id="wizard_invoicing"/-->
-
-
-		<wizard string="Invoice Seller objects"
-			model="auction.lots"
-			name="auction.lots.make_invoice"
-		multi="1"
-			id="wizard_invoice"/>
-
-		<wizard string="Invoice Buyer objects"
-			model="auction.lots"
-			name="auction.lots.make_invoice_buyer"
-			id="wizard_invoice_buyer1"/>
-
-		<wizard string="Unmark as taken away"
-			model="auction.lots"
-			name="auction.lots.enable"
-			multi="1"
-			id="auction_wizard_enable_taken"/>
-
-		<wizard string="Mark as taken away"
-			model="auction.lots"
-			name="auction.lots.able"
-			multi="1"
-			id="auction_wizard_able_taken"/>
-
 			<wizard
 			id="auction_catalog_flagy"
 			string="Auction Catalog Flagey"
 			model="auction.dates"
 			name="auction.catalog.flagey"
 			keyword="client_print_multi"/>
-
-<wizard string="Mark as paid for seller"
-			model="auction.lots"
-			name="auction.payer.sel"
-			multi="1"
-			id="auction_wizard_payer_sel"/>
-
-
+ -->
 
 	</data>
 </openerp>
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 <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:33+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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..bcd2de8b301 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -19,24 +19,19 @@
 #
 ##############################################################################
 
-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_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..119c3273ee0
--- /dev/null
+++ b/addons/auction/wizard/auction_catalog_flagey_report.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+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):
+        current_auction = self.pool.get('auction.dates').browse(cr,uid,context.get('active_ids', []))
+        v_lots = self.pool.get('auction.lots').search(cr,uid,[('auction_id','=',current_auction.id)])
+        v_ids = self.pool.get('auction.lots').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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Auction Catalog Flagey Report -->
+        
+		<record id="view_auction_catalog_flagey_wizard" model="ir.ui.view">
+            <field name="name">Auction Catalog Flagey</field>
+            <field name="model">auction.catalog.flagey</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Catalog Flagey Report">
+                	<label string="Print Auction Catalog Flagey Report..."/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="print_report" string="Ok"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+       <act_window name="Auction Catalog Flagey"
+            res_model="auction.catalog.flagey"
+            src_model="auction.dates"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_catalog_flagey_wizard"/>
+	</data>
+</openerp>	
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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
 import wizard
 
-price_form = '''<?xml version="1.0"?>
-<form string="Paid ?">
-    <field name="number"/>
-</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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_able" model="ir.ui.view">
+            <field name="name">auction.lots.able.form</field>
+            <field name="model">auction.lots.able</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Confirmation set taken away" colspan="4"/>
+              			 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-goto-last" string="Able Taken away" name="confirm_able" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+        <act_window name="Mark as taken away"		    
+		    res_model="auction.lots.able"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_able"/>       
+    </data>
+</openerp>
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..24b2604d1d7
--- /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 (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+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')
+        for datas in self.read(cr, uid, ids):
+            if not (datas['auction_id'] and len(context['active_ids'])) :
+                return {}
+            
+            rec_ids = refs.browse(cr, uid, context['active_ids'])
+            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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_auction_move" model="ir.ui.view">
+            <field name="name">auction.lots.auction.move.form</field>
+            <field name="model">auction.lots.auction.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Auction Date">
+                	<group colspan="4" >
+                		 <label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
+              			 <newline/>
+              			 <field name="auction_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-redo" string="Move to Auction date" name="auction_move_set" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <act_window name="Change Auction Date"		    
+		    res_model="auction.lots.auction.move"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_auction_move"/>    
+    </data>
+</openerp>
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..db80a2ab3f3
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+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:
+            for lots in lots_obj.browse(cr, uid, record_ids):
+                if lots.ach_uid:
+                    res['arch'] = """
+                            <form title="Mapping Result">
+                                <group col="2" colspan="2">
+                                    <label string="All objects are assigned to buyers !"/>
+                                    <newline/>
+                                    <button icon='gtk-cancel' special="cancel"
+                                        string="Done" />
+                                </group>
+                            </form>
+                    """
+        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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Auction lots send result -->
+        
+		<record id="view_auction_buyer_map" model="ir.ui.view">
+            <field name="name">Map buyer username to Partners</field>
+            <field name="model">auction.lots.buyer_map</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Buyer Map" >
+				    <field name="ach_login" colspan="4"/>
+				    <newline/>
+				    <field name="ach_uid" colspan="4"/>
+				    <separator colspan="4"/>
+				    <group col="4" colspan="4">
+				    	<button icon='gtk-cancel' special="cancel"
+                			string="Exit" />
+                		<button name="buyer_map_set" string="Update"
+                			colspan="2" type="object" icon="gtk-go-forward" />
+				    </group>
+				</form>
+			</field>
+		</record>
+		
+		<act_window name="Map buyer username to Partners"
+            res_model="auction.lots.buyer_map"
+            src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_auction_buyer_map"/>
+
+	</data>
+</openerp>
diff --git a/addons/report_timesheet/__terp__.py b/addons/auction/wizard/auction_lots_enable.py
similarity index 54%
rename from addons/report_timesheet/__terp__.py
rename to addons/auction/wizard/auction_lots_enable.py
index 8fcf827af68..e8aa5edadf5 100644
--- a/addons/report_timesheet/__terp__.py
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -18,22 +18,30 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
 
-
-{
-    'name': 'Timesheet - Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
-    'description': """Module to add timesheet views like
-    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['hr_timesheet', 'hr_timesheet_invoice'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_timesheet_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0078701510301',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_enable" model="ir.ui.view">
+            <field name="name">auction.lots.enable.form</field>
+            <field name="model">auction.lots.enable</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Confirmation enable taken away" colspan="4"/>
+              			 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-goto-last"  string="Enable Taken away" name="confirm_enable" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		
+        <act_window name="Unmark as taken away"		    
+		    res_model="auction.lots.enable"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_enable"/>    
+		      		
+        
+    </data>
+</openerp>
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 (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Auction Lots Invoice Report -->
+        
+		<record id="view_auction_lots_invoice_wizard" model="ir.ui.view">
+            <field name="name">auction.lots.invoice.wizard</field>
+            <field name="model">auction.lots.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid ?">
+                	<field name="amount"/>
+                	<field name="objects"/>
+                	<field name="amount_topay"/>
+                	<field name="amount_paid"/>
+                	<newline/>
+                	<field name="ach_uid"/>
+                	<field name="number"/>
+                	<label string="Let this invoice's number"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="print_report" string="Ok"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+       <act_window name="Auction Lots Invoice"
+            res_model="auction.lots.invoice"
+            src_model="auction.dates"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_invoice_wizard"/>
+	</data>
+</openerp>	
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..6be49f7336a
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+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):
+    
+    
+    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') 
+    
+        for data in self.read(cr, uid, ids):
+            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, context['active_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']        
+                }
+            
+    _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, 
+               
+               }
+
+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..53c3519d225
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_make_invoice_buyer(osv.osv_memory):
+    
+    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.
+        """    
+        newinv = []
+
+        order_obj = self.pool.get('auction.lots')
+        mod_obj = self.pool.get('ir.model.data') 
+        
+        for data in self.read(cr, uid, ids):            
+            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'])
+            invoice_number = data['number']
+            for lot in lots:
+                up_auction = order_obj.write(cr, uid, [lot.id], {'ach_uid':data['buyer_id']})
+            ids = order_obj.lots_invoice(cr, uid, context['active_ids'], context, data['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']         
+            }
+            
+    _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,
+               }
+
+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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_make_invoice_buyer" model="ir.ui.view">
+            <field name="name">auction.lots.make.invoice.buyer.form</field>
+            <field name="model">auction.lots.make.invoice.buyer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="objects"/>
+                		 <field name="number"/>
+                		 <label string="(Keep empty for automatic number)" colspan="2"/>
+                		 <field name="buyer_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="makeInvoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+       <act_window name="Invoice Buyer objects"		    
+		    res_model="auction.lots.make.invoice.buyer"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_make_invoice_buyer"/>    
+		      		        
+        
+    </data>
+</openerp>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_make_invoice" model="ir.ui.view">
+            <field name="name">auction.lots.make.invoice.form</field>
+            <field name="model">auction.lots.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="objects"/>
+                		 <field name="number" colspan="3"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="makeInvoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+       <act_window name="Invoice Seller objects"		    
+		    res_model="auction.lots.make.invoice"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_make_invoice"/>            
+        
+    </data>
+</openerp>
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 (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_sms_send" model="ir.ui.view">
+            <field name="name">auction.lots.sms.send.form</field>
+            <field name="model">auction.lots.sms.send</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="SMS - Gateway: clickatell','Bulk SMS send">
+                	<group colspan="4" >
+                		 <separator string="SMS - Gateway: clickatell','Bulk SMS send" colspan="4"/>
+                		 <field name="app_id"/>
+                		 <newline/>
+                		 <field name="user"/>
+                		 <field name="password"/>
+                		 <newline/>
+                		 <field name="text" colspan="3"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-go-back" string="Send SMS" name="sms_send" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+       <act_window name="SMS Send"		    
+		    res_model="auction.lots.sms.send"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_sms_send"/>  
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
new file mode 100644
index 00000000000..8f16ea9e7de
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -0,0 +1,115 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_pay_buy(osv.osv_memory):
+    
+    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 {}
+   
+    _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), 
+               }
+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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_pay_buy" model="ir.ui.view">
+            <field name="name">auction.pay.buy.form</field>
+            <field name="model">auction.pay.buy</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay objects">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="statement_id1" domain="[('state','=','draft')]"/>
+                		 <field name="amount2"/>
+                		 <field name="statement_id2"  domain="[('state','=','draft')]"/>
+                		 <field name="amount3"/>
+                		 <field name="statement_id3"  domain="[('state','=','draft')]"/>
+                		 <newline/>
+                		 <field name="buyer_id"/>
+                		 <field name="total"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-yes"  string="Pay" name="pay_and_reconcile" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+       <act_window name="Pay objects of the buyer"		    
+		    res_model="auction.pay.buy"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_pay_buy"/>   
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
new file mode 100644
index 00000000000..df7b4a794f3
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_pay_sel" model="ir.ui.view">
+            <field name="name">auction.pay.sel.form</field>
+            <field name="model">auction.pay.sel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay invoice">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="dest_account_id"/>
+                		 <field name="journal_id"/>
+                		 <field name="period_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-yes" string="Pay" name="pay_and_reconcile" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="action_auction_pay_sel" model="ir.actions.act_window">
+            <field name="name">Pay objects of the seller</field>
+            <field name="res_model">auction.pay.sel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_pay_sel"/> 
+           <field name="target">new</field>
+  		</record>
+
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_wizard_able_taken.py b/addons/auction/wizard/auction_payer_sel.py
similarity index 51%
rename from addons/auction/wizard/auction_wizard_able_taken.py
rename to addons/auction/wizard/auction_payer_sel.py
index 261cc47c48b..349f10d4dec 100644
--- a/addons/auction/wizard/auction_wizard_able_taken.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -19,43 +19,42 @@
 #
 ##############################################################################
 
-import wizard
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
-take_form = """<?xml version="1.0"?>
-<form title="Confirm">
-    <separator string="Confirmation set taken away" colspan="4"/>
-    <newline/>
-</form>
-"""
+import time
+import tools
+import wizard
 
-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')
+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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_payer" model="ir.ui.view">
+            <field name="name">auction.payer.form</field>
+            <field name="model">auction.payer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check payment for buyer">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="2">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon = "gtk-yes"  string="Pay"   name="payer" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_auction_payer_sel" model="ir.ui.view">
+            <field name="name">auction.payer.sel.form</field>
+            <field name="model">auction.payer.sel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check payment for seller">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-yes" string="Pay" name="payer_sel" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+       <act_window name="Mark as paid for seller"		    
+		    res_model="auction.payer.sel"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_payer_sel"/>          
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
new file mode 100644
index 00000000000..63c3db7583c
--- /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 (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+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('&','&amp;').replace('<','&lt;').replace('>','&gt;')
+
+    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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_taken" model="ir.ui.view">
+            <field name="name">auction.taken.form</field>
+            <field name="model">auction.taken</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Mark Lots"> 
+                	<group colspan="4" >
+                		 <label string="Select lots which are Sold" colspan="4"/>
+                		 <field name="lot_ids" nolabel="1" colspan="4" domain="[('state','=','sold')]"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-ok"  string="OK"  name="process" type="object" />
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_taken" model="ir.actions.act_window">
+            <field name="name">Gestion emporte</field>
+            <field name="res_model">auction.taken</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_taken"/> 
+           <field name="target">new</field>
+        </record>
+        
+        <!-- <menuitem name="Tools Bar Codes"
+		id="auction_outils_menu"
+		parent="auction_menu_root" sequence="5"
+		/>
+        <menuitem name="Deliveries Management"
+		action="action_auction_taken"
+		id="menu_wizard_emporte"
+		parent="auction_outils_menu"
+		/> -->
+        
+    </data>
+</openerp>
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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-#field name="confirm_en"/>
-
-take_form = """<?xml version="1.0"?>
-<form title="Confirm">
-    <separator string="Confirmation enable taken away" colspan="4"/>
-    <newline/>
-</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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-invoice_form = '''<?xml version="1.0"?>
-<form title="Paid ?">
-    <field name="amount"/>
-    <field name="objects"/>
-    <field name="number"/>
-    <label string="(Keep empty for automatic number)" colspan="2"/>
-    <field name="buyer_id"/>
-</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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-
-
-invoice_form = '''<?xml version="1.0"?>
-<form title="Paid ?">
-    <field name="amount"/>
-    <field name="objects"/>
-    <field name="number" colspan="3"/>
-</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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-import pooler
-from tools.misc import UpdateableStr
-
-
-# Dossier
-
-_lot_arch = """<?xml version="1.0"?>
-<form string="Mark Lots" height="500" width="1000">
-    <label string="Select lots which are Sold" colspan="4"/>
-    <field name="lot_ids" nolabel="1" colspan="4" domain="[('state','=','sold')]"/>
-</form>
-"""
-_lot_fields = {
-    'lot_ids': {'string':'Lots Emportes','relation':'auction.lots','type':'many2many'}
-}
-
-def _to_xml(s):
-    return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
-
-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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-import sql_db
-
-auction_move = '''<?xml version="1.0"?>
-<form string="Change Auction Date">
-    <group col="1" colspan="2">
-    <label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
-    </group>
-    <newline/>
-    <field name="auction_id"/>
-</form>'''
-
-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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-import sql_db
-
-buyer_map = '''<?xml version="1.0"?>
-<form title="Buyer Map">
-    <field name="ach_login"/>
-    <newline/>
-    <field name="ach_uid"/>
-</form>'''
-
-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':'''<?xml version="1.0"?>
-                <form title="Mapping result">
-                    <label string="All objects are assigned to buyers !"/>
-                </form>''',
-                '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_invoice.py b/addons/auction/wizard/wizard_lots_invoice.py
deleted file mode 100644
index 636b12cc2ff..00000000000
--- a/addons/auction/wizard/wizard_lots_invoice.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-invoice_form = '''<?xml version="1.0"?>
-<form title="Paid ?">
-    <field name="amount"/>
-    <field name="objects"/>
-    <field name="amount_topay"/>
-    <field name="amount_paid"/>
-    <!--field name= "tax_applied"/>-->
-    <newline/>
-    <field name="ach_uid" colspan="3"/>
-    <field name="number" colspan="3"/>
-    <field label="Let this invoice's number "/>
-</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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-
-invoice_form = '''<?xml version="1.0"?>
-<form string="Pay invoice">
-    <field name="amount"/>
-    <field name="dest_account_id"/>
-    <field name="journal_id"/>
-    <field name="period_id"/>
-</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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-import urllib
-
-sms_send_form = '''<?xml version="1.0"?>
-<form title="%s">
-    <separator string="%s" colspan="4"/>
-    <field name="app_id"/>
-    <newline/>
-    <field name="user"/>
-    <field name="password"/>
-    <newline/>
-    <field name="text" colspan="3"/>
-</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 <fp@tiny.Be>
-#
-# 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 = '''<?xml version="1.0"?>
-<form string="%s">
-    <separator string="%s" colspan="4"/>
-    <field name="app_id"/>
-    <newline/>
-    <field name="user"/>
-    <field name="password"/>
-    <newline/>
-    <field name="text" colspan="3"/>
-</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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-pay_form = '''<?xml version="1.0"?>
-<form string="Pay objects">
-    <field name="amount"/>
-    <field name="statement_id1" domain="[('state','=','draft')]"/>
-    <field name="amount2"/>
-    <field name="statement_id2"  domain="[('state','=','draft')]"/>
-    <field name="amount3"/>
-    <field name="statement_id3"  domain="[('state','=','draft')]"/>
-    <newline/>
-    <field name="buyer_id"/>
-    <field name="total"/>
-</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 (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-
-pay_form = '''<?xml version="1.0"?>
-<form string="Check payment for buyer">
-</form>'''
-pay_fields = {
-}
-
-
-pay_form1 = '''<?xml version="1.0"?>
-<form string="Check payment for seller">
-</form>'''
-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/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index e7ecd839efb..d8b573a704a 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 (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -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 <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-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_calendar/__terp__.py b/addons/base_calendar/__terp__.py
index e433fbb7668..c0169db368b 100644
--- a/addons/base_calendar/__terp__.py
+++ b/addons/base_calendar/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,36 +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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 
 {
-    "name" : "Basic Calendar Functionality", 
-    "version" : "1.0", 
+    "name" : "Basic Calendar Functionality",
+    "version" : "1.0",
     "depends" : [
-                    "base", 
-                ], 
+                    "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', 
+  - Invitations to other people
+""",
+    "author" : "Tiny",
+    'category': 'Generic Modules/Others',
+    'website': 'http://www.openerp.com',
     "init_xml" : [
                    'base_calendar_data.xml'
-                   ], 
-    "demo_xml" : [], 
+                   ],
+    "demo_xml" : [],
     "update_xml" : [
-                    'security/ir.model.access.csv', 
+                    'security/ir.model.access.csv',
                     'base_calendar_view.xml'
-                    ], 
-    "installable" : True, 
-    "active" : False, 
+                    ],
+    "installable" : True,
+    "active" : False,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4d0f85376f3..3c99b7b5410 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -325,26 +325,17 @@ class calendar_attendee(osv.osv):
                 result[id][name] = ', '.join(fromdata)
             if name == 'event_date':
                 if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model)
-                    obj = model_obj.read(cr, uid, res_id, ['date'])[0]
-                    result[id][name] = obj.get('date')
+                    result[id][name] = attdata.ref.date
                 else:
                     result[id][name] = False
             if name == 'event_end_date':
                 if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model)
-                    obj = model_obj.read(cr, uid, res_id, ['date_deadline'])[0]
-                    result[id][name] = obj.get('date_deadline')
+                     result[id][name] = attdata.ref.date_deadline
                 else:
                     result[id][name] = False
             if name == 'sent_by_uid':
                 if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model)
-                    obj = model_obj.read(cr, uid, res_id, ['user_id'])[0]
-                    result[id][name] = obj.get('user_id')
+                    result[id][name] = (attdata.ref.user_id.id,attdata.ref.user_id.name)
                 else:
                     result[id][name] = uid
             if name == 'language':
@@ -441,8 +432,7 @@ request was delegated to"),
         for att in self.browse(cr, uid, ids, context=context):
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
-            model, res_id = tuple(att.ref.split(','))            
-            res_obj = self.pool.get(model).browse(cr, uid, res_id)
+            res_obj = att.ref
             if res_obj and len(res_obj):
                 res_obj = res_obj[0]
             sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
@@ -490,9 +480,7 @@ request was delegated to"),
             if user:
                 ref = vals.get('ref', None)
                 if ref:
-                    model, event = ref.split(',')
-                    model_obj = self.pool.get(model)
-                    event_ref =  model_obj.browse(cr, uid, event, context=context)[0]
+                    event_ref = ref
                     if event_ref.user_id.id != user[0]:
                         defaults = {'user_id':  user[0]}
                         new_event = model_obj.copy(cr, uid, event, default=defaults, context=context)
@@ -574,7 +562,6 @@ are both optional, but if one occurs, so MUST the other"""),
                 cr.execute('Update %s set base_calendar_alarm_id=%s, alarm_id=%s \
                                         where id=%s' % (model_obj._table, \
                                         alarm_id, basic_alarm.id, data.id))
-        cr.commit()
         return True
 
     def do_alarm_unlink(self, cr, uid, ids, model, context={}):
@@ -1185,7 +1172,10 @@ class virtual_report_spool(web_services.report_spool):
         new_ids = []
         for id in ids:
             new_ids.append(base_calendar_id2real_id(id))
-        datas['id'] = base_calendar_id2real_id(datas['id'])        
+        if datas is None:
+            datas = {}
+        if datas.get('id',False):
+            datas['id'] = base_calendar_id2real_id(datas['id'])        
         return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
 
 virtual_report_spool()
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d6430ca98a2..f1e59583cc1 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -159,8 +159,8 @@
 			            <field name="name" select="1"/>                        			    
 			            <field name="trigger_interval" select="1"/>
 			            <field name="trigger_duration" select="1"/>
-			            <field name="trigger_related" select="1"/>
 			            <field name="trigger_occurs" select="1"/>			            
+			            <field name="trigger_related" select="1"/>
 		            </tree>
                 </field>
             </record>
diff --git a/addons/base_contact/i18n/ar.po b/addons/base_contact/i18n/ar.po
index fafb3b5f3c2..ef9bf53de26 100644
--- a/addons/base_contact/i18n/ar.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/bg.po b/addons/base_contact/i18n/bg.po
index 3c32d08f4ea..134f79092f6 100644
--- a/addons/base_contact/i18n/bg.po
+++ b/addons/base_contact/i18n/bg.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: 2009-09-08 13:01+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-30 19:31+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -37,7 +37,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,function_id:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Функция ня партньора"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -57,12 +57,12 @@ msgstr ""
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Текущ"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr "Собствено име"
+msgstr "Собствено Име"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
@@ -72,7 +72,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "Друго"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
@@ -286,7 +286,7 @@ msgstr ""
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Партньори"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
diff --git a/addons/base_contact/i18n/bs.po b/addons/base_contact/i18n/bs.po
index de19533f69b..caecefbf573 100644
--- a/addons/base_contact/i18n/bs.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/ca.po b/addons/base_contact/i18n/ca.po
index 750aeb6d405..19966b0b23d 100644
--- a/addons/base_contact/i18n/ca.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/cs.po b/addons/base_contact/i18n/cs.po
index a28ee816003..8b71fe80d7c 100644
--- a/addons/base_contact/i18n/cs.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/de.po b/addons/base_contact/i18n/de.po
index 666065918a4..6523bc3fc26 100644
--- a/addons/base_contact/i18n/de.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po
index 99daa103446..6198c7c5070 100644
--- a/addons/base_contact/i18n/el.po
+++ b/addons/base_contact/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_contact/i18n/es.po b/addons/base_contact/i18n/es.po
index a162fc94d2a..ae6c0535dc5 100644
--- a/addons/base_contact/i18n/es.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/es_AR.po b/addons/base_contact/i18n/es_AR.po
index a49490cb085..8fa0295d884 100644
--- a/addons/base_contact/i18n/es_AR.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/et.po b/addons/base_contact/i18n/et.po
index e084629bf3a..c971d1fb57b 100644
--- a/addons/base_contact/i18n/et.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/fi.po b/addons/base_contact/i18n/fi.po
index 6e402196d62..f38013ee002 100644
--- a/addons/base_contact/i18n/fi.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/fr.po b/addons/base_contact/i18n/fr.po
index 079fde869fb..c7f694ea9f9 100644
--- a/addons/base_contact/i18n/fr.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/hr.po b/addons/base_contact/i18n/hr.po
index 3d11dd37b3e..82d50f149ab 100644
--- a/addons/base_contact/i18n/hr.po
+++ b/addons/base_contact/i18n/hr.po
@@ -1,41 +1,43 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_contact
-#
+# * base_contact
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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:40+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Seq. Osobe"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr ""
+msgstr "res.partner.contact"
 
 #. module: base_contact
 #: 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: base_contact
 #: field:res.partner.job,function_id:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Funkcija Partnera"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -45,62 +47,62 @@ msgstr ""
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakti"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Partner Seq."
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Tekući"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "Ime osobe"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Funkcija Osobe Partnera - Contact Partner Function"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "Drugi"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Osoba na Funkciju - Contact to Function"
 
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Partner na Adresu"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "# Osoba"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Dodatno polje za tel. broj"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
-msgstr ""
+msgstr "Funkcija"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
@@ -110,7 +112,7 @@ msgstr "Fax"
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
 msgid "Language"
-msgstr ""
+msgstr "Jezik"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
@@ -120,22 +122,22 @@ msgstr ""
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr ""
+msgstr "Određuje Osobe i Funkcije"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr ""
+msgstr "Naslov"
 
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Funkcije Osoba"
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 msgid "Base Contact"
-msgstr ""
+msgstr "Osnovna Osoba"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_partner:0
@@ -143,212 +145,214 @@ msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
 msgstr ""
+"redoslijed važnosti ovog naziva Posla-Radnog mjesta u listi naziva Poslova-"
+"Radnih mjesta povezanog Partnera"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
 #: field:res.partner.job,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr ""
+msgstr "Datum Završetka"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Poslovi Osobe"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Državljanstvo"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
 msgid ""
 "Order of importance of this address in the list of addresses of the linked "
 "contact"
-msgstr ""
+msgstr "redoslijed važnosti ove Adrese u listi Adresa povezanog Partnera"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Glavni Posao"
 
 #. module: base_contact
 #: view:res.partner:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "Glavna funkcija"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr ""
+msgstr "Definiraj Partnere i njihove Adrese"
 
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact Process"
-msgstr ""
+msgstr "Proces Osnovne Osobe za kontakt"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Seq."
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "Ekstenzija"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobitel"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Unutarnja/Vanjska Ekstenzija Tel. broja"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Ljudi s kojima radite."
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Dodatni Podaci"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Funkcije i Adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: base_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Osoba"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Tvrtke s kojima radite."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Glavni Poslodavac."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Funkcija na Adresu - Function to address"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Osobe kod Partnera"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Osoba kod Partnera"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
 #: view:res.partner:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adrese"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Poslovne i Privatne Adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
 msgid "Last Name"
-msgstr ""
+msgstr "Prezime osobe"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr ""
+msgstr "Općenit"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "Prošli"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr ""
+msgstr "Opća Informacija"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Poslovi na istoj Adresi Partnera"
 
 #. module: base_contact
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Datum Početka"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Definiraj Funkcije i Adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
 msgid "Website"
-msgstr ""
+msgstr "Web stranica"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
 msgid "Birth Date"
-msgstr ""
+msgstr "Datum rođenja"
diff --git a/addons/base_contact/i18n/hu.po b/addons/base_contact/i18n/hu.po
index 86089b16e28..50b26f03fa2 100644
--- a/addons/base_contact/i18n/hu.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/id.po b/addons/base_contact/i18n/id.po
index fe6057edfd5..f44fa3384bc 100644
--- a/addons/base_contact/i18n/id.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po
index 487a73f2c3f..90776c07414 100644
--- a/addons/base_contact/i18n/it.po
+++ b/addons/base_contact/i18n/it.po
@@ -7,19 +7,19 @@ 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-17 06:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-26 16:08+0000\n"
+"Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Seq. Contatto"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
@@ -52,7 +52,7 @@ msgstr "Contatti"
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Seq. Partner"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -82,7 +82,7 @@ msgstr "Contatto di funzione"
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
@@ -92,12 +92,12 @@ msgstr "Partner da contattare"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "Numero Contatti"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Numero di telefono aggiuntivo"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
@@ -189,7 +189,7 @@ msgstr ""
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Lavoro principale"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -224,7 +224,7 @@ msgstr "Seq."
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "Interno"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index 526e923d235..08a837a039c 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 14c485e9538..25bba1b7571 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/lv.po b/addons/base_contact/i18n/lv.po
index 552ca46fe95..dea63f9824b 100644
--- a/addons/base_contact/i18n/lv.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
index 2289f2fb555..f8f3f8f2597 100644
--- a/addons/base_contact/i18n/nl.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/nl_BE.po b/addons/base_contact/i18n/nl_BE.po
index 7e48198be70..3a5c520cdea 100644
--- a/addons/base_contact/i18n/nl_BE.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/pl.po b/addons/base_contact/i18n/pl.po
index 8d70ab3e2b3..c329d7278c2 100644
--- a/addons/base_contact/i18n/pl.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/pt.po b/addons/base_contact/i18n/pt.po
index 72cceaf9e9a..c6dab1f3423 100644
--- a/addons/base_contact/i18n/pt.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/pt_BR.po b/addons/base_contact/i18n/pt_BR.po
index 41f18c21c40..edbf85fa620 100644
--- a/addons/base_contact/i18n/pt_BR.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/ro.po b/addons/base_contact/i18n/ro.po
index 72ea000b612..1f7a4297bf4 100644
--- a/addons/base_contact/i18n/ro.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index 42285ee93d9..bfc391d95ef 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sk.po b/addons/base_contact/i18n/sk.po
index 84b1c4233d7..a0d6b5879fa 100644
--- a/addons/base_contact/i18n/sk.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sl.po b/addons/base_contact/i18n/sl.po
index a96a50131ea..b9076d0946e 100644
--- a/addons/base_contact/i18n/sl.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sq.po b/addons/base_contact/i18n/sq.po
index 1022679a6b9..6a1976747d3 100644
--- a/addons/base_contact/i18n/sq.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sr.po b/addons/base_contact/i18n/sr.po
index b19860be038..0ed86ccc62d 100644
--- a/addons/base_contact/i18n/sr.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sv.po b/addons/base_contact/i18n/sv.po
index 93f2d95a816..e537802666e 100644
--- a/addons/base_contact/i18n/sv.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/tlh.po b/addons/base_contact/i18n/tlh.po
index 4724d1747c1..dcb16ca3582 100644
--- a/addons/base_contact/i18n/tlh.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index d2b26f0b241..b9febf05c33 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/uk.po b/addons/base_contact/i18n/uk.po
index b9c5f83f6d1..158ae0c0fce 100644
--- a/addons/base_contact/i18n/uk.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index af2071d08b9..c750ab300aa 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.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: 2009-12-01 14:36+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-29 00:51+0000\n"
+"Last-Translator: digitalsatori <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/zh_TW.po b/addons/base_contact/i18n/zh_TW.po
index 02c4cfc8bcd..fc21c875ba5 100644
--- a/addons/base_contact/i18n/zh_TW.po
+++ b/addons/base_contact/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__terp__.py
index e8527ee6459..f534c42bb33 100644
--- a/addons/base_iban/__terp__.py
+++ b/addons/base_iban/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
-This module install the base for IBAN bank accounts. 
+This module install the base for IBAN (International Bank Account Number) bank accounts and checks for its validity
 
     """,
     'author': 'Tiny',
diff --git a/addons/base_iban/i18n/ar.po b/addons/base_iban/i18n/ar.po
index b17509665f0..84d2b44b366 100644
--- a/addons/base_iban/i18n/ar.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/bg.po b/addons/base_iban/i18n/bg.po
index e2ba5326a61..2f3528a7593 100644
--- a/addons/base_iban/i18n/bg.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/bs.po b/addons/base_iban/i18n/bs.po
index bf4cc970cdf..8bdc4c3dca1 100644
--- a/addons/base_iban/i18n/bs.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/ca.po b/addons/base_iban/i18n/ca.po
index 72f5507c240..6bac5036f94 100644
--- a/addons/base_iban/i18n/ca.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/cs.po b/addons/base_iban/i18n/cs.po
index 146bf52faf1..626d9d25eff 100644
--- a/addons/base_iban/i18n/cs.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index 4b2315f8b72..71500a68e0a 100644
--- a/addons/base_iban/i18n/de.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index 824a1fe1bef..b676235b731 100644
--- a/addons/base_iban/i18n/el.po
+++ b/addons/base_iban/i18n/el.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_iban/i18n/es.po b/addons/base_iban/i18n/es.po
index 15b19a821f4..33dd52d9188 100644
--- a/addons/base_iban/i18n/es.po
+++ b/addons/base_iban/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/es_AR.po b/addons/base_iban/i18n/es_AR.po
index b842f5f1300..f8e01dd0e52 100644
--- a/addons/base_iban/i18n/es_AR.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po
index c252a806e6b..1f8f95f4e1c 100644
--- a/addons/base_iban/i18n/et.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/fi.po b/addons/base_iban/i18n/fi.po
index b1d86aed1fe..f5e5e32d41b 100644
--- a/addons/base_iban/i18n/fi.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index 6f3c7693d83..033a0d11f0c 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/gl.po b/addons/base_iban/i18n/gl.po
index d304f77b79e..ff03bb32a74 100644
--- a/addons/base_iban/i18n/gl.po
+++ b/addons/base_iban/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index 0e2702c5b7a..f5590e76c6b 100644
--- a/addons/base_iban/i18n/hr.po
+++ b/addons/base_iban/i18n/hr.po
@@ -1,63 +1,64 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_iban
-#
+# * base_iban
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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:34+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_iban
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
-msgstr ""
+msgstr "Pošt. Broj"
 
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr ""
+msgstr "Međunarodni broj Bankovnog računa"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr ""
+msgstr "country_id"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bic"
-msgstr ""
+msgstr "bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
-msgstr ""
+msgstr "iban"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr ""
+msgstr "IBAN konto"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr ""
+msgstr "Broj konta"
diff --git a/addons/base_iban/i18n/hu.po b/addons/base_iban/i18n/hu.po
index b17509665f0..84d2b44b366 100644
--- a/addons/base_iban/i18n/hu.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/id.po b/addons/base_iban/i18n/id.po
index dffa24b8d26..76ceb696d6c 100644
--- a/addons/base_iban/i18n/id.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/it.po b/addons/base_iban/i18n/it.po
index d868a04651d..eeb94310200 100644
--- a/addons/base_iban/i18n/it.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/ko.po b/addons/base_iban/i18n/ko.po
index 9220ae46fe9..b6d7ec6da43 100644
--- a/addons/base_iban/i18n/ko.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/lt.po b/addons/base_iban/i18n/lt.po
index 3c2b17be94b..94dc6114b2b 100644
--- a/addons/base_iban/i18n/lt.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/lv.po b/addons/base_iban/i18n/lv.po
index ad925507388..2d6b963df26 100644
--- a/addons/base_iban/i18n/lv.po
+++ b/addons/base_iban/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po
index 7c2cc6fea0a..f4e0f8657b7 100644
--- a/addons/base_iban/i18n/nl.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/nl_BE.po b/addons/base_iban/i18n/nl_BE.po
index 02cef412fe2..220ce1185cd 100644
--- a/addons/base_iban/i18n/nl_BE.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/pl.po b/addons/base_iban/i18n/pl.po
index 405fe2ef33e..9e2da727237 100644
--- a/addons/base_iban/i18n/pl.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index f241f53e860..e3598cc3605 100644
--- a/addons/base_iban/i18n/pt.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/pt_BR.po b/addons/base_iban/i18n/pt_BR.po
index 0fdf96c287a..e69ed2f200a 100644
--- a/addons/base_iban/i18n/pt_BR.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/ro.po b/addons/base_iban/i18n/ro.po
index ea1852ef65d..5c73a3532af 100644
--- a/addons/base_iban/i18n/ro.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index 5fee67a4daf..11b626d63e7 100644
--- a/addons/base_iban/i18n/ru.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/sk.po b/addons/base_iban/i18n/sk.po
index 5daed20664c..a6015eacda5 100644
--- a/addons/base_iban/i18n/sk.po
+++ b/addons/base_iban/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sl.po b/addons/base_iban/i18n/sl.po
index 505da3572d7..b652cf021d7 100644
--- a/addons/base_iban/i18n/sl.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/sq.po b/addons/base_iban/i18n/sq.po
index 42acec95740..a20cc6fba58 100644
--- a/addons/base_iban/i18n/sq.po
+++ b/addons/base_iban/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index 1102855704c..21e583f03b0 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index 5e96a5a7a4b..0d90ca0127f 100644
--- a/addons/base_iban/i18n/sv.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/tlh.po b/addons/base_iban/i18n/tlh.po
index 43f5946d13f..aa3a1d3026e 100644
--- a/addons/base_iban/i18n/tlh.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 302a64443b2..ca27bc94fdd 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/uk.po b/addons/base_iban/i18n/uk.po
index 5c87d0c4a5d..b78afe279bf 100644
--- a/addons/base_iban/i18n/uk.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index dfe8c394db1..159cb9d26e0 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.po
@@ -4,22 +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-15 13:06+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:35+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML视图结构无效"
+msgstr "无效XML视图结构!"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -29,12 +29,12 @@ msgstr "邮政编码"
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr "国际银行账号（IBAN）"
+msgstr "银行账号"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr "国家_id"
+msgstr "国家 - ID"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
@@ -55,9 +55,20 @@ msgstr "国际银行账号（IBAN）"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "国际银行账号（IBAN）"
+msgstr "IBAN账户"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
 msgstr "账号"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module install the base for IBAN bank accounts. \n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块安装银行账号的IBAN . \n"
+#~ "\n"
+#~ "    "
diff --git a/addons/base_iban/i18n/zh_TW.po b/addons/base_iban/i18n/zh_TW.po
index 7b6843e733b..7e99ffe8d07 100644
--- a/addons/base_iban/i18n/zh_TW.po
+++ b/addons/base_iban/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: base_iban
diff --git a/addons/base_module_merge/i18n/ar.po b/addons/base_module_merge/i18n/ar.po
index ea0cad606c0..3c59125355a 100644
--- a/addons/base_module_merge/i18n/ar.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/bg.po b/addons/base_module_merge/i18n/bg.po
index ea0cad606c0..3c59125355a 100644
--- a/addons/base_module_merge/i18n/bg.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/bs.po b/addons/base_module_merge/i18n/bs.po
index ea0cad606c0..3c59125355a 100644
--- a/addons/base_module_merge/i18n/bs.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/ca.po b/addons/base_module_merge/i18n/ca.po
index af3d255fb03..3a6ddcff6a5 100644
--- a/addons/base_module_merge/i18n/ca.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/cs.po b/addons/base_module_merge/i18n/cs.po
index ea0cad606c0..3c59125355a 100644
--- a/addons/base_module_merge/i18n/cs.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/de.po b/addons/base_module_merge/i18n/de.po
index d5f4ae71502..c1e4b0eb805 100644
--- a/addons/base_module_merge/i18n/de.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/el.po b/addons/base_module_merge/i18n/el.po
index ef3afd78075..e1b6e5bcdba 100644
--- a/addons/base_module_merge/i18n/el.po
+++ b/addons/base_module_merge/i18n/el.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_module_merge/i18n/es.po b/addons/base_module_merge/i18n/es.po
index 1ba35f8fbd4..8894863af77 100644
--- a/addons/base_module_merge/i18n/es.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/es_AR.po b/addons/base_module_merge/i18n/es_AR.po
index dedc90c2316..c91dab2b3bf 100644
--- a/addons/base_module_merge/i18n/es_AR.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/es_EC.po b/addons/base_module_merge/i18n/es_EC.po
index d3b3b4d6bbd..cbb09a1d4c8 100644
--- a/addons/base_module_merge/i18n/es_EC.po
+++ b/addons/base_module_merge/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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/et.po b/addons/base_module_merge/i18n/et.po
index 8b33e76fddd..2d6a5c0c6af 100644
--- a/addons/base_module_merge/i18n/et.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/fi.po b/addons/base_module_merge/i18n/fi.po
index b493e84be58..4dec1ed5149 100644
--- a/addons/base_module_merge/i18n/fi.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
@@ -35,7 +35,7 @@ msgstr "Moduulien liittäminen"
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,author:0
 msgid "Author"
-msgstr "Luoja"
+msgstr "Tekijä"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,directory_name:0
@@ -61,7 +61,7 @@ msgstr "Versio"
 #: wizard_view:base_module_merge.module_merge,info:0
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module Recording"
-msgstr "Moduulitallennus"
+msgstr "Moduulin tallennus"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
@@ -97,12 +97,12 @@ msgstr "Moduulin liittäjä"
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module successfully created !"
-msgstr "Moduuli luotu onnistuneesti !"
+msgstr "Moduuli luotu onnistuneesti!"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,website:0
 msgid "Documentation URL"
-msgstr "Dokumentaatio URL"
+msgstr "Dokumentaation URL"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,init,modules_list:0
@@ -127,14 +127,14 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
-"Jos luulet, että tekemäsi moduuli kiinnostaa muita käyttäjiä, haluaisimme "
-"että julkaiset sen OpenERP.com:ssa, \"Modules\" -osiossa. Voit tehdä sen "
-"kotisivulta käyttäen \"base_module_publish\" -moduulin ominaisuuksia."
+"Jos uskot että moduulisi kiinnostaisi muitakin käyttäjiä, haluaisimme että "
+"julkaisisit sen OpenERP.com:in \"Modules\"-osiossa. Voit tehdä sen "
+"käyttämällä verkkosivua tai \"base_module_publish\"-moduulia."
 
 #. module: base_module_merge
 #: help:base_module_merge.module_merge,init,modules_list:0
 msgid "Select Modules which you want to merge in single module"
-msgstr "Valitse moduulit jotka haluat liittää yhdessä moduulissa"
+msgstr "Valitse moduulit jotka haluat liittää yhteen moduuliin"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,data_kind:0
diff --git a/addons/base_module_merge/i18n/fr.po b/addons/base_module_merge/i18n/fr.po
index 26db9f0d71f..b1fff30df68 100644
--- a/addons/base_module_merge/i18n/fr.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/gl.po b/addons/base_module_merge/i18n/gl.po
index 76285d2b696..70eb7a0907d 100644
--- a/addons/base_module_merge/i18n/gl.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/hr.po b/addons/base_module_merge/i18n/hr.po
index 86da56d3753..cae2bd1c026 100644
--- a/addons/base_module_merge/i18n/hr.po
+++ b/addons/base_module_merge/i18n/hr.po
@@ -1,123 +1,124 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_module_merge
-#
+# * base_module_merge
+# Drazen Bosak <drazen.bosak@gmail.com>, 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 13:34+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:51+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,init:0
 msgid "Module Merging"
-msgstr ""
+msgstr "Spajanje Modula"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+msgstr "Ime Direktorija"
 
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Demo Podaciž"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_filename:0
 msgid "Filename"
-msgstr ""
+msgstr "Ime datoteke"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "Verzija"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,info:0
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module Recording"
-msgstr ""
+msgstr "Snimanje Modula"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Thanks in advance for your contribution."
-msgstr ""
+msgstr "naprijed Hvala na doprinosu!"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,description:0
 msgid "Full Description"
-msgstr ""
+msgstr "Puni opis"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,name:0
 msgid "Module Name"
-msgstr ""
+msgstr "Ime Modula"
 
 #. module: base_module_merge
 #: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
 #: model:ir.ui.menu,name:base_module_merge.menu_wizard_base_module_merger
 msgid "Merge module"
-msgstr ""
+msgstr "Spoji Modul"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_file:0
 msgid "Module .zip File"
-msgstr ""
+msgstr ".zip datoteka Modula"
 
 #. module: base_module_merge
 #: model:ir.module.module,shortdesc:base_module_merge.module_meta_information
 msgid "Module Merger"
-msgstr ""
+msgstr "Spoj Modula"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module successfully created !"
-msgstr ""
+msgstr "Modul uspješno kreiran !"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,website:0
 msgid "Documentation URL"
-msgstr ""
+msgstr "URL Dokumentacije"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,init,modules_list:0
 msgid "Modules"
-msgstr ""
+msgstr "Moduli"
 
 #. module: base_module_merge
 #: wizard_button:base_module_merge.module_merge,info,save:0
 #: wizard_button:base_module_merge.module_merge,init,info:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "Obični podaci"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
@@ -126,29 +127,32 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
+"publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
+"korištenjem mogućnosti Modula: 'base_module_publish'"
 
 #. module: base_module_merge
 #: help:base_module_merge.module_merge,init,modules_list:0
 msgid "Select Modules which you want to merge in single module"
-msgstr ""
+msgstr "Odaberite Module koje želite spojiti u jedan Modul"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,data_kind:0
 msgid "Type of Data"
-msgstr ""
+msgstr "Tip Podataka"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,info:0
 msgid "Module Information"
-msgstr ""
+msgstr "Informacije o Modulu"
 
 #. module: base_module_merge
 #: wizard_button:base_module_merge.module_merge,info,end:0
 #: wizard_button:base_module_merge.module_merge,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_module_merge
 #: wizard_button:base_module_merge.module_merge,save,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
diff --git a/addons/base_module_merge/i18n/hu.po b/addons/base_module_merge/i18n/hu.po
index ea0cad606c0..3c59125355a 100644
--- a/addons/base_module_merge/i18n/hu.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/id.po b/addons/base_module_merge/i18n/id.po
index 1400aeea7c3..0d3070464e2 100644
--- a/addons/base_module_merge/i18n/id.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/it.po b/addons/base_module_merge/i18n/it.po
index a1d9564260e..81f420e5ab1 100644
--- a/addons/base_module_merge/i18n/it.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/ko.po b/addons/base_module_merge/i18n/ko.po
index 81ac4143fbe..6e3031ccc4f 100644
--- a/addons/base_module_merge/i18n/ko.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/lt.po b/addons/base_module_merge/i18n/lt.po
index 1090e2c7448..78182f690e9 100644
--- a/addons/base_module_merge/i18n/lt.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/nl.po b/addons/base_module_merge/i18n/nl.po
index 8cee86e9651..ff604dabaf1 100644
--- a/addons/base_module_merge/i18n/nl.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/pl.po b/addons/base_module_merge/i18n/pl.po
index 4c42dc37138..56d73a016a4 100644
--- a/addons/base_module_merge/i18n/pl.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/pt.po b/addons/base_module_merge/i18n/pt.po
index 32305c2416c..d2cc1c21fed 100644
--- a/addons/base_module_merge/i18n/pt.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/pt_BR.po b/addons/base_module_merge/i18n/pt_BR.po
index 23202b21e79..75cf564bd79 100644
--- a/addons/base_module_merge/i18n/pt_BR.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/ro.po b/addons/base_module_merge/i18n/ro.po
index 9e4c15ccce9..fc3cdd73e1b 100644
--- a/addons/base_module_merge/i18n/ro.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/ru.po b/addons/base_module_merge/i18n/ru.po
index de533c29c08..5b6b2e8f1b8 100644
--- a/addons/base_module_merge/i18n/ru.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/sk.po b/addons/base_module_merge/i18n/sk.po
index 167c2e72ccf..096006e3020 100644
--- a/addons/base_module_merge/i18n/sk.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/sl.po b/addons/base_module_merge/i18n/sl.po
index a8bfa0542f8..3b0b9bd5716 100644
--- a/addons/base_module_merge/i18n/sl.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/sq.po b/addons/base_module_merge/i18n/sq.po
index ed7ffd350d9..6c4443fd4f7 100644
--- a/addons/base_module_merge/i18n/sq.po
+++ b/addons/base_module_merge/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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/sv.po b/addons/base_module_merge/i18n/sv.po
index ea0cad606c0..3c59125355a 100644
--- a/addons/base_module_merge/i18n/sv.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/tlh.po b/addons/base_module_merge/i18n/tlh.po
index 4996953d3b6..c79648bb029 100644
--- a/addons/base_module_merge/i18n/tlh.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/tr.po b/addons/base_module_merge/i18n/tr.po
index 094b410ed8d..9c163b3734d 100644
--- a/addons/base_module_merge/i18n/tr.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/uk.po b/addons/base_module_merge/i18n/uk.po
index f0860465386..e37067dead7 100644
--- a/addons/base_module_merge/i18n/uk.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/vi.po b/addons/base_module_merge/i18n/vi.po
index 42492ad024a..4836f9310e4 100644
--- a/addons/base_module_merge/i18n/vi.po
+++ b/addons/base_module_merge/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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/zh_CN.po b/addons/base_module_merge/i18n/zh_CN.po
index f1b01c8ede0..576594b37f5 100644
--- a/addons/base_module_merge/i18n/zh_CN.po
+++ b/addons/base_module_merge/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 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-07 11:24+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:35+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
@@ -29,7 +29,7 @@ msgstr "信息"
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,init:0
 msgid "Module Merging"
-msgstr "模块合并"
+msgstr "模块合并中"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,author:0
@@ -44,7 +44,7 @@ msgstr "目录名"
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Demo Data"
-msgstr "演示数据"
+msgstr "日期"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_filename:0
@@ -65,17 +65,17 @@ msgstr "模块记录"
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Thanks in advance for your contribution."
-msgstr "感谢您的贡献。"
+msgstr "谢谢你的贡献"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,description:0
 msgid "Full Description"
-msgstr "完整描述"
+msgstr "完整的说明"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,name:0
 msgid "Module Name"
-msgstr "模块名称"
+msgstr "模块名"
 
 #. module: base_module_merge
 #: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
@@ -86,7 +86,7 @@ msgstr "合并模块"
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_file:0
 msgid "Module .zip File"
-msgstr "模块 .zip 文件"
+msgstr "zip文件"
 
 #. module: base_module_merge
 #: model:ir.module.module,shortdesc:base_module_merge.module_meta_information
@@ -96,12 +96,12 @@ msgstr "模块合并"
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module successfully created !"
-msgstr "模块已成功创建！"
+msgstr "模块创建完成！"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,website:0
 msgid "Documentation URL"
-msgstr "文档地址-URL"
+msgstr "文档URL"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,init,modules_list:0
@@ -117,7 +117,7 @@ msgstr "继续"
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Normal Data"
-msgstr "普通数据"
+msgstr "一般数据"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
@@ -125,14 +125,12 @@ msgid ""
 "If you think your module could interrest others people, we'd like you to "
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
-msgstr ""
-"如果您认为您的模块其他人也会感兴趣，我们希望您能够把它发布到 OpenERP.com "
-"的“Modules”部分中。您可以直接通过网站进行发布或者使用“base_module_publish”模块。"
+msgstr "如果你认为你的模块可以发布给其他人.你可以上网站或使用'base_module_publish'模块"
 
 #. module: base_module_merge
 #: help:base_module_merge.module_merge,init,modules_list:0
 msgid "Select Modules which you want to merge in single module"
-msgstr "选择您希望合并成为单个模块的模块列表"
+msgstr "选择将要合并的模块"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,data_kind:0
@@ -153,4 +151,25 @@ msgstr "取消"
 #. module: base_module_merge
 #: wizard_button:base_module_merge.module_merge,save,end:0
 msgid "Close"
-msgstr "关闭"
+msgstr "结束"
+
+#~ msgid ""
+#~ "\n"
+#~ "    * The wizard asks a many2many of modules\n"
+#~ "    * And then generate a module which is the merge of all selected modules\n"
+#~ "    * The new module is provided as a .zip file\n"
+#~ "\n"
+#~ "    The merge will works in all situations:\n"
+#~ "    * Merging all .py files with the same name in the new module\n"
+#~ "    * merging all .xml files and take care of id's.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    * 这向导会询问many2many模块\n"
+#~ " * 然后生成一个合并选择的模块\n"
+#~ "* 新的模块是一个.zip文件\n"
+#~ "    \n"
+#~ "    合并工作将在所有的情况下:\n"
+#~ "       * 合并所有的py具有相同名称文件\n"
+#~ "       * 合并所有xml文件\n"
+#~ "    "
diff --git a/addons/base_module_merge/i18n/zh_TW.po b/addons/base_module_merge/i18n/zh_TW.po
index f6fb8b52174..374a9c4b820 100644
--- a/addons/base_module_merge/i18n/zh_TW.po
+++ b/addons/base_module_merge/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_publish/i18n/ar.po b/addons/base_module_publish/i18n/ar.po
index 8deb163554f..13c488dc82b 100644
--- a/addons/base_module_publish/i18n/ar.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/bg.po b/addons/base_module_publish/i18n/bg.po
index 5a9f30a3670..a505fd797c2 100644
--- a/addons/base_module_publish/i18n/bg.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/bs.po b/addons/base_module_publish/i18n/bs.po
index 6682928f775..0b7a88161ab 100644
--- a/addons/base_module_publish/i18n/bs.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/ca.po b/addons/base_module_publish/i18n/ca.po
index 4adb99f2b9a..f3b71468dae 100644
--- a/addons/base_module_publish/i18n/ca.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/cs.po b/addons/base_module_publish/i18n/cs.po
index a8a046c47c3..fb5860c0988 100644
--- a/addons/base_module_publish/i18n/cs.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/de.po b/addons/base_module_publish/i18n/de.po
index 048070c473c..83a1ffc0717 100644
--- a/addons/base_module_publish/i18n/de.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/el.po b/addons/base_module_publish/i18n/el.po
index 2dcd29d3535..b6656af281c 100644
--- a/addons/base_module_publish/i18n/el.po
+++ b/addons/base_module_publish/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_module_publish/i18n/es.po b/addons/base_module_publish/i18n/es.po
index a847600a9fa..d04c27b7d0b 100644
--- a/addons/base_module_publish/i18n/es.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/es_AR.po b/addons/base_module_publish/i18n/es_AR.po
index 720aa470893..b8e2e36d9b5 100644
--- a/addons/base_module_publish/i18n/es_AR.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/et.po b/addons/base_module_publish/i18n/et.po
index d55b3014dff..2c8b981d04f 100644
--- a/addons/base_module_publish/i18n/et.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/fi.po b/addons/base_module_publish/i18n/fi.po
index 0508deae731..ce24cba77e0 100644
--- a/addons/base_module_publish/i18n/fi.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/fr.po b/addons/base_module_publish/i18n/fr.po
index 263f8536c0d..395202eeb6e 100644
--- a/addons/base_module_publish/i18n/fr.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/hr.po b/addons/base_module_publish/i18n/hr.po
index 043f5cd1c7b..3bd4d77a30b 100644
--- a/addons/base_module_publish/i18n/hr.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/hu.po b/addons/base_module_publish/i18n/hu.po
index 8deb163554f..13c488dc82b 100644
--- a/addons/base_module_publish/i18n/hu.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/id.po b/addons/base_module_publish/i18n/id.po
index 7639897dd74..5dcdb1c3217 100644
--- a/addons/base_module_publish/i18n/id.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/it.po b/addons/base_module_publish/i18n/it.po
index 15cd9ed0642..6c876d5fd1c 100644
--- a/addons/base_module_publish/i18n/it.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/ko.po b/addons/base_module_publish/i18n/ko.po
index b5f09419bed..f0c78a6bd5c 100644
--- a/addons/base_module_publish/i18n/ko.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/lt.po b/addons/base_module_publish/i18n/lt.po
index 8deb163554f..13c488dc82b 100644
--- a/addons/base_module_publish/i18n/lt.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/nl.po b/addons/base_module_publish/i18n/nl.po
index 382d453571b..91deb97129c 100644
--- a/addons/base_module_publish/i18n/nl.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/nl_BE.po b/addons/base_module_publish/i18n/nl_BE.po
index a704459964b..25ed0b29a43 100644
--- a/addons/base_module_publish/i18n/nl_BE.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/pl.po b/addons/base_module_publish/i18n/pl.po
index 24580a552c0..8271cc6a94c 100644
--- a/addons/base_module_publish/i18n/pl.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/pt.po b/addons/base_module_publish/i18n/pt.po
index 307d9e22710..03e09643b2a 100644
--- a/addons/base_module_publish/i18n/pt.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/pt_BR.po b/addons/base_module_publish/i18n/pt_BR.po
index c51fc9a858d..d412e7feda0 100644
--- a/addons/base_module_publish/i18n/pt_BR.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/ro.po b/addons/base_module_publish/i18n/ro.po
index 89ba59b0783..0fe712435a7 100644
--- a/addons/base_module_publish/i18n/ro.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/ru.po b/addons/base_module_publish/i18n/ru.po
index f32a1d6ac40..9b3c1c8602f 100644
--- a/addons/base_module_publish/i18n/ru.po
+++ b/addons/base_module_publish/i18n/ru.po
@@ -7,13 +7,13 @@ 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: 2008-10-30 16:51+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-03-29 06:18+0000\n"
+"Last-Translator: Alexey Rusaleev <alexey.rusaleev@mail.ru>\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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
@@ -87,7 +87,7 @@ msgstr ""
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,operation:0
 msgid "Modification"
-msgstr ""
+msgstr "Модификация"
 
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,demourl:0
@@ -137,7 +137,7 @@ msgstr ""
 #: wizard_view:base_module_publish.module_publish,init:0
 #: wizard_view:base_module_publish.module_publish_all,init:0
 msgid "Publication information"
-msgstr ""
+msgstr "Информация о публикации"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_export,zip,end:0
diff --git a/addons/base_module_publish/i18n/sl.po b/addons/base_module_publish/i18n/sl.po
index 56db2c5d358..77890d4beef 100644
--- a/addons/base_module_publish/i18n/sl.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/sr.po b/addons/base_module_publish/i18n/sr.po
index 19c745d554c..a4e6e56f453 100644
--- a/addons/base_module_publish/i18n/sr.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/sv.po b/addons/base_module_publish/i18n/sv.po
index 8deb163554f..13c488dc82b 100644
--- a/addons/base_module_publish/i18n/sv.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/tlh.po b/addons/base_module_publish/i18n/tlh.po
index 49675df52c6..ff477104345 100644
--- a/addons/base_module_publish/i18n/tlh.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/tr.po b/addons/base_module_publish/i18n/tr.po
index 3df4e6d7909..30f66a5c78a 100644
--- a/addons/base_module_publish/i18n/tr.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/uk.po b/addons/base_module_publish/i18n/uk.po
index 3b7108b6b98..79705d6c962 100644
--- a/addons/base_module_publish/i18n/uk.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/zh_CN.po b/addons/base_module_publish/i18n/zh_CN.po
index b0937c6943d..5df023d5eee 100644
--- a/addons/base_module_publish/i18n/zh_CN.po
+++ b/addons/base_module_publish/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: 2009-09-08 16:18+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:36+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
@@ -29,7 +29,7 @@ msgstr "信息"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,shortdesc:0
 msgid "Small description"
-msgstr "简要说明"
+msgstr "简短说明"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,author:0
@@ -40,13 +40,13 @@ msgstr "作者"
 #: wizard_field:base_module_publish.module_publish,init,text:0
 #: wizard_field:base_module_publish.module_publish_all,init,text:0
 msgid "Introduction"
-msgstr "说明"
+msgstr "信息"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,url:0
 #: wizard_field:base_module_publish.module_publish,step1,url_download:0
 msgid "Download URL"
-msgstr "下载地址-URL"
+msgstr "下载URL"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_publish,step2,publish:0
@@ -62,12 +62,12 @@ msgstr "文件名"
 #. module: base_module_publish
 #: model:ir.module.module,shortdesc:base_module_publish.module_meta_information
 msgid "Module publisher"
-msgstr ""
+msgstr "模块发布"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,demourl:0
 msgid "Demo URL"
-msgstr "演示地址-URL"
+msgstr "示范URL"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,version:0
@@ -77,33 +77,33 @@ msgstr "版本"
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,license:0
 msgid "Other proprietary"
-msgstr ""
+msgstr "其它操作"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_export,init,include_src:0
 msgid "Include sources"
-msgstr ""
+msgstr "包含来源"
 
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,operation:0
 msgid "Modification"
-msgstr ""
+msgstr "修改"
 
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,demourl:0
 msgid "empty to keep existing value"
-msgstr ""
+msgstr "留空为保持现有值"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step2,email:0
 #: wizard_field:base_module_publish.module_publish_all,login,email:0
 msgid "Email"
-msgstr "Email"
+msgstr "电子邮件"
 
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,url_download:0
 msgid "Keep empty for an auto upload of the module"
-msgstr ""
+msgstr "留空为自动上次模块"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,website:0
@@ -113,12 +113,12 @@ msgstr "网站"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_export,zip,module_file:0
 msgid "Module .zip file"
-msgstr "模块.zip文件"
+msgstr "模块zip文件"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_export,zip:0
 msgid "Finish"
-msgstr "结束"
+msgstr "完成"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,step1:0
@@ -131,20 +131,20 @@ msgstr "说明"
 #: wizard_view:base_module_publish.module_publish_all,login:0
 msgid ""
 "If you don't have an access, you can create one http://www.openerp.com/"
-msgstr ""
+msgstr "如果你不能访问,你可以在网站建一个"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,init:0
 #: wizard_view:base_module_publish.module_publish_all,init:0
 msgid "Publication information"
-msgstr "信息发布"
+msgstr "发布信息"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_export,zip,end:0
 #: wizard_button:base_module_publish.module_publish,publish,end:0
 #: wizard_button:base_module_publish.module_publish_all,publish,end:0
 msgid "Close"
-msgstr "关闭"
+msgstr "结束"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,init:0
@@ -160,12 +160,12 @@ msgstr "模块发布"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,license:0
 msgid "Licence"
-msgstr "授权"
+msgstr ""
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,step1:0
 msgid "Verify your module information"
-msgstr "检查模块信息"
+msgstr "验证你的模块信息"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step2,password:0
@@ -176,12 +176,12 @@ msgstr "密码"
 #. module: base_module_publish
 #: model:ir.actions.wizard,name:base_module_publish.wizard_base_module_publish_all
 msgid "Publish all modules"
-msgstr ""
+msgstr "发布模块"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,publish,result:0
 msgid "Result page"
-msgstr "结果"
+msgstr "结果页"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_export,init,zip:0
@@ -197,27 +197,27 @@ msgstr "名称"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish_all,publish,update:0
 msgid "Modules updated"
-msgstr "模块已更新"
+msgstr "模块更新"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish_all,publish,error:0
 msgid "Modules in error"
-msgstr "模块出错"
+msgstr "模块错误"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,docurl:0
 msgid "Documentation URL"
-msgstr "文档地址-URL"
+msgstr "文档URL"
 
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,image:0
 msgid "support only .png files"
-msgstr ""
+msgstr "只支持.png文件"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,publish,text_end:0
 msgid "Summary"
-msgstr "总结"
+msgstr "摘要"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_publish,init,step1:0
@@ -228,7 +228,7 @@ msgstr "继续"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish_all,publish,already:0
 msgid "Modules already updated"
-msgstr "模块已更新"
+msgstr "模块已经更新"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_export,init:0
@@ -240,7 +240,7 @@ msgstr "导出模块"
 #: wizard_view:base_module_publish.module_publish,step2:0
 #: wizard_view:base_module_publish.module_publish_all,login:0
 msgid "Please provide here your login on the Open ERP website."
-msgstr ""
+msgstr "请提供你的网站登录信息"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step2,login:0
@@ -261,17 +261,17 @@ msgstr "上传信息"
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_export,zip:0
 msgid "Module successfully exported !"
-msgstr "模块成功导出"
+msgstr "模块导出完成！"
 
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,operation:0
 msgid "Creation"
-msgstr ""
+msgstr "创建"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,include_src:0
 msgid "Include source"
-msgstr "包括源代码"
+msgstr "包含来源"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,step1:0
@@ -302,7 +302,7 @@ msgstr "取消"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,image:0
 msgid "Image file"
-msgstr "图片文件"
+msgstr "图像文件"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,operation:0
@@ -312,15 +312,15 @@ msgstr "操作"
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,docurl:0
 msgid "Empty to keep existing value"
-msgstr ""
+msgstr "空为保持现有值"
 
 #. module: base_module_publish
 #: model:ir.actions.wizard,name:base_module_publish.wizard_base_module_publish
 msgid "Publish module"
-msgstr ""
+msgstr "发布模块"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_publish,step1,init:0
 #: wizard_button:base_module_publish.module_publish,step2,step1:0
 msgid "Previous"
-msgstr "上一步"
+msgstr "先前"
diff --git a/addons/base_module_publish/i18n/zh_TW.po b/addons/base_module_publish/i18n/zh_TW.po
index adeb24a0337..eaa470e88a0 100644
--- a/addons/base_module_publish/i18n/zh_TW.po
+++ b/addons/base_module_publish/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_quality/i18n/ab.po b/addons/base_module_quality/i18n/ab.po
index bbc8410c7b4..d0d78b3aa59 100644
--- a/addons/base_module_quality/i18n/ab.po
+++ b/addons/base_module_quality/i18n/ab.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ar.po b/addons/base_module_quality/i18n/ar.po
index b09f8bd06c4..51d35d85736 100644
--- a/addons/base_module_quality/i18n/ar.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/bg.po b/addons/base_module_quality/i18n/bg.po
index 57b97b28582..4ade4707c00 100644
--- a/addons/base_module_quality/i18n/bg.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/bs.po b/addons/base_module_quality/i18n/bs.po
index c63424cb448..af85e64ddf2 100644
--- a/addons/base_module_quality/i18n/bs.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ca.po b/addons/base_module_quality/i18n/ca.po
index 55611b8ada6..1850e933ecc 100644
--- a/addons/base_module_quality/i18n/ca.po
+++ b/addons/base_module_quality/i18n/ca.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/cs.po b/addons/base_module_quality/i18n/cs.po
index 34229d9a9e9..f11fde5ca6c 100644
--- a/addons/base_module_quality/i18n/cs.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/de.po b/addons/base_module_quality/i18n/de.po
index fd5e50fd540..7b23ad779e2 100644
--- a/addons/base_module_quality/i18n/de.po
+++ b/addons/base_module_quality/i18n/de.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po
index 17f049a3bd8..aec07bc9336 100644
--- a/addons/base_module_quality/i18n/es.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es_AR.po b/addons/base_module_quality/i18n/es_AR.po
index d713beec571..0b584e0d8df 100644
--- a/addons/base_module_quality/i18n/es_AR.po
+++ b/addons/base_module_quality/i18n/es_AR.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es_EC.po b/addons/base_module_quality/i18n/es_EC.po
index 42d4c9c83ed..8f9a289d2e0 100644
--- a/addons/base_module_quality/i18n/es_EC.po
+++ b/addons/base_module_quality/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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/et.po b/addons/base_module_quality/i18n/et.po
index 943ddfef5ee..cb2a9e32e3a 100644
--- a/addons/base_module_quality/i18n/et.po
+++ b/addons/base_module_quality/i18n/et.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/fi.po b/addons/base_module_quality/i18n/fi.po
index 80b75a7f4a3..00e85c4a111 100644
--- a/addons/base_module_quality/i18n/fi.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/fr.po b/addons/base_module_quality/i18n/fr.po
index 374a95b4a74..d08be52da37 100644
--- a/addons/base_module_quality/i18n/fr.po
+++ b/addons/base_module_quality/i18n/fr.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/gl.po b/addons/base_module_quality/i18n/gl.po
index 0446cf37495..ce25a03e177 100644
--- a/addons/base_module_quality/i18n/gl.po
+++ b/addons/base_module_quality/i18n/gl.po
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/hr.po b/addons/base_module_quality/i18n/hr.po
index 6daae728fe3..8a5b6fc5d77 100644
--- a/addons/base_module_quality/i18n/hr.po
+++ b/addons/base_module_quality/i18n/hr.po
@@ -2,66 +2,68 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-18 12:31+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
+"PO-Revision-Date: 2010-03-25 21:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "Konačni Rezultat (%)"
 
 #. module: base_module_quality
 #: 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: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality"
-msgstr ""
+msgstr "Kvalitet osnovnog Modula"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
 msgid "Rated Module"
-msgstr ""
+msgstr "Ocijenjen Modul"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalj"
 
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
-msgstr ""
+msgstr "Detalji"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "Ponderacija"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -69,17 +71,19 @@ msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
 msgstr ""
+"Neki su testovi od većeg kritičnog značaja od drugih, tako da imaju veću "
+"\"težinu\" u izračunu konačne procjene."
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: field:module.quality.check,check_detail_ids:0
 msgid "Tests"
-msgstr ""
+msgstr "Testovi"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Preskočen"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -87,95 +91,97 @@ msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
 msgstr ""
+"test će biti dovršen jedino ako je modul instaliran ili ako test može biti "
+"procesiran an neinstaliranom modulu."
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
 msgid "module.quality.check"
-msgstr ""
+msgstr "module.quality.check"
 
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "Spremi Izvještaj"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Ime datoteke"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "Rezultat (%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "Spremi izvještaj u .html formatu"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 #: field:module.quality.detail,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sižetak"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "Spremi Izvještaj"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Standardni unosi"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Spremi Izvještaj"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 msgid "Quality Check"
-msgstr ""
+msgstr "Provjera Kvalitete"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
 msgid "module.quality.detail"
-msgstr ""
+msgstr "module.quality.detail"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: view:module.quality.detail:0
 msgid "Result"
-msgstr ""
+msgstr "Rezultat"
 
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
 msgid "Quality"
-msgstr ""
+msgstr "Kvaliteta"
diff --git a/addons/base_module_quality/i18n/hu.po b/addons/base_module_quality/i18n/hu.po
index 37f45f75c5a..9510f8fb6b1 100644
--- a/addons/base_module_quality/i18n/hu.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 14d4256f048..d501f883291 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/iu.po b/addons/base_module_quality/i18n/iu.po
index f854db02156..32effc8262b 100644
--- a/addons/base_module_quality/i18n/iu.po
+++ b/addons/base_module_quality/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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ko.po b/addons/base_module_quality/i18n/ko.po
index df34066f2a3..52656467b5c 100644
--- a/addons/base_module_quality/i18n/ko.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/lt.po b/addons/base_module_quality/i18n/lt.po
index 3532fe9d644..06364a7a12a 100644
--- a/addons/base_module_quality/i18n/lt.po
+++ b/addons/base_module_quality/i18n/lt.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po
index b10734fa47f..a993cb544df 100644
--- a/addons/base_module_quality/i18n/nl.po
+++ b/addons/base_module_quality/i18n/nl.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/pl.po b/addons/base_module_quality/i18n/pl.po
index 7f003c91621..9f044562a9a 100644
--- a/addons/base_module_quality/i18n/pl.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/pt.po b/addons/base_module_quality/i18n/pt.po
index 8caa053957c..9c8708516b7 100644
--- a/addons/base_module_quality/i18n/pt.po
+++ b/addons/base_module_quality/i18n/pt.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/pt_BR.po b/addons/base_module_quality/i18n/pt_BR.po
index 9661a93cd58..c8088bdd790 100644
--- a/addons/base_module_quality/i18n/pt_BR.po
+++ b/addons/base_module_quality/i18n/pt_BR.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ro.po b/addons/base_module_quality/i18n/ro.po
index ef6c7c47176..b88f83bce74 100644
--- a/addons/base_module_quality/i18n/ro.po
+++ b/addons/base_module_quality/i18n/ro.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po
index 73b1a3e947f..6c9a23d4eae 100644
--- a/addons/base_module_quality/i18n/ru.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sk.po b/addons/base_module_quality/i18n/sk.po
index 04a460cec18..901238a264a 100644
--- a/addons/base_module_quality/i18n/sk.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sl.po b/addons/base_module_quality/i18n/sl.po
index 1dccde2e195..dc56723da6b 100644
--- a/addons/base_module_quality/i18n/sl.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sr.po b/addons/base_module_quality/i18n/sr.po
index 70540a21b13..37f739a8dd3 100644
--- a/addons/base_module_quality/i18n/sr.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sv.po b/addons/base_module_quality/i18n/sv.po
index 4e77ad0c7b5..e89f4cd6ac1 100644
--- a/addons/base_module_quality/i18n/sv.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index 922faf41317..70a375d7c0d 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/uk.po b/addons/base_module_quality/i18n/uk.po
index e246eb42964..bae45b84a26 100644
--- a/addons/base_module_quality/i18n/uk.po
+++ b/addons/base_module_quality/i18n/uk.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/zh_CN.po b/addons/base_module_quality/i18n/zh_CN.po
index a968421924a..c33660e799e 100644
--- a/addons/base_module_quality/i18n/zh_CN.po
+++ b/addons/base_module_quality/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 15:33+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-17 14:08+0000\n"
+"Last-Translator: 英华 <wantinghard@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -86,7 +86,7 @@ msgstr "已跳过"
 msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
-msgstr ""
+msgstr "只有模块已经安装或测试能在已卸载的模块上运行的情况下测试才能完成。"
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
@@ -132,7 +132,7 @@ msgstr "概要"
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "保存报告"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
diff --git a/addons/base_module_quality/i18n/zh_TW.po b/addons/base_module_quality/i18n/zh_TW.po
index 37f45f75c5a..9510f8fb6b1 100644
--- a/addons/base_module_quality/i18n/zh_TW.po
+++ b/addons/base_module_quality/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 1bea209cd78..cda1f4ebb82 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -72,6 +72,40 @@ def doc_createXElement(xdoc, tagName):
         e.ownerDocument = xdoc
         return e
 
+import yaml
+            
+class record(yaml.YAMLObject):
+    yaml_tag = u'!record'
+    def __init__(self, model, id=None, attrs={}):
+        self.model = model
+        self.id = id
+        self.attrs=attrs
+    def __repr__(self):
+        return '!record {model: %s, id: %s}:' % (str(self.model,), str(self.id,))
+
+class workflow(yaml.YAMLObject):
+    yaml_tag = u'!workflow'
+    def __init__(self, model, action, ref=None):
+        self.model = model
+        self.ref = ref
+        self.action=action
+    def __repr__(self):
+        return '!workflow {model: %s, action: %s, ref: %s}' % (str(self.model,), str(self.action,), str(self.ref,))
+        
+class ref(yaml.YAMLObject):
+    yaml_tag = u'!ref'
+    def __init__(self, expr="False"):
+        self.expr = expr
+    def __repr__(self):
+        return 'ref(%s)' % (str(self.expr,))
+
+class eval(yaml.YAMLObject):
+    yaml_tag = u'!eval'
+    def __init__(self, expr="False"):
+        self.expr = expr
+    def __repr__(self):
+        return 'eval(%s)' % (str(self.expr,))
+
 class base_module_record(osv.osv):
     _name = "ir.module.record"
     _columns = {
@@ -105,7 +139,7 @@ class base_module_record(osv.osv):
         dt = self.pool.get('ir.model.data')
         dtids = dt.search(cr, uid, [('model','=',model), ('res_id','=',id)])
         if not dtids:
-            return None, None
+            return False, None
         obj = dt.browse(cr, uid, dtids[0])
         self.depends[obj.module] = True
         return obj.module+'.'+obj.name, obj.noupdate
@@ -372,6 +406,17 @@ class base_module_record(osv.osv):
             self.ids[(rec[2], result)] = id
             record = self._create_yaml_record(cr, uid, rec[2], rec[4], id)
             return record
+        if self.mode=="workflow":
+            id,update = self._get_id(cr, uid, rec[2], rec[4])
+            data = {}
+            data['model'] = rec[2]
+            data['action'] = rec[3]
+            data['ref'] = id
+            return data
+        if self.mode=="write":
+            id,update = self._get_id(cr, uid, rec[2],rec[4][0])
+            record = self._create_yaml_record(cr, uid, rec[2], rec[5], id)
+            return record
         data=self.get_copy_data(cr,uid,rec[2],rec[4],rec[5])
         copy_rec=(rec[0],rec[1],rec[2],rec[3],rec[4],data,rec[5])
         rec=copy_rec
@@ -394,7 +439,7 @@ class base_module_record(osv.osv):
             doc.appendChild(terp)
             for rec in self.recording_data:
                 if rec[0]=='workflow':
-                    rec_id,noupdate = self._get_id(cr, uid, rec[1][3], rec[1][5])
+                    rec_id,noupdate = self._get_id(cr, uid, rec[1][2], rec[1][4])
                     if not rec_id:
                         continue
                     data = doc.createElement("data")
@@ -422,73 +467,45 @@ class base_module_record(osv.osv):
     def generate_yaml(self, cr, uid):
         self.ids = {}
         if len(self.recording_data):
-            strg='''import yaml
-            
-class record(yaml.YAMLObject):
-    yaml_tag = u'!record'
-    def __init__(self, model, id=None, attrs={}):
-        self.model = model
-        self.id = id
-        self.attrs=attrs
-    def __repr__(self):
-        return '!record {model: %s, id: %s}:' % (str(self.model,), str(self.id,))
-
-class ref(yaml.YAMLObject):
-    yaml_tag = u'!ref'
-    def __init__(self, expr="False"):
-        self.expr = expr
-    def __repr__(self):
-        return 'ref(%s)' % (str(self.expr,))
-
-class eval(yaml.YAMLObject):
-    yaml_tag = u'!eval'
-    def __init__(self, expr="False"):
-        self.expr = expr
-    def __repr__(self):
-        return 'eval(%s)' % (str(self.expr,))
-\n'''
+            yaml_file='''\n'''
     
             for rec in self.recording_data:
                 if rec[1][3] == 'create':
                     self.mode="create"
+                elif rec[1][3] == 'write':
+                    self.mode="write"
                 elif rec[1][3] == 'copy':
                     self.mode="copy"
+                elif rec[0] == 'workflow':
+                    self.mode="workflow"
                 else:
                     continue
-                record= self._generate_object_yaml(cr, uid, rec[1],rec[3])
-                strg+="object=yaml.load(unicode('''\n !record %s \n''','iso-8859-1'))"%record
-                strg+='''
-print object
-attrs=yaml.dump(object.attrs, default_flow_style=False)
-print attrs \n\n'''
-
-            import os
-            py_path = os.path.join(os.getcwd(), 'records.py')
-            txt_path = os.path.join(os.getcwd(), 'records.txt')
-            f = open(py_path, 'w')
-            f.write(strg)
-            f.close()
-            os.system('python %s > %s'%(py_path,txt_path))
-            f = open(txt_path, 'r+')
-            lines=f.readlines()
-            f.seek(0)
-            for line in lines:
-                line=line.replace("''","'")
-                if line.find('!record') == 0:
-                    line = "- \n" + "  " + line
-                elif line.find('- -') != -1:
-                    line=line.replace('- -','  -')
-                    line = "    " + line
+                if self.mode == "workflow":
+                    record= self._generate_object_yaml(cr, uid, rec[1],rec[0])
+                    object=yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1'))
+                    yaml_file += str(object) + '''\n'''
                 else:
-                    line = "    " + line
-                f.write(line)
-            f.close()
-            f = open(txt_path, 'r')
-            strg = ''.join(f.readlines()) 
-            f.close()
-            os.system('rm %s'%py_path)
-            os.system('rm %s'%txt_path)
-            return strg
+                    record= self._generate_object_yaml(cr, uid, rec[1],rec[3])
+                    object= yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1'))
+                    yaml_file += str(object) + '''\n'''
+                    attrs=yaml.dump(object.attrs, default_flow_style=False)
+                    yaml_file += attrs + '''\n\n'''
+                    
+        yaml_result=''''''
+        for line in yaml_file.split('\n'):
+            line=line.replace("''","'")
+            if line.find('!record') == 0:
+                line = "- \n" + "  " + line
+            elif line.find('!workflow') == 0:
+                line = "- \n" + "  " + line                    
+            elif line.find('- -') != -1:
+                line=line.replace('- -','  -')
+                line = "    " + line
+            else:
+                line = "    " + line
+            yaml_result += line + '''\n'''
+            
+        return yaml_result
 
 base_module_record()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/i18n/ar.po b/addons/base_module_record/i18n/ar.po
index eed13dfd5fd..def2b44aab4 100644
--- a/addons/base_module_record/i18n/ar.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/bg.po b/addons/base_module_record/i18n/bg.po
index f7239b89fda..05b38e4c418 100644
--- a/addons/base_module_record/i18n/bg.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/bs.po b/addons/base_module_record/i18n/bs.po
index eed13dfd5fd..def2b44aab4 100644
--- a/addons/base_module_record/i18n/bs.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/ca.po b/addons/base_module_record/i18n/ca.po
index 16508dd9e6f..6e8291f392b 100644
--- a/addons/base_module_record/i18n/ca.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/cs.po b/addons/base_module_record/i18n/cs.po
index eed13dfd5fd..def2b44aab4 100644
--- a/addons/base_module_record/i18n/cs.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/de.po b/addons/base_module_record/i18n/de.po
index ad0f0ffecea..60babf958b6 100644
--- a/addons/base_module_record/i18n/de.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/el.po b/addons/base_module_record/i18n/el.po
index da26d100c2d..f6e3a1f56c6 100644
--- a/addons/base_module_record/i18n/el.po
+++ b/addons/base_module_record/i18n/el.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_module_record/i18n/es.po b/addons/base_module_record/i18n/es.po
index 988dd8f6794..91e81b20364 100644
--- a/addons/base_module_record/i18n/es.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/es_AR.po b/addons/base_module_record/i18n/es_AR.po
index 7bf0daa5db1..d2adf6e348d 100644
--- a/addons/base_module_record/i18n/es_AR.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/et.po b/addons/base_module_record/i18n/et.po
index 22bd8c21422..aa761cbcfbf 100644
--- a/addons/base_module_record/i18n/et.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/fi.po b/addons/base_module_record/i18n/fi.po
index a12462cdfeb..0ed3e981175 100644
--- a/addons/base_module_record/i18n/fi.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/fr.po b/addons/base_module_record/i18n/fr.po
index f329f1ae8e0..f9e51e66f0b 100644
--- a/addons/base_module_record/i18n/fr.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/gl.po b/addons/base_module_record/i18n/gl.po
index 4865a401935..55d236bface 100644
--- a/addons/base_module_record/i18n/gl.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/hr.po b/addons/base_module_record/i18n/hr.po
index 1aacc87b906..9ab91fe4270 100644
--- a/addons/base_module_record/i18n/hr.po
+++ b/addons/base_module_record/i18n/hr.po
@@ -1,105 +1,107 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_module_record
-#
+# * base_module_record
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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 15:16+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 21:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,category:0
 #: wizard_field:base_module_record.module_save,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_field:base_module_record.module_save,init,info_text:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "ir.module.record"
 
 #. module: base_module_record
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Choose objects to record"
-msgstr ""
+msgstr "Izaberite Objekte za Snimanje"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,author:0
 #: wizard_field:base_module_record.module_save,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,directory_name:0
 #: wizard_field:base_module_record.module_save,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+msgstr "Ime Direktorija"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Records only"
-msgstr ""
+msgstr "Samo Zapisi"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Demo Podaci"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
 #: wizard_field:base_module_record.module_save,save,module_filename:0
 msgid "Filename"
-msgstr ""
+msgstr "Ime datoteke"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,version:0
 #: wizard_field:base_module_record.module_save,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "Verzija"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Objects Recording"
-msgstr ""
+msgstr "Objekti se Snimaju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
-msgstr ""
+msgstr "Zapis od Datuma"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 #: wizard_view:base_module_record.module_save,init:0
 msgid "Recording Information"
-msgstr ""
+msgstr "Informacija o Snimanju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_save,init,info_status:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -111,111 +113,111 @@ msgstr ""
 #: wizard_view:base_module_record.module_save,init:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module Recording"
-msgstr ""
+msgstr "Modul se Zapisuje"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr ""
+msgstr "Izvezi Prilagodbe kao Modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Thanks in advance for your contribution."
-msgstr ""
+msgstr "Hvala unaprijed na Vašem Doprinosu"
 
 #. module: base_module_record
 #: help:base_module_record.module_record_objects,init,objects:0
 msgid "List of objects to be recorded"
-msgstr ""
+msgstr "Lista Objekata za zapis"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,start_confirm:0
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
 msgid "Start Recording"
-msgstr ""
+msgstr "Počni Snimanje"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Not Recording"
-msgstr ""
+msgstr "Ne Zapisuje se"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,description:0
 #: wizard_field:base_module_record.module_save,info,description:0
 msgid "Full Description"
-msgstr ""
+msgstr "Puni Opis"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,name:0
 #: wizard_field:base_module_record.module_save,info,name:0
 msgid "Module Name"
-msgstr ""
+msgstr "Ime Modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,objects:0
 msgid "Objects"
-msgstr ""
+msgstr "Objekti"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_file:0
 #: wizard_field:base_module_record.module_save,save,module_file:0
 msgid "Module .zip File"
-msgstr ""
+msgstr ".zip datoteka Modula"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording information"
-msgstr ""
+msgstr "Informacija o Snimanju"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module successfully created !"
-msgstr ""
+msgstr "Modul uspješno kreiran !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording Stopped"
-msgstr ""
+msgstr "Snimanje zaustavljeno"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr ""
+msgstr "Kreiran"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
 #: wizard_view:base_module_record.module_save,end:0
 msgid "Thanks For using Module Recorder"
-msgstr ""
+msgstr "Hvala što ste koristili Snimač  Modula"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record,start,continue:0
 msgid "Continue Previous Session"
-msgstr ""
+msgstr "Nastavi Prethodnu Sesiju"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,website:0
 #: wizard_field:base_module_record.module_save,info,website:0
 msgid "Documentation URL"
-msgstr ""
+msgstr "URL Dokumentacije"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Modified"
-msgstr ""
+msgstr "Izmijenjen"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr ""
+msgstr "Snimanje"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
 msgid "Record"
-msgstr ""
+msgstr "Zapis"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,stop,end:0
@@ -223,25 +225,25 @@ msgstr ""
 #: wizard_button:base_module_record.module_save,info,save:0
 #: wizard_button:base_module_record.module_save,init,check:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
 msgid "Module Recorder"
-msgstr ""
+msgstr "Snimač Modula"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "uobičajeni Podaci"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,end,end:0
 #: wizard_button:base_module_record.module_save,end,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -251,6 +253,9 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
+"publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
+"korištenjem mogućnosti Modula: 'base_module_publish'."
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -259,16 +264,19 @@ msgid ""
 "ERP client and save them as a module. You will be able to install this "
 "module on any database to reuse and/or publish it."
 msgstr ""
+"Snimač Modula omogućuje Vam da snimite svaku operaciju izvršenu u Open ERP "
+"klijentu i izmjene spremite kao Modul. Moći ćete instalirati taj Modul na "
+"bilo kojoj Bazi Podataka za ponovnu uporabu ili publiciranje."
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
 msgid "Record module"
-msgstr ""
+msgstr "Snimi Modul"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+msgstr "Kreacija Modula"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -276,30 +284,33 @@ msgid ""
 "You can continue the recording session by relauching the 'start recording' "
 "wizard."
 msgstr ""
+"Možete nastaviti snimanje tako da ponovo pokrenete Čarobnjak \"Počni "
+"Snimanje\""
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
 #: wizard_field:base_module_record.module_save,info,data_kind:0
 msgid "Type of Data"
-msgstr ""
+msgstr "Tip podataka"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,intro:0
 #: wizard_view:base_module_record.module_save,info:0
 msgid "Module Information"
-msgstr ""
+msgstr "Informacija o Modulu"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
 msgid "Save Recorded Module"
-msgstr ""
+msgstr "Spremi Snimljen Modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 msgid ""
 "Open ERP recording is stopped. Don't forget to save the recorded module."
 msgstr ""
+"OpenERP Snimač je zaustavljen. Ne zaboravite spremiti snimljen Modul."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,end:0
@@ -308,20 +319,20 @@ msgstr ""
 #: wizard_button:base_module_record.module_save,info,end:0
 #: wizard_button:base_module_record.module_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_save,save,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr ""
+msgstr "Kreiran i Izmijenjen"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
 msgid "Stop Recording"
-msgstr ""
+msgstr "Zaustavi Snimanje"
diff --git a/addons/base_module_record/i18n/hu.po b/addons/base_module_record/i18n/hu.po
index eed13dfd5fd..7d315de9ad5 100644
--- a/addons/base_module_record/i18n/hu.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/id.po b/addons/base_module_record/i18n/id.po
index 18de6721040..d5e32d16cbe 100644
--- a/addons/base_module_record/i18n/id.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/it.po b/addons/base_module_record/i18n/it.po
index d513fa1f4f7..835f78b1cd2 100644
--- a/addons/base_module_record/i18n/it.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/ko.po b/addons/base_module_record/i18n/ko.po
index fd8f6f86d99..85e1c4b3501 100644
--- a/addons/base_module_record/i18n/ko.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/lt.po b/addons/base_module_record/i18n/lt.po
index c49d28ca9e6..04d48d7a5c8 100644
--- a/addons/base_module_record/i18n/lt.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po
index ac9ffc2dc0d..d9072638ec0 100644
--- a/addons/base_module_record/i18n/nl.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/nl_BE.po b/addons/base_module_record/i18n/nl_BE.po
index cfe905a0c58..6367b60a5af 100644
--- a/addons/base_module_record/i18n/nl_BE.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/pl.po b/addons/base_module_record/i18n/pl.po
index c3f42bf504c..910dbc2cac2 100644
--- a/addons/base_module_record/i18n/pl.po
+++ b/addons/base_module_record/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/pt.po b/addons/base_module_record/i18n/pt.po
index 8a4494e4dec..3f77757f2da 100644
--- a/addons/base_module_record/i18n/pt.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/pt_BR.po b/addons/base_module_record/i18n/pt_BR.po
index 603f91b1a3d..bceb647246e 100644
--- a/addons/base_module_record/i18n/pt_BR.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/ro.po b/addons/base_module_record/i18n/ro.po
index 00d62647ec0..7bfb832b20f 100644
--- a/addons/base_module_record/i18n/ro.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
index 098d96c7a61..0016ea889c0 100644
--- a/addons/base_module_record/i18n/ru.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/sk.po b/addons/base_module_record/i18n/sk.po
index 9179054375a..5774dbe16d5 100644
--- a/addons/base_module_record/i18n/sk.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/sl.po b/addons/base_module_record/i18n/sl.po
index 8ddb1cb9d3d..232621c2d9f 100644
--- a/addons/base_module_record/i18n/sl.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po
index 8fc49aac8e9..5de93f537bc 100644
--- a/addons/base_module_record/i18n/sr.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/sv.po b/addons/base_module_record/i18n/sv.po
index 67584021858..87df02e1178 100644
--- a/addons/base_module_record/i18n/sv.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/tlh.po b/addons/base_module_record/i18n/tlh.po
index c0350cdb568..8283e3fe1ad 100644
--- a/addons/base_module_record/i18n/tlh.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 49b8ed9bf03..536fc23635e 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/uk.po b/addons/base_module_record/i18n/uk.po
index 7beef323ab0..4ce7fb65b1a 100644
--- a/addons/base_module_record/i18n/uk.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/zh_CN.po b/addons/base_module_record/i18n/zh_CN.po
index c5301792672..38d66ee5241 100644
--- a/addons/base_module_record/i18n/zh_CN.po
+++ b/addons/base_module_record/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 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-07 11:38+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:36+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -38,12 +38,12 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Choose objects to record"
-msgstr "选择要记录的对象列表"
+msgstr "选择要记录的对象"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,author:0
@@ -60,13 +60,13 @@ msgstr "目录名"
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Records only"
-msgstr ""
+msgstr "只记录"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr "演示数据"
+msgstr "示范数据"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
@@ -83,12 +83,12 @@ msgstr "版本"
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Objects Recording"
-msgstr "对象记录"
+msgstr "记录对象"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
-msgstr ""
+msgstr "记录日期"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -111,47 +111,47 @@ msgstr "状态"
 #: wizard_view:base_module_record.module_save,init:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module Recording"
-msgstr "模块记录"
+msgstr "记录模块"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr "把自定义设置作为模块导出"
+msgstr "导出自定义模块"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Thanks in advance for your contribution."
-msgstr "感谢您的贡献。"
+msgstr "感谢你的贡献"
 
 #. module: base_module_record
 #: help:base_module_record.module_record_objects,init,objects:0
 msgid "List of objects to be recorded"
-msgstr "将被记录的对象列表"
+msgstr "要记录的对象列表"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,start_confirm:0
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
 msgid "Start Recording"
-msgstr "开始录制"
+msgstr "开始记录"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Not Recording"
-msgstr "没有记录"
+msgstr "不记录"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,description:0
 #: wizard_field:base_module_record.module_save,info,description:0
 msgid "Full Description"
-msgstr "完整描述"
+msgstr "完整的说明"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,name:0
 #: wizard_field:base_module_record.module_save,info,name:0
 msgid "Module Name"
-msgstr "模块名称"
+msgstr "模块名"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,objects:0
@@ -162,55 +162,55 @@ msgstr "对象"
 #: wizard_field:base_module_record.module_record_objects,save,module_file:0
 #: wizard_field:base_module_record.module_save,save,module_file:0
 msgid "Module .zip File"
-msgstr "模块 .zip 文件"
+msgstr "模块zip文件"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording information"
-msgstr ""
+msgstr "记录信息"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module successfully created !"
-msgstr "模块已成功创建！"
+msgstr "模块创建完成！"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording Stopped"
-msgstr "记录已停止"
+msgstr "停止记录"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr "已创建"
+msgstr "创建"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
 #: wizard_view:base_module_record.module_save,end:0
 msgid "Thanks For using Module Recorder"
-msgstr "感谢使用模块记录器"
+msgstr "感谢你使用模块记录"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record,start,continue:0
 msgid "Continue Previous Session"
-msgstr "继续上次会话"
+msgstr "继续先前的会话"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,website:0
 #: wizard_field:base_module_record.module_save,info,website:0
 msgid "Documentation URL"
-msgstr "文档地址-URL"
+msgstr "文档URL"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Modified"
-msgstr "已修改"
+msgstr "修改"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr "记录中"
+msgstr "记录"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
@@ -229,13 +229,13 @@ msgstr "继续"
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
 msgid "Module Recorder"
-msgstr "模块记录器"
+msgstr "模块记录"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Normal Data"
-msgstr "普通数据"
+msgstr "一般数据"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,end,end:0
@@ -250,9 +250,7 @@ msgid ""
 "If you think your module could interrest others people, we'd like you to "
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
-msgstr ""
-"如果您认为您的模块其他人也会感兴趣，我们希望您能够把它发布到 OpenERP.com "
-"的“Modules”部分中。您可以直接通过网站进行发布或者使用“base_module_publish”模块。"
+msgstr "如果你认为你的模块可以发布给其他人.你可以上网站或使用'base_module_publish'模块"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -260,24 +258,24 @@ msgid ""
 "The module recorder allows you to record every operation made in the Open "
 "ERP client and save them as a module. You will be able to install this "
 "module on any database to reuse and/or publish it."
-msgstr ""
+msgstr "这记录者模块允许你记录客户端的每个操作并保存为一个模块.你能够安装这模块可以再利用或发布"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
 msgid "Record module"
-msgstr ""
+msgstr "记录模块"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+msgstr "模块创建"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 msgid ""
 "You can continue the recording session by relauching the 'start recording' "
 "wizard."
-msgstr ""
+msgstr "你可以继续记录这会话.开始记录向导"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
@@ -295,13 +293,13 @@ msgstr "模块信息"
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
 msgid "Save Recorded Module"
-msgstr ""
+msgstr "保存记录"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 msgid ""
 "Open ERP recording is stopped. Don't forget to save the recorded module."
-msgstr ""
+msgstr "停止系统记录不要忘记保存记录"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,end:0
@@ -316,14 +314,56 @@ msgstr "取消"
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_save,save,end:0
 msgid "Close"
-msgstr "关闭"
+msgstr "结束"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr ""
+msgstr "创建&修改"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
 msgid "Stop Recording"
 msgstr "结束记录"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to create a new module without any development.\n"
+#~ "It records all operations on objects during the recording session and\n"
+#~ "produce a .ZIP module. So you can create your own module directly from\n"
+#~ "the Open ERP client.\n"
+#~ "\n"
+#~ "This version works for creating and updating existing records. It "
+#~ "recomputes\n"
+#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
+#~ "It also support workflows and demo/update data.\n"
+#~ "\n"
+#~ "This should help you to easily create reusable and publishable modules\n"
+#~ "for custom configurations and demo/testing data.\n"
+#~ "\n"
+#~ "How to use it:\n"
+#~ "1. Start the recording\n"
+#~ "2. Do stuff in your Open ERP client\n"
+#~ "3. Stop the recording session\n"
+#~ "4. Export to a reusable module\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块允许你创建你的模块和发展\n"
+#~ "    它记录在会话周期的所有对象操作\n"
+#~ "和产生一个zip模块\n"
+#~ "所以你可以在系统的客户端创建自己的模块.\n"
+#~ "    \n"
+#~ "版本的创建和更新时重新计算的\n"
+#~ "依赖关系和所有关系类型(many2one, many2many, ...).\n"
+#~ "它也支持工作流和demo和测试数据.\n"
+#~ "\n"
+#~ "    这有助你简化创建可再重用和发布自定义模块\n"
+#~ "自定义配置和示范或测试数据.\n"
+#~ "    \n"
+#~ "    如何使用?\n"
+#~ "    1.开始记录\n"
+#~ "    2.在你的客户端完成操作\n"
+#~ "    3.停止记录会话\n"
+#~ "    4.导出一个可重用的模块\n"
+#~ "    "
diff --git a/addons/base_module_record/i18n/zh_TW.po b/addons/base_module_record/i18n/zh_TW.po
index 3b2978ca7ba..f8324c9befa 100644
--- a/addons/base_module_record/i18n/zh_TW.po
+++ b/addons/base_module_record/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/i18n/ar.po b/addons/base_report_creator/i18n/ar.po
index 156c025349e..ad003fe1179 100644
--- a/addons/base_report_creator/i18n/ar.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/bg.po b/addons/base_report_creator/i18n/bg.po
index 8a132e380c0..16f961a2de1 100644
--- a/addons/base_report_creator/i18n/bg.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/bs.po b/addons/base_report_creator/i18n/bs.po
index ee39a940773..cdd9e1ddea4 100644
--- a/addons/base_report_creator/i18n/bs.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ca.po b/addons/base_report_creator/i18n/ca.po
index e4013cb3337..d4dc763b1bd 100644
--- a/addons/base_report_creator/i18n/ca.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/cs.po b/addons/base_report_creator/i18n/cs.po
index 156c025349e..ad003fe1179 100644
--- a/addons/base_report_creator/i18n/cs.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/de.po b/addons/base_report_creator/i18n/de.po
index c79e834e5b6..87bc375d118 100644
--- a/addons/base_report_creator/i18n/de.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/el.po b/addons/base_report_creator/i18n/el.po
index dc426262543..e5095909807 100644
--- a/addons/base_report_creator/i18n/el.po
+++ b/addons/base_report_creator/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_report_creator/i18n/es.po b/addons/base_report_creator/i18n/es.po
index 128ff298348..db537472f43 100644
--- a/addons/base_report_creator/i18n/es.po
+++ b/addons/base_report_creator/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/es_AR.po b/addons/base_report_creator/i18n/es_AR.po
index d38c4901e63..540cdc35dc8 100644
--- a/addons/base_report_creator/i18n/es_AR.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/et.po b/addons/base_report_creator/i18n/et.po
index ec209aa9cad..bd89e98ccf9 100644
--- a/addons/base_report_creator/i18n/et.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/fi.po b/addons/base_report_creator/i18n/fi.po
index 591d7a80411..752c22590b4 100644
--- a/addons/base_report_creator/i18n/fi.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/fr.po b/addons/base_report_creator/i18n/fr.po
index 7c3cd339232..109e6b7aa3a 100644
--- a/addons/base_report_creator/i18n/fr.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -189,7 +189,7 @@ msgstr "XML non valide pour l'architecture de la vue"
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Tree"
-msgstr "Arbre"
+msgstr "Liste"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
@@ -214,7 +214,7 @@ msgstr "Sécurité"
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Nom du menu"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
@@ -408,6 +408,13 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+"Ce module permet de créer des rapports statistiques\n"
+"sur plusieurs objets. C'est un outil de définition et de consultation \n"
+"de requêtes SQL pour les utilisateurs finaux.\n"
+"\n"
+"Une fois le module installé, il ajoute un menu pour définir des rapports "
+"personnalisés\n"
+"dans le menu \"Tableaux de bord\".\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
diff --git a/addons/base_report_creator/i18n/hr.po b/addons/base_report_creator/i18n/hr.po
index abef2835b05..5c5ceec2a31 100644
--- a/addons/base_report_creator/i18n/hr.po
+++ b/addons/base_report_creator/i18n/hr.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: 2009-11-18 06:19+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-16 14:28+0000\n"
+"Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -23,6 +23,8 @@ msgid ""
 "records.\n"
 " e.g. res_partner.id=3"
 msgstr ""
+"Unesite izraz za polje po kojem želite filtrirati zapise.\n"
+"npr. res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -47,7 +49,7 @@ msgstr "Grafički"
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -158,7 +160,7 @@ msgstr "Kreiraj izbornik izvještaja"
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Form"
-msgstr ""
+msgstr "Ekran"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type3:0
@@ -335,7 +337,7 @@ msgstr "Potvrdi filter"
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "Filter"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_report_open
diff --git a/addons/base_report_creator/i18n/hu.po b/addons/base_report_creator/i18n/hu.po
index 156c025349e..ad003fe1179 100644
--- a/addons/base_report_creator/i18n/hu.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/id.po b/addons/base_report_creator/i18n/id.po
index d749fdea9c2..087e4b4c30e 100644
--- a/addons/base_report_creator/i18n/id.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/it.po b/addons/base_report_creator/i18n/it.po
index 76a6207119e..3eca492900c 100644
--- a/addons/base_report_creator/i18n/it.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ko.po b/addons/base_report_creator/i18n/ko.po
index dfbc3717caf..4a92233df54 100644
--- a/addons/base_report_creator/i18n/ko.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/lt.po b/addons/base_report_creator/i18n/lt.po
index 156c025349e..ad003fe1179 100644
--- a/addons/base_report_creator/i18n/lt.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/nl.po b/addons/base_report_creator/i18n/nl.po
index fadc9bf920c..e02b0d343bf 100644
--- a/addons/base_report_creator/i18n/nl.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/nl_BE.po b/addons/base_report_creator/i18n/nl_BE.po
index 0ebee1d1e93..b10d04b1897 100644
--- a/addons/base_report_creator/i18n/nl_BE.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/pl.po b/addons/base_report_creator/i18n/pl.po
index 795297a3aa4..fb25c849ca8 100644
--- a/addons/base_report_creator/i18n/pl.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/pt.po b/addons/base_report_creator/i18n/pt.po
index 1286df68bba..fb65de47d60 100644
--- a/addons/base_report_creator/i18n/pt.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/pt_BR.po b/addons/base_report_creator/i18n/pt_BR.po
index 00cfbb94d19..16805f800d3 100644
--- a/addons/base_report_creator/i18n/pt_BR.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ro.po b/addons/base_report_creator/i18n/ro.po
index d37c126074f..53d537838c6 100644
--- a/addons/base_report_creator/i18n/ro.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po
index b2838555704..43e1da5cef1 100644
--- a/addons/base_report_creator/i18n/ru.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sk.po b/addons/base_report_creator/i18n/sk.po
index 534bb7c1b54..61d5492240c 100644
--- a/addons/base_report_creator/i18n/sk.po
+++ b/addons/base_report_creator/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sl.po b/addons/base_report_creator/i18n/sl.po
index 4ab209c0f09..4886a5e4bb3 100644
--- a/addons/base_report_creator/i18n/sl.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po
index 74086d06f17..354ace73ea3 100644
--- a/addons/base_report_creator/i18n/sr.po
+++ b/addons/base_report_creator/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sv.po b/addons/base_report_creator/i18n/sv.po
index ad8de1f3359..5e9d629d4b1 100644
--- a/addons/base_report_creator/i18n/sv.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/tlh.po b/addons/base_report_creator/i18n/tlh.po
index 576c469296f..ec87f675604 100644
--- a/addons/base_report_creator/i18n/tlh.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 2075dafe542..5b643309101 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/uk.po b/addons/base_report_creator/i18n/uk.po
index 9ca12b342b8..5cb941efa82 100644
--- a/addons/base_report_creator/i18n/uk.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index 4d723774e2e..fe2310ae80c 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/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-01 23:39+0000\n"
-"Last-Translator: mrshelly <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -22,17 +22,17 @@ msgid ""
 "Provide an expression for the field based on which you want to filter the "
 "records.\n"
 " e.g. res_partner.id=3"
-msgstr "可以使用基于字段的Python条件表达式做为过滤条件.(如 res_partner.id=3)"
+msgstr "提供一个基于字段的表达式必须过滤记录 .例如res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
 msgid "Graph Type"
-msgstr "图表类型"
+msgstr "图形类型"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Used View"
-msgstr "已使用的视图"
+msgstr "用户视图"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
@@ -42,17 +42,17 @@ msgstr "过滤值"
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,graph_mode:0
 msgid "Graph Mode"
-msgstr "图表模式"
+msgstr "图形模式"
 
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Graph View"
-msgstr "图表视图"
+msgstr "图形视图"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,expression:0
@@ -67,18 +67,18 @@ msgstr "设置过滤字段"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Ending Date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
 msgid "Report Filters"
-msgstr "报表过滤器"
+msgstr "报表过滤"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,sql_query:0
 msgid "SQL Query"
-msgstr "SQL 查询"
+msgstr "SQL查询"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -89,12 +89,12 @@ msgstr "创建菜单"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Minimum"
-msgstr "最小值"
+msgstr "最小"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
 msgid "Operator"
-msgstr "运算符"
+msgstr "操作"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
@@ -116,12 +116,12 @@ msgstr "菜单信息"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Sum"
-msgstr "求和"
+msgstr "合计"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
-msgstr "以添加到报表的对象"
+msgstr "报表对象"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -141,17 +141,17 @@ msgstr "状态"
 #. module: base_report_creator
 #: selection:base_report_creator.report,state:0
 msgid "Valid"
-msgstr "验证"
+msgstr "有效"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
-msgstr "添加过滤条件"
+msgstr "增加过滤"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_menu_create
 msgid "Create Menu for Report"
-msgstr "为报表创建菜单"
+msgstr "报表创建菜单"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
@@ -177,39 +177,39 @@ msgstr "报表"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Starting Date"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: base_report_creator
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Tree"
-msgstr "树形列表"
+msgstr "树"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
 msgid "Authorized Groups"
-msgstr "已授权的用户组"
+msgstr "授权组"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_orientation:0
 msgid "Graph Orientation"
-msgstr "图表方向"
+msgstr "图方向"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Authorized Groups (empty for all)"
-msgstr "已授权的用户组（如果为空则授权给所有用户组）"
+msgstr "授权组(留空为所有)"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Security"
-msgstr "安全设定"
+msgstr "安全"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
@@ -225,36 +225,36 @@ msgstr "与（AND）"
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
-msgstr "日历模式"
+msgstr "日程表模式"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
 msgid "Display Fields"
-msgstr "显示的字段"
+msgstr "显示字段"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "Y Axis"
-msgstr "Y 轴"
+msgstr "y轴"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Calendar"
-msgstr "日历"
+msgstr "日程表"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Graph"
-msgstr "图表"
+msgstr "图形"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
 msgid "Field Name"
-msgstr "字段名称"
+msgstr "字段名"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,state:0
@@ -274,7 +274,7 @@ msgstr "状态"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Vertical"
-msgstr "垂直的"
+msgstr "垂直线"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,type:0
@@ -284,27 +284,27 @@ msgstr "行列报表"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "General Configuration"
-msgstr "通用设置"
+msgstr "一般设置"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,init:0
 msgid "Select Field to filter"
-msgstr "选择要过滤的字段"
+msgstr "选择过滤字段"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,active:0
 msgid "Active"
-msgstr "可用"
+msgstr "有效"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Horizontal"
-msgstr "水平的"
+msgstr "水平线"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,group_method:0
 msgid "Grouping Method"
-msgstr "分组方法"
+msgstr "图形模板"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,condition:0
@@ -320,7 +320,7 @@ msgstr "计数"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "X Axis"
-msgstr "X 轴"
+msgstr "x轴"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0
@@ -330,12 +330,12 @@ msgstr "上级菜单"
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
 msgid "Confirm Filter"
-msgstr "确认过滤器"
+msgstr "确定过滤"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,name:0
 msgid "Filter Name"
-msgstr "过滤器名称"
+msgstr "过滤名称"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_report_open
@@ -345,13 +345,13 @@ msgstr "打开报表"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Grouped"
-msgstr "已分组"
+msgstr "图形"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
 msgid "Report Creator"
-msgstr "报表创建器"
+msgstr "创建报表"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report.menu.create,init,end:0
@@ -364,17 +364,17 @@ msgstr "取消"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
 msgid "First View"
-msgstr "第一视图"
+msgstr "首视图"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Delay"
-msgstr "延迟"
+msgstr "拖延"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,field_id:0
@@ -384,7 +384,7 @@ msgstr "字段"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Filters on Fields"
-msgstr "字段上的过滤器"
+msgstr "过滤字段"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -406,13 +406,17 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
-"本模块可以让您使用SQL查询器新建很灵活的对象统计报表.\n"
-"安装此模块后, \"Dashboard(系统面板)\" 上会添加对应的菜单入口.\n"
+"这模块允许你创建任何统计\n"
+"报告几个对象,它是一SQL查询生成器和浏览器\n"
+"和用户\n"
+"\n"
+"安装模块后,它在控制台菜单增加一个自定义的报表菜单在\n"
+"控制台 的 菜单\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Uniq Colors"
-msgstr "唯一的颜色"
+msgstr "颜色"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
@@ -422,22 +426,22 @@ msgstr "报表名称"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Fields"
-msgstr "字段列表"
+msgstr "字段"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Average"
-msgstr "平均值"
+msgstr "平均"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Reports"
-msgstr "报表列表"
+msgstr "报表"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Maximum"
-msgstr "最大值"
+msgstr "最大"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
@@ -452,7 +456,7 @@ msgstr "值"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Bar Chart"
-msgstr "柱状图"
+msgstr "条线图"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type2:0
@@ -462,7 +466,7 @@ msgstr "第二视图"
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report.menu.create,init:0
 msgid "Create Menu For This Report"
-msgstr "为此报表创建菜单"
+msgstr "报表创建菜单"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -472,7 +476,7 @@ msgstr "视图参数"
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,sequence:0
 msgid "Sequence"
-msgstr "顺序"
+msgstr "序列"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
@@ -483,10 +487,10 @@ msgstr "过滤字段"
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,field_ids:0
 msgid "Fields to Display"
-msgstr "要显示的字段"
+msgstr "显示字段"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,filter_ids:0
 msgid "Filters"
-msgstr "过滤器"
+msgstr "过滤"
diff --git a/addons/base_report_creator/i18n/zh_TW.po b/addons/base_report_creator/i18n/zh_TW.po
index c12108dfc2c..5b1d890ee1f 100644
--- a/addons/base_report_creator/i18n/zh_TW.po
+++ b/addons/base_report_creator/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__terp__.py
index 0d2ca29e657..f19d179a1ed 100644
--- a/addons/base_report_designer/__terp__.py
+++ b/addons/base_report_designer/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,8 +25,13 @@
     'version': '0.1',
     'category': 'Generic Modules/Base',
     'description': """
-This module adds wizards to import/export documents to be edited in
-OpenOffice.
+This module is used along with openerp OpenOffice plugin.
+You have to first install the plugin which is available at
+http://www.openerp.com
+
+This module adds wizards to import/export .SXW report that
+you can modify in OpenOffice.Once you have modified it you can
+upload the report using the same wizard.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index bddc9da9e17..311449fd46c 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -60,7 +60,6 @@ class report_xml(osv.osv):
             'report_sxw_content': base64.decodestring(file_sxw),
             'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())),
         })
-        cr.commit()
         db = pooler.get_db_only(cr.dbname)
         interface.register_all(db)
         return True
diff --git a/addons/base_report_designer/i18n/ar.po b/addons/base_report_designer/i18n/ar.po
index 255e263bc35..c65ae776e3e 100644
--- a/addons/base_report_designer/i18n/ar.po
+++ b/addons/base_report_designer/i18n/ar.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: 2009-12-22 20:05+0000\n"
-"Last-Translator: akram@teiseer.com <akram@teiseer.com>\n"
+"Last-Translator: Akram Obeidat <akram@teiseer.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/bg.po b/addons/base_report_designer/i18n/bg.po
index c2f4e36f971..e21a255fb89 100644
--- a/addons/base_report_designer/i18n/bg.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/bs.po b/addons/base_report_designer/i18n/bs.po
index 921dc23ad6f..5b51ef22251 100644
--- a/addons/base_report_designer/i18n/bs.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/ca.po b/addons/base_report_designer/i18n/ca.po
index fcbef43a9db..e4f4308ec15 100644
--- a/addons/base_report_designer/i18n/ca.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/cs.po b/addons/base_report_designer/i18n/cs.po
index ea35d77a673..bb5819ca5b4 100644
--- a/addons/base_report_designer/i18n/cs.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index f80f6742fcc..33e329024b8 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
index b45241c059c..88f3fc0c8c2 100644
--- a/addons/base_report_designer/i18n/el.po
+++ b/addons/base_report_designer/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_report_designer/i18n/es.po b/addons/base_report_designer/i18n/es.po
index 946f02e0733..546cc5ba693 100644
--- a/addons/base_report_designer/i18n/es.po
+++ b/addons/base_report_designer/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/es_AR.po b/addons/base_report_designer/i18n/es_AR.po
index 185426de55d..2826143423f 100644
--- a/addons/base_report_designer/i18n/es_AR.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/et.po b/addons/base_report_designer/i18n/et.po
index 53018a82383..581c9d01c20 100644
--- a/addons/base_report_designer/i18n/et.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/fi.po b/addons/base_report_designer/i18n/fi.po
index 79c63b04544..25548248f62 100644
--- a/addons/base_report_designer/i18n/fi.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index 73aede30928..7c6eff6cea8 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/gl.po b/addons/base_report_designer/i18n/gl.po
index 457c97a56ef..3908345bc0b 100644
--- a/addons/base_report_designer/i18n/gl.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index 4bf555fb9e5..38406fcfc95 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_report_designer
-#
+# * base_report_designer
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-30 08:28+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 09:27+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
@@ -29,67 +30,67 @@ msgstr ""
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,send_form:0
 msgid "Upload the modified report"
-msgstr ""
+msgstr "Pošalji promijenjen Izvještaj na Server"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
 msgid "The .SXW report"
-msgstr ""
+msgstr ".SXW Izvještaj"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Report modified"
-msgstr ""
+msgstr "Izvještaj je promijenjen"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,init,get_form:0
 msgid "Modify a report"
-msgstr ""
+msgstr "Izmijeni Izvještaj"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Your report has been modified."
-msgstr ""
+msgstr "Vaš je Izvještaj izmijenjen"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
-msgstr ""
+msgstr "Modul sučelja Dizajnera Izvještaja"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form,report_id:0
 #: wizard_field:base_report_designer.modify,get_form_result,report_id:0
 #: wizard_field:base_report_designer.modify,send_form,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Izvještaj"
 
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify
 msgid "Report Designer"
-msgstr ""
+msgstr "Dizajner Izvještaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 #: wizard_view:base_report_designer.modify,get_form_result:0
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Get a report"
-msgstr ""
+msgstr "Napravi Izvještaj"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,get_form_result:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form_result,file_sxw:0
 #: wizard_field:base_report_designer.modify,send_form,file_sxw:0
 msgid "Your .SXW file"
-msgstr ""
+msgstr "Vaša .SXW datoteka"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer"
-msgstr ""
+msgstr "Dizajner Izvještaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
@@ -99,47 +100,51 @@ msgid ""
 "to modify it. Once it is modified, re-upload it in Open ERP using this "
 "wizard."
 msgstr ""
+"Ovo je Predložak vašeg traženog Izvještaja. Spremite ga kao .SXW datoteku i "
+"otvorite s programon OpenOffice. Ne zaboravite instalirati Tiny OpenOffice "
+"paket kako biste mogli vršiti izmjene. kad izvršite izmjene, vratite "
+"datoteku u Open ERP koristeći ovaj Čarobnjak."
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0
 msgid "Update the report"
-msgstr ""
+msgstr "Ažurirajte Izvještaj"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 msgid "Create a new report"
-msgstr ""
+msgstr "Napravi novi Izvještaj"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 #: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify
 msgid "Modify an existing report"
-msgstr ""
+msgstr "Izmijeni postojeći izvještaj"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,end:0
 #: wizard_button:base_report_designer.modify,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,end:0
 #: wizard_button:base_report_designer.modify,send_form,end:0
 #: wizard_button:base_report_designer.modify,send_form_result,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,operation:0
 msgid "Operation"
-msgstr ""
+msgstr "Operacija"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer introduction"
-msgstr ""
+msgstr "Uvod u Dizajner Izvještaja"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 msgid "Select your report"
-msgstr ""
+msgstr "Odaberite izvještaj"
diff --git a/addons/base_report_designer/i18n/hu.po b/addons/base_report_designer/i18n/hu.po
index 921dc23ad6f..5b51ef22251 100644
--- a/addons/base_report_designer/i18n/hu.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/id.po b/addons/base_report_designer/i18n/id.po
index 90a769aea28..2cc21f79c09 100644
--- a/addons/base_report_designer/i18n/id.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 350547d9c1f..4ccb793a2fe 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/ko.po b/addons/base_report_designer/i18n/ko.po
index b7d0b708a95..8c8b8445106 100644
--- a/addons/base_report_designer/i18n/ko.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/lt.po b/addons/base_report_designer/i18n/lt.po
index 921dc23ad6f..e9532b2e4b0 100644
--- a/addons/base_report_designer/i18n/lt.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/nl.po b/addons/base_report_designer/i18n/nl.po
index 6c9338006a8..00d6528bfca 100644
--- a/addons/base_report_designer/i18n/nl.po
+++ b/addons/base_report_designer/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: base_report_designer
diff --git a/addons/base_report_designer/i18n/nl_BE.po b/addons/base_report_designer/i18n/nl_BE.po
index 8b5badb32b8..2486bb80d67 100644
--- a/addons/base_report_designer/i18n/nl_BE.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/pl.po b/addons/base_report_designer/i18n/pl.po
index 0efe4f06ce8..e5656cd2887 100644
--- a/addons/base_report_designer/i18n/pl.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/pt.po b/addons/base_report_designer/i18n/pt.po
index f95bde65ca7..3ca428660af 100644
--- a/addons/base_report_designer/i18n/pt.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/pt_BR.po b/addons/base_report_designer/i18n/pt_BR.po
index c403962dd21..e5bf850f4c9 100644
--- a/addons/base_report_designer/i18n/pt_BR.po
+++ b/addons/base_report_designer/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
index b67a095cab1..8064a7dbfbd 100644
--- a/addons/base_report_designer/i18n/ro.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
index c42bff3e862..54cf6bda270 100644
--- a/addons/base_report_designer/i18n/ru.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sk.po b/addons/base_report_designer/i18n/sk.po
index 916ec2bce32..8abe8149874 100644
--- a/addons/base_report_designer/i18n/sk.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sl.po b/addons/base_report_designer/i18n/sl.po
index a1f447f9231..610f5a56a1b 100644
--- a/addons/base_report_designer/i18n/sl.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index 971e6905a4c..a8829c93793 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index 921dc23ad6f..e9532b2e4b0 100644
--- a/addons/base_report_designer/i18n/sv.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/tlh.po b/addons/base_report_designer/i18n/tlh.po
index 3ee1802220a..c798d77b074 100644
--- a/addons/base_report_designer/i18n/tlh.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 7985ef2180a..5db438c5d47 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/uk.po b/addons/base_report_designer/i18n/uk.po
index 58ecac10658..cc80433200a 100644
--- a/addons/base_report_designer/i18n/uk.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index ebbed29382b..464f0c8894b 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -4,57 +4,57 @@
 #
 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-07 07:55+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
 msgid "Introduction"
-msgstr "说明"
+msgstr "介绍"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Upload your modified report"
-msgstr "上传修改的报表"
+msgstr "上传你修改的报表"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,send_form:0
 msgid "Upload the modified report"
-msgstr "上传修改的报表"
+msgstr "上传这修改的报表"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
 msgid "The .SXW report"
-msgstr ".SXW报表"
+msgstr "这.SXW报表"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Report modified"
-msgstr "报表已修改"
+msgstr "报表修改"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,init,get_form:0
 msgid "Modify a report"
-msgstr "修改报表"
+msgstr "修改一个报表"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Your report has been modified."
-msgstr "报表已修改"
+msgstr "你的报表已经修改"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
-msgstr "报表设计器接口模块"
+msgstr "报表设计接口模块"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form,report_id:0
@@ -66,14 +66,14 @@ msgstr "报表"
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify
 msgid "Report Designer"
-msgstr "报表设计器"
+msgstr "报表设计者"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 #: wizard_view:base_report_designer.modify,get_form_result:0
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Get a report"
-msgstr "获取报表"
+msgstr "给一个报表"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,get_form_result:0
@@ -84,12 +84,12 @@ msgstr "继续"
 #: wizard_field:base_report_designer.modify,get_form_result,file_sxw:0
 #: wizard_field:base_report_designer.modify,send_form,file_sxw:0
 msgid "Your .SXW file"
-msgstr ".SXW文件"
+msgstr "你的.SXW文件"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer"
-msgstr "报表设计器"
+msgstr "报表设计者"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
@@ -98,25 +98,23 @@ msgid ""
 "open it with OpenOffice. Don't forget to install the Tiny OpenOffice package "
 "to modify it. Once it is modified, re-upload it in Open ERP using this "
 "wizard."
-msgstr ""
-"这是您要求的报表模板。请把它保存为 .SXW 格式文件并用 OpenOffice 软件打开。别忘了安装 Tiny 公司的 OpenOffice "
-"扩展包。修改完毕以后再次使用本向导上传到系统。"
+msgstr "这是你要求报表的模板.保存为一个.SXW文件和用openoffice打开和修改.修改后使用这个向导重新上传"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0
 msgid "Update the report"
-msgstr "上传报表"
+msgstr "更新报表"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 msgid "Create a new report"
-msgstr "创建新报表"
+msgstr "创建一个新报表"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 #: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify
 msgid "Modify an existing report"
-msgstr "修改已存在的报表"
+msgstr "修改现有的报表"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,end:0
@@ -134,14 +132,23 @@ msgstr "关闭"
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,operation:0
 msgid "Operation"
-msgstr "方向"
+msgstr "操作"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer introduction"
-msgstr "报表设计器说明"
+msgstr "报表设计介绍"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 msgid "Select your report"
-msgstr "选择您的报表"
+msgstr "选择你的报表"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module adds wizards to import/export documents to be edited in\n"
+#~ "OpenOffice.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "这模块增加一个向导来导入和导出文档在\n"
+#~ "OpenOffice编辑\n"
diff --git a/addons/base_report_designer/i18n/zh_TW.po b/addons/base_report_designer/i18n/zh_TW.po
index 2c3a39b85a6..0f7585296c3 100644
--- a/addons/base_report_designer/i18n/zh_TW.po
+++ b/addons/base_report_designer/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index 789229c3040..ca7441b9ce3 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index 7ac5b1b8491..8ff4f38cedf 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index 789229c3040..ca7441b9ce3 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 0ff553cc8c9..78acd9a0286 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index c704f1cfda8..229745ba879 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index d0cefa0a3ce..ff88b95261b 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 22b44d7a111..cba00d19dfd 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index b200ecaab4a..d760ddff5f8 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 29d27e70a70..29d7f434048 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 1fd3238580b..087c471efc7 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/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:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index b8ac33dd930..035e0330abd 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index 8176af6eacc..d656f45fd84 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/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:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -91,12 +91,12 @@ msgstr "Sähköposti"
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr "Tila"
+msgstr "Osavaltio"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr "Uusi tietokanta on nyt asennettu."
+msgstr "Uusi tietokanta on nyt kokonaan asennettu."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
@@ -183,7 +183,7 @@ msgstr "Maa"
 #: model:ir.actions.wizard,name:base_setup.action_wizard_setup
 #: model:ir.actions.wizard,name:base_setup.wizard_base_setup
 msgid "Setup"
-msgstr "Asennus"
+msgstr "Asetukset"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer1:0
@@ -194,8 +194,8 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
-"Tämä lauseke tulee näkymään raporttiesi alarivillä.\n"
-"Suosittelemme laittamaan tähän seuraavat tiedot:\n"
+"Tämä lauseke tulee näkymään raporttiesi lopussa.\n"
+"Suosittelemme laittamaan tähän esim. seuraavia tietoja:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
@@ -272,7 +272,7 @@ msgstr "Logo"
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr "Perusasennus"
+msgstr "Perusasetukset"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,init:0
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 04aee846bb7..c5a3edb0e86 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index 06b55c87171..019258d0f37 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/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:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 038c0c73538..d38e175377c 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_setup
-#
+# * base_setup
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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 16:32+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-26 01:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,city:0
@@ -29,34 +30,37 @@ msgid ""
 "You can start configuring the system or connect directly to the database "
 "using the default setup."
 msgstr ""
+"Možete početi s konfiguracijom sustava ili se izravno spojiti na bazu "
+"podataka koristeći predefinirane postavke."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,zip:0
 #: wizard_field:base_setup.base_setup,init,zip:0
 #: wizard_field:base_setup.base_setup,update,zip:0
 msgid "Zip code"
-msgstr ""
+msgstr "Pošt. broj"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid "Select a Profile"
-msgstr ""
+msgstr "Odaberite Profil"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report header"
-msgstr ""
+msgstr "Zaglavlje Izvještaja"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,config:0
 msgid "Start Configuration"
-msgstr ""
+msgstr "Započnite Konfiguriranje"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid ""
 "You'll be able to install more modules later through the Administration menu."
 msgstr ""
+"Moći ćete instalirati više Modula kasnije kroz izbornik Admininstracija"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
@@ -65,88 +69,91 @@ msgid ""
 "have been setup to help you discover the different aspects of OpenERP. This "
 "is just an overview, we have 300+ available modules."
 msgstr ""
+"Profil određuje pred-izbor modula za specifične potrebe. Ti su profili "
+"podešeni kako biste lakše otkrivali različite aspekte Open ERP-a. Ovo je tek "
+"osvrt, postoji 300+ raspoloživih modula."
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,update:0
 #: wizard_button:base_setup.base_setup,init,company:0
 msgid "Next"
-msgstr ""
+msgstr "Dalje"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,email:0
 #: wizard_field:base_setup.base_setup,init,email:0
 #: wizard_field:base_setup.base_setup,update,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,state_id:0
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr ""
+msgstr "Vaša nova baza podataka sada je instalirana u potpunosti."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
 #: wizard_field:base_setup.base_setup,init,profile:0
 #: wizard_field:base_setup.base_setup,update,profile:0
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer1:0
 #: wizard_field:base_setup.base_setup,init,rml_footer1:0
 #: wizard_field:base_setup.base_setup,update,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Podnožje Izvještaja 1"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer2:0
 #: wizard_field:base_setup.base_setup,init,rml_footer2:0
 #: wizard_field:base_setup.base_setup,update,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "Podnožje Izvještaja 2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "General Information"
-msgstr ""
+msgstr "Opće Informacije"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street2:0
 #: wizard_field:base_setup.base_setup,init,street2:0
 #: wizard_field:base_setup.base_setup,update,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Ulica2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report Information"
-msgstr ""
+msgstr "Informacija o Izvještaju"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,phone:0
 #: wizard_field:base_setup.base_setup,init,phone:0
 #: wizard_field:base_setup.base_setup,update,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Define Main Company"
-msgstr ""
+msgstr "Odredite glavnu Tvrtku"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,name:0
 #: wizard_field:base_setup.base_setup,init,name:0
 #: wizard_field:base_setup.base_setup,update,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "Ime Tvrtke"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer2:0
@@ -157,13 +164,16 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete bankovne podatke:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - PDV: BE0477.472.701"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,country_id:0
 #: wizard_field:base_setup.base_setup,init,country_id:0
 #: wizard_field:base_setup.base_setup,update,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Država"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
@@ -173,7 +183,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:base_setup.action_wizard_setup
 #: model:ir.actions.wizard,name:base_setup.wizard_base_setup
 msgid "Setup"
-msgstr ""
+msgstr "Postava"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer1:0
@@ -184,21 +194,24 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
+"Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete osnovne podatke:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
 msgid "Summary"
-msgstr ""
+msgstr "Sižetak"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,update,finish:0
 msgid "Install"
-msgstr ""
+msgstr "Instaliraj"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Instalacija Završena"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_header1:0
@@ -209,57 +222,60 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Ova će se rečenica pojavljivati u gornjem desno kutu vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete slogan tvrtke:\n"
+"\"Open Source Business Solutions\""
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
 #: wizard_field:base_setup.base_setup,init,rml_header1:0
 #: wizard_field:base_setup.base_setup,update,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Zaglavlje Izvještaja"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Vaš Logo: Koristite veličinu slike od cca. 450x150 pixela."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,currency:0
 #: wizard_field:base_setup.base_setup,init,currency:0
 #: wizard_field:base_setup.base_setup,update,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street:0
 #: wizard_field:base_setup.base_setup,init,street:0
 #: wizard_field:base_setup.base_setup,update,street:0
 msgid "Street"
-msgstr ""
+msgstr "Ulica"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,menu:0
 msgid "Use Directly"
-msgstr ""
+msgstr "Koristi Izravno"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,init,menu:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,logo:0
 #: wizard_field:base_setup.base_setup,init,logo:0
 #: wizard_field:base_setup.base_setup,update,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "Osnovni Postav"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,init:0
 #: wizard_button:base_setup.base_setup,update,company:0
 msgid "Previous"
-msgstr ""
+msgstr "Prethodno"
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index 789229c3040..ca7441b9ce3 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 3398c4e81d0..f3daed533fc 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 5d19924701f..a6d5352b798 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index a9a357d3941..ed036a536d2 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index 64dc7af531e..6c956b1239b 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 28145a94058..06cf576ce83 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index 55cc808d929..414159895f3 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index 9802d849faf..5c207031bbe 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index 95dc7bbc751..837e2c3b815 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index e9e23a3579a..e3aafe0a842 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index 5f277536777..b7995ce0b7d 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index e82fc716f3c..c1f453ee60f 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index d77887ede76..2e443e99afd 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 457007a3c4d..a7e3b75091e 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index dee2edc8610..178ffdf907d 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index 8bb318b8d95..25bdcc8f9aa 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/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:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 4e4bbfcb8d8..885168ed80d 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index 114b90c6b81..6fd8891c539 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 8293f500a94..f6abbff100d 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index 60eaee6dc4f..88df9c3bb0b 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index f2ce57fe884..1c5f7303d01 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/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: 2009-12-16 01:54+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -28,7 +28,7 @@ msgstr "城市"
 msgid ""
 "You can start configuring the system or connect directly to the database "
 "using the default setup."
-msgstr "您可以开始配置系统或使用默认设置直接连接到数据库。"
+msgstr "你可以开始设置系统或使用默认的设置连接到数据库"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,zip:0
@@ -50,13 +50,13 @@ msgstr "报表头"
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,config:0
 msgid "Start Configuration"
-msgstr "开始配置"
+msgstr "开始设置"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid ""
 "You'll be able to install more modules later through the Administration menu."
-msgstr "您可以之后通过管理菜单，安装更多的模块。"
+msgstr "你以后可以通过管理员菜单安装更多的模块."
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
@@ -64,7 +64,7 @@ msgid ""
 "A profile sets a pre-selection of modules for specific needs. These profiles "
 "have been setup to help you discover the different aspects of OpenERP. This "
 "is just an overview, we have 300+ available modules."
-msgstr "配置文件设定了一套预选模块为满足特有的需求.这些配置帮助您发现系统的不同特征.这是一个概要而已，一共有300多个模块."
+msgstr "配置文件规定了预选模块的具体需要.这些配置已经安装以帮助你发现系统的不同的配置.这是一个配置里面含300多个模块."
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,update:0
@@ -77,26 +77,26 @@ msgstr "下一个"
 #: wizard_field:base_setup.base_setup,init,email:0
 #: wizard_field:base_setup.base_setup,update,email:0
 msgid "E-mail"
-msgstr "Email"
+msgstr "电子邮件"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,state_id:0
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr "省/ 州"
+msgstr "省市"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr "新帐套已安装完毕。"
+msgstr "新账套已安装完毕."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
 #: wizard_field:base_setup.base_setup,init,profile:0
 #: wizard_field:base_setup.base_setup,update,profile:0
 msgid "Profile"
-msgstr "行业属性"
+msgstr "配置"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer1:0
@@ -115,7 +115,7 @@ msgstr "报表脚注2"
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "General Information"
-msgstr "通用信息"
+msgstr "一般信息"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street2:0
@@ -139,7 +139,7 @@ msgstr "电话"
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Define Main Company"
-msgstr "定义总公司"
+msgstr "定义主公司"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,name:0
@@ -156,10 +156,7 @@ msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-msgstr ""
-"该语句将显示在您的报表底部，\n"
-"我们建议您填写银行信息显示，如：\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr "这将显示在报表底部.建议你输入银行的信息"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,country_id:0
@@ -186,10 +183,7 @@ msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-msgstr ""
-"这语句将会显示在您报表的底部。\n"
-"我们建议您在此输入法律信息，如：\n"
-"网址： http://openerp.com - 传真： +32.81.73.35.01 - 银行帐号：126-2013269-07"
+msgstr "这将显示在报表底部,建议你放入正式的公司信息."
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
@@ -214,10 +208,7 @@ msgid ""
 "This sentence will appear at the top right corner of your reports.\n"
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
-msgstr ""
-"这句话将会出现在您报告页面的右上角.\n"
-"我们建议您在这留下一句标语:\n"
-"Open Source Business Solutions"
+msgstr "这将显示在报表的右上角,建议你放一个标语."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
@@ -229,7 +220,7 @@ msgstr "报表页眉"
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "您的徽标——使用大小约为 450x150 像素的图片"
+msgstr "你的标识使用尺寸为450×150像素"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,currency:0
@@ -243,7 +234,7 @@ msgstr "货币"
 #: wizard_field:base_setup.base_setup,init,street:0
 #: wizard_field:base_setup.base_setup,update,street:0
 msgid "Street"
-msgstr "街区地址"
+msgstr "街区"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,menu:0
@@ -260,15 +251,44 @@ msgstr "取消"
 #: wizard_field:base_setup.base_setup,init,logo:0
 #: wizard_field:base_setup.base_setup,update,logo:0
 msgid "Logo"
-msgstr "徽标"
+msgstr "标识"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr "基本设置"
+msgstr "基础安装"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,init:0
 #: wizard_button:base_setup.base_setup,update,company:0
 msgid "Previous"
 msgstr "上一个"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module implements a configuration system that helps user\n"
+#~ "    to configure the system at the installation of a new database.\n"
+#~ "\n"
+#~ "    It allows you to select between a list of profiles to install:\n"
+#~ "    * Minimal profile\n"
+#~ "    * Accounting only\n"
+#~ "    * Services companies\n"
+#~ "    * Manufacturing companies\n"
+#~ "\n"
+#~ "    It also asks screens to help easily configure your company, the header "
+#~ "and\n"
+#~ "    footer, the account chart to install and the language.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块实现一个配置的系统帮助用户\n"
+#~ "在一个新数据库配置系统\n"
+#~ "\n"
+#~ "    它允许在配置列表中选择安装:\n"
+#~ "   *最小配置\n"
+#~ "    *只有会计\n"
+#~ "    *制造公司\n"
+#~ "\n"
+#~ "    它还询问以帮助简单设置你的公司:\n"
+#~ "                  报表头,注脚,所用的会计表和要安装的语言\n"
+#~ "    "
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index 34c1b343bfa..198d91025d1 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/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: base_setup
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__terp__.py
index 6e1f03e4644..bdef947f77f 100644
--- a/addons/base_vat/__terp__.py
+++ b/addons/base_vat/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,12 @@
     'name': 'Base VAT - To check VAT number validity',
     'version': '1.0',
     'category': 'Generic Modules/Base',
-    'description': """Enable the VAT Number for the partner. Check the validity of that VAT Number.""",
+    'description': """
+    Enable the VAT Number for the partner. Check the validity of that VAT Number.
+
+    This module follows the methods stated at http://sima-pc.com/nif.php for
+    checking the validity of VAT Number assinged to partners in European countries.
+    """,
     'author': 'Tiny',
     'depends': ['base', 'account'],
     'update_xml': ['base_vat_data.xml'],
diff --git a/addons/base_vat/i18n/ar.po b/addons/base_vat/i18n/ar.po
index e09a96861e5..4bae5a4d1f7 100644
--- a/addons/base_vat/i18n/ar.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/bg.po b/addons/base_vat/i18n/bg.po
index 2ed630b6dee..65a3bac191c 100644
--- a/addons/base_vat/i18n/bg.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/bs.po b/addons/base_vat/i18n/bs.po
index 4e1a31e0e76..bd2cd3fde0c 100644
--- a/addons/base_vat/i18n/bs.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ca.po b/addons/base_vat/i18n/ca.po
index a67ede394b2..eb8ed30c8cc 100644
--- a/addons/base_vat/i18n/ca.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/cs.po b/addons/base_vat/i18n/cs.po
index ddfc00a53f6..7041a13085e 100644
--- a/addons/base_vat/i18n/cs.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index 515061962b6..8a9913bf309 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index 92b280769ea..7bc6f203a43 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/el.po b/addons/base_vat/i18n/el.po
index 9f5c9533dae..f6df1998bb5 100644
--- a/addons/base_vat/i18n/el.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/en_AU.po b/addons/base_vat/i18n/en_AU.po
index 6297484b05c..1f5ec8fda80 100644
--- a/addons/base_vat/i18n/en_AU.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es.po b/addons/base_vat/i18n/es.po
index dd4d736f0d4..34e8fa160aa 100644
--- a/addons/base_vat/i18n/es.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es_AR.po b/addons/base_vat/i18n/es_AR.po
index da21e489344..6efe522d319 100644
--- a/addons/base_vat/i18n/es_AR.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/et.po b/addons/base_vat/i18n/et.po
index 85990cbd6c5..292ec740c9b 100644
--- a/addons/base_vat/i18n/et.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/fi.po b/addons/base_vat/i18n/fi.po
index 31aa4a90170..44721ae50bb 100644
--- a/addons/base_vat/i18n/fi.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 4c4c13cfc54..e0828329ca8 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/gl.po b/addons/base_vat/i18n/gl.po
index 3143aaa1749..d5231882bf5 100644
--- a/addons/base_vat/i18n/gl.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/hr.po b/addons/base_vat/i18n/hr.po
index 05cb385380c..6f49cec5fa3 100644
--- a/addons/base_vat/i18n/hr.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index e09a96861e5..4bae5a4d1f7 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index d65984bd8c1..21c367c50aa 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index 1891b10b7ca..f6fc67b599e 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ko.po b/addons/base_vat/i18n/ko.po
index b45d423c298..179274deec7 100644
--- a/addons/base_vat/i18n/ko.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/lt.po b/addons/base_vat/i18n/lt.po
index aef473fbdd4..d5e8c908781 100644
--- a/addons/base_vat/i18n/lt.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po
index a0be8218989..903018e2336 100644
--- a/addons/base_vat/i18n/nb.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nl.po b/addons/base_vat/i18n/nl.po
index 3dfb3caed30..5f46db488d7 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nl_BE.po b/addons/base_vat/i18n/nl_BE.po
index aae0f8b14d1..69664458db2 100644
--- a/addons/base_vat/i18n/nl_BE.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/oc.po b/addons/base_vat/i18n/oc.po
index d3c5430711c..46460347241 100644
--- a/addons/base_vat/i18n/oc.po
+++ b/addons/base_vat/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-09-18 12:36+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/pl.po b/addons/base_vat/i18n/pl.po
index 6d2359f8005..d3916b5b349 100644
--- a/addons/base_vat/i18n/pl.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index 5a909467255..c254bc113f1 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index 15dab0fde12..b23ec95f7a4 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ro.po b/addons/base_vat/i18n/ro.po
index fdb7cab5a0f..735879b9f9d 100644
--- a/addons/base_vat/i18n/ro.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index 96a421ae965..cdb067976dc 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sk.po b/addons/base_vat/i18n/sk.po
index 852a3b194c6..b188035d2cb 100644
--- a/addons/base_vat/i18n/sk.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sl.po b/addons/base_vat/i18n/sl.po
index b63519a5b02..184984dee97 100644
--- a/addons/base_vat/i18n/sl.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index 6c09426ac43..a1e8ba7f3a0 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index e09a96861e5..4bae5a4d1f7 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/tlh.po b/addons/base_vat/i18n/tlh.po
index b1d6cf9e305..107631a4949 100644
--- a/addons/base_vat/i18n/tlh.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 93aa1b60ab7..c2748e26861 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/uk.po b/addons/base_vat/i18n/uk.po
index 2f6c5eda4e9..2efe05d4a8c 100644
--- a/addons/base_vat/i18n/uk.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index e17022cca2d..1b116c03bff 100644
--- a/addons/base_vat/i18n/zh_CN.po
+++ b/addons/base_vat/i18n/zh_CN.po
@@ -4,35 +4,40 @@
 #
 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-15 13:08+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
 msgid ""
 "Enable the VAT Number for the partner. Check the validity of that VAT Number."
-msgstr "启用合作伙伴的增值税号码。检查的增值税号码的有效性。"
+msgstr "启用业务伙伴增值税号.检查有效性"
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "增值税法律申明"
+msgstr "增值税描述"
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "VAT"
 msgstr "增值税"
+
+#~ msgid ""
+#~ "Check this box if the partner is subjected to the VAT. It will be used for "
+#~ "the VAT legal statement."
+#~ msgstr "如果你的业务伙伴接收增值税勾选此项.它将用于增值税的正式报表"
diff --git a/addons/base_vat/i18n/zh_TW.po b/addons/base_vat/i18n/zh_TW.po
index 7c767572eee..2747d823876 100644
--- a/addons/base_vat/i18n/zh_TW.po
+++ b/addons/base_vat/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/board.py b/addons/board/board.py
index 29e8a3310b4..5154a7cb993 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -57,15 +57,12 @@ class board_board(osv.osv):
 
     def write(self, cr, uid, ids, vals, context={}):
         result = super(board_board, self).write(cr, uid, ids, vals, context)
-        cr.commit()
 
         board = self.pool.get('board.board').browse(cr, uid, ids[0])
 
         view = self.create_view(cr, uid, ids[0], context)
         id = board.view_id.id
         cr.execute("update ir_ui_view set arch=%s where id=%s" , (view, id))
-        cr.commit()
-
         return result
 
     def create(self, cr, user, vals, context=None):
diff --git a/addons/board/i18n/ar.po b/addons/board/i18n/ar.po
index 216605dc4ef..39a61b5b959 100644
--- a/addons/board/i18n/ar.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/bg.po b/addons/board/i18n/bg.po
index 45a2adbf89b..39c6275e28f 100644
--- a/addons/board/i18n/bg.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/bs.po b/addons/board/i18n/bs.po
index f2f61e12e29..6bf37349682 100644
--- a/addons/board/i18n/bs.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/ca.po b/addons/board/i18n/ca.po
index 0e5fc24a7f8..b6e220e61d0 100644
--- a/addons/board/i18n/ca.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/cs.po b/addons/board/i18n/cs.po
index ea32fa76ab5..22cf4974f62 100644
--- a/addons/board/i18n/cs.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index 642994653f5..ca8e73d679e 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/el.po b/addons/board/i18n/el.po
index f5fc2f7a931..0a1dacd68cc 100644
--- a/addons/board/i18n/el.po
+++ b/addons/board/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index e94f0109789..79eb2c8db23 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index dd93ece33e4..9ae6f88f65c 100644
--- a/addons/board/i18n/es_AR.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/et.po b/addons/board/i18n/et.po
index deea1ec564c..b1186912415 100644
--- a/addons/board/i18n/et.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/fi.po b/addons/board/i18n/fi.po
new file mode 100644
index 00000000000..dc1d00c0f88
--- /dev/null
+++ b/addons/board/i18n/fi.po
@@ -0,0 +1,220 @@
+# Finnish 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-19 18:51+0000\n"
+"Last-Translator: smii <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "board.board"
+msgstr ""
+
+#. module: board
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr "Laatija"
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+msgid "Note"
+msgstr "Huomautus"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Leveys"
+
+#. module: board
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Otsikko"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr ""
+
+#. module: board
+#: wizard_view:board.board.menu.create,init:0
+msgid "Menu Information"
+msgstr "Valikon tiedot"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_note
+msgid "board.note"
+msgstr ""
+
+#. module: board
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: board
+#: model:ir.ui.menu,name:board.next_id_50
+msgid "Configuration"
+msgstr "Kokoonpano"
+
+#. module: board
+#: field:board.note.type,name:0
+msgid "Note Type"
+msgstr ""
+
+#. module: board
+#: wizard_view:board.board.menu.create,init:0
+msgid "Create Menu For Dashboard"
+msgstr ""
+
+#. module: board
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#. module: board
+#: wizard_field:board.board.menu.create,init,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Päävalikko"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: board
+#: model:ir.model,name:board.model_board_note_type
+msgid "board.note.type"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+msgid "Dashboard"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr ""
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Sijainti"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr ""
+
+#. module: board
+#: wizard_field:board.board.menu.create,init,menu_name:0
+msgid "Menu Name"
+msgstr "Valikon nimi"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Vasen"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Oikea"
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: wizard_button:board.board.menu.create,init,create_menu:0
+msgid "Create Menu"
+msgstr "Luo valikko"
+
+#. module: board
+#: model:ir.ui.menu,name:board.dashboard_menu
+msgid "Dashboards"
+msgstr "Työtilat"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Korkeus"
+
+#. module: board
+#: model:ir.actions.wizard,name:board.wizard_board_create_menu
+msgid "Create Board Menu"
+msgstr ""
+
+#. module: board
+#: wizard_button:board.board.menu.create,init,end:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "board.board.line"
+msgstr ""
+
+#. module: board
+#: field:board.note,name:0
+msgid "Subject"
+msgstr "Aihe"
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index 1785124d530..00c23ba774e 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/gl.po b/addons/board/i18n/gl.po
index 43aadf21bdf..a074172a9a8 100644
--- a/addons/board/i18n/gl.po
+++ b/addons/board/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/hr.po b/addons/board/i18n/hr.po
index 3909f59d207..ed0ddb3187b 100644
--- a/addons/board/i18n/hr.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/hu.po b/addons/board/i18n/hu.po
index 216605dc4ef..39a61b5b959 100644
--- a/addons/board/i18n/hu.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/id.po b/addons/board/i18n/id.po
index e289f7e1f8f..3d00a9122ae 100644
--- a/addons/board/i18n/id.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index c876a222b30..629e4319c12 100644
--- a/addons/board/i18n/it.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/ko.po b/addons/board/i18n/ko.po
index 46515f4bb9f..6e7c898b316 100644
--- a/addons/board/i18n/ko.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/lt.po b/addons/board/i18n/lt.po
index 1ec87a40d49..98ae6960ca2 100644
--- a/addons/board/i18n/lt.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/nl.po b/addons/board/i18n/nl.po
index 75b4c27ad08..9ebbf048a9a 100644
--- a/addons/board/i18n/nl.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index 27bcc283eb5..936f07e00c7 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/pl.po b/addons/board/i18n/pl.po
index 0af56dd68ee..204fc01da71 100644
--- a/addons/board/i18n/pl.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index 50e6d487060..d6353424c12 100644
--- a/addons/board/i18n/pt.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po
index a1293c0dad3..7f8737fce2d 100644
--- a/addons/board/i18n/pt_BR.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/ro.po b/addons/board/i18n/ro.po
index 2f39a529c49..a48ec13d25d 100644
--- a/addons/board/i18n/ro.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/ru.po b/addons/board/i18n/ru.po
index ea6ce40ef0b..4be7e63b286 100644
--- a/addons/board/i18n/ru.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
index 05370857b83..66c8eaae79e 100644
--- a/addons/board/i18n/sk.po
+++ b/addons/board/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sl.po b/addons/board/i18n/sl.po
index f1a70420661..57c7f31c3a5 100644
--- a/addons/board/i18n/sl.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index bb2b487c72c..f363ec57bdd 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/tlh.po b/addons/board/i18n/tlh.po
index 6893ac2bcaf..ff28c798060 100644
--- a/addons/board/i18n/tlh.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 2bb856300f4..a96e0d93472 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/uk.po b/addons/board/i18n/uk.po
index a1b56f36ff3..b6dad68a2cc 100644
--- a/addons/board/i18n/uk.po
+++ b/addons/board/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: board
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index a9f014d2289..45f17feedec 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/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-12-28 07:53+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "board.board"
-msgstr "board.board"
+msgstr "控制台"
 
 #. module: board
 #: field:board.note,user_id:0
@@ -83,7 +83,7 @@ msgstr "动作视图"
 #. module: board
 #: model:ir.model,name:board.model_board_note
 msgid "board.note"
-msgstr "board.note"
+msgstr "备注"
 
 #. module: board
 #: field:board.note,date:0
@@ -108,7 +108,7 @@ msgstr "创建仪表盘菜单"
 #. module: board
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_parent_id:0
@@ -118,12 +118,12 @@ msgstr "上级菜单"
 #. module: board
 #: view:board.note:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: board
 #: model:ir.model,name:board.model_board_note_type
 msgid "board.note.type"
-msgstr "board.note.type"
+msgstr "备注类型"
 
 #. module: board
 #: view:board.board:0
@@ -160,22 +160,22 @@ msgstr "备注类型"
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
-msgstr "靠左"
+msgstr "左对齐"
 
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr "看板视图"
+msgstr "控制台视图"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Right"
-msgstr "靠右"
+msgstr "右对齐"
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr "顺序"
+msgstr "序列"
 
 #. module: board
 #: view:board.board:0
@@ -196,7 +196,7 @@ msgstr "高度"
 #. module: board
 #: model:ir.actions.wizard,name:board.wizard_board_create_menu
 msgid "Create Board Menu"
-msgstr "创建版面菜单"
+msgstr "创建控制台菜单"
 
 #. module: board
 #: wizard_button:board.board.menu.create,init,end:0
@@ -206,14 +206,17 @@ msgstr "取消"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr "看板视图"
+msgstr "控制台视图"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "board.board.line"
-msgstr "board.board.line"
+msgstr "控制台明细"
 
 #. module: board
 #: field:board.note,name:0
 msgid "Subject"
 msgstr "主题"
+
+#~ msgid "Action"
+#~ msgstr "动作"
diff --git a/addons/board/i18n/zh_TW.po b/addons/board/i18n/zh_TW.po
index 4a343aaf560..efe500ba54d 100644
--- a/addons/board/i18n/zh_TW.po
+++ b/addons/board/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: board
diff --git a/addons/board_account/i18n/ar.po b/addons/board_account/i18n/ar.po
index 978c89a0a0c..64885050f91 100644
--- a/addons/board_account/i18n/ar.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/bg.po b/addons/board_account/i18n/bg.po
index ec2a8d21478..fd9d1d50fe4 100644
--- a/addons/board_account/i18n/bg.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/bs.po b/addons/board_account/i18n/bs.po
index fc7525c9811..b5111b44880 100644
--- a/addons/board_account/i18n/bs.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/ca.po b/addons/board_account/i18n/ca.po
index 5718743c2a3..961f398bdf3 100644
--- a/addons/board_account/i18n/ca.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/cs.po b/addons/board_account/i18n/cs.po
index 978c89a0a0c..64885050f91 100644
--- a/addons/board_account/i18n/cs.po
+++ b/addons/board_account/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/de.po b/addons/board_account/i18n/de.po
index 7957b825533..7e4e5935720 100644
--- a/addons/board_account/i18n/de.po
+++ b/addons/board_account/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/el.po b/addons/board_account/i18n/el.po
index ab46630f20c..5d4827014d3 100644
--- a/addons/board_account/i18n/el.po
+++ b/addons/board_account/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_account/i18n/es.po b/addons/board_account/i18n/es.po
index bfc5ddab0e9..9754c1b8e90 100644
--- a/addons/board_account/i18n/es.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/es_AR.po b/addons/board_account/i18n/es_AR.po
index d5c83cf3782..63584310f9b 100644
--- a/addons/board_account/i18n/es_AR.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/et.po b/addons/board_account/i18n/et.po
index fdd7b39c5db..575a2ffbf7c 100644
--- a/addons/board_account/i18n/et.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/fr.po b/addons/board_account/i18n/fr.po
index 8564cdd52b5..a93c79f36a6 100644
--- a/addons/board_account/i18n/fr.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/hr.po b/addons/board_account/i18n/hr.po
index a1a6661b58a..22dcb1085ed 100644
--- a/addons/board_account/i18n/hr.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/hu.po b/addons/board_account/i18n/hu.po
index 33257a46549..3e06a5cea12 100644
--- a/addons/board_account/i18n/hu.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/id.po b/addons/board_account/i18n/id.po
index cc3b1342054..98396a3cc01 100644
--- a/addons/board_account/i18n/id.po
+++ b/addons/board_account/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/it.po b/addons/board_account/i18n/it.po
index f399d4cff8e..71013e1ff3b 100644
--- a/addons/board_account/i18n/it.po
+++ b/addons/board_account/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/ko.po b/addons/board_account/i18n/ko.po
index b03ca59bdd1..78929b05086 100644
--- a/addons/board_account/i18n/ko.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/lt.po b/addons/board_account/i18n/lt.po
index 978c89a0a0c..64885050f91 100644
--- a/addons/board_account/i18n/lt.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/nl.po b/addons/board_account/i18n/nl.po
index cbab0833542..baa484709bb 100644
--- a/addons/board_account/i18n/nl.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/nl_BE.po b/addons/board_account/i18n/nl_BE.po
index a7b87a8d680..50620b8f217 100644
--- a/addons/board_account/i18n/nl_BE.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/pl.po b/addons/board_account/i18n/pl.po
index b5efde978d1..67f851f1822 100644
--- a/addons/board_account/i18n/pl.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/pt.po b/addons/board_account/i18n/pt.po
index 4a83970b6ff..3f68a2ba90d 100644
--- a/addons/board_account/i18n/pt.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/pt_BR.po b/addons/board_account/i18n/pt_BR.po
index be58da0a072..1fa6d99f155 100644
--- a/addons/board_account/i18n/pt_BR.po
+++ b/addons/board_account/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/ro.po b/addons/board_account/i18n/ro.po
index c29edee4be5..d7769c9044e 100644
--- a/addons/board_account/i18n/ro.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/ru.po b/addons/board_account/i18n/ru.po
index 70d8345af71..3b86324170b 100644
--- a/addons/board_account/i18n/ru.po
+++ b/addons/board_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: 2009-09-08 12:16+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-03-30 10:23+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
@@ -57,12 +57,12 @@ msgstr "Расходы для выставления счетов"
 #. module: board_account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "Повременный расход"
 
 #. module: board_account
 #: model:ir.module.module,shortdesc:board_account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "Панель контролёра счетов"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_income
@@ -77,7 +77,7 @@ msgstr "Мои индикаторы"
 #. module: board_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: board_account
 #: model:ir.ui.menu,name:board_account.next_id_68
@@ -87,9 +87,9 @@ msgstr "Бухгалтерский"
 #. module: board_account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Панель счетов"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Повременный доход"
diff --git a/addons/board_account/i18n/sk.po b/addons/board_account/i18n/sk.po
index 607768e8542..283d4d344e4 100644
--- a/addons/board_account/i18n/sk.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/sl.po b/addons/board_account/i18n/sl.po
index 9543fd8ed14..ef01dbdc03e 100644
--- a/addons/board_account/i18n/sl.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/sv.po b/addons/board_account/i18n/sv.po
index 978c89a0a0c..b107a848b43 100644
--- a/addons/board_account/i18n/sv.po
+++ b/addons/board_account/i18n/sv.po
@@ -7,19 +7,19 @@ 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-16 08:14+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Objektkonton att stänga"
 
 #. module: board_account
 #: view:board.board:0
diff --git a/addons/board_account/i18n/tlh.po b/addons/board_account/i18n/tlh.po
index 1741e131053..9d4f884336c 100644
--- a/addons/board_account/i18n/tlh.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/tr.po b/addons/board_account/i18n/tr.po
index f375a7f8a5d..9eeffc40887 100644
--- a/addons/board_account/i18n/tr.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/uk.po b/addons/board_account/i18n/uk.po
index fe5426e22ad..7e4704a6440 100644
--- a/addons/board_account/i18n/uk.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/zh_CN.po b/addons/board_account/i18n/zh_CN.po
index 10a1f10845c..04c80181e6d 100644
--- a/addons/board_account/i18n/zh_CN.po
+++ b/addons/board_account/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 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:21+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr "要关闭的分析科目"
+msgstr "关闭辅助核算项目"
 
 #. module: board_account
 #: view:board.board:0
@@ -29,13 +29,13 @@ msgstr "发票草稿"
 #. module: board_account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.open_board_account
 #: model:ir.ui.menu,name:board_account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr "会计看板"
+msgstr "会计控制台"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_receivable
@@ -46,50 +46,70 @@ msgstr "应收款科目"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "发票科目"
 
 #. module: board_account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "成本发票"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "以前应收款"
 
 #. module: board_account
 #: model:ir.module.module,shortdesc:board_account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "会计面板"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_income
 msgid "Income Accounts"
-msgstr "收益帐户"
+msgstr "收入科目"
 
 #. module: board_account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "我的指标"
 
 #. module: board_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_account
 #: model:ir.ui.menu,name:board_account.next_id_68
 msgid "Accounting"
-msgstr "会计及账簿"
+msgstr "会计"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "会计看板"
+msgstr "科目面板"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "以前收入"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module creates a dashboards for accountants that includes:\n"
+#~ "    * List of analytic accounts to close\n"
+#~ "    * List of uninvoiced quotations\n"
+#~ "    * List of invoices to confirm\n"
+#~ "    * Graph of costs to invoice\n"
+#~ "    * Graph of aged receivables\n"
+#~ "    * Graph of aged incomes\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块将创建一个会计人员的控制台包括:\n"
+#~ "    *关闭的辅助核算项目列表\n"
+#~ "    *未开发票报价单\n"
+#~ "    *待确认发票\n"
+#~ "    *费用发票图表\n"
+#~ "    *旧的收入图表\n"
+#~ "    "
diff --git a/addons/board_account/i18n/zh_TW.po b/addons/board_account/i18n/zh_TW.po
index a3912ee1308..3b0efb01cff 100644
--- a/addons/board_account/i18n/zh_TW.po
+++ b/addons/board_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_association/__terp__.py b/addons/board_association/__terp__.py
index ed2264fd6eb..56402fc64ef 100644
--- a/addons/board_association/__terp__.py
+++ b/addons/board_association/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,12 @@
     'version': '1.0',
     'category': 'Board/Associations',
     'description': """
-This module implements a dashboard for associations.
+This module implements a dashboard for associations that includes:
+    * New Members (graph)
+    * Registration by Events (graph)
+    * Next Events (list)
+    * My Tasks (list)
+    * Unpaid Invoices (list)
     """,
     'author': 'Tiny',
     'depends': ['event', 'membership', 'board', 'project'],
diff --git a/addons/board_association/i18n/ar.po b/addons/board_association/i18n/ar.po
index 488c6f373a4..01b5b43f8ec 100644
--- a/addons/board_association/i18n/ar.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/bg.po b/addons/board_association/i18n/bg.po
index f7590c51fee..b723fac90d5 100644
--- a/addons/board_association/i18n/bg.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/bs.po b/addons/board_association/i18n/bs.po
index b8f45783ddc..44453e06de6 100644
--- a/addons/board_association/i18n/bs.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/ca.po b/addons/board_association/i18n/ca.po
index 225f8b5bab0..640c01b1a2f 100644
--- a/addons/board_association/i18n/ca.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/cs.po b/addons/board_association/i18n/cs.po
index b4b9bae2093..8f6e2ea006e 100644
--- a/addons/board_association/i18n/cs.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/de.po b/addons/board_association/i18n/de.po
index 18a723823c6..739dddf9d11 100644
--- a/addons/board_association/i18n/de.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/el.po b/addons/board_association/i18n/el.po
index 3402f477656..5f625c5ee87 100644
--- a/addons/board_association/i18n/el.po
+++ b/addons/board_association/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_association/i18n/es.po b/addons/board_association/i18n/es.po
index 19f5dba19ae..b511b657eeb 100644
--- a/addons/board_association/i18n/es.po
+++ b/addons/board_association/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/es_AR.po b/addons/board_association/i18n/es_AR.po
index 323f1b5200b..7bde13c0120 100644
--- a/addons/board_association/i18n/es_AR.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/et.po b/addons/board_association/i18n/et.po
index 51bea0d19ff..07e501ddb1b 100644
--- a/addons/board_association/i18n/et.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/fr.po b/addons/board_association/i18n/fr.po
index a469d4ade99..01c720b8a05 100644
--- a/addons/board_association/i18n/fr.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/gl.po b/addons/board_association/i18n/gl.po
index 53c2805c828..4b3d118007a 100644
--- a/addons/board_association/i18n/gl.po
+++ b/addons/board_association/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/hr.po b/addons/board_association/i18n/hr.po
index 26fbf750dac..bc5df611834 100644
--- a/addons/board_association/i18n/hr.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/hu.po b/addons/board_association/i18n/hu.po
index 488c6f373a4..01b5b43f8ec 100644
--- a/addons/board_association/i18n/hu.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/id.po b/addons/board_association/i18n/id.po
index 2dc49ab9a1b..408244ee79c 100644
--- a/addons/board_association/i18n/id.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/it.po b/addons/board_association/i18n/it.po
index 824089d714f..c990a23ceff 100644
--- a/addons/board_association/i18n/it.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/ko.po b/addons/board_association/i18n/ko.po
index e526ab55636..2f026f0de11 100644
--- a/addons/board_association/i18n/ko.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/lt.po b/addons/board_association/i18n/lt.po
index 1f9f0d49fa1..f60acfbf77a 100644
--- a/addons/board_association/i18n/lt.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/nl.po b/addons/board_association/i18n/nl.po
index 6826775d0fa..3ca828b1120 100644
--- a/addons/board_association/i18n/nl.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/nl_BE.po b/addons/board_association/i18n/nl_BE.po
index 3a4a76ef895..d37c9bd003f 100644
--- a/addons/board_association/i18n/nl_BE.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/pl.po b/addons/board_association/i18n/pl.po
index ce102f13870..e8aa2b27bcd 100644
--- a/addons/board_association/i18n/pl.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/pt.po b/addons/board_association/i18n/pt.po
index d18fdd6a62b..9f2f8fd8497 100644
--- a/addons/board_association/i18n/pt.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/pt_BR.po b/addons/board_association/i18n/pt_BR.po
index eb140c8e24c..e3997888590 100644
--- a/addons/board_association/i18n/pt_BR.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/ro.po b/addons/board_association/i18n/ro.po
index 70a06f8c6cf..76c857e6732 100644
--- a/addons/board_association/i18n/ro.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/ru.po b/addons/board_association/i18n/ru.po
index 839ac1415da..162fb0712f6 100644
--- a/addons/board_association/i18n/ru.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/sl.po b/addons/board_association/i18n/sl.po
index a3e80e9c5b3..f1e213819eb 100644
--- a/addons/board_association/i18n/sl.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/sv.po b/addons/board_association/i18n/sv.po
index 488c6f373a4..01b5b43f8ec 100644
--- a/addons/board_association/i18n/sv.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/tlh.po b/addons/board_association/i18n/tlh.po
index 8fe05c1fc7b..2da3cbbf37a 100644
--- a/addons/board_association/i18n/tlh.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/tr.po b/addons/board_association/i18n/tr.po
index 2fd2e38da70..25c253b2f31 100644
--- a/addons/board_association/i18n/tr.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/uk.po b/addons/board_association/i18n/uk.po
index 0e9a0116737..a06fd3431e3 100644
--- a/addons/board_association/i18n/uk.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_association/i18n/zh_CN.po b/addons/board_association/i18n/zh_CN.po
index 60c19e6a23d..4e5f8de5f7b 100644
--- a/addons/board_association/i18n/zh_CN.po
+++ b/addons/board_association/i18n/zh_CN.po
@@ -7,35 +7,35 @@ 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-12-15 13:37+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
 #: model:ir.ui.menu,name:board_association.menu_board_associations_manager
 msgid "Associations"
-msgstr ""
+msgstr "协会"
 
 #. module: board_association
 #: model:ir.module.module,shortdesc:board_association.module_meta_information
 msgid "Dashboard for Associations"
-msgstr ""
+msgstr "协会控制台"
 
 #. module: board_association
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效的视图结构xml文件!"
 
 #. module: board_association
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_association.open_board_associations_manager
 msgid "Association Dashboard"
-msgstr ""
+msgstr "协会控制台"
 
 #. module: board_association
 #: view:board.board:0
@@ -45,7 +45,7 @@ msgstr "我的任务"
 #. module: board_association
 #: view:board.board:0
 msgid "New members"
-msgstr ""
+msgstr "新成员"
 
 #. module: board_association
 #: view:board.board:0
@@ -55,12 +55,12 @@ msgstr "未支付的发票"
 #. module: board_association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中无效的模块名."
 
 #. module: board_association
 #: view:board.board:0
 msgid "Next Events"
-msgstr "下一条事件"
+msgstr "下一个事件"
 
 #. module: board_association
 #: view:board.board:0
diff --git a/addons/board_association/i18n/zh_TW.po b/addons/board_association/i18n/zh_TW.po
index e80787798d9..28392e6655f 100644
--- a/addons/board_association/i18n/zh_TW.po
+++ b/addons/board_association/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: board_association
diff --git a/addons/board_auction/__terp__.py b/addons/board_auction/__terp__.py
index bf43d74edf2..9a633e47af9 100644
--- a/addons/board_auction/__terp__.py
+++ b/addons/board_auction/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,7 +26,10 @@
     'category': 'Board/Auction',
     'description': """
     This module creates a dashboards for auction that includes:
-
+       * My Latest Objects (list)
+       * My Latest Deposits (list)
+       * Objects Statistics (list)
+       * My Objects By Day (list)
     """,
     'author': 'Tiny',
     'depends': ['board', 'auction'],
diff --git a/addons/board_auction/i18n/ar.po b/addons/board_auction/i18n/ar.po
index 7e07aef45dc..a884ec196c5 100644
--- a/addons/board_auction/i18n/ar.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/bg.po b/addons/board_auction/i18n/bg.po
index f26d7fd4f98..86783d35da0 100644
--- a/addons/board_auction/i18n/bg.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/bs.po b/addons/board_auction/i18n/bs.po
index a8543531198..1511e0f5bbd 100644
--- a/addons/board_auction/i18n/bs.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/ca.po b/addons/board_auction/i18n/ca.po
index 4b12d1368f0..dad27434f04 100644
--- a/addons/board_auction/i18n/ca.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/cs.po b/addons/board_auction/i18n/cs.po
index 7e07aef45dc..a884ec196c5 100644
--- a/addons/board_auction/i18n/cs.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/de.po b/addons/board_auction/i18n/de.po
index 2dbc412ca7e..7b26473b114 100644
--- a/addons/board_auction/i18n/de.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/el.po b/addons/board_auction/i18n/el.po
index 40010e2778e..d0cb7c3e11f 100644
--- a/addons/board_auction/i18n/el.po
+++ b/addons/board_auction/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_auction/i18n/es.po b/addons/board_auction/i18n/es.po
index de34da00def..283140ace38 100644
--- a/addons/board_auction/i18n/es.po
+++ b/addons/board_auction/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/es_AR.po b/addons/board_auction/i18n/es_AR.po
index 64d5e032f84..c168109e603 100644
--- a/addons/board_auction/i18n/es_AR.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/et.po b/addons/board_auction/i18n/et.po
index 2f7e5afa427..7537ce6c39f 100644
--- a/addons/board_auction/i18n/et.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/fr.po b/addons/board_auction/i18n/fr.po
index 30619b036f1..611e8c3e9a9 100644
--- a/addons/board_auction/i18n/fr.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/hr.po b/addons/board_auction/i18n/hr.po
index ab649351689..4dc642aa471 100644
--- a/addons/board_auction/i18n/hr.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/hu.po b/addons/board_auction/i18n/hu.po
index 7e07aef45dc..a884ec196c5 100644
--- a/addons/board_auction/i18n/hu.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/id.po b/addons/board_auction/i18n/id.po
index 0333c5e2d4f..ff55f9394f5 100644
--- a/addons/board_auction/i18n/id.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/it.po b/addons/board_auction/i18n/it.po
index a1565664a69..9ba500c246e 100644
--- a/addons/board_auction/i18n/it.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/ko.po b/addons/board_auction/i18n/ko.po
index 9ef5f95ca16..73cd672d0c5 100644
--- a/addons/board_auction/i18n/ko.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/lt.po b/addons/board_auction/i18n/lt.po
index 7e07aef45dc..a884ec196c5 100644
--- a/addons/board_auction/i18n/lt.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/nl.po b/addons/board_auction/i18n/nl.po
index 9ab9ac4ee15..ed109193c56 100644
--- a/addons/board_auction/i18n/nl.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/nl_BE.po b/addons/board_auction/i18n/nl_BE.po
index 96f437d59a1..617b2e5fecf 100644
--- a/addons/board_auction/i18n/nl_BE.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/pl.po b/addons/board_auction/i18n/pl.po
index b513cad7f32..fda50efcdc8 100644
--- a/addons/board_auction/i18n/pl.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/pt.po b/addons/board_auction/i18n/pt.po
index 188aa0297e2..8a0f3413dff 100644
--- a/addons/board_auction/i18n/pt.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/pt_BR.po b/addons/board_auction/i18n/pt_BR.po
index fd5755c9a74..b261074558b 100644
--- a/addons/board_auction/i18n/pt_BR.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/ro.po b/addons/board_auction/i18n/ro.po
index 1e96160ac9b..657beb68b21 100644
--- a/addons/board_auction/i18n/ro.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/ru.po b/addons/board_auction/i18n/ru.po
index b39971cc1d8..fca4c2b9ec4 100644
--- a/addons/board_auction/i18n/ru.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/sl.po b/addons/board_auction/i18n/sl.po
index 0ba716ea5fd..4ba0f979a26 100644
--- a/addons/board_auction/i18n/sl.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/sv.po b/addons/board_auction/i18n/sv.po
index 7e07aef45dc..a884ec196c5 100644
--- a/addons/board_auction/i18n/sv.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/tlh.po b/addons/board_auction/i18n/tlh.po
index a2434bb8195..a9f19690d52 100644
--- a/addons/board_auction/i18n/tlh.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/tr.po b/addons/board_auction/i18n/tr.po
index f8c580935b3..298ae9aa27b 100644
--- a/addons/board_auction/i18n/tr.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/uk.po b/addons/board_auction/i18n/uk.po
index c428c1034c7..7f51918b4ae 100644
--- a/addons/board_auction/i18n/uk.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/zh_CN.po b/addons/board_auction/i18n/zh_CN.po
index 0b5b265bc56..4144f931cf8 100644
--- a/addons/board_auction/i18n/zh_CN.po
+++ b/addons/board_auction/i18n/zh_CN.po
@@ -7,116 +7,116 @@ 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-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "在这动作定义中无效的模块名"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Objects by day"
-msgstr ""
+msgstr "天物品"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Objects statistics"
-msgstr ""
+msgstr "物品统计"
 
 #. module: board_auction
 #: model:ir.ui.menu,name:board_auction.menu_board_auction_manager
 msgid "Auction Manager"
-msgstr ""
+msgstr "拍卖管理"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Summary pointing by user"
-msgstr ""
+msgstr "每用户摘要指示"
 
 #. module: board_auction
 #: model:ir.ui.menu,name:board_auction.menu_board_auction
 msgid "Auction Member"
-msgstr ""
+msgstr "拍卖会员"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My Latest Deposits"
-msgstr ""
+msgstr "我最近的押金"
 
 #. module: board_auction
 #: model:ir.actions.act_window,name:board_auction.open_board_auction
 msgid "Auction member board"
-msgstr ""
+msgstr "拍卖会员控制台"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Auction manager "
-msgstr ""
+msgstr "拍卖管理 "
 
 #. module: board_auction
 #: model:ir.module.module,shortdesc:board_auction.module_meta_information
 msgid "Board for Auction"
-msgstr ""
+msgstr "拍卖控制台"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Estimations/Adjudication"
-msgstr ""
+msgstr "评价/最终结果"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Total Adjudications"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Latest objects"
-msgstr ""
+msgstr "最新的物品"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Latest deposits"
-msgstr ""
+msgstr "最近的押金"
 
 #. module: board_auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在动作定义中无效的模块名"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Menu"
-msgstr ""
+msgstr "菜单"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My objects By Day"
-msgstr ""
+msgstr "每天我的物品"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My board"
-msgstr ""
+msgstr "我的控制台"
 
 #. module: board_auction
 #: model:ir.actions.act_window,name:board_auction.open_board_auction_manager
 msgid "Auction manager board"
-msgstr ""
+msgstr "拍卖管理控制台"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Min/Adj/Max"
-msgstr ""
+msgstr "最少/邻近/最大"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My Latest Objects"
-msgstr ""
+msgstr "我最后的物品"
diff --git a/addons/board_auction/i18n/zh_TW.po b/addons/board_auction/i18n/zh_TW.po
index 0b5b265bc56..fa22e37ddfc 100644
--- a/addons/board_auction/i18n/zh_TW.po
+++ b/addons/board_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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_crm_configuration/i18n/ar.po b/addons/board_crm_configuration/i18n/ar.po
index 0d45f64ade7..d315a61cdb3 100644
--- a/addons/board_crm_configuration/i18n/ar.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/bg.po b/addons/board_crm_configuration/i18n/bg.po
index 0c6b86788a2..10120f52836 100644
--- a/addons/board_crm_configuration/i18n/bg.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/bs.po b/addons/board_crm_configuration/i18n/bs.po
index 169d54c67c0..8df5e1030e9 100644
--- a/addons/board_crm_configuration/i18n/bs.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/ca.po b/addons/board_crm_configuration/i18n/ca.po
index 85f3d59696d..127579c4d15 100644
--- a/addons/board_crm_configuration/i18n/ca.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/cs.po b/addons/board_crm_configuration/i18n/cs.po
index a94aeadbbd1..770be218d90 100644
--- a/addons/board_crm_configuration/i18n/cs.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/de.po b/addons/board_crm_configuration/i18n/de.po
index 314ec8a2f7f..ba937ff3423 100644
--- a/addons/board_crm_configuration/i18n/de.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm_configuration/i18n/el.po
index 85e11aa84e4..cad9f6edde9 100644
--- a/addons/board_crm_configuration/i18n/el.po
+++ b/addons/board_crm_configuration/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_crm_configuration/i18n/es.po b/addons/board_crm_configuration/i18n/es.po
index e7c73f55d0d..f2c6c69e5d9 100644
--- a/addons/board_crm_configuration/i18n/es.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/es_AR.po b/addons/board_crm_configuration/i18n/es_AR.po
index 20f27d482ae..846dcefae11 100644
--- a/addons/board_crm_configuration/i18n/es_AR.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/et.po b/addons/board_crm_configuration/i18n/et.po
index 7e16a374ebe..c9659fd369c 100644
--- a/addons/board_crm_configuration/i18n/et.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/fr.po b/addons/board_crm_configuration/i18n/fr.po
index 0151b62fb82..eeee00c3e67 100644
--- a/addons/board_crm_configuration/i18n/fr.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/hr.po b/addons/board_crm_configuration/i18n/hr.po
index 608da6333da..cea1072de61 100644
--- a/addons/board_crm_configuration/i18n/hr.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/hu.po b/addons/board_crm_configuration/i18n/hu.po
index 0d45f64ade7..d315a61cdb3 100644
--- a/addons/board_crm_configuration/i18n/hu.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/id.po b/addons/board_crm_configuration/i18n/id.po
index 6237ee205ba..8a822cf4f1f 100644
--- a/addons/board_crm_configuration/i18n/id.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm_configuration/i18n/it.po
index f63f0417ef5..e14d62beaad 100644
--- a/addons/board_crm_configuration/i18n/it.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/ko.po b/addons/board_crm_configuration/i18n/ko.po
index 83bcf0bfd4b..c2ef7fddfc0 100644
--- a/addons/board_crm_configuration/i18n/ko.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/lt.po b/addons/board_crm_configuration/i18n/lt.po
index 0d45f64ade7..d315a61cdb3 100644
--- a/addons/board_crm_configuration/i18n/lt.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/nl.po b/addons/board_crm_configuration/i18n/nl.po
index 6e6ed7f9d70..40adcb1702c 100644
--- a/addons/board_crm_configuration/i18n/nl.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/nl_BE.po b/addons/board_crm_configuration/i18n/nl_BE.po
index a407979359b..d90499dbd14 100644
--- a/addons/board_crm_configuration/i18n/nl_BE.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/pl.po b/addons/board_crm_configuration/i18n/pl.po
index 9a5864ff93d..56d64e1bc88 100644
--- a/addons/board_crm_configuration/i18n/pl.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/pt.po b/addons/board_crm_configuration/i18n/pt.po
index 0e24b303455..8ac07a2fc56 100644
--- a/addons/board_crm_configuration/i18n/pt.po
+++ b/addons/board_crm_configuration/i18n/pt.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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/pt_BR.po b/addons/board_crm_configuration/i18n/pt_BR.po
index 965ee773daa..c8fb96376b4 100644
--- a/addons/board_crm_configuration/i18n/pt_BR.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm_configuration/i18n/ro.po
index 1df910d1e42..915df8eec13 100644
--- a/addons/board_crm_configuration/i18n/ro.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/ru.po b/addons/board_crm_configuration/i18n/ru.po
index ab06806271e..e63164f2a75 100644
--- a/addons/board_crm_configuration/i18n/ru.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/sk.po b/addons/board_crm_configuration/i18n/sk.po
index 8461cbb0130..42e8e1faf03 100644
--- a/addons/board_crm_configuration/i18n/sk.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/sl.po b/addons/board_crm_configuration/i18n/sl.po
index e032b2f7647..4ec46ba138b 100644
--- a/addons/board_crm_configuration/i18n/sl.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/sv.po b/addons/board_crm_configuration/i18n/sv.po
index 0d45f64ade7..d315a61cdb3 100644
--- a/addons/board_crm_configuration/i18n/sv.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/tlh.po b/addons/board_crm_configuration/i18n/tlh.po
index 93bfa46a627..81a9c9b3f75 100644
--- a/addons/board_crm_configuration/i18n/tlh.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/tr.po b/addons/board_crm_configuration/i18n/tr.po
index add143cbc72..abc4e6f2fd1 100644
--- a/addons/board_crm_configuration/i18n/tr.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/uk.po b/addons/board_crm_configuration/i18n/uk.po
index db1c4e12574..5e1b840ebb0 100644
--- a/addons/board_crm_configuration/i18n/uk.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm_configuration/i18n/zh_CN.po
index b2df7e714c2..abcf5e26caa 100644
--- a/addons/board_crm_configuration/i18n/zh_CN.po
+++ b/addons/board_crm_configuration/i18n/zh_CN.po
@@ -4,28 +4,28 @@
 #
 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-12-16 13:21+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
 #: model:ir.module.module,shortdesc:board_crm_configuration.module_meta_information
 msgid "Dashboard for CRM Configuration"
-msgstr ""
+msgstr "客户关系管理控制台配置"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "统计控制台"
 
 #. module: board_crm_configuration
 #: constraint:ir.ui.view:0
@@ -36,84 +36,105 @@ msgstr "无效XML视图结构!"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "销售机会分类"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_my_cases
 msgid "My Cases"
-msgstr ""
+msgstr "我的业务个案"
 
 #. module: board_crm_configuration
 #: model:ir.actions.act_window,name:board_crm_configuration.open_board_crm
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "客户关系管理控制台"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm
 msgid "Connecting Dashboard"
-msgstr ""
+msgstr "联系控制台"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_leads_month_user
 msgid "Leads Of The Month By User"
-msgstr ""
+msgstr "这月的用户商机"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: view:report.crm.case.section.stage:0
 msgid "Leads By Stage"
-msgstr ""
+msgstr "商机进展"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Meetings"
-msgstr ""
+msgstr "我的会议"
 
 #. module: board_crm_configuration
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm_config
 msgid "CRM Configuration"
-msgstr ""
+msgstr "客户关系管理配置"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_jobs_categ
 msgid "Jobs Requests Of The Month by Applied Job"
-msgstr ""
+msgstr "每月申请职位的职位请求"
 
 #. module: board_crm_configuration
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Sales Pipeline"
-msgstr "我的销售渠道"
+msgstr "我的销售管线"
 
 #. module: board_crm_configuration
 #: view:report.crm.case.user:0
 msgid "Cases by User and Section"
-msgstr "用户和部门项目"
+msgstr "用户业务个案和项"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Leads By Stage"
-msgstr ""
+msgstr "我的商机进展"
 
 #. module: board_crm_configuration
 #: view:report.crm.case.categ:0
 msgid "Cases by Sections and Categories"
-msgstr ""
+msgstr "业务个案项和分类"
 
 #. module: board_crm_configuration
 #: model:ir.actions.act_window,name:board_crm_configuration.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr "CRM - 统计信息控制台"
+msgstr "客户关系统计控制台"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Leads"
-msgstr ""
+msgstr "我的商机"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module implements a dashboard for CRM that includes:\n"
+#~ "    * My Leads (list)\n"
+#~ "    * Leads by Stage (graph)\n"
+#~ "    * My Meetings (list)\n"
+#~ "    * Sales Pipeline by Stage (graph)\n"
+#~ "    * My Cases (list)\n"
+#~ "    * Jobs Tracking (graph)\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块实现了客户关系管理的控制台包括:\n"
+#~ "    *我的商机(列表)\n"
+#~ "    *商机进展(图表)\n"
+#~ "    *我的会议(列表)\n"
+#~ "    *销售管线阶段(图表)\n"
+#~ "    *我的业务个案(列表)\n"
+#~ "    *工作跟踪(图表)\n"
+#~ "    "
diff --git a/addons/board_crm_configuration/i18n/zh_TW.po b/addons/board_crm_configuration/i18n/zh_TW.po
index 7880bf4fcd5..c23bd6742d4 100644
--- a/addons/board_crm_configuration/i18n/zh_TW.po
+++ b/addons/board_crm_configuration/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: board_crm_configuration
diff --git a/addons/board_document/__terp__.py b/addons/board_document/__terp__.py
index 0ba8552fb51..77fd09fdf45 100644
--- a/addons/board_document/__terp__.py
+++ b/addons/board_document/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,13 @@
     'name': 'Dashboard for Document Management',
     'version': '1.0',
     'category': 'Board/Document',
-    'description': """ This module implements a dashboard for Document """,
+    'description': """
+    This module implements a dashboard for Document that includes:
+        * New Files (list)
+        * Files by Resource Type (graph)
+        * Files by Partner (graph)
+        * Files by Month (graph)
+    """,
     'author': 'Tiny',
     'depends': ['board', 'document', 'report_document'],
     'update_xml': ['board_document_view.xml'],
diff --git a/addons/board_document/i18n/ar.po b/addons/board_document/i18n/ar.po
index 9c101bb9531..f68394a82ce 100644
--- a/addons/board_document/i18n/ar.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/bg.po b/addons/board_document/i18n/bg.po
index f542f7a3c98..7af902f3ed2 100644
--- a/addons/board_document/i18n/bg.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/bs.po b/addons/board_document/i18n/bs.po
index 25f93e75b15..4b39265fb90 100644
--- a/addons/board_document/i18n/bs.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/ca.po b/addons/board_document/i18n/ca.po
index 8a9e4883952..cf85b388a3b 100644
--- a/addons/board_document/i18n/ca.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/cs.po b/addons/board_document/i18n/cs.po
index 9c101bb9531..f68394a82ce 100644
--- a/addons/board_document/i18n/cs.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/de.po b/addons/board_document/i18n/de.po
index c1713a89c9d..b59f21df532 100644
--- a/addons/board_document/i18n/de.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/el.po b/addons/board_document/i18n/el.po
index d8c7c1cbee5..acb5af53821 100644
--- a/addons/board_document/i18n/el.po
+++ b/addons/board_document/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_document/i18n/es.po b/addons/board_document/i18n/es.po
index d4573fecf1f..1215ee5e375 100644
--- a/addons/board_document/i18n/es.po
+++ b/addons/board_document/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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/es_AR.po b/addons/board_document/i18n/es_AR.po
index 8dc8dbbd05a..446659892e1 100644
--- a/addons/board_document/i18n/es_AR.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/et.po b/addons/board_document/i18n/et.po
index 517de00ae30..0625f22ac19 100644
--- a/addons/board_document/i18n/et.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/fr.po b/addons/board_document/i18n/fr.po
index e8b57fc1da3..07b585c96bb 100644
--- a/addons/board_document/i18n/fr.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/hr.po b/addons/board_document/i18n/hr.po
index 0b383e11450..bba330fcfae 100644
--- a/addons/board_document/i18n/hr.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/hu.po b/addons/board_document/i18n/hu.po
index 9c101bb9531..f68394a82ce 100644
--- a/addons/board_document/i18n/hu.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/id.po b/addons/board_document/i18n/id.po
index eda4ffb28a1..39b29ef4af1 100644
--- a/addons/board_document/i18n/id.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/it.po b/addons/board_document/i18n/it.po
index 190e48a5dbc..1e455b1357b 100644
--- a/addons/board_document/i18n/it.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/ko.po b/addons/board_document/i18n/ko.po
index 7968ca79d2e..d7f5fe65167 100644
--- a/addons/board_document/i18n/ko.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/lt.po b/addons/board_document/i18n/lt.po
index 9c101bb9531..f68394a82ce 100644
--- a/addons/board_document/i18n/lt.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/nl.po b/addons/board_document/i18n/nl.po
index d9a3f1d9474..72873f366ff 100644
--- a/addons/board_document/i18n/nl.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/pl.po b/addons/board_document/i18n/pl.po
index 4b9811b0590..2e74a77e9ed 100644
--- a/addons/board_document/i18n/pl.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/pt.po b/addons/board_document/i18n/pt.po
index 21f6eea01fd..dd7fff490b5 100644
--- a/addons/board_document/i18n/pt.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/pt_BR.po b/addons/board_document/i18n/pt_BR.po
index c27f77a6419..ea7628d22c8 100644
--- a/addons/board_document/i18n/pt_BR.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/ro.po b/addons/board_document/i18n/ro.po
index b36205ea656..b184a59ecc9 100644
--- a/addons/board_document/i18n/ro.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/ru.po b/addons/board_document/i18n/ru.po
index cd4de37e38d..cdfc90a771c 100644
--- a/addons/board_document/i18n/ru.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/sk.po b/addons/board_document/i18n/sk.po
index fea78a8cc01..ef5cbe02cde 100644
--- a/addons/board_document/i18n/sk.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/sl.po b/addons/board_document/i18n/sl.po
index a485a6a9bc7..8c45d4bc902 100644
--- a/addons/board_document/i18n/sl.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/sv.po b/addons/board_document/i18n/sv.po
index 9c101bb9531..f68394a82ce 100644
--- a/addons/board_document/i18n/sv.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/tlh.po b/addons/board_document/i18n/tlh.po
index a325afd425f..1b833e00c2f 100644
--- a/addons/board_document/i18n/tlh.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/tr.po b/addons/board_document/i18n/tr.po
index e3bbf589db4..6c95121e80e 100644
--- a/addons/board_document/i18n/tr.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/uk.po b/addons/board_document/i18n/uk.po
index d3a25a08399..d3079b41be5 100644
--- a/addons/board_document/i18n/uk.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_document/i18n/zh_CN.po b/addons/board_document/i18n/zh_CN.po
index 67262de3fe7..72ebaf6f46c 100644
--- a/addons/board_document/i18n/zh_CN.po
+++ b/addons/board_document/i18n/zh_CN.po
@@ -4,33 +4,33 @@
 #
 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-12-28 08:03+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: board_document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "新文件"
 
 #. module: board_document
 #: model:ir.actions.act_window,name:board_document.open_board_document_manager
 #: model:ir.ui.menu,name:board_document.menu_board_document_manager
 msgid "Document Dashboard"
-msgstr "文件控制台"
+msgstr "文档控制台"
 
 #. module: board_document
 #: view:board.board:0
@@ -40,38 +40,38 @@ msgstr "羞愧者名单"
 #. module: board_document
 #: view:board.board:0
 msgid "File Size by Month"
-msgstr "按月排列文件大小"
+msgstr "这个月的文件体积"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Month"
-msgstr "按月排列文件"
+msgstr "本月文件"
 
 #. module: board_document
 #: model:ir.actions.act_window,name:board_document.open_board_document_manager1
 #: model:ir.ui.menu,name:board_document.menu_board_document_manager1
 msgid "Statistics by User"
-msgstr "按用户排列统计数据"
+msgstr "用户统计"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Resource Type"
-msgstr "按资源类型排列文件"
+msgstr "文件资源的类型"
 
 #. module: board_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_document
 #: model:ir.module.module,shortdesc:board_document.module_meta_information
 msgid "Dashboard for Document Management"
-msgstr "文件管理控制台"
+msgstr "文档管理控制台"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr "按业务伙伴排列文件"
+msgstr "业务伙伴文件"
 
 #. module: board_document
 #: model:ir.ui.menu,name:board_document.menu_board_document
@@ -81,9 +81,12 @@ msgstr "文档"
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "按用户排列文件"
+msgstr "用户文件"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Document board"
 msgstr "文档面板"
+
+#~ msgid " This module implements a dashboard for Document "
+#~ msgstr " 这模块实现文档控制台 "
diff --git a/addons/board_document/i18n/zh_TW.po b/addons/board_document/i18n/zh_TW.po
index c55c17242b0..e710d5bb812 100644
--- a/addons/board_document/i18n/zh_TW.po
+++ b/addons/board_document/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: board_document
diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__terp__.py
index 937f4e72c32..b64d09c1b33 100644
--- a/addons/board_hr/__terp__.py
+++ b/addons/board_hr/__terp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Board for Human Reasources Management',
     'version': '1.0',
-    'category': '',
+    'category': 'Board/Human Resources',
     'description': """
 This module implements a dashboard for human resource management that includes:
     * My Current Timesheet
diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__terp__.py
index 9c644262969..50afa0d6cbc 100644
--- a/addons/board_manufacturing/__terp__.py
+++ b/addons/board_manufacturing/__terp__.py
@@ -32,7 +32,7 @@
     * List of procurement in exception
     """,
     'author': 'Tiny',
-    'depends': ['board', 'mrp', 'stock', 'report_mrp'],
+    'depends': ['board', 'mrp', 'stock' ],
     'update_xml': ['board_manufacturing_view.xml'],
     'demo_xml': ['board_manufacturing_demo.xml'],
     'installable': True,
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 7e913209c4a..df4a6805afb 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -20,9 +20,9 @@
 
 
                         <child2>
-                            <action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
+                            <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
 
-                            <action colspan="4" name="%(report_mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
+                            <action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/board_manufacturing/i18n/ar.po b/addons/board_manufacturing/i18n/ar.po
index b37e2852dde..6864a7b86f9 100644
--- a/addons/board_manufacturing/i18n/ar.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/bg.po b/addons/board_manufacturing/i18n/bg.po
index 0aed5e48d85..f07505dfaef 100644
--- a/addons/board_manufacturing/i18n/bg.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/bs.po b/addons/board_manufacturing/i18n/bs.po
index 63b0da8a93c..5cd347ad9cf 100644
--- a/addons/board_manufacturing/i18n/bs.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/ca.po b/addons/board_manufacturing/i18n/ca.po
index 52b1da52d46..80ccf85e163 100644
--- a/addons/board_manufacturing/i18n/ca.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/cs.po b/addons/board_manufacturing/i18n/cs.po
index b37e2852dde..6864a7b86f9 100644
--- a/addons/board_manufacturing/i18n/cs.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/de.po b/addons/board_manufacturing/i18n/de.po
index a39047c3e28..4504671eb4d 100644
--- a/addons/board_manufacturing/i18n/de.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/el.po b/addons/board_manufacturing/i18n/el.po
index 5605afaac77..eff89310447 100644
--- a/addons/board_manufacturing/i18n/el.po
+++ b/addons/board_manufacturing/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_manufacturing/i18n/es.po b/addons/board_manufacturing/i18n/es.po
index 8b7eb027ad2..c7c01c83ef4 100644
--- a/addons/board_manufacturing/i18n/es.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/es_AR.po b/addons/board_manufacturing/i18n/es_AR.po
index a7fe7f4cfc9..3e011c0147c 100644
--- a/addons/board_manufacturing/i18n/es_AR.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/et.po b/addons/board_manufacturing/i18n/et.po
index 9bdd0e8382d..1e21e65978f 100644
--- a/addons/board_manufacturing/i18n/et.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
@@ -34,7 +34,7 @@ msgstr "Vigane XML vaate arhitektuurile!"
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Deliveries (Out packing)"
-msgstr ""
+msgstr "Tarned (Välipakend)"
 
 #. module: board_manufacturing
 #: view:board.board:0
diff --git a/addons/board_manufacturing/i18n/fr.po b/addons/board_manufacturing/i18n/fr.po
index 50ac66e71d5..7de21abc122 100644
--- a/addons/board_manufacturing/i18n/fr.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/gl.po b/addons/board_manufacturing/i18n/gl.po
index 2b002756d96..66529a0a893 100644
--- a/addons/board_manufacturing/i18n/gl.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/hr.po b/addons/board_manufacturing/i18n/hr.po
index 91e68aec150..3a32e8f6396 100644
--- a/addons/board_manufacturing/i18n/hr.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/hu.po b/addons/board_manufacturing/i18n/hu.po
index b37e2852dde..6864a7b86f9 100644
--- a/addons/board_manufacturing/i18n/hu.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/id.po b/addons/board_manufacturing/i18n/id.po
index f1eef8b4fb8..dbf685ed526 100644
--- a/addons/board_manufacturing/i18n/id.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/it.po b/addons/board_manufacturing/i18n/it.po
index 13c61604584..e32f74b1fcc 100644
--- a/addons/board_manufacturing/i18n/it.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/ko.po b/addons/board_manufacturing/i18n/ko.po
index 84ea666cb4f..6674329cca8 100644
--- a/addons/board_manufacturing/i18n/ko.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/lt.po b/addons/board_manufacturing/i18n/lt.po
index b37e2852dde..6864a7b86f9 100644
--- a/addons/board_manufacturing/i18n/lt.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/nl.po b/addons/board_manufacturing/i18n/nl.po
index e9852a98176..ed240cd9253 100644
--- a/addons/board_manufacturing/i18n/nl.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/nl_BE.po b/addons/board_manufacturing/i18n/nl_BE.po
index e8996f66dd2..369614b90a1 100644
--- a/addons/board_manufacturing/i18n/nl_BE.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/pl.po b/addons/board_manufacturing/i18n/pl.po
index 771e4964bef..a5193bae6ec 100644
--- a/addons/board_manufacturing/i18n/pl.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/pt.po b/addons/board_manufacturing/i18n/pt.po
index 4cfca8a4c23..29b272aa17b 100644
--- a/addons/board_manufacturing/i18n/pt.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/pt_BR.po b/addons/board_manufacturing/i18n/pt_BR.po
index e7af4859dc9..da368697a69 100644
--- a/addons/board_manufacturing/i18n/pt_BR.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/ro.po b/addons/board_manufacturing/i18n/ro.po
index 166ed7576ef..9fed4542f5c 100644
--- a/addons/board_manufacturing/i18n/ro.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/ru.po b/addons/board_manufacturing/i18n/ru.po
index da138ae40cb..23925d042f8 100644
--- a/addons/board_manufacturing/i18n/ru.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/sl.po b/addons/board_manufacturing/i18n/sl.po
index 12abbad748c..a7f1041d05c 100644
--- a/addons/board_manufacturing/i18n/sl.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/sv.po b/addons/board_manufacturing/i18n/sv.po
index 03f3d84d9ec..705729fc0b0 100644
--- a/addons/board_manufacturing/i18n/sv.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/tlh.po b/addons/board_manufacturing/i18n/tlh.po
index ea017a0239d..05603846041 100644
--- a/addons/board_manufacturing/i18n/tlh.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/tr.po b/addons/board_manufacturing/i18n/tr.po
index 327c62b0992..95d40a6d02b 100644
--- a/addons/board_manufacturing/i18n/tr.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/uk.po b/addons/board_manufacturing/i18n/uk.po
index a5a2620a76f..b3de2db2175 100644
--- a/addons/board_manufacturing/i18n/uk.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/zh_CN.po b/addons/board_manufacturing/i18n/zh_CN.po
index 0b3e874f770..e798ea2f680 100644
--- a/addons/board_manufacturing/i18n/zh_CN.po
+++ b/addons/board_manufacturing/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 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-12-28 08:08+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Procurement in Exception"
-msgstr "需求单异常"
+msgstr "产品需求异常"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -29,12 +29,12 @@ msgstr "下一批生产订单"
 #. module: board_manufacturing
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Deliveries (Out packing)"
-msgstr "送货(出货分拣单)"
+msgstr "已交付(从包装)"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -49,7 +49,7 @@ msgstr "生产"
 #. module: board_manufacturing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_manufacturing
 #: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
@@ -60,7 +60,7 @@ msgstr "生产仪表盘"
 #. module: board_manufacturing
 #: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
 msgid "Board for manufacturing"
-msgstr "生产控制台"
+msgstr "生产面板"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -71,3 +71,20 @@ msgstr "库存价值变更"
 #: view:board.board:0
 msgid "Workcenter futur load"
 msgstr "工作中心未来负荷"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module creates a dashboards for Manufaturing that includes:\n"
+#~ "    * List of next production orders\n"
+#~ "    * List of deliveries (out packing)\n"
+#~ "    * Graph of workcenter load\n"
+#~ "    * List of procurement in exception\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块创建生产控制台包括:\n"
+#~ "    *下一生产单列表\n"
+#~ "    *已交付列表(包装好)\n"
+#~ "    *工作中心负荷图形\n"
+#~ "    *产品需求异常列表\n"
+#~ "    "
diff --git a/addons/board_manufacturing/i18n/zh_TW.po b/addons/board_manufacturing/i18n/zh_TW.po
index e79e854949d..7296abefad3 100644
--- a/addons/board_manufacturing/i18n/zh_TW.po
+++ b/addons/board_manufacturing/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 19cdb3a6a1b..fc79b0f9304 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -93,10 +93,10 @@
                         <child1>
                             <action colspan="4" height="220" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
                             <action colspan="4" name="%(project_issue.project_issue_categ_act0)d" string="Issues"/>
-                            
+
                          </child1>
                         <child2>
-                             <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Members list of project"/>
+                             <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Project(s) Members"/>
                              <action colspan="4" name="%(action_view_project_editable_messages_tree)d" string="Messages"/>
                         </child2>
                     </hpaned>
diff --git a/addons/board_project/i18n/ar.po b/addons/board_project/i18n/ar.po
index 62d581de9fc..1bbc7117ee6 100644
--- a/addons/board_project/i18n/ar.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/bg.po b/addons/board_project/i18n/bg.po
index 8b2b048f1d4..7092cddc583 100644
--- a/addons/board_project/i18n/bg.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/bs.po b/addons/board_project/i18n/bs.po
index 88804c8d202..57d50d56019 100644
--- a/addons/board_project/i18n/bs.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/ca.po b/addons/board_project/i18n/ca.po
index aed306bffef..094388946ca 100644
--- a/addons/board_project/i18n/ca.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/cs.po b/addons/board_project/i18n/cs.po
index 62d581de9fc..1bbc7117ee6 100644
--- a/addons/board_project/i18n/cs.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/de.po b/addons/board_project/i18n/de.po
index c35bc12da26..b279ac0f835 100644
--- a/addons/board_project/i18n/de.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/el.po b/addons/board_project/i18n/el.po
index 9adf1e5cabc..3d02c37a6b5 100644
--- a/addons/board_project/i18n/el.po
+++ b/addons/board_project/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_project/i18n/es.po b/addons/board_project/i18n/es.po
index 9ab32d5503d..6ba6ce27d48 100644
--- a/addons/board_project/i18n/es.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/es_AR.po b/addons/board_project/i18n/es_AR.po
index 36d78481173..96c09ba2aac 100644
--- a/addons/board_project/i18n/es_AR.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/et.po b/addons/board_project/i18n/et.po
index d8472d6e4af..626f7a9e8a3 100644
--- a/addons/board_project/i18n/et.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/fa.po b/addons/board_project/i18n/fa.po
index 8d0e6d63813..8348ee66f6e 100644
--- a/addons/board_project/i18n/fa.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/fr.po b/addons/board_project/i18n/fr.po
index 101a22d67d0..c45ef58fd35 100644
--- a/addons/board_project/i18n/fr.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/hr.po b/addons/board_project/i18n/hr.po
index 7812d5e95bf..537b2a14270 100644
--- a/addons/board_project/i18n/hr.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/hu.po b/addons/board_project/i18n/hu.po
index 62d581de9fc..1bbc7117ee6 100644
--- a/addons/board_project/i18n/hu.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/id.po b/addons/board_project/i18n/id.po
index aeebb178012..1cac7be697c 100644
--- a/addons/board_project/i18n/id.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/it.po b/addons/board_project/i18n/it.po
index a831e34092e..6219ecced78 100644
--- a/addons/board_project/i18n/it.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/ko.po b/addons/board_project/i18n/ko.po
index 3e118af6fb8..bb1fa9bdeb3 100644
--- a/addons/board_project/i18n/ko.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/lt.po b/addons/board_project/i18n/lt.po
index 2addf4ea2b3..af82bb8653f 100644
--- a/addons/board_project/i18n/lt.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/nl.po b/addons/board_project/i18n/nl.po
index b43f1930444..bb64a95e382 100644
--- a/addons/board_project/i18n/nl.po
+++ b/addons/board_project/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/nl_BE.po b/addons/board_project/i18n/nl_BE.po
index fdf4caca39a..b6a8ed0fe0c 100644
--- a/addons/board_project/i18n/nl_BE.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/pl.po b/addons/board_project/i18n/pl.po
index bc4f61bd5a5..a228cdee36b 100644
--- a/addons/board_project/i18n/pl.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/pt.po b/addons/board_project/i18n/pt.po
index d10a0e02e67..d99138be082 100644
--- a/addons/board_project/i18n/pt.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/pt_BR.po b/addons/board_project/i18n/pt_BR.po
index 5f3a08f0722..3ea67356454 100644
--- a/addons/board_project/i18n/pt_BR.po
+++ b/addons/board_project/i18n/pt_BR.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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/ro.po b/addons/board_project/i18n/ro.po
index 96dc00abf73..4bc0872a5c9 100644
--- a/addons/board_project/i18n/ro.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/ru.po b/addons/board_project/i18n/ru.po
index 2b7c1de619c..da870866b24 100644
--- a/addons/board_project/i18n/ru.po
+++ b/addons/board_project/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: 2009-09-08 12:27+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-30 10:26+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
@@ -30,7 +30,7 @@ msgstr "Табели"
 #. module: board_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: board_project
 #: view:board.board:0
@@ -63,7 +63,7 @@ msgstr "Панель аналитики проекта"
 #. module: board_project
 #: model:ir.module.module,shortdesc:board_project.module_meta_information
 msgid "Board for project users"
-msgstr ""
+msgstr "Панель для пользователей проекта"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
@@ -73,7 +73,7 @@ msgstr "Конвейер заданий"
 #. module: board_project
 #: view:board.board:0
 msgid "My Planning"
-msgstr ""
+msgstr "Мой план"
 
 #. module: board_project
 #: view:board.board:0
@@ -136,4 +136,4 @@ msgstr "Мои конвейеры пользователей"
 #. module: board_project
 #: view:board.board:0
 msgid "My Timesheet"
-msgstr ""
+msgstr "Мой табель"
diff --git a/addons/board_project/i18n/sl.po b/addons/board_project/i18n/sl.po
index 4e31744d308..9e42c1de263 100644
--- a/addons/board_project/i18n/sl.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/sv.po b/addons/board_project/i18n/sv.po
index 16fdd4bd9ff..9eee2ad050b 100644
--- a/addons/board_project/i18n/sv.po
+++ b/addons/board_project/i18n/sv.po
@@ -7,100 +7,100 @@ 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-02-03 11:05+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-24 08:22+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My project's planning"
-msgstr ""
+msgstr "Mina projekts planering"
 
 #. module: board_project
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:board_project.act_hr_timesheet_sheet
 msgid "Timesheets"
-msgstr ""
+msgstr "Tidrapporter"
 
 #. module: board_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Felaktigt namn för modell i händelsedefinitionen."
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.act_my_project
 msgid "My projects"
-msgstr ""
+msgstr "Mina projekt"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Mina aktiviteters deadlines"
 
 #. module: board_project
 #: view:project.task:0
 msgid "My Tasks"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
 msgid "Public Notes"
-msgstr ""
+msgstr "Publika Inlägg"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.open_board_project
 #: model:ir.ui.menu,name:board_project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "Projekt dashboard"
 
 #. module: board_project
 #: model:ir.module.module,shortdesc:board_project.module_meta_information
 msgid "Board for project users"
-msgstr ""
+msgstr "Dashboard för projektanvändare"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
 msgid "Pipeline of tasks"
-msgstr ""
+msgstr "Aktiviteter i pipeline"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Planning"
-msgstr ""
+msgstr "Min planering"
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "Mina konton som skall fakturerar"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.open_board_project_manager
 #: model:ir.ui.menu,name:board_project.menu_board_project_manager
 msgid "Project Manager Dashboard"
-msgstr ""
+msgstr "Projektledare dashboard"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Deadlines"
-msgstr ""
+msgstr "Mina deadlines"
 
 #. module: board_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Felaktig XML för Vyarkitektur!"
 
 #. module: board_project
 #: view:board.board:0
 msgid "User's timesheets"
-msgstr ""
+msgstr "Användares tidrapporter"
 
 #. module: board_project
 #: model:ir.ui.menu,name:board_project.next_id_86
@@ -110,30 +110,30 @@ msgstr "Projekt"
 #. module: board_project
 #: view:board.board:0
 msgid "Project manager board"
-msgstr ""
+msgstr "Projektledarens dashboard"
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Mina öppna aktiviteter"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Min dashboard"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My tasks board"
-msgstr ""
+msgstr "Dashboard för mina aktiviteter"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My user's pipeline"
-msgstr ""
+msgstr "Mina användares pipeline"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Timesheet"
-msgstr ""
+msgstr "Min tidrapport"
diff --git a/addons/board_project/i18n/tlh.po b/addons/board_project/i18n/tlh.po
index 4ad6a64847e..e3b54635e9e 100644
--- a/addons/board_project/i18n/tlh.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/tr.po b/addons/board_project/i18n/tr.po
index 47a0645b4a4..c5a19bc0c4d 100644
--- a/addons/board_project/i18n/tr.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/uk.po b/addons/board_project/i18n/uk.po
index 1d9923fbe85..a97b7713e22 100644
--- a/addons/board_project/i18n/uk.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/zh_CN.po b/addons/board_project/i18n/zh_CN.po
index 3d0c7bdcc3f..a316b21a815 100644
--- a/addons/board_project/i18n/zh_CN.po
+++ b/addons/board_project/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: 2009-12-16 13:28+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-29 00:44+0000\n"
+"Last-Translator: digitalsatori <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
@@ -30,7 +30,7 @@ msgstr "时间表"
 #. module: board_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_project
 #: view:board.board:0
@@ -41,7 +41,7 @@ msgstr "我的项目"
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr "我的项目截至期限"
+msgstr "我的任务最后期限"
 
 #. module: board_project
 #: view:project.task:0
@@ -52,23 +52,23 @@ msgstr "我的任务"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
 msgid "Public Notes"
-msgstr "发布备注"
+msgstr "公开备注"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.open_board_project
 #: model:ir.ui.menu,name:board_project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "项目控制台"
 
 #. module: board_project
 #: model:ir.module.module,shortdesc:board_project.module_meta_information
 msgid "Board for project users"
-msgstr ""
+msgstr "用户项目面板"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
 msgid "Pipeline of tasks"
-msgstr "任务流水线"
+msgstr "任务管线"
 
 #. module: board_project
 #: view:board.board:0
@@ -85,12 +85,12 @@ msgstr "我的发票科目"
 #: model:ir.actions.act_window,name:board_project.open_board_project_manager
 #: model:ir.ui.menu,name:board_project.menu_board_project_manager
 msgid "Project Manager Dashboard"
-msgstr ""
+msgstr "项目管理控制台"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Deadlines"
-msgstr "我的截止日期"
+msgstr "我的最后期限"
 
 #. module: board_project
 #: constraint:ir.ui.view:0
@@ -110,30 +110,49 @@ msgstr "项目"
 #. module: board_project
 #: view:board.board:0
 msgid "Project manager board"
-msgstr ""
+msgstr "项目管理控制台"
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree
 msgid "My Open Tasks"
-msgstr "我进行中的任务列表"
+msgstr "我的未结任务"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "我的面板"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My tasks board"
-msgstr ""
+msgstr "我的任务面板"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My user's pipeline"
-msgstr ""
+msgstr "我用户的管线"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Timesheet"
 msgstr "我的时间表"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module implements a dashboard for project member that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * List of my next deadlines\n"
+#~ "    * List of public notes\n"
+#~ "    * Graph of my timesheet\n"
+#~ "    * Graph of my work analysis\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块实现项目的控制台包括:\n"
+#~ "    *我打开的任务列表\n"
+#~ "    *我的下一最后期限列表\n"
+#~ "    *公开备注列表\n"
+#~ "    *我的时间表图表\n"
+#~ "    *我的工作分析图形\n"
+#~ "    "
diff --git a/addons/board_project/i18n/zh_TW.po b/addons/board_project/i18n/zh_TW.po
index 59d42e1f403..9f56ee7e3f4 100644
--- a/addons/board_project/i18n/zh_TW.po
+++ b/addons/board_project/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_sale/i18n/ar.po b/addons/board_sale/i18n/ar.po
index cbcacb04d67..7b3b45d32ef 100644
--- a/addons/board_sale/i18n/ar.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/bg.po b/addons/board_sale/i18n/bg.po
index c800c20cc0b..7c5bfa72b47 100644
--- a/addons/board_sale/i18n/bg.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/bs.po b/addons/board_sale/i18n/bs.po
index 964cf68641a..c074f90c313 100644
--- a/addons/board_sale/i18n/bs.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/ca.po b/addons/board_sale/i18n/ca.po
index b074e107de7..5f1fe5ef0d6 100644
--- a/addons/board_sale/i18n/ca.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/cs.po b/addons/board_sale/i18n/cs.po
index 8903f847794..7cfbfcab5da 100644
--- a/addons/board_sale/i18n/cs.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/de.po b/addons/board_sale/i18n/de.po
index a62c855b356..22acc60864e 100644
--- a/addons/board_sale/i18n/de.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/el.po b/addons/board_sale/i18n/el.po
index 87f7e51253d..e2749ee77cb 100644
--- a/addons/board_sale/i18n/el.po
+++ b/addons/board_sale/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_sale/i18n/es.po b/addons/board_sale/i18n/es.po
index 6f7f475d304..906d7885bfb 100644
--- a/addons/board_sale/i18n/es.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/es_AR.po b/addons/board_sale/i18n/es_AR.po
index f5798da3c0e..9d5cdad859d 100644
--- a/addons/board_sale/i18n/es_AR.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/et.po b/addons/board_sale/i18n/et.po
index 4027fe3f252..7f9feba17dc 100644
--- a/addons/board_sale/i18n/et.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/fr.po b/addons/board_sale/i18n/fr.po
index 3373cd1e341..6dc578cac6b 100644
--- a/addons/board_sale/i18n/fr.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/gl.po b/addons/board_sale/i18n/gl.po
index 75343f12cfa..65a8762b205 100644
--- a/addons/board_sale/i18n/gl.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/hr.po b/addons/board_sale/i18n/hr.po
index f40d579b4f5..46ae5146152 100644
--- a/addons/board_sale/i18n/hr.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/hu.po b/addons/board_sale/i18n/hu.po
index b4711a691b3..159dc8f923e 100644
--- a/addons/board_sale/i18n/hu.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/id.po b/addons/board_sale/i18n/id.po
index 4a638d7c318..02c72525f83 100644
--- a/addons/board_sale/i18n/id.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/it.po b/addons/board_sale/i18n/it.po
index cb91e8a96bc..4782d9394c6 100644
--- a/addons/board_sale/i18n/it.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/ko.po b/addons/board_sale/i18n/ko.po
index c1e4b7066bc..1f177b585be 100644
--- a/addons/board_sale/i18n/ko.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/lt.po b/addons/board_sale/i18n/lt.po
index cbcacb04d67..7b3b45d32ef 100644
--- a/addons/board_sale/i18n/lt.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/nl.po b/addons/board_sale/i18n/nl.po
index 5d096e9f4ab..62d060a58e6 100644
--- a/addons/board_sale/i18n/nl.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/nl_BE.po b/addons/board_sale/i18n/nl_BE.po
index d40994eb8da..e7acadd1a60 100644
--- a/addons/board_sale/i18n/nl_BE.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/pl.po b/addons/board_sale/i18n/pl.po
index 9ffd7fd47e2..4bc84deb95d 100644
--- a/addons/board_sale/i18n/pl.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/pt.po b/addons/board_sale/i18n/pt.po
index 6c2c3ff3f1a..ca19c1b2388 100644
--- a/addons/board_sale/i18n/pt.po
+++ b/addons/board_sale/i18n/pt.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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/pt_BR.po b/addons/board_sale/i18n/pt_BR.po
index b723be1d001..4d93927e23e 100644
--- a/addons/board_sale/i18n/pt_BR.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/ro.po b/addons/board_sale/i18n/ro.po
index 5adeca9f1e3..218b372b3b3 100644
--- a/addons/board_sale/i18n/ro.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/ru.po b/addons/board_sale/i18n/ru.po
index ae7385fe899..ff21bd37042 100644
--- a/addons/board_sale/i18n/ru.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/sl.po b/addons/board_sale/i18n/sl.po
index 2a7a9d62a74..d5d2b870533 100644
--- a/addons/board_sale/i18n/sl.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/sv.po b/addons/board_sale/i18n/sv.po
index 146ea3c73d8..861a02d5693 100644
--- a/addons/board_sale/i18n/sv.po
+++ b/addons/board_sale/i18n/sv.po
@@ -7,67 +7,67 @@ 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-24 13:56+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
 #: model:ir.module.module,shortdesc:board_sale.module_meta_information
 msgid "Dashboard for sales"
-msgstr ""
+msgstr "Dashboard för kundorder"
 
 #. module: board_sale
 #: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
 #: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
 msgid "Sale Dashboard"
-msgstr ""
+msgstr "Kundorder dashboard"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Sales of the month"
-msgstr ""
+msgstr "Försäljning denna månad"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Sales manager board"
-msgstr ""
+msgstr "Dashboard för försäljningschef"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases of the month"
-msgstr ""
+msgstr "Ärenden denna månad"
 
 #. module: board_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
+msgstr "Ogiltig XML för Vy-arkitektur!"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "My open quotations"
-msgstr ""
+msgstr "Mina öppna offerter"
 
 #. module: board_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Felaktigt namn för modell i händelsedefinitionen."
+msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
 
 #. module: board_sale
 #: model:ir.ui.menu,name:board_sale.next_id_88
 msgid "Sales"
-msgstr ""
+msgstr "Kundorder"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases statistics"
-msgstr ""
+msgstr "Ärendestatistik"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Top ten sales of the month"
-msgstr ""
+msgstr "Top tio kundorder denna månad"
diff --git a/addons/board_sale/i18n/tlh.po b/addons/board_sale/i18n/tlh.po
index 61f8d374f98..36fc3ad9b47 100644
--- a/addons/board_sale/i18n/tlh.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/tr.po b/addons/board_sale/i18n/tr.po
index 9ecd87a0ac7..90ec4f2a50f 100644
--- a/addons/board_sale/i18n/tr.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/uk.po b/addons/board_sale/i18n/uk.po
index 666a622344c..6273c407a5c 100644
--- a/addons/board_sale/i18n/uk.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/zh_CN.po b/addons/board_sale/i18n/zh_CN.po
index 62489348f86..152661489ab 100644
--- a/addons/board_sale/i18n/zh_CN.po
+++ b/addons/board_sale/i18n/zh_CN.po
@@ -4,43 +4,43 @@
 #
 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-07 11:12+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:39+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
 #: model:ir.module.module,shortdesc:board_sale.module_meta_information
 msgid "Dashboard for sales"
-msgstr "销售情况看板"
+msgstr "销售控制台"
 
 #. module: board_sale
 #: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
 #: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
 msgid "Sale Dashboard"
-msgstr "销售看板"
+msgstr "销售控制台"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Sales of the month"
-msgstr "该月销售情况"
+msgstr "当月销售"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Sales manager board"
-msgstr "销售经理控制台"
+msgstr "销售管理面板"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases of the month"
-msgstr "该月项目情况"
+msgstr "这月业务个案"
 
 #. module: board_sale
 #: constraint:ir.ui.view:0
@@ -50,12 +50,12 @@ msgstr "无效的XML视图结构！"
 #. module: board_sale
 #: view:board.board:0
 msgid "My open quotations"
-msgstr "我的公开报价"
+msgstr "我打开报价"
 
 #. module: board_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_sale
 #: model:ir.ui.menu,name:board_sale.next_id_88
@@ -65,9 +65,28 @@ msgstr "销售"
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases statistics"
-msgstr "项目统计"
+msgstr "业务个案统计"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Top ten sales of the month"
-msgstr "当月十大销售排行"
+msgstr "当月销售"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module implements a dashboard for salesman that includes:\n"
+#~ "    * You open quotations\n"
+#~ "    * Top 10 sales of the month\n"
+#~ "    * Cases statistics\n"
+#~ "    * Graph of sales by product\n"
+#~ "    * Graph of cases of the month\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块实现业务员控制台包括:\n"
+#~ "    *你待处理的报价\n"
+#~ "    *这月前10业务员\n"
+#~ "    *业务统计\n"
+#~ "    *销售产品图表\n"
+#~ "    *月份业务图表\n"
+#~ "    "
diff --git a/addons/board_sale/i18n/zh_TW.po b/addons/board_sale/i18n/zh_TW.po
index 18d8dc32088..f2a577f0d29 100644
--- a/addons/board_sale/i18n/zh_TW.po
+++ b/addons/board_sale/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/caldav/caldav_fs.py b/addons/caldav/caldav_fs.py
index 28424acedf8..40f0f56b45e 100644
--- a/addons/caldav/caldav_fs.py
+++ b/addons/caldav/caldav_fs.py
@@ -38,7 +38,6 @@ from DAV.iface import *
 import urllib
 
 from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
-from document.nodes import node_res_dir, node_res_obj
 from caldav_cache import memoize
 from tools import misc
 CACHE_SIZE=20000
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 1f5a2352b5f..64ee27b751a 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -64,6 +64,9 @@ class node_calendar(object):
 
     def _get_ttag(self,cr):
         return 'calendar-%d' % self.calendar_id
+    
+    def get_dav_eprop(self,cr,ns,prop):
+        return None
 
 class Calendar(osv.osv):
     _inherit = 'basic.calendar'
diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 994f11f3212..b2a40c822a6 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -41,73 +41,75 @@ appropriate staff, and making sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
-between mails and Open ERP.""", 
-    'author': 'Tiny', 
-    'website': 'http://www.openerp.com', 
-    'depends': ['base', 'base_action_rule',                         
-                        'process', 
-                        'mail_gateway', 
+between mails and Open ERP.""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['base', 'base_action_rule',
+                        'process',
+                        'mail_gateway',
                         'base_calendar',
-                    ], 
-    'init_xml': ['crm_data.xml', 
-                'crm_meeting_data.xml', 
-                 'crm_claims_data.xml', 
-                 'crm_fund_data.xml', 
-                 'crm_helpdesk_data.xml', 
-                 'crm_lead_data.xml', 
-                 'crm_meeting_data.xml', 
-                 'crm_opportunity_data.xml', 
-                 'crm_phonecall_data.xml', 
-    ], 
+                    ],
+    'init_xml': ['crm_data.xml',
+                'crm_meeting_data.xml',
+                 'crm_claims_data.xml',
+                 'crm_fund_data.xml',
+                 'crm_helpdesk_data.xml',
+                 'crm_lead_data.xml',
+                 'crm_meeting_data.xml',
+                 'crm_opportunity_data.xml',
+                 'crm_phonecall_data.xml',
+    ],
 
     'update_xml': [
-        'crm_wizard.xml', 
-        'crm_view.xml', 
-        'crm_action_rule_view.xml', 
-        'crm_lead_wizard.xml', 
-        'crm_lead_view.xml', 
-        'crm_lead_menu.xml', 
-        'crm_meeting_wizard.xml', 
-        'crm_meeting_view.xml', 
-        'crm_meeting_menu.xml', 
-        'crm_phonecall_wizard.xml', 
-        'crm_phonecall_view.xml', 
-        'crm_phonecall_menu.xml',         
-        'crm_opportunity_wizard.xml', 
-        'crm_opportunity_view.xml', 
-        'crm_opportunity_menu.xml', 
-        'crm_fund_view.xml', 
-        'crm_fund_menu.xml', 
-        'crm_claims_view.xml', 
-        'crm_claims_menu.xml', 
+        'wizard/crm_send_email_view.xml', 
+        'crm_wizard.xml',
+        'crm_view.xml',
+        'crm_action_rule_view.xml',
+        'crm_lead_wizard.xml',
+        'crm_lead_view.xml',
+        'crm_lead_menu.xml',
+        'crm_meeting_wizard.xml',
+        'crm_meeting_view.xml',
+        'crm_meeting_menu.xml',
+        'crm_phonecall_wizard.xml',
+        'crm_phonecall_view.xml',
+        'crm_phonecall_menu.xml',
+        'crm_opportunity_wizard.xml',
+        'crm_opportunity_view.xml',
+        'crm_opportunity_menu.xml',
+        'crm_fund_view.xml',
+        'crm_fund_menu.xml',
+        'crm_claims_view.xml',
+        'crm_claims_menu.xml',
 
         'crm_helpdesk_view.xml',
-        'crm_helpdesk_menu.xml', 
-         
-        'security/crm_security.xml', 
-        'security/ir.model.access.csv', 
+        'crm_helpdesk_menu.xml',
+
+        'security/crm_security.xml',
+        'security/ir.model.access.csv',
 
         'report/crm_report_view.xml',
         'report/crm_claim_report_view.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_fundraising_report_view.xml',
-        'report/crm_opportunity_report_view.xml' ,       
+        'report/crm_opportunity_report_view.xml' ,
         'report/crm_phonecall_report_view.xml',
-        
+        'report/crm_helpdesk_report_view.xml',
+
         'process/crm_configuration_process.xml',
-        
+
     ],
     'demo_xml': [
-        'crm_demo.xml', 
-        'crm_claims_demo.xml', 
-        'crm_fund_demo.xml', 
-        'crm_helpdesk_demo.xml', 
-        'crm_lead_demo.xml', 
-        'crm_meeting_demo.xml', 
-        'crm_opportunity_demo.xml', 
-        'crm_phonecall_demo.xml'], 
-    'installable': True, 
-    'active': False, 
-    'certificate': '0079056041421', 
+        'crm_demo.xml',
+        'crm_claims_demo.xml',
+        'crm_fund_demo.xml',
+        'crm_helpdesk_demo.xml',
+        'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
+        'crm_opportunity_demo.xml',
+        'crm_phonecall_demo.xml'],
+    'installable': True,
+    'active': False,
+    'certificate': '0079056041421',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 282584b8c6f..a6baed45b4e 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -53,13 +53,6 @@ AVAILABLE_PRIORITIES = [
     ('2','High'),
     ('1','Highest')
 ]
-
-icon_lst = {
-    'form':'STOCK_NEW',
-    'tree':'STOCK_JUSTIFY_FILL',
-    'calendar':'STOCK_SELECT_COLOR'
-}
-
 class crm_case_section(osv.osv):
     _name = "crm.case.section"
     _description = "Sales Teams"
@@ -156,6 +149,7 @@ class crm_case_stage(osv.osv):
         'object_id': fields.many2one('ir.model','Object Name'),
         'probability': fields.float('Probability (%)', required=True),
         'on_change': fields.boolean('Change Probability Automatically',help="Change Probability on next and previous stages."),
+        'requirements': fields.text('Requirements')
     }
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
@@ -320,31 +314,21 @@ class crm_case(osv.osv):
                 s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
                 if st in s[section]:
                     self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
-        return True
-
-    def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}):
-        if not case_id:
-            return {}
-        case = self.browse(cr, uid, case_id, context=context)
-        value = {}
-        if not name:
-            value['name'] = case.name
-        if (not partner_id) and case.partner_id:
-            value['partner_id'] = case.partner_id.id
-            if case.partner_address_id:
-                value['partner_address_id'] = case.partner_address_id.id
-            if case.email_from:
-                value['email_from'] = case.email_from
-        return {'value': value}
+        return True    
     
-    def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
+    def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, email_from=False, context={}):
         cases = self.browse(cr, uid, ids, context=context)
-        return self.__history(cr, uid, cases, keyword=keyword,\
-                               history=history, email=email, details=details,\
+        return self._history(cr, uid, cases, keyword=keyword,\
+                               history=history, email=email, details=details, email_from=email_from, \
                                context=context)
 
-    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
-        model_obj = self.pool.get('ir.model')          
+    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, context={}):
+        model_obj = self.pool.get('ir.model')  
+        if email and type(email) == type([]):
+            email = ','.join(email) 
+        if email_from and type(email_from) == type([]):
+            email_from = ','.join(email_from) 
+       
         for case in cases:
             model_ids = model_obj.search(cr, uid, [('model','=',case._name)])            
             data = {
@@ -356,12 +340,17 @@ class crm_case(osv.osv):
                 'section_id': case.section_id.id
             }
             obj = self.pool.get('crm.case.log')
-            if history and case.description:
+            if history:
                 obj = self.pool.get('crm.case.history')
                 data['description'] = details or case.description
-                data['email'] = email or \
+                data['email_to'] = email or \
+                        (case.section_id and case.section_id.reply_to) or \
                         (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or False
+                            case.user_id.address_id.email) or tools.config.get('email_from',False)
+                data['email_from'] = email_from or \
+                        (case.section_id and case.section_id.reply_to) or \
+                        (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from',False)
             res = obj.create(cr, uid, data, context)            
         return True
     _history = __history
@@ -376,7 +365,7 @@ class crm_case(osv.osv):
     def add_reply(self, cursor, user, ids, context=None):
         for case in self.browse(cursor, user, ids, context=context):
             if case.email_last:
-                description = email_last
+                description = case.email_last
                 self.write(cursor, user, case.id, {
                     'description': '> ' + description.replace('\n','\n> '),
                     }, context=context)
@@ -400,12 +389,10 @@ class crm_case(osv.osv):
             if not case.description:
                 raise osv.except_osv(_('Error!'),
                         _('Can not send mail with empty body,you should have description in the body'))
-        self.__history(cr, uid, cases, _('Send'), history=True, email=False)
+        
         for case in cases:
             self.write(cr, uid, [case.id], {
-                'description': False,
-                'som': False,
-                'canal_id': False,
+                'description': False,                
                 })
             emails = [case.email_from] + (case.email_cc or '').split(',')
             emails = filter(None, emails)
@@ -426,6 +413,7 @@ class crm_case(osv.osv):
                 reply_to=case.section_id.reply_to,
                 openobject_id=str(case.id)
             )
+            self.__history(cr, uid, [case], _('Send'), history=True, email=emails, details=body, email_from=emailfrom)
         return True
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
@@ -519,9 +507,7 @@ class crm_case_log(osv.osv):
     _order = "id desc"
     _columns = {
         'name': fields.char('Status', size=64),
-        'som': fields.many2one('res.partner.som', 'State of Mind'),
-        'date': fields.datetime('Date'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'),
+        'date': fields.datetime('Date'),        
         'section_id': fields.many2one('crm.case.section', 'Section'),
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
         'model_id': fields.many2one('ir.model', "Model"),
@@ -547,7 +533,8 @@ class crm_case_history(osv.osv):
     _columns = {
         'description': fields.text('Description'),
         'note': fields.function(_note_get, method=True, string="Description", type="text"),
-        'email': fields.char('Email', size=84),
+        'email_to': fields.char('Email TO', size=84),
+        'email_from' : fields.char('Email From', size=84),
         'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'),
     }
 crm_case_history()
@@ -591,16 +578,16 @@ class crm_email_add_cc_wizard(osv.osv_memory):
         case = model_pool.browse(cr, uid, history_line.log_id.res_id)
         body = history_line.description.replace('\n','\n> ')
         flag = tools.email_send(
-            case.user_id.address_id.email,
-            [case.email_from],
+            email,
+            [case.user_id.address_id.email],
             subject or '['+str(case.id)+'] '+case.name,
-            model_pool.format_body(body),
-            email_cc = [email],
+            model_pool.format_body(body),            
             openobject_id=str(case.id),
             subtype="html"
         )
         if flag:
             model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc +','+ email or email})
+            self.__history(cr, uid, [case], _('Send'), history=True, email=email, details=body, email_from=case.user_id.address_id.email)
         else:
             raise osv.except_osv(_('Email Fail!'),("Lastest Email is not sent successfully"))
         return {}
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 1e7c50588db..cd9c8f39ede 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -55,11 +55,14 @@ class case(osv.osv):
             if case.section_id.reply_to and case.email_from:
                 src = case.email_from
                 dest = case.section_id.reply_to
-                body = case.email_last or case.description
+                body = ""
+                body = case.email_last or case.description               
                 if not destination:
                     src, dest = dest, src
-                    if case.user_id.signature:
-                        body += '\n\n%s' % (case.user_id.signature or '')
+                    if body and case.user_id.signature:
+                        body += '\n\n%s' % (case.user_id.signature)
+
+                body = self.format_body(body)
                 dest = [dest]
 
                 attach_to_send = None
@@ -74,15 +77,16 @@ class case(osv.osv):
                     src,
                     dest,
                     "Reminder: [%s] %s" % (str(case.id), case.name, ),
-                    self.format_body(body),
+                    body,
                     reply_to=case.section_id.reply_to,
                     openobject_id=str(case.id),
                     attach=attach_to_send
                 )
-                if flag:
-                    raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
-                else:
-                    raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
+                self._history(cr, uid, [case], _('Send'), history=True, email=dest, details=body, email_from=src)
+                #if flag:
+                #    raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
+                #else:
+                #    raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
         return True    
 
     def _check(self, cr, uid, ids=False, context={}):
@@ -120,6 +124,23 @@ case()
 class base_action_rule(osv.osv):
     _inherit = 'base.action.rule'
     _description = 'Action Rules'
+
+    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from',False), context={}):
+        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:
+                emailfrom = obj.user_id.address_id.email
+            
+        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
+        emailfrom = tools.ustr(emailfrom)
+        if hasattr(obj, 'section_id') and obj.section_id and obj.section_id.reply_to:
+            reply_to = obj.section_id.reply_to
+        else:
+            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 = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
@@ -146,7 +167,7 @@ class base_action_rule(osv.osv):
         res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)         
         write = {}
         
-        if action.act_section_id:
+        if hasattr(action, act_section_id) and action.act_section_id:
             obj.section_id = action.act_section_id
             write['section_id'] = action.act_section_id.id        
         
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 5a4c6a3f6ad..2104c1c8d94 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -45,7 +45,7 @@
         <field name="model">crm.claim</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Claims" colors="blue:state=='open';red:(date_deadline&lt;=current_date)">
+            <tree string="Claims" colors="blue:state=='pending';black:state=='open';grey:state in ('close', 'cancel')">
                 <field name="id"/>
                 <field name="name"/>
                 <field name="partner_id"/>
@@ -134,9 +134,7 @@
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
-                            <field name="user_id"/>
-                            <field name="som"/>
-                            <field name="canal_id"/>
+                            <field name="user_id"/>                            
                         </form>
                     </field>
                 </page>
@@ -148,24 +146,31 @@
                         <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                                <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                <field name="email_to"/>
+                                <field name="email_from"/>
+                               <button
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.claim'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.claim'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
                 </group>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 75aae19a4af..d1287abacf1 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -132,9 +132,7 @@
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
-                            <field name="user_id"/>
-                            <field name="som"/>
-                            <field name="canal_id"/>
+                            <field name="user_id"/>                            
                         </form>
                     </field>
                 </page>
@@ -146,24 +144,31 @@
                        <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
+                                <field name="email_to"/>                                
+                                <field name="email_from"/> 
                                 <button
-								   string="Add a CC"
-								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-								    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.fundraising'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.fundraising'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -202,24 +207,24 @@
                 <search string="Search Funds">
                    <group col='6' colspan='4'>
                        <filter icon="terp-partner" string="My Funds"
-                       	default="1" domain="[('user_id','=',uid)]"
-                       	separator="1"
-                       	help="Funds Related to Current User"
-                       />
-                       <field name="state" select="1">
-                           <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Funds" default="1"/>
-                           <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Funds"/>
-                           <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Funds"/>
-                       </field>
+                           default="1" domain="[('user_id','=',uid)]"
+                           separator="1"
+                           help="Funds Related to Current User"
+                           />
+                       <filter icon="gtk-new" string="Current Funds" domain="[('state','in',('draft', 'open'))]" help="Current Funds" />
+                       <filter icon="gtk-yes" string="Open Funds" domain="[('state','=','open')]" help="Open Funds"/>
+                       <filter icon="gtk-media-pause" string="Pending Funds" domain="[('state','=','pending')]" help="Pending Funds"/>
+                       <separator orientation="vertical"/>
+                       <field name="state" select="1" />
                        <field name="name" select='1' string="Fund Description"/>
                        <field name="user_id" select="1" widget="selection">
-		                   <filter icon="terp-partner" domain="[('user_id','=', False)]" help="Unassigned" />
+                           <filter icon="terp-partner" domain="[('user_id','=', False)]" help="Unassigned" />
                        </field>
-					   <field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
-							<filter icon="terp-crm"
+                       <field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
+                           <filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
                                help="My section"
-                           />
+                               />
                        </field>
                    </group>
                </search>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 68a47fef9f8..c22ccf782a0 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -80,9 +80,7 @@
                                 <separator colspan="4" string="Action Information"/>
                                 <field colspan="4" name="name"/>
                                 <field name="date" select="2"/>
-                                <field name="user_id" select="2"/>
-                                <field name="som" select="2"/>
-                                <field name="canal_id"/>
+                                <field name="user_id" select="2"/>                                
                             </form>
                         </field>
                     </page>
@@ -94,24 +92,31 @@
                            <form string="Communication history">
                                <group col="7" colspan="4">
                                    <field name="date"/>
-                                   <field name="email"/>
-                                   <field name="canal_id"/>
+                                   <field name="email_to"/>
+                                   <field name="email_from"/>
                                    <button
-									   string="Add a CC"
-									    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-									    icon="gtk-add" type="action"/>
-                               </group>
-                               <newline/>
-                               <field name="description" colspan="4" nolabel="1"/>
-                               <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                           </form>
-                           <tree string="Communication history">
-                               <field name="description"/>
-                               <field name="email"/>
-                               <field name="date"/>
-                           </tree>
-                       </field>
-                       <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.helpdesk'}"
+                           	icon="gtk-go-forward" type="action" />
                     </page>
                 </notebook>
             </form>
@@ -122,7 +127,8 @@
         <field name="model">crm.helpdesk</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Helpdesk Support Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            <tree string="Helpdesk Support Tree"
+                colors="black:state=='open';blue:state=='pending';grey:state in ('cancel','close')">
                 <field name="id"/>
                 <field name="name" string="Query Description" />
                 <field name="partner_id" string="Partner"/>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index da9f2ed7230..aea2da0325e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -30,7 +30,7 @@ class crm_lead(osv.osv):
     _columns = {
         'categ_id': fields.many2one('crm.case.categ', 'Lead Source', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-        'partner_name': fields.char("Lead Name", size=64),
+        'partner_name': fields.char("Contact Name", size=64),
 
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
@@ -39,6 +39,7 @@ class crm_lead(osv.osv):
 
         'user_id': fields.many2one('res.users', 'Salesman'),
         'referred': fields.char('Referred By', size=32),
+        'function_name' : fields.char('Function', size=64),
     }
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 61763ce41ce..f660d265111 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -42,7 +42,7 @@
         <field name="arch" type="xml">
             <form string="Leads Form">
                 <group colspan="4" col="7">
-                    <field name="partner_name" required="1"/>
+                    <field name="name" required="1"/>
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
@@ -57,7 +57,6 @@
                     <field name="user_id"/>
                     <field name="stage_id" widget="selection" readonly="1" domain="[('object_id.model', '=', 'crm.lead')]"/>
                     <group col="2" colspan="1">
-                        
                         <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
                         <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
                     </group>
@@ -66,10 +65,10 @@
                 <page string="Lead">
                     <group colspan="2" col="4">
                         <separator string="Contact" colspan="4" col="4"/>
-                        <field name="name" string="Contact Name" colspan="4"/>
+                        <field name="partner_name" string="Contact Name" colspan="4"/>
                         <newline/>
                         <field domain="[('domain', '=', 'contact')]" name="title"/>
-                        <field name="function"/>
+                        <field name="function_name" />
                         <field name="street" colspan="4"/>
                         <field name="street2" colspan="4"/>
                         <field name="zip"/>
@@ -79,14 +78,14 @@
                     </group>
                     <group colspan="2" col="3">
                         <separator string="Communication" colspan="4" col="3"/>
+                        <field name="email_from" widget="email"/>
+                        <newline/>
                         <field name="phone"/>
                         <newline/>
                         <field name="fax"/>
                         <newline/>
                         <field name="mobile"/>
                         <newline/>
-                        <field name="email_from" widget="email"/>
-                        <newline/>
                         <separator string="Links" colspan="4" col="3"/>
                         <field name="partner_id"/>
                         <button
@@ -117,27 +116,31 @@
                         <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
+                                <field name="email_to"/>  
+                                <field name="email_from"/>                                
                                 <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email"
-                        name="%(crm.wizard_crm_new_send_mail)d"
-                        context="{'mail':'new'}" icon="gtk-go-forward"
-                        type="action" />
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.lead'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.lead'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py
index 8b2f3bdef88..60bd4f430f2 100644
--- a/addons/crm/crm_mailgate.py
+++ b/addons/crm/crm_mailgate.py
@@ -34,24 +34,28 @@ from osv.orm import except_orm
 
 class crm_cases(osv.osv):
     _name = "crm.case"
-    _inherit = "crm.case"
+    _inherit = "crm.case"    
 
     def msg_new(self, cr, uid, msg):                
         mailgate_obj = self.pool.get('mail.gateway')
         msg_body = mailgate_obj.msg_body_get(msg)
+        msg_subject = mailgate_obj._decode_header(msg['Subject'])
+        msg_from = mailgate_obj._decode_header(msg['From'])
+        msg_cc = mailgate_obj._decode_header(msg['Cc'])
+        body = self.format_body(msg_body['body'])
         data = {   
-            'name': msg['Subject'],         
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],            
+            'name': msg_subject,         
+            'email_from': msg_from,
+            'email_cc': msg_cc,            
             'user_id': False,
-            'description': msg_body['body'],            
+            'description': body,            
         }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
+        res = mailgate_obj.partner_get(cr, uid, msg_from)
         if res:
             data.update(res)
         res = self.create(cr, uid, data)        
         cases = self.browse(cr, uid, [res])       
-        self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])
+        self._history(cr, uid, cases, _('Receive'), history=True, details=body, email_from=msg_from)
         return res
     
     def msg_update(self, cr, uid, ids, msg, data={}, default_act='pending'):
@@ -79,10 +83,10 @@ class crm_cases(osv.osv):
 
         if 'partner' in msg_actions:
             data['email_from'] = msg_actions['partner'][:128]        
-
+        msg_from = self._decode_header(msg['From'])
         res = self.write(cr, uid, select, data)
         cases = self.browse(cr, uid, select)       
-        self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])        
+        self._history(cr, uid, cases, _('Receive'), history=True, details=body_data, email_from=msg['From'])        
         getattr(self,act)(cr, uid, select)
         return res
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index ce818fa0189..de0f1f01c33 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -74,17 +74,14 @@ class calendar_attendee(osv.osv):
             result[id] = {}
             if name == 'categ_id':
                 if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model)
-                    obj = model_obj.read(cr, uid, res_id, ['categ_id'])[0]
-                    result[id][name] = obj.get('categ_id')
+                    result[id][name] = (attdata.ref.categ_id.id,attdata.ref.categ_id.name,)
                 else:
                     result[id][name] = False
         return result
     _columns = {
         'categ_id': fields.function(_compute_data, method=True, \
                         string='Event Type', type="many2one", \
-                        relation="crm.case.categ", multi='categ_id'), 
+                        relation="crm.case.categ", multi='categ_id'),
     }
 calendar_attendee()
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a1f1cef502e..8161b504306 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -148,8 +148,7 @@
                                         <field name="rsvp" select="1" />
                                         <field name="cutype" select="1" />
                                         <field name="role" select="1" />
-                                        <separator colspan="4" string="" />
-                                        <field name="state" />
+                                        <separator colspan="4" string=""/>
                                         <group col="6" colspan="4">
                                             <field name="state" select="2" />
                                             <button name="do_tentative" states="needs-action,declined,accepted"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9b6e3739dce..02ffc47e374 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -56,10 +56,11 @@
             <form string="Opportunities">
                 <group colspan="4" col="7">
                     <field name="name" string="Opportunity"/>
-                    <group colspan="2" col="4">
-                        <field name="stage_id" readonly="1" on_change="onchange_stage_id(stage_id)" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                        <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
-                        <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
+                    <label string="Stage:" align="1.0"/>
+                    <group colspan="1" col="4">
+                        <field name="stage_id" nolabel="1" on_change="onchange_stage_id(stage_id)" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                        <button name="stage_previous" states="open,pending" type="object" icon="gtk-go-back" string=""/>
+                        <button name="stage_next" states="open,pending" type="object" icon="gtk-go-forward" string=""/>
                     </group>
                     <field name="user_id"/>
                     <button string="Schedule Meeting"
@@ -121,9 +122,7 @@
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
-                            <field name="user_id"/>
-                            <field name="som"/>
-                            <field name="canal_id"/>
+                            <field name="user_id"/>                           
                         </form>
                     </field>
                 </page>
@@ -135,24 +134,31 @@
                         <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
+                                <field name="email_to"/>
+                                <field name="email_from"/>
                                 <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.opportunity'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.opportunity'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -214,24 +220,24 @@
                 />
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity"/>
+                <field name="partner_id"/>
                 <field name="user_id" widget="selection">
                     <filter icon="terp-partner"
                         domain="[('user_id','=',uid)]"
                         help="My Opportunities" default="1"
                     />
                 </field>
-                <field name="partner_id"/>
-                <field name="state">
-                    <filter icon="gtk-media-rewind"
-                        string="New and open opportunities"
-                        default="1"
-                        domain="[('state','in',('draft','open'))]"/>
-                </field>
                 <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection">
                     <filter icon="terp-crm"
                         domain="[('section_id','=',context.get('section_id',False))]"
                         help="My section"/>
                 </field>
+                <field name="state">
+                    <filter icon="gtk-media-rewind"
+                        help="New and open opportunities"
+                        default="1"
+                        domain="[('state','in',('draft','open'))]" />
+                </field>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="4">
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 1c0f4e1df4a..6a65195a38b 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -42,7 +42,7 @@ class crm_phonecall(osv.osv):
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),
     }
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d')
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')
     }
 crm_phonecall()
 
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 2f0e2a1c650..2844cd02881 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -78,10 +78,8 @@ class crm_segmentation(osv.osv):
 
             for partner_id in partners:
                 cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
-            cr.commit()
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
-            cr.commit()
         return True
 
     def process_stop(self, cr, uid, ids, *args):
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 7ac6e119c27..3348083eb0b 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,11 +2,7 @@
 <openerp>
     <data>
 <!--        <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>-->
-        <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
-
-        <wizard id="wizard_crm_send_mail" model="crm.case.history" name="crm.send.mail" string="Send Mail" menu="False"/>
-        <wizard id="wizard_crm_new_send_mail" model="crm.case" name="crm.new.send.mail" string="Send New Mail" menu="False"/>
-
+        <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>        
         <!-- Case Sections -->
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
@@ -71,13 +67,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stage">
+                    <separator string="Stage Definition" colspan="4"/>
                     <field name="name" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
                     <field name="object_id" invisible="1" />
                     <field name="sequence"/>
                     <field name="probability"/>
                     <field name="on_change"/>
-                    
+                    <separator string="Requirements" colspan="4"/>
+                    <field name="requirements" nolabel="1" colspan="4"/>
                 </form>
             </field>
         </record>
@@ -218,10 +216,12 @@
                 <tree string="Case logs">
                     <field name="date"/>
                     <field name="name"/>
-                    <field name="som"/>
                     <field name="user_id"/>
                     <field name="section_id"/>
+                    <!--
+                    <field name="som"/>
                     <field name="canal_id"/>
+                    -->
                 </tree>
             </field>
         </record>
@@ -235,9 +235,11 @@
                 <tree string="Case History">
                     <field name="date"/>
                     <field name="name"/>
-                    <field name="som"/>
                     <field name="user_id"/>
+                    <!--
+                    <field name="som"/>
                     <field name="canal_id"/>
+                    -->
                 </tree>
             </field>
         </record>
@@ -326,9 +328,7 @@
                                     <separator colspan="4" string="Action Information"/>
                                     <field colspan="4" name="name"/>
                                     <field name="date" select="2"/>
-                                    <field name="user_id" select="2"/>
-                                    <field name="som" select="2"/>
-                                    <field name="canal_id"/>
+                                    <field name="user_id" select="2"/>                                    
                                 </form>
                             </field>
                         </page>
@@ -340,8 +340,8 @@
                                <form string="Communication history">
                                    <group col="7" colspan="4">
                                        <field name="date"/>
-                                       <field name="email"/>
-                                       <field name="canal_id"/>
+                                       <field name="email_to"/>
+                                       <field name="email_from"/>                                       
                                        <button
                                      string="Add a CC"
                                                name="%(crm.action_view_crm_email_add_cc_wizard)d"
@@ -349,15 +349,22 @@
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4" string="Reply to Last Email" name="%(wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.case'}"
+                                   	icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
-                                   <field name="email"/>
+                                   <field name="email_to"/>
                                    <field name="date"/>
                                </tree>
                            </field>
-                           <button colspan="4" string="Send New Email" name="%(wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.case'}"
+                           	icon="gtk-go-forward" type="action" />
                         </page>
                     </notebook>
                 </form>
@@ -632,7 +639,7 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="category_id" position="after">
-                    <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"/>
                     </field>
                 </field>
         </record>
diff --git a/addons/crm/i18n/ar.po b/addons/crm/i18n/ar.po
index 7771cc4762f..91e6dd58b89 100644
--- a/addons/crm/i18n/ar.po
+++ b/addons/crm/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/bg.po b/addons/crm/i18n/bg.po
index aab3fafa923..bd11f72d9c1 100644
--- a/addons/crm/i18n/bg.po
+++ b/addons/crm/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2009-02-03 10:09+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-29 14:21+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -37,7 +37,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Заглавие"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
@@ -55,7 +55,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Дни    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
diff --git a/addons/crm/i18n/bs.po b/addons/crm/i18n/bs.po
index 1185d4d4863..ccae5c54f9a 100644
--- a/addons/crm/i18n/bs.po
+++ b/addons/crm/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index 0b5259f0723..89539e3d7fa 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/cs.po b/addons/crm/i18n/cs.po
index 7a5dd30e276..919bda279ee 100644
--- a/addons/crm/i18n/cs.po
+++ b/addons/crm/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index cebfd12ac21..fe49389532c 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2009-11-22 19:06+0000\n"
+"PO-Revision-Date: 2010-03-22 09:17+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "gesendet an"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -37,17 +37,17 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "Fälle nach Sektionen und Kategorie 2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr ""
+msgstr "Beende Interessent"
 
 #. module: crm
 #: view:crm.job:0
@@ -55,17 +55,17 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Tage    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Managt einen Anwendersupport."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "offene Jobangebote"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
@@ -80,7 +80,7 @@ msgstr "Plankosten"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Schliesse Job Anfrage"
 
 #. module: crm
 #: field:crm.case.stage,name:0
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index 3ffc343df45..8aa104a4fed 100644
--- a/addons/crm/i18n/el.po
+++ b/addons/crm/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 4b19c3d135a..16a23891c8a 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-03-04 10:04+0000\n"
-"Last-Translator: xavi <xgilest@gmail.com>\n"
+"PO-Revision-Date: 2010-03-30 21:03+0000\n"
+"Last-Translator: Luis Gerardo Cruz Garcia <lgcruz@morfosys.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -27,6 +27,8 @@ msgid ""
 "This property defines the list                 of date/time exceptions for "
 "arecurring calendar component."
 msgstr ""
+"Esta propiedad define la lista de excepciones (días/horas) para un evento de "
+"calendario recurrente"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_user:0
@@ -306,7 +308,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Fechas de excepción"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -400,17 +402,17 @@ msgstr "Próxima entrevista"
 #. module: crm
 #: field:crm.case.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Expresiones Regulares en el Historial del Caso"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "Email añadir CC"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Oportunidad de Reunión"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -423,7 +425,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "Reglas de Excepción"
 
 #. module: crm
 #: field:crm.menu.config_wizard,opportunity:0
@@ -434,7 +436,7 @@ msgstr "Oportunidades de negocio"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Aceptado como reclamación"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -459,18 +461,18 @@ msgstr "%(email_from)s = Email empresa"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Muerto"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr ""
+msgstr "Confirmar reunión"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Cliente existente"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
@@ -494,7 +496,7 @@ msgstr "Categoría"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Casos por sección, categoría y fase"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -502,11 +504,13 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Active esta casilla en caso que quiera que la regla sea marcada CC ( copia "
+"de email para cualquier otra persona definida en las acciones)"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privada"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -566,7 +570,7 @@ msgstr "Posición"
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Crear oportunidad"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -579,7 +583,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Árbol de reuniones"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -596,7 +600,7 @@ msgstr "Escalado"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Todas las reuniones"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -607,7 +611,7 @@ msgstr "Gestión de relaciones con clientes & proveedores"
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "Agregar CC"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -615,7 +619,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -625,7 +629,7 @@ msgstr "Por defecto (0=Ninguno)"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Rechazado por la compañía"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
@@ -643,12 +647,12 @@ msgstr "Permitir eliminar"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "Propuesta de valor"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -658,17 +662,17 @@ msgstr "%(case_id)s = ID del caso"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Nuevo negocio"
 
 #. module: crm
 #: help:crm.case,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Estas personas recibirán un email."
 
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr ""
+msgstr "Permite mostrar el calendario"
 
 #. module: crm
 #: view:crm.job:0
@@ -676,13 +680,13 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   Hoy   "
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Descripción de la llamada"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -702,7 +706,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Política de reclamaciones"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -718,7 +722,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Asignada a"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -728,12 +732,12 @@ msgstr "Eventos empresa"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "Contrato propuesto"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Trabajos - Proceso de selección de personal"
 
 #. module: crm
 #: view:crm.case:0
@@ -741,7 +745,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "Casos Relacionados"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -749,7 +753,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "Setiembre"
 
 #. module: crm
 #: view:crm.case:0
@@ -764,33 +768,33 @@ msgstr "Historial de comunicación"
 #. module: crm
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Nuevas Reclamaciones"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr ""
+msgstr "Formulario de reuniones"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
 msgid "Negotiation/Review"
-msgstr ""
+msgstr "Negociación/Revisión"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Una empresa ya esta definida para esta llamada."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Casos por oportunidades y fase"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Fecha de reclamación"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -800,12 +804,12 @@ msgstr "Líneas de segmentación de empresa"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Todas las iniciativas"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Formulario de iniciativas"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -816,17 +820,17 @@ msgstr "Segmentación de empresa"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Contrato firmado"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Subscribe to Remote ICS"
-msgstr ""
+msgstr "Subcribirse a ICS remotos"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Negocio existente"
 
 #. module: crm
 #: field:crm.case,probability:0
@@ -837,7 +841,7 @@ msgstr "Probabilidad (%)"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Leads Cases"
-msgstr ""
+msgstr "Casos Oportunidades"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -864,7 +868,7 @@ msgstr "Regla del caso"
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
 #. module: crm
 #: view:crm.case:0
@@ -874,12 +878,12 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "Emails"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisión"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -889,18 +893,18 @@ msgstr "Parar el proceso"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Reclamaciones objetivas"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Buscar llamadas"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Continue"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -915,13 +919,13 @@ msgstr "Valor"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Salvar en formato .ics"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Mensaje"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -960,7 +964,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
@@ -980,12 +984,13 @@ msgstr "Fecha del disparo"
 #. module: crm
 #: view:crm.case.history:0
 msgid "Search Histories"
-msgstr ""
+msgstr "Buscar en Historial"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
+"Da el orden de secuencia cuando se muestra un lista de etápas de caso."
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support3
@@ -993,7 +998,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunidades"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -1028,6 +1033,8 @@ msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
 msgstr ""
+"Estas personas recibirán una copia de toda comunicación entre el partner y "
+"los usuarios."
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -1035,12 +1042,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Acción del servidor a ser ejecutada"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_rule-act
@@ -1057,13 +1064,13 @@ msgstr ""
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Establecer estado a"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Este correo no puede ser contestado"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1073,7 +1080,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Crear empresa"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1088,12 +1095,12 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "Mis donaciones"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Móvil"
 
 #. module: crm
 #: field:crm.case.rule,name:0
@@ -1114,12 +1121,12 @@ msgstr "Historial del caso"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Desarrollador junior"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Mis reuniones"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1129,7 +1136,7 @@ msgstr "Nombre de la categoría de casos"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventivo"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1139,7 +1146,7 @@ msgstr "Añadir observadores (CC)"
 #. module: crm
 #: wizard_view:caldav.crm.export,init:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Exportar ICS"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -1149,7 +1156,7 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "No se puede asignar un caso cerrado."
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
@@ -1167,7 +1174,7 @@ msgstr ""
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Reuniones"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1192,12 +1199,12 @@ msgstr "Fecha límite"
 #: wizard_button:caldav.crm.import,init,end:0
 #: wizard_button:caldav.crm.subscribe,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: crm
 #: field:crm.case,category2_id:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nombre de Categoría"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1207,7 +1214,7 @@ msgstr "Segmentaciones de empresa"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Rule"
-msgstr ""
+msgstr "Regla concurrente"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
@@ -1221,12 +1228,12 @@ msgstr "Categoría del caso"
 #: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Asunto"
 
 #. module: crm
 #: field:crm.meeting,attendees:0
 msgid "Attendees"
-msgstr ""
+msgstr "Asistentes"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -1281,7 +1288,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "El prospecto se convierte a partner"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1291,17 +1298,17 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Pending Claims"
-msgstr ""
+msgstr "Reclamaciones Pendientes"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
 msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Casos por oportunidades, categoría y etapa"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: crm
 #: field:crm.case,som:0
@@ -1316,12 +1323,12 @@ msgstr "Grado de satisfacción"
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Refused"
-msgstr ""
+msgstr "Candidato rechazado"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1351,7 +1358,7 @@ msgstr "Fecha creación"
 #: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "Reunión"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1372,12 +1379,12 @@ msgstr "Cambiar a borrador"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
 msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Casos por sección, categoría y categoría2"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor6
 msgid "Closed Won"
-msgstr ""
+msgstr "Cerrado-Ganado"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1396,7 +1403,7 @@ msgstr "Casos abiertos"
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm
 #: constraint:ir.ui.view:0
@@ -1409,24 +1416,26 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "section without removing it."
 msgstr ""
+"Si el campo activo esta en verdadero, te permitira esconder la sección del "
+"caso sin removerla"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Aprendizaje y educación"
 
 #. module: crm
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this phonecall ?"
-msgstr ""
+msgstr "Estas seguro que deseas crear una empresa basado en esta llamada?"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Etapas"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
diff --git a/addons/crm/i18n/es_AR.po b/addons/crm/i18n/es_AR.po
index ae302ffacfc..03ce5ef5764 100644
--- a/addons/crm/i18n/es_AR.po
+++ b/addons/crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index 3ebad95a99b..ef3031395c6 100644
--- a/addons/crm/i18n/et.po
+++ b/addons/crm/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index afbf0f90936..0c83df25abc 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-03-12 20:47+0000\n"
-"Last-Translator: Mauri Latvala <Unknown>\n"
+"PO-Revision-Date: 2010-04-01 15:06+0000\n"
+"Last-Translator: smii <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -130,7 +130,7 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Määrä"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -141,7 +141,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Ennalta määrätty"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -310,7 +310,7 @@ msgstr "Viimeisin Tapahtumapäivämäärä"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Arvonnousu"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
@@ -342,7 +342,7 @@ msgstr "Varoitus!"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Dates"
-msgstr ""
+msgstr "Päiväykset"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -404,7 +404,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Mahdollisuuskokous"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -456,7 +456,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Kuollut"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -499,11 +499,12 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Valitse tämä jos haluat säännön liittävän sähköpostille muita vastaanottajia."
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Yksityisyys"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -574,7 +575,7 @@ msgstr "Elokuu"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Kokouspuu"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -643,7 +644,7 @@ msgstr "Lokakuu"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "Arvoesitys"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -712,7 +713,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Annettu toimeksi"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -763,7 +764,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr ""
+msgstr "Kokouslomake"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
@@ -784,7 +785,7 @@ msgstr "Tapahtumat mahdollisuuksien ja vaiheen mukaan"
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Vaateen päivämäärä"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -831,7 +832,7 @@ msgstr "Todennäköisyys (%)"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Leads Cases"
-msgstr ""
+msgstr "Vihjetapaukset"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -929,7 +930,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "Poissulkeva"
 
 #. module: crm
 #: help:crm.case,categ_id:0
@@ -952,7 +953,7 @@ msgstr "Sähköposti!"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
@@ -1082,7 +1083,7 @@ msgstr "%(tapahtuma_kuvaus) = Tapahtuma kuvaus"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "Omat rahastot"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
@@ -1201,7 +1202,7 @@ msgstr "Kumppanisegmentoinnit"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Rule"
-msgstr ""
+msgstr "Toistumissääntö"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
@@ -1351,7 +1352,7 @@ msgstr "Luontipäivämäärä"
 #: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "Kokous"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1440,7 +1441,7 @@ msgstr "Odotettu tuotto"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Kokouksen päivämäärä"
 
 #. module: crm
 #: view:crm.job:0
@@ -1452,7 +1453,7 @@ msgstr "Muunna kumppaniksi"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr ""
+msgstr "Seuraavat kokoukset"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1468,7 +1469,7 @@ msgstr "Et voi poistaa tätä kohtaa. Sinun olisi parempi peruuttaa se."
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Tilaa"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
@@ -1483,7 +1484,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Arvovaateet"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
@@ -1560,7 +1561,7 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "Rahastot"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1586,23 +1587,23 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name"
-msgstr ""
+msgstr "Ehdokkaan nimi"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead2
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Self Generated"
-msgstr ""
+msgstr "Itsestään luotu"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Ei korjaa"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Converted"
-msgstr ""
+msgstr "Muunnettu"
 
 #. module: crm
 #: view:crm.case:0
@@ -1632,7 +1633,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
@@ -1642,7 +1643,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Työpaikat - Rekrytointipuu"
 
 #. module: crm
 #: field:crm.case.rule,regex_name:0
@@ -1656,7 +1657,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: crm
 #: view:crm.case:0
@@ -1670,7 +1671,7 @@ msgstr "Lähetä muistutus"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "References"
-msgstr ""
+msgstr "Viittaukset"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1701,7 +1702,7 @@ msgstr ""
 #: wizard_button:crm.send.mail,init,end:0
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1717,7 +1718,7 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of claim"
-msgstr ""
+msgstr "Vaateen tyyppi"
 
 #. module: crm
 #: view:crm.case:0
@@ -1727,17 +1728,17 @@ msgstr ""
 #. module: crm
 #: view:res.partner.events:0
 msgid "General Description"
-msgstr ""
+msgstr "Yleinen kuvaus"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Other Info"
-msgstr ""
+msgstr "Muut tiedot"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim Cost"
-msgstr ""
+msgstr "Vaadi kustannus"
 
 #. module: crm
 #: view:crm.job:0
@@ -1748,7 +1749,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Viittaus"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
@@ -1763,7 +1764,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
 msgid "Mail"
-msgstr ""
+msgstr "Posti"
 
 #. module: crm
 #: field:crm.case.rule,act_priority:0
@@ -1773,7 +1774,7 @@ msgstr "Aseta prioriteetti"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor2
 msgid "Needs Analysis"
-msgstr ""
+msgstr "Tarvitsee analysoinnin"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1788,7 +1789,7 @@ msgstr "Viestirunko"
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Hallinnoi käyttäjien tapaamiskalenteria"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1808,7 +1809,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1816,17 +1817,17 @@ msgstr ""
 #: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage"
-msgstr ""
+msgstr "Myyntivaihe"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Hälytys"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
@@ -1837,7 +1838,7 @@ msgstr ""
 #: view:crm.fundraising:0
 #: view:crm.meeting:0
 msgid "Next Meeting"
-msgstr ""
+msgstr "Seuraava kokous"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1855,12 +1856,12 @@ msgstr "Sallii luonnoksettomien tapahtumien poiston"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor7
 msgid "Closed Lost"
-msgstr ""
+msgstr "Suljettu menetys"
 
 #. module: crm
 #: field:crm.menu.config_wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Ohjelmointivirheiden jäljitys"
 
 #. module: crm
 #: view:crm.case:0
@@ -1871,7 +1872,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Actions"
-msgstr ""
+msgstr "Toimenpiteet"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -1879,12 +1880,12 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
-msgstr ""
+msgstr "Suuri"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Muunna ehdokas liiketoimintakumppaniksi"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1909,12 +1910,12 @@ msgstr "Viive asetetun päivämäärän jälkeen"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
 msgid "Web"
-msgstr ""
+msgstr "Web"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Campaign Type"
-msgstr ""
+msgstr "Kampanjatyyppi"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1926,7 +1927,7 @@ msgstr "Mielentilanlaskenta"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting_generic_wizard
@@ -1941,7 +1942,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job1
 msgid "Graduate"
-msgstr ""
+msgstr "Valmistua"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
@@ -1950,11 +1951,13 @@ msgid ""
 "Note that you can also use the calendar view to graphically schedule your "
 "next meeting."
 msgstr ""
+"Huomaa, että voit käyttää kalenterinäkymää myös suunnitellaksesi graafisesti "
+"seuraavan kokouksesi."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Tree"
-msgstr ""
+msgstr "Opaspuu"
 
 #. module: crm
 #: field:crm.meeting,caldav_url:0
@@ -1964,7 +1967,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee"
-msgstr ""
+msgstr "Osanottaja"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1978,12 +1981,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Saapuva"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Virhe! Et voi luoda rekursiivisia osioita."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
@@ -2003,7 +2006,7 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Year"
-msgstr ""
+msgstr "Tänä vuonna"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
@@ -2021,7 +2024,7 @@ msgstr "Korkein"
 #. module: crm
 #: view:crm.job:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Sopimuksen tiedot (data)"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2036,17 +2039,17 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Jaettu kalenteri"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Vastaus osoitteeseen"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
 msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Tapahtumat johdon ja tyypin mukaan"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2057,12 +2060,12 @@ msgstr "Minuuttia"
 #: field:report.crm.case.section.categ2,amount_revenue:0
 #: field:report.crm.case.section.stage,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Arvioitu tuotto"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job1
 msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Alkutöiden tarve"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
@@ -2077,12 +2080,12 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Claims Info"
-msgstr ""
+msgstr "Vaade tiedot"
 
 #. module: crm
 #: field:crm.case.category2,name:0
 msgid "Case Category2 Name"
-msgstr ""
+msgstr "Tapahtuma kategoria2 nimi"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2090,13 +2093,13 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Muunna mahdollisuudeksi"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone2
 #: view:crm.phonecall:0
 msgid "Held"
-msgstr ""
+msgstr "Pysäytetty"
 
 #. module: crm
 #: view:crm.case:0
@@ -2112,7 +2115,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.new.send.mail,init,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Muuttamaton"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2121,7 +2124,7 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "Muunna kumppaniksi"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
@@ -2147,17 +2150,17 @@ msgstr "Prioriteetti"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Source"
-msgstr ""
+msgstr "Lähde"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Sijainti"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Maksutapa"
 
 #. module: crm
 #: help:crm.case.rule,trg_date_range:0
@@ -2172,7 +2175,7 @@ msgstr ""
 #: view:crm.job:0
 #: view:crm.lead:0
 msgid "Stage: "
-msgstr ""
+msgstr "Vaihe: "
 
 #. module: crm
 #: view:crm.case.section:0
@@ -2182,7 +2185,7 @@ msgstr "Tapahtumaosio"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Ajoita normaali puhelinkokous"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2193,7 +2196,7 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Virhe!"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2203,7 +2206,7 @@ msgstr "Muutettavat kentät"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "Puhelinmyynnit"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
@@ -2213,7 +2216,7 @@ msgstr "Tapahtumahistoriat"
 #. module: crm
 #: field:crm.case,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Luotu"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2230,12 +2233,12 @@ msgstr "Segmentointirivi"
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
 #: view:crm.phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Suunniteltu päivämäärä"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Tunnit"
 
 #. module: crm
 #: help:crm.menu.config_wizard,phonecall:0
@@ -2265,7 +2268,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "July"
-msgstr ""
+msgstr "heinäkuu"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
@@ -2275,7 +2278,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Työntekijän sähköposti"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
@@ -2285,17 +2288,17 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr ""
+msgstr "Työtehtävän tiedot"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Cancel Meeting"
-msgstr ""
+msgstr "Peruuta kokous/tapaaminen"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
 msgid "Jobs"
-msgstr ""
+msgstr "Työpaikat"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2306,7 +2309,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_phone3
 #: view:crm.phonecall:0
 msgid "Not Held"
-msgstr ""
+msgstr "Ei pidätetty"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_user:0
@@ -2316,12 +2319,12 @@ msgstr "Sähköposti vastaavalle"
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Työpaikat - Rekrytointilomake"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Tarkennus"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
@@ -2344,7 +2347,7 @@ msgstr "Lähetettävän sähköpostin malli"
 #: field:report.crm.case.section.categ2,month:0
 #: field:report.crm.case.section.stage,month:0
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support2
@@ -2360,7 +2363,7 @@ msgstr ""
 #: wizard_button:crm.new.send.mail,init,send:0
 #: wizard_button:crm.send.mail,init,send:0
 msgid "Send Email"
-msgstr ""
+msgstr "Lähetä sähköpostia"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
@@ -2370,7 +2373,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Luottokortti"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2379,6 +2382,8 @@ msgid ""
 "No E-Mail ID Found for the Responsible Partner or missing reply address in "
 "section!"
 msgstr ""
+"Ei löydettyä sähköposti ID:tä vastaavalle kumppanille tai puuttuva "
+"vastausosoite tässä osiossa!"
 
 #. module: crm
 #: view:crm.job:0
@@ -2388,18 +2393,18 @@ msgstr ""
 #. module: crm
 #: field:crm.case.history,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Loki"
 
 #. module: crm
 #: help:crm.menu.config_wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr ""
+msgstr "Tämä saattaa auttaa yhteisöjä varainhankinnassa ja sen seurannassa."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Palauta vahvistamattomaksi"
 
 #. module: crm
 #: view:crm.case:0
@@ -2414,7 +2419,7 @@ msgstr "Seuraajien Sähköpostit"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Note"
-msgstr ""
+msgstr "Huomautus"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,delay_close:0
@@ -2422,7 +2427,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,delay_close:0
 #: field:report.crm.case.section.stage,delay_close:0
 msgid "Delay Close"
-msgstr ""
+msgstr "Viivytä sulkemista"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -2430,7 +2435,7 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Low"
-msgstr ""
+msgstr "Matala"
 
 #. module: crm
 #: field:crm.case,date_closed:0
@@ -2443,23 +2448,23 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name2"
-msgstr ""
+msgstr "Ehdokasnimi 2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Sisäinen kokous"
 
 #. module: crm
 #: view:crm.case:0
@@ -2468,7 +2473,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
-msgstr ""
+msgstr "Tapahtumat"
 
 #. module: crm
 #: help:crm.menu.config_wizard,lead:0
@@ -2476,6 +2481,8 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Sallii sinun seuraavan ja hallinoimaan oppaita jotka ovat esi-myynti "
+"pyyntöjä tai yhteystietoja. Ensimmäinen yhteydenotto asiakkaan pyyntöön."
 
 #. module: crm
 #: help:crm.case,som:0
@@ -2493,7 +2500,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Asiakastapaaminen"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
@@ -2508,7 +2515,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Degree"
-msgstr ""
+msgstr "Tutkinto"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc1:0
@@ -2524,7 +2531,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
 msgid "Phone Calls"
-msgstr ""
+msgstr "Puhelinsoitot"
 
 #. module: crm
 #: help:crm.case,active:0
@@ -2546,19 +2553,19 @@ msgstr "Asiahistoria"
 #. module: crm
 #: field:crm.case,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Puhelin"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Šekki"
 
 #. module: crm
 #: field:crm.case,active:0
 #: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_attach:0
@@ -2577,7 +2584,7 @@ msgstr "Pakollinen Määritelmä"
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.job:0
@@ -2587,12 +2594,12 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "Lähetä sähköpostia"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Months"
-msgstr ""
+msgstr "Kuukautta"
 
 #. module: crm
 #: view:crm.claim.assign_wizard:0
@@ -2615,7 +2622,7 @@ msgstr ""
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Kun todellinen projekti/mahdollisuus on löydetty"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2626,7 +2633,7 @@ msgstr ""
 #: wizard_field:crm.lead.opportunity_set,create_partner,action:0
 #: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Action"
-msgstr ""
+msgstr "Toiminto"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -2637,7 +2644,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
-msgstr ""
+msgstr "Vaateet"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
@@ -2652,7 +2659,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_category2
 msgid "Category2 of case"
-msgstr ""
+msgstr "tapahtuman kategoria2"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,to:0
@@ -2668,29 +2675,29 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
 msgid "Sales"
-msgstr ""
+msgstr "Myynnit"
 
 #. module: crm
 #: view:crm.case:0
 #: view:crm.phonecall:0
 msgid "General"
-msgstr ""
+msgstr "Yleiset"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Assigned"
-msgstr ""
+msgstr "Määrätty"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Recycled"
-msgstr ""
+msgstr "Kierrätetty"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "Muu"
 
 #. module: crm
 #: view:crm.case:0
@@ -2700,7 +2707,7 @@ msgstr ""
 #: selection:crm.new.send.mail,init,state:0
 #: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2731,7 +2738,7 @@ msgstr ""
 #: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Avoin"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -2775,29 +2782,29 @@ msgstr ""
 #: field:crm.opportunity.assign_wizard,user_id:0
 #: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuullinen"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "Virheellinen"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "Aseta kokous"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Kokouskalenteri"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Tapahtumat vaiheen ja arvioiden mukaan"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2827,18 +2834,18 @@ msgstr "Suurin kommunikointihistoria"
 #. module: crm
 #: view:crm.lead:0
 msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "Kokous ohjausten luomiseksi"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
 #: wizard_view:crm.lead.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr ""
+msgstr "Oletko varma, että haluat luoda kumppanin perustuen tähän johtoon ?"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Hylätty työntekijän toimesta"
 
 #. module: crm
 #: field:crm.case,partner_name:0
@@ -2848,7 +2855,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "Ensimmäinen haastattelu"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -2856,17 +2863,17 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "Tässä kuussa"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Saatavuus (viikoissa)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "Mahdollisuuksien puu"
 
 #. module: crm
 #: help:crm.case,state:0
@@ -2888,7 +2895,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Sähköpostiosoite"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2902,17 +2909,17 @@ msgstr ""
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "Liittyvä tapahtuma"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Palvelintoiminto"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
 msgid "All Claims"
-msgstr ""
+msgstr "Kaikki vaateet"
 
 #. module: crm
 #: field:crm.case.log,user_id:0
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index d3a77572ea2..b0c4f2752e5 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.7\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-02-09 23:36+0000\n"
+"PO-Revision-Date: 2010-03-26 21:06+0000\n"
 "Last-Translator: Sebastien LANGE - http://www.Syleam.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -1753,7 +1753,7 @@ msgstr "Planifier un appel téléphonique"
 #. module: crm
 #: field:crm.case,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Référence"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
diff --git a/addons/crm/i18n/gl.po b/addons/crm/i18n/gl.po
index 509cc9413da..8542650db8b 100644
--- a/addons/crm/i18n/gl.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index a995d20051e..0c8433ae71f 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -1,25 +1,26 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* crm
-#
+# * crm
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2009-09-08 16:00+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 00:54+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Pošalji prema"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -27,27 +28,29 @@ msgid ""
 "This property defines the list                 of date/time exceptions for "
 "arecurring calendar component."
 msgstr ""
+"Ovo svojstvo određuje listu datum/vrijeme Iznimaka za ponavljajuću "
+"komponentu kalendara."
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_user:0
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
-msgstr ""
+msgstr "Označite želite li da pravilo uključi slanje maila odgovornoj osobi."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Naslov"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "Slučajevi po Grupi i Kategoriji2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr ""
+msgstr "Zaključi Kontakt"
 
 #. module: crm
 #: view:crm.job:0
@@ -55,37 +58,37 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 dana    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Upravlja uslugom Helpdesk-a."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "Poslovi u tijeku"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr ""
+msgstr "Pritisnuta tipka"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Planned costs"
-msgstr ""
+msgstr "Planirani troškovi"
 
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Zaključi zahtjev za posao"
 
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Naziv stupnja"
 
 #. module: crm
 #: view:crm.case:0
@@ -95,7 +98,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
-msgstr ""
+msgstr "Slučajevi"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -103,16 +106,18 @@ msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
 msgstr ""
+"Kategorija partnera koja će biti dodana partnerima koji se - po izračunu - "
+"podudaraju s kriterijima segmentacije."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Ljudski resursi"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
 msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Slučajevi po Prodajnim prilikama, Kategorijama i Tipu"
 
 #. module: crm
 #: help:crm.menu.config_wizard,claims:0
@@ -120,22 +125,24 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Upravlja zahtjevima kupaca i dobavljača, uključujući vaše korektivne i "
+"preventivne radnje."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "sObični sastanak ili telefonski razgovor, vezan uz Prodajnu priliku"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Fiksno"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -144,40 +151,40 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Upozorenje!"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Molim, navedite e-mail adresu korisnika !"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Kampanja"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Pretraga Prodajnih prilika"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr ""
+msgstr "Slučajevi po Grupi i Stupnju"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr ""
+msgstr "Trajanje (Sati)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "TRANSPARENT"
-msgstr ""
+msgstr "TRANSPARENTAN"
 
 #. module: crm
 #: help:crm.case.rule,server_action_id:0
@@ -185,6 +192,8 @@ msgid ""
 "Describes the action name.eg:on which object which ation to be taken on "
 "basis of which condition"
 msgstr ""
+"Opisuje naziv radnje. Npr. na kojem objektu će se izvršiti koja radnja na "
+"osnovi kojeg uvjeta"
 
 #. module: crm
 #: help:crm.case,section_id:0
@@ -192,6 +201,8 @@ msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
 msgstr ""
+"Grupa kojoj Slučaj pripada. Odredite odgovornog korisnika i e-mail adresu za "
+"mail gateway."
 
 #. module: crm
 #: view:crm.case:0
@@ -210,7 +221,7 @@ msgstr ""
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
@@ -220,17 +231,17 @@ msgstr ""
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr ""
+msgstr "Grupa Slučaja"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Predložena Plaća"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
 msgid "Gives the sequence order when displaying a list of case sections."
-msgstr ""
+msgstr "Daje redoslijed kod prikazivanja liste Grupa Slučajeva"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -238,27 +249,27 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefonski poziv"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "Slučajevi po Grupi i Stupnju"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
 msgid "Mail to these emails"
-msgstr ""
+msgstr "Pošalji mail na te e-mail adrese"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "None"
-msgstr ""
+msgstr "Ništa"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Special Keywords to Be Used in The Body"
-msgstr ""
+msgstr "Posebne ključne riječo koje se koriste u Tijelu teksta"
 
 #. module: crm
 #: view:crm.case:0
@@ -268,59 +279,59 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Pošalji novi e-mail"
 
 #. module: crm
 #: view:crm.case.history:0
 msgid "My Histories"
-msgstr ""
+msgstr "Moje Povijesti"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "Kriteriji"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sections"
-msgstr ""
+msgstr "grupe"
 
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Prati prepoznate poslovne prilike u okviru vaše tijeka prodaje."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Datumi Iznimaka"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "Last Action Date"
-msgstr ""
+msgstr "Datum zadnje radnje"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Povećanje vrijednosti; vrednovanje; uvažavanje"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Drugi razgovor"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Pretplatiti se na Izdvojeni kalendar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ-act
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -336,39 +347,39 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr ""
+msgstr "Segmentacijski test"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Izgledni Partner"
 
 #. module: crm
 #: view:crm.fundraising:0
 #: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Opisni podaci"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Ime osobe"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Poveznica s postojećim partnerom"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr ""
+msgstr "Tip odgode"
 
 #. module: crm
 #: view:crm.claim:0
@@ -378,27 +389,27 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Osoba"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Slijedeći razgovor"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Regularni Izraz na osnovi Povijesti Slučaja"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "Dodaj CC kod e-maila"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Sastanak s prodajnom prilikom"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -407,22 +418,25 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate the canall "
 "which is this opportunity source."
 msgstr ""
+"Kanali predstavljaju različite modalitete komunikacije primjenjive sa "
+"strankom. Kod svake prodajne prilike, moguće je navesti kanal koji je izvor "
+"informacija vezan uz prodajnu priliku."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "Pravila za Iznimke"
 
 #. module: crm
 #: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
-msgstr ""
+msgstr "poslovne prilike"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Prihvaćeno kao potraživanje"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -430,37 +444,40 @@ msgid ""
 "The rule use a AND operator. The case must match all non empty fields so "
 "that the rule execute the action described in the 'Actions' tab."
 msgstr ""
+"Pravilo koristi AND/I operator. Slučaj se mora podudarati sa svim ne-praznim "
+"poljima kako bi pravilo pokrenulo izvršenje radnje opisano u okviru Tab-a "
+"\"Radnje\"."
 
 #. module: crm
 #: field:crm.case,history_line:0
 msgid "Communication"
-msgstr ""
+msgstr "Komunikacija"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(email_from)s = Partner email"
-msgstr ""
+msgstr "%(email_from)s = Partner email"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Mrtav"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr ""
+msgstr "Potvrdi sastanak"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Postojeća stranka"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Početna stranica"
 
 #. module: crm
 #: field:crm.case,categ_id:0
@@ -472,14 +489,14 @@ msgstr ""
 #: field:report.crm.case.section.categ.stage,categ_id:0
 #: field:report.crm.case.section.stage,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_stage
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Slučajevi po Grupi, Kategoriji i Stupnju"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -487,16 +504,18 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Odaberite ovu opcije ako želite da pravilo označi CC(Mail bilo kojoj drugoj "
+"osobi navedenoj u radnjama)"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privatnost"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(partner)s = Ime partnera"
 
 #. module: crm
 #: view:crm.case:0
@@ -506,40 +525,41 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Action Information"
-msgstr ""
+msgstr "Podaci o radnji"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user_phone)s = Responsible phone"
-msgstr ""
+msgstr "%(case_user_phone)s = Tel. broj odgovorne osobe"
 
 #. module: crm
 #: 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: crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions"
-msgstr ""
+msgstr "Uvjeti"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
 msgid "Open Cases"
-msgstr ""
+msgstr "Otvoreni Slučajevi"
 
 #. module: crm
 #: field:crm.case.log,name:0
 #: view:crm.claim:0
 #: view:crm.job:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm
 #: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@@ -549,7 +569,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Stvori Prodajnu priliku"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -557,12 +577,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Stablo sastanaka"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -574,23 +594,23 @@ msgstr ""
 #: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "Eskalirati"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Svi sastanci"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "upravljanje odnosima s Kupcima i Dobavljačima"
 
 #. module: crm
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "Dodaj CC"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -598,27 +618,27 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr ""
+msgstr "Default (0=None)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Odbijeno od strane Tvrtke"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Planirani prihod"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
 msgid "Allow Delete"
-msgstr ""
+msgstr "Dopusti Brisanje"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -626,32 +646,32 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "Vrednuj Prijedlog"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_id)s = Case ID"
-msgstr ""
+msgstr "%(case_id)s = Case ID"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Novi Poslovni odnos"
 
 #. module: crm
 #: help:crm.case,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Ove će osobe primiti mail."
 
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr ""
+msgstr "Dopušta prikaz kalendara"
 
 #. module: crm
 #: view:crm.job:0
@@ -659,18 +679,18 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   Danas   "
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Opis telefonskog razgovora"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr ""
+msgstr "Kategorija Slučaja"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -682,7 +702,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Načela Potraživanja"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -692,26 +712,28 @@ msgstr ""
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
 msgstr ""
+"Morate odrediti odgovornog korisnika za taj Slučaj kako biste primijenili "
+"ovu radnju!"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Dodijeljeno"
 
 #. module: crm
 #: view:res.partner.events:0
 msgid "Partner Events"
-msgstr ""
+msgstr "Događaji vezani uz Partnere"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "Predložen Ugovor"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Poslovi - Proces zapošljavanja"
 
 #. module: crm
 #: view:crm.case:0
@@ -719,7 +741,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "Povezani slučajevi"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -727,7 +749,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: crm
 #: view:crm.case:0
@@ -737,85 +759,85 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Communication history"
-msgstr ""
+msgstr "Povijest komunikacije"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Nova potraživanja"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr ""
+msgstr "Obrazac Sastanaka"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
 msgid "Negotiation/Review"
-msgstr ""
+msgstr "Pregovaranje/Preispitivanje"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Partner je već određen ovim telefonskim pozivom."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Slučajevi prema Prilikama i Stupnju"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Datum Potraživanja"
 
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr ""
+msgstr "Slijedovi Segmentacije Partnera"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Svi Kontakti"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Obrazac Kontakta"
 
 #. module: crm
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr ""
+msgstr "Segmentacija Partnera"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Ugovor potpisan"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Subscribe to Remote ICS"
-msgstr ""
+msgstr "Pretplatiti se na Izdvojen ICS"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Postojeći posao"
 
 #. module: crm
 #: field:crm.case,probability:0
 #: field:crm.case.categ,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Vjerojatnost (%)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Leads Cases"
-msgstr ""
+msgstr "Slučajevi Kontakta"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -823,12 +845,14 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 "cases in this section"
 msgstr ""
+"E-mail adresa koja se dodaje u polje \"Odgovoriti-na\" kod svih e-mailova "
+"koji su odaslani iz aplikacije Open ERP vezano uz Slučajeve u ovoj Grupi"
 
 #. module: crm
 #: view:crm.case.rule:0
 #: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
-msgstr ""
+msgstr "Pravilo Slučaja"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -840,7 +864,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Prilika"
 
 #. module: crm
 #: view:crm.case:0
@@ -850,12 +874,12 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "Mailovi"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televizija"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -865,23 +889,23 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Faktična potraživanja"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Pretraži Telefonske pozive"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Periode"
-msgstr ""
+msgstr "Dani po Periodu"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -891,13 +915,13 @@ msgstr ""
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Spremi u .ics formatu"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -906,11 +930,14 @@ msgid ""
 "criterions. If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Provjerite je li kategorija je ograničena na partnere koji odgovaraju "
+"kriterijima segmentacije. Ako je tako, uklonite kategoriju iz grupe partnera "
+"koji ne odgovara kriterijima segmentacije"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "Isključujući"
 
 #. module: crm
 #: help:crm.case,categ_id:0
@@ -918,47 +945,49 @@ msgid ""
 "Category related to the section.Subdivide the CRM cases independently or "
 "section-wise."
 msgstr ""
+"Kategorija koja se odnosi na Grupu. Podijelite CRM Slučajeve pojedinačno ili "
+"u Grupe."
 
 #. module: crm
 #: field:crm.case.rule,act_state:0
 msgid "Set state to"
-msgstr ""
+msgstr "Postavi stanje na"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email!"
-msgstr ""
+msgstr "Email!"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
 msgid "crm.opportunity.assign_wizard"
-msgstr ""
+msgstr "crm.opportunity.assign_wizard"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on States"
-msgstr ""
+msgstr "Uvjeti Stanja"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Datum pokretač"
 
 #. module: crm
 #: view:crm.case.history:0
 msgid "Search Histories"
-msgstr ""
+msgstr "Pretraži Povijesti"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
-msgstr ""
+msgstr "Daje redoslijed kod prikazivanja liste Stupnjeva Slučajeva"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support3
@@ -966,33 +995,33 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Prilike"
 
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr ""
+msgstr "Naziv segmentacije"
 
 #. module: crm
 #: field:crm.case.rule,trg_partner_categ_id:0
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Kategorija Partnera"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr ""
+msgstr "Koristi Pravila vezana uz Kupoprodaju"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr ""
+msgstr "Iznos kupnje"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Direction"
-msgstr ""
+msgstr "Smjer"
 
 #. module: crm
 #: help:crm.case,email_cc:0
@@ -1001,6 +1030,8 @@ msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
 msgstr ""
+"Ovi ljudi će dobiti primjerak budućih komunikacije između partnera i "
+"korisnika putem e-pošte"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -1008,35 +1039,35 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "AKtivnost Servera koja se pokreće"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_rule-act
 #: model:ir.ui.menu,name:crm.menu_crm_case_rule-act
 msgid "Rules"
-msgstr ""
+msgstr "Pravila"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
 #: wizard_view:crm.phonecall.meeting_set,init:0
 msgid "Plan Meeting"
-msgstr ""
+msgstr "Planiraj Sastanak"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Postavi stanje"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Ne postoji mail za odgovor!"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1046,73 +1077,73 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Krairaj Partnera"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_description)s = Case description"
-msgstr ""
+msgstr "%(case_description)s = Opis Slučaja"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "Moja sredstva"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobitel"
 
 #. module: crm
 #: field:crm.case.rule,name:0
 #: field:crm.segmentation.line,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Ime pravila"
 
 #. module: crm
 #: field:crm.case,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Planirani troškovi"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_history
 msgid "Case history"
-msgstr ""
+msgstr "Povijest slučaja"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Mlađi programer"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Moji sastanci"
 
 #. module: crm
 #: field:crm.case.categ,name:0
 msgid "Case Category Name"
-msgstr ""
+msgstr "Naziv Kategorije Slučaja"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventivno"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
 msgid "Add watchers (Cc)"
-msgstr ""
+msgstr "Dodaj mail nadglednika u (Cc)"
 
 #. module: crm
 #: wizard_view:caldav.crm.export,init:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Izvezi ICS"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -1122,13 +1153,14 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "Ne možete dodijeliti zaključen slučaj"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
 msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
+"Označite želite li postaviti pravilo slanja e-mail podsjetnika partneru."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:0
@@ -1138,17 +1170,17 @@ msgstr ""
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Sastanci"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Fields"
-msgstr ""
+msgstr "Uvjeti vezani uz polja Slučaja"
 
 #. module: crm
 #: field:crm.case,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Siljedeća Radnja"
 
 #. module: crm
 #: view:crm.case:0
@@ -1156,34 +1188,34 @@ msgstr ""
 #: selection:crm.case.rule,trg_date_type:0
 #: view:crm.opportunity:0
 msgid "Deadline"
-msgstr ""
+msgstr "Rok"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
 #: wizard_button:caldav.crm.import,init,end:0
 #: wizard_button:caldav.crm.subscribe,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Odustani"
 
 #. module: crm
 #: field:crm.case,category2_id:0
 msgid "Category Name"
-msgstr ""
+msgstr "Naziv Kategorije"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "Segmentacije Partnera"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Rule"
-msgstr ""
+msgstr "Pravilo ponavljanja"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of case"
-msgstr ""
+msgstr "Kategorija slučaja"
 
 #. module: crm
 #: field:crm.email.add.cc,subject:0
@@ -1192,12 +1224,12 @@ msgstr ""
 #: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Predmet"
 
 #. module: crm
 #: field:crm.meeting,attendees:0
 msgid "Attendees"
-msgstr ""
+msgstr "Sudionici"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -1227,38 +1259,61 @@ msgid ""
 "The CRM module has a email gateway for the synchronisation interface\n"
 "between mails and Open ERP."
 msgstr ""
+"Open ERP - Generički Sustav za Upravljanje Odnosima s Korisnicima omogućava "
+"inteligentno i učinkovito upravljanje\n"
+"Kontaktima, prilikama, zadaćama, upitima, zahtjevi, bugovima, kampanjama, "
+"potraživanjima, itd.\n"
+"Omogućva rukovođenje ključnih zadataka, kao što su komunikacije, "
+"identifikacije prioriteta, zadaćama, rješenjima i obavijestima.\n"
+"\n"
+"Open ERP osigurava da se svi slučajevi uspješno prate od strane korisnika, "
+"kupaca i dobavljača. Može automatski poslati podsjetnike, eskalirati "
+"zahtjev, pokrenuti specifične metode te puno drugih akcija na temelju "
+"pravila Vaše tvrtke.\n"
+"\n"
+"Najvažnija odlika ovog sustava je da korisnici ne moraju činiti ništa\n"
+"posebno. Pošalju li e-mail na Request Tracker, Open ERP će automatizmom "
+"voditi brigu o preusmjeravanju sljedbenih radnji; poslati zahvalnicu "
+"korisniku, proslijediti poruku odgovornim djelatnicima, automatski je "
+"usmjeravanje na\n"
+"odgovarajuće osoblje te omogućiti da se sva buduća korespondencija ispravno "
+"usmjerava i definira.\n"
+"\n"
+"CRM modul ima e-mail gateway - sučelje za sinkronizaciju e-mailova s Open "
+"ERP-om.\n"
+"između pošte i Open ERP-a."
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Izgledna stranka pretvara se u poslovnog Partnera"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Case Name"
-msgstr ""
+msgstr "Regex na Ime Slučaja"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Pending Claims"
-msgstr ""
+msgstr "Potraživanja i tijeku"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
 msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Slučajevi po Prodajnim prilikama, Kategoriji i Stupnju"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
 msgid "Print"
-msgstr ""
+msgstr "Ispis"
 
 #. module: crm
 #: field:crm.case,som:0
 #: field:crm.case.log,som:0
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "Stanje uma"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1266,22 +1321,22 @@ msgstr ""
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Refused"
-msgstr ""
+msgstr "Kandidat odbijen"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr ""
+msgstr "Izračunaj Segmentaciju"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Email"
-msgstr ""
+msgstr "E-mail Kontakta"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
@@ -1289,24 +1344,24 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 #: model:ir.ui.menu,name:crm.next_id_53
 msgid "Segmentations"
-msgstr ""
+msgstr "Segmentacije"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum stvaranja"
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "Sastanak"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(partner_email)s = Partner email"
-msgstr ""
+msgstr "%(partner_email)s = Partner email"
 
 #. module: crm
 #: view:crm.case:0
@@ -1317,17 +1372,17 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Vrati na Nacrt"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
 msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Slučajevi po grupi, kategoriji i kategoriji2"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor6
 msgid "Closed Won"
-msgstr ""
+msgstr "Zaključen dobijen"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1336,7 +1391,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.act_res_partner_canal_2_crm_case_opened
 #: model:ir.actions.act_window,name:crm.act_res_users_2_crm_case_opened
 msgid "Open cases"
-msgstr ""
+msgstr "Otvoreni Slučajevi"
 
 #. module: crm
 #: field:crm.case,stage_id:0
@@ -1346,12 +1401,12 @@ msgstr ""
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Stupanj"
 
 #. module: crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Invalid XML for View Architecture!"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1359,106 +1414,110 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "section without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na TRUE, moći ćete sakriti Grupu Slučajeva "
+"bez da je izbrišete."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Učenje i obrazovanje"
 
 #. module: crm
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this phonecall ?"
 msgstr ""
+"Jeste li sigurni da želite kreirati Partnera na osnovi ovog telefonskog "
+"poziva?"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Stupnjevi"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Očekivani prihod"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Datum sastanka"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Partner"
-msgstr ""
+msgstr "Pretvori u Partnera"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr ""
+msgstr "Slijedeći sastanci"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr ""
+msgstr "Max Partner ID processed"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You can not delete this case. You should better cancel it."
-msgstr ""
+msgstr "Ne možete izbrisati ovaj Slučaj. Morate ga Otkazati."
 
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "-Prijava"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
 msgid "Minimum Priority"
-msgstr ""
+msgstr "Minimalni prioritet"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
 msgid "Meeting Generic Wizard"
-msgstr ""
+msgstr "Osnovni Čarobnjak za Sastanak"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Vrijednosna potraživanja"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
 msgid "Message..."
-msgstr ""
+msgstr "Poruka..."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
 msgid "crm.phonecall.assign_wizard"
-msgstr ""
+msgstr "crm.phonecall.assign_wizard"
 
 #. module: crm
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Slučajevi po Grupi i Kategoriji2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "done"
-msgstr ""
+msgstr "gotovo"
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Reminder"
-msgstr ""
+msgstr "Podsjetnik"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1466,33 +1525,35 @@ msgid ""
 "Check if you want to use this tab as part of the segmentation rule. If not "
 "checked, the criteria beneath will be ignored"
 msgstr ""
+"Označite ako želite koristiti ovu karticu (Tab) kao dio pravila "
+"segmentacije. Ako ne označite, kriteriji koji slijedi će biti zanemaren"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr ""
+msgstr "otvori"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
 msgid "Remind with attachment"
-msgstr ""
+msgstr "Podsjeti s privitkom"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead6
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Website"
-msgstr ""
+msgstr "Web stranica"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
 msgid "Remind responsible"
-msgstr ""
+msgstr "Podsjeti odgovorne"
 
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr ""
+msgstr "Status izvršenja"
 
 #. module: crm
 #: help:crm.menu.config_wizard,jobs:0
@@ -1500,23 +1561,25 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Pomaže vam organizirati poslove procesa zapošljavanja: evaluaciju, sastanke, "
+"integraciju e-mailova ..."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "Sredstva"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim5
 #: model:crm.case.stage,name:crm.stage_meet4
 msgid "Awaiting Response"
-msgstr ""
+msgstr "Očekujući odgovor"
 
 #. module: crm
 #: field:crm.case,date:0
@@ -1525,28 +1588,28 @@ msgstr ""
 #: view:crm.claim:0
 #: view:crm.phonecall:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name"
-msgstr ""
+msgstr "Ime kandidata"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead2
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Self Generated"
-msgstr ""
+msgstr "Samo-generirano"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Neće se fiksirati"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Converted"
-msgstr ""
+msgstr "Pretvoren"
 
 #. module: crm
 #: view:crm.case:0
@@ -1556,17 +1619,17 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Reply to Last Email"
-msgstr ""
+msgstr "Odgovori na zadnji mail"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr ""
+msgstr "Opis Segmentacije"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "Daje lokaciju sastanka"
 
 #. module: crm
 #: view:crm.case:0
@@ -1576,22 +1639,22 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
 msgid "Job Cases"
-msgstr ""
+msgstr "Slučajevi posla"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Poslovi - Stablo procesa novačenja"
 
 #. module: crm
 #: field:crm.case.rule,regex_name:0
 msgid "Regular Expression on Case Name"
-msgstr ""
+msgstr "Regularni Izraz na osnovi Naziva Slučaja"
 
 #. module: crm
 #: field:crm.case,state:0
@@ -1600,12 +1663,12 @@ msgstr ""
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
 msgid "State"
-msgstr ""
+msgstr "Država"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Send Reminder"
-msgstr ""
+msgstr "Pošalji podsjetnik"
 
 #. module: crm
 #: view:crm.case:0
@@ -1614,7 +1677,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "References"
-msgstr ""
+msgstr "Reference"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1645,99 +1708,99 @@ msgstr ""
 #: wizard_button:crm.send.mail,init,end:0
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Nema e-mail ID-a za adresu Vaše Tvrtke"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "Pretraži Sredstva"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of claim"
-msgstr ""
+msgstr "Tip potraživanja"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Stablo Helpdesk Potpore"
 
 #. module: crm
 #: view:res.partner.events:0
 msgid "General Description"
-msgstr ""
+msgstr "Opći opis"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Other Info"
-msgstr ""
+msgstr "Druge informacije"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim Cost"
-msgstr ""
+msgstr "Potraživanje troška"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
-msgstr ""
+msgstr "Rasporedi Telefonski poziv"
 
 #. module: crm
 #: field:crm.case,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referenca"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Pravilo Iznimke"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "Označite želite li postaviti pravilo slanja e-maila partneru."
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
 msgid "Mail"
-msgstr ""
+msgstr "Mail"
 
 #. module: crm
 #: field:crm.case.rule,act_priority:0
 msgid "Set priority to"
-msgstr ""
+msgstr "Postavite priorite"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor2
 msgid "Needs Analysis"
-msgstr ""
+msgstr "Treba analizu"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "Pretraži ptraživanja"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_body:0
 msgid "Mail body"
-msgstr ""
+msgstr "Tijelo Maila"
 
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Upravlja kalendarom sastanaka korisnika"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr ""
+msgstr "Iznos prodaje"
 
 #. module: crm
 #: view:crm.case:0
@@ -1747,12 +1810,12 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Add a CC"
-msgstr ""
+msgstr "Dodaj CC"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1760,28 +1823,28 @@ msgstr ""
 #: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage"
-msgstr ""
+msgstr "Stupanj prodaje"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
 msgid "Mail to watchers (CC)"
-msgstr ""
+msgstr "Pošalji mail nadglednicima kao (CC)"
 
 #. module: crm
 #: view:crm.fundraising:0
 #: view:crm.meeting:0
 msgid "Next Meeting"
-msgstr ""
+msgstr "Slijedeći sastanak"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1790,21 +1853,23 @@ msgid ""
 "No E-Mail ID Found for your Company address or missing reply address in "
 "section!"
 msgstr ""
+"Nije nađen e-amil ID za adresu Vaše tvrtke ili nedostaje mail adresa za "
+"odgovor u grupi!"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "Omogućuje brisanje slučajeva koji nisu u nacrtu"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor7
 msgid "Closed Lost"
-msgstr ""
+msgstr "Zaključen izgubljen"
 
 #. module: crm
 #: field:crm.menu.config_wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Traženje Bugova"
 
 #. module: crm
 #: view:crm.case:0
@@ -1815,7 +1880,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Actions"
-msgstr ""
+msgstr "Radnje"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -1823,69 +1888,69 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
-msgstr ""
+msgstr "Visok"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Pretv u Izglenog Partnera pa u Poslovnog Partnera"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "In Progress Claims"
-msgstr ""
+msgstr "Potraživanja u tijeku"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule
 msgid "Set RRULE"
-msgstr ""
+msgstr "Postavi RRULE"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor4
 msgid "Proposal/Price Quote"
-msgstr ""
+msgstr "Ponuda/Navod cijene"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Delay After Trigger Date:"
-msgstr ""
+msgstr "Odgoda nakon Datuma pokretanja"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
 msgid "Web"
-msgstr ""
+msgstr "Internet"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Campaign Type"
-msgstr ""
+msgstr "Tip kampanje"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr ""
+msgstr "State of Mind Computation"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Greška"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting_generic_wizard
 msgid "crm.meeting.generic_wizard"
-msgstr ""
+msgstr "crm.meeting.generic_wizard"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_history-act
 msgid "Histories"
-msgstr ""
+msgstr "Povijesti"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job1
 msgid "Graduate"
-msgstr ""
+msgstr "Apsolvirati"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
@@ -1894,27 +1959,29 @@ msgid ""
 "Note that you can also use the calendar view to graphically schedule your "
 "next meeting."
 msgstr ""
+"Imajte na umu da možete koristiti pregled kroz kalendar za grafički prikaz "
+"rasporeda Vašeg sljedećeg sastanka."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Tree"
-msgstr ""
+msgstr "Stablo Kontakta"
 
 #. module: crm
 #: field:crm.meeting,caldav_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav URL"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee"
-msgstr ""
+msgstr "Sudionik"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email Fail!"
-msgstr ""
+msgstr "Neuspio mail!"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1922,17 +1989,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Ulazni"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne grupe."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
 msgid "CRM & SRM"
-msgstr ""
+msgstr "CRM i SRM"
 
 #. module: crm
 #: help:crm.menu.config_wizard,document_ics:0
@@ -1940,6 +2007,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Omogućit će Vam da sinhronizirate Oen ERP kalendare s mobitelom, kao i "
+"alikacijama: Outlook, Sunbirs, ical, ..."
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -1947,12 +2016,12 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Year"
-msgstr ""
+msgstr "Ove godine"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
 msgid "Remind Partner"
-msgstr ""
+msgstr "Podsjeti partnera"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -1960,73 +2029,74 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Highest"
-msgstr ""
+msgstr "Najviši"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Ugovorni podaci"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Days"
-msgstr ""
+msgstr "Dani"
 
 #. module: crm
 #: help:crm.menu.config_wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Koriste ga tvrtke za praćenje bugova i obraku zahtjeva korisnika softwarea"
 
 #. module: crm
 #: field:crm.menu.config_wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Dijeljeni kalendar"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Odgovor-na"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
 msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Slučajevi po Kontaktu i Tipu"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minute"
 
 #. module: crm
 #: field:report.crm.case.section.categ2,amount_revenue:0
 #: field:report.crm.case.section.stage,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Procijenjeni prihod"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job1
 msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Početni zahtjev posla"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
 msgid "Maximim Priority"
-msgstr ""
+msgstr "Maksimalni prioritet"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "OPAQUE"
-msgstr ""
+msgstr "PROZIRAN"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claims Info"
-msgstr ""
+msgstr "Podaci potraživanja"
 
 #. module: crm
 #: field:crm.case.category2,name:0
 msgid "Case Category2 Name"
-msgstr ""
+msgstr "Naziv Kategorije2 Slučaja"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2034,29 +2104,29 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Pretvori u priliku"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone2
 #: view:crm.phonecall:0
 msgid "Held"
-msgstr ""
+msgstr "Održan"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Helpdesk potpora"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support4
 #: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Skupljanje sredstava"
 
 #. module: crm
 #: selection:crm.new.send.mail,init,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Nepromijenjen"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2070,7 +2140,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
 msgid "Case State"
-msgstr ""
+msgstr "Stanje Slučaja"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2078,7 +2148,7 @@ msgstr ""
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
-msgstr ""
+msgstr "Poslano"
 
 #. module: crm
 #: field:crm.case,priority:0
@@ -2086,22 +2156,22 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Source"
-msgstr ""
+msgstr "Izvor"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Lokacija"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Način plaćanja"
 
 #. module: crm
 #: help:crm.case.rule,trg_date_range:0
@@ -2110,23 +2180,26 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
+"Odgoda nakon datuma pokretanja, određuje da se može koristiti negativni broj "
+"za postavu odgode prije datuma pokretanja, poput slanja podsjetnika 15 "
+"minuta prije sastanka."
 
 #. module: crm
 #: view:crm.claim:0
 #: view:crm.job:0
 #: view:crm.lead:0
 msgid "Stage: "
-msgstr ""
+msgstr "Supanj "
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Case section"
-msgstr ""
+msgstr "Grupa Slučaja"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Dogovorite uobičajen ili telefonski sastanak"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2137,49 +2210,49 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Greška !"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Fields to Change"
-msgstr ""
+msgstr "Polja za promijeniti"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "Teleprodaja"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
 msgid "Cases Histories"
-msgstr ""
+msgstr "Povijesti slučajeva"
 
 #. module: crm
 #: field:crm.case,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Kreiran"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Information"
-msgstr ""
+msgstr "Podaci Kontakta"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr ""
+msgstr "Segmentacijski niz"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,deadline:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
 #: view:crm.phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Planiran datum"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Sati"
 
 #. module: crm
 #: help:crm.menu.config_wizard,phonecall:0
@@ -2187,21 +2260,23 @@ msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
 msgstr ""
+"Pomaže vam da kodirate rezultat telefonskog poziva ili da planirate popis "
+"telefonskih poziva za obradu."
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
 msgid "Import ICS File"
-msgstr ""
+msgstr "Uvoz ICS datoteke"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee Detail"
-msgstr ""
+msgstr "Detalji o polazniku"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job3
 msgid " > Bac +5"
-msgstr ""
+msgstr " > Bac +5"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -2209,78 +2284,78 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
 msgid "Prospecting"
-msgstr ""
+msgstr "Obrada izglednih stranaka"
 
 #. module: crm
 #: field:crm.case,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Email djelatnika"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
 msgid "Meeting Cases"
-msgstr ""
+msgstr "Sastanci sa Slučajevima"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr ""
+msgstr "Podaci o poslu"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Cancel Meeting"
-msgstr ""
+msgstr "Otkaži sastanak"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
 msgid "Jobs"
-msgstr ""
+msgstr "Polsovi"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_date)s = Creation date"
-msgstr ""
+msgstr "%(case_date)s = Datum kreiranja"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone3
 #: view:crm.phonecall:0
 msgid "Not Held"
-msgstr ""
+msgstr "Nije održano"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_user:0
 msgid "Mail to responsible"
-msgstr ""
+msgstr "Mail odgovornoj osobi"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Poslovi - Obrazac procesa novačenja"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Korektivan"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
 msgid "Opportunity Cases"
-msgstr ""
+msgstr "Slučajevi prilike"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Support Query"
-msgstr ""
+msgstr "Upit potpore"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Template of Email to Send"
-msgstr ""
+msgstr "Predložak Emaila za slanje"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,month:0
@@ -2288,7 +2363,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,month:0
 #: field:report.crm.case.section.stage,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support2
@@ -2298,23 +2373,23 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Kontakti"
 
 #. module: crm
 #: wizard_button:crm.new.send.mail,init,send:0
 #: wizard_button:crm.send.mail,init,send:0
 msgid "Send Email"
-msgstr ""
+msgstr "Pošalji mail"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
 msgid "Set case state to"
-msgstr ""
+msgstr "Postavi stanje Slučaja na"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Kreditna kartica"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2323,27 +2398,29 @@ msgid ""
 "No E-Mail ID Found for the Responsible Partner or missing reply address in "
 "section!"
 msgstr ""
+"Nije nađen e-amil ID za odgovornog Partnera ili nedostaje mail adresa za "
+"odgovor u grupi!"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "Pretraži poslove"
 
 #. module: crm
 #: field:crm.case.history,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Zapis"
 
 #. module: crm
 #: help:crm.menu.config_wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr ""
+msgstr "Ovo može pomoći suradnicima u prikupljanu sredstava o praćenju."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Vrati na Nepotvrđen"
 
 #. module: crm
 #: view:crm.case:0
@@ -2353,12 +2430,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Email nadglednika"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,delay_close:0
@@ -2366,7 +2443,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,delay_close:0
 #: field:report.crm.case.section.stage,delay_close:0
 msgid "Delay Close"
-msgstr ""
+msgstr "Odgodi zaključivanje"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -2374,7 +2451,7 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Low"
-msgstr ""
+msgstr "Nizak"
 
 #. module: crm
 #: field:crm.case,date_closed:0
@@ -2387,23 +2464,23 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Zatvoren"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name2"
-msgstr ""
+msgstr "Ime2 kandidata"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Interni sastanak"
 
 #. module: crm
 #: view:crm.case:0
@@ -2412,7 +2489,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
-msgstr ""
+msgstr "Događaji"
 
 #. module: crm
 #: help:crm.menu.config_wizard,lead:0
@@ -2420,6 +2497,8 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Omogućava praćenje i upravljanje Kontakta koji su pred-prodajni zahtjevi ili "
+"kontakti, to je inicijalni kontakt sa upitom stranke."
 
 #. module: crm
 #: help:crm.case,som:0
@@ -2428,36 +2507,39 @@ msgid ""
 "mentality in relation to our services.The scale hasto be created with a "
 "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
 msgstr ""
+"Stanja uma omogućuju definiranje vrijednosne skale koja predstavlja "
+"Parnerovu percepciju naših usluga. Skala mora biti kreirana tako da podržava "
+"raspon kategorija od 0 (Vrlo nezadovoljan) do 10 (Izuzetno zadovoljan)."
 
 #. module: crm
 #: field:crm.meeting,freebusy:0
 msgid "FreeBusy"
-msgstr ""
+msgstr "SlobodanZauzet"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "sastanak sa Strankom"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
 msgid "Attachment2"
-msgstr ""
+msgstr "Privitak2"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc3:0
 msgid "Attachment3"
-msgstr ""
+msgstr "Privitak3"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Degree"
-msgstr ""
+msgstr "Stupanj"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc1:0
 msgid "Attachment1"
-msgstr ""
+msgstr "Privitak1"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
@@ -2468,7 +2550,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
 msgid "Phone Calls"
-msgstr ""
+msgstr "Telefonski pozivi"
 
 #. module: crm
 #: help:crm.case,active:0
@@ -2476,33 +2558,35 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na TRUE, moći ćete sakriti Slučaj bez da ga "
+"izbrišete."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_menu_config_wizard
 msgid "crm.menu.config_wizard"
-msgstr ""
+msgstr "crm.menu.config_wizard"
 
 #. module: crm
 #: view:crm.case.history:0
 msgid "Case History"
-msgstr ""
+msgstr "Povijest slučaja"
 
 #. module: crm
 #: field:crm.case,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Ček"
 
 #. module: crm
 #: field:crm.case,active:0
 #: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_attach:0
@@ -2510,31 +2594,33 @@ msgid ""
 "Check this if you want that all documents attached to the case be attached "
 "to the reminder email sent."
 msgstr ""
+"Potvrdite ako želite da se svi dokumenti vezani uz slučaj dodaju u privitak "
+"maila podsjetnika."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "Obavezan izraz"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Phone"
-msgstr ""
+msgstr "Telefon kandidata"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "Pošalji mail"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Months"
-msgstr ""
+msgstr "Mjeseci"
 
 #. module: crm
 #: view:crm.claim.assign_wizard:0
@@ -2546,29 +2632,30 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
 msgid "To Assign"
-msgstr ""
+msgstr "Dodijeliti"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "Molim upisati ispravam URL !"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Kada se prepozna pravi projekt / prilika"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
+"Jeste li sigurni da želite kreirati Partnera na osnovi ovog upita za posao ?"
 
 #. module: crm
 #: wizard_field:crm.lead.opportunity_set,create_partner,action:0
 #: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Action"
-msgstr ""
+msgstr "Radnja"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -2579,60 +2666,60 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
-msgstr ""
+msgstr "Potraživanja"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr ""
+msgstr "Umanjiti (0>1)"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
 msgid "History of Events"
-msgstr ""
+msgstr "Povijest događaja"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_category2
 msgid "Category2 of case"
-msgstr ""
+msgstr "Kategorija2 slučaja"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,to:0
 #: wizard_field:crm.send.mail,init,to:0
 msgid "To"
-msgstr ""
+msgstr "Za"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user_email)s = Responsible email"
-msgstr ""
+msgstr "%(case_user_email)s = Email odgovorne osobe"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
 msgid "Sales"
-msgstr ""
+msgstr "Prodaje"
 
 #. module: crm
 #: view:crm.case:0
 #: view:crm.phonecall:0
 msgid "General"
-msgstr ""
+msgstr "Općenit"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Assigned"
-msgstr ""
+msgstr "Dodijeljen"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Recycled"
-msgstr ""
+msgstr "Recikliran"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "Drugi"
 
 #. module: crm
 #: view:crm.case:0
@@ -2642,17 +2729,17 @@ msgstr ""
 #: selection:crm.new.send.mail,init,state:0
 #: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr ""
+msgstr "Maksimalni interval"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
 msgid "All Opportunities"
-msgstr ""
+msgstr "Sve prilike"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2673,12 +2760,12 @@ msgstr ""
 #: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "PUBLIC"
-msgstr ""
+msgstr "JAVAN"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -2686,22 +2773,22 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Već postoji Partner s tim imenom."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "Phonecall Cases"
-msgstr ""
+msgstr "Telefonski pozivi slučajevima"
 
 #. module: crm
 #: help:crm.case.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of case rules."
-msgstr ""
+msgstr "Daje redoslijed kod prikazivanja liste pravila Slučajeva"
 
 #. module: crm
 #: field:crm.menu.config_wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm
 #: field:crm.case,user_id:0
@@ -2717,29 +2804,29 @@ msgstr ""
 #: field:crm.opportunity.assign_wizard,user_id:0
 #: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "Nepravilan"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "Dogovori Sastanak"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Kalendar sastanaka"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Slučajevi prema stupnju i procjeni"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2747,48 +2834,49 @@ msgstr ""
 msgid ""
 "You can not escalate this case.\n"
 "You are already at the top level."
-msgstr ""
+msgstr "Ne možete eskalirati ovaj slučaj. Već ste na najvišoj razini."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Name"
-msgstr ""
+msgstr "Ime Kontakta"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "Opis Radnje/Potraživanja"
 
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "Maksimalna povijest komunikacije"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "Sastanak u cilju kreiranja Kontakta"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
 #: wizard_view:crm.lead.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
 msgstr ""
+"Jeste li sigurni da želite kreirati Partnera na osnovi ovog Kontakta ?"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Odbijeno od strane djelatnika"
 
 #. module: crm
 #: field:crm.case,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Ime djelatnika"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "Prvi razgovor"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -2796,17 +2884,17 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Raspoloživost (tjedni)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "Stablo prilika"
 
 #. module: crm
 #: help:crm.case,state:0
@@ -2819,16 +2907,20 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Stanje je postavljeno na 'Nacrt', kada se stvara Slučaj.\n"
+"Ako je Slučaj je u tijeku Stanje je postavljeno na 'Otvoren'.\n"
+"Kada se Slučaj završi, Stanje je postavljen na \"Gotovo\".\n"
+"Ako slučaj treba biti pregledan, Stanje je postavljeno na 'U tijeku'."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Open Jobs"
-msgstr ""
+msgstr "Otvoreni poslovi"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Email adresa"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2836,130 +2928,132 @@ msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
 msgstr ""
+"Obračun je izvršen na svim događajima koji su se pojavili tijekom ovog "
+"intervala, zadnjih X razdoblja."
 
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "Povezan slučaj"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Radnja poslužitelja"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
 msgid "All Claims"
-msgstr ""
+msgstr "Sva potraživanja"
 
 #. module: crm
 #: field:crm.case.log,user_id:0
 msgid "User Responsible"
-msgstr ""
+msgstr "Odgovorni korisnik"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Email not sent !"
-msgstr ""
+msgstr "Email nije poslan!"
 
 #. module: crm
 #: wizard_field:crm.phonecall.partner_create,init,close:0
 msgid "Close Phonecall"
-msgstr ""
+msgstr "Zaključi poziv"
 
 #. module: crm
 #: field:crm.case,email_last:0
 msgid "Latest E-Mail"
-msgstr ""
+msgstr "Zadnji Email"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Communication History"
-msgstr ""
+msgstr "Regex vezan uz Povijest Komunikacije"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Zahtijevaj Nacrt"
 
 #. module: crm
 #: field:crm.case,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: field:crm.case,log_ids:0
 msgid "Logs History"
-msgstr ""
+msgstr "Povijest zapisa"
 
 #. module: crm
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Sažetak prilike"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Search Case"
-msgstr ""
+msgstr "Pretraži slučaj"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Continue Process"
-msgstr ""
+msgstr "Nastavi Process"
 
 #. module: crm
 #: view:crm.case.history:0
 msgid "Case Description"
-msgstr ""
+msgstr "Opis Slučaja"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Dodijeli"
 
 #. module: crm
 #: field:crm.case,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Posljednja radnja"
 
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
 msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "Slučajevi po Grupi, Kategoriji i Stupnju"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Hired"
-msgstr ""
+msgstr "Kandidat zaposlen"
 
 #. module: crm
 #: field:crm.menu.config_wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Postupak zapošljavanja"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
-msgstr ""
+msgstr "Svi slučajevi"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Partner je već određen ovim Kontaktom"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Source"
-msgstr ""
+msgstr "Izvor Kontakta"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,nbr:0
@@ -2967,76 +3061,76 @@ msgstr ""
 #: field:report.crm.case.section.categ2,nbr:0
 #: field:report.crm.case.section.stage,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# SLučaja"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "PRIVATE"
-msgstr ""
+msgstr "PRIVATE"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Provide path for Remote Calendar"
-msgstr ""
+msgstr "Navedi poveznik na Izdvojeni Kalendar"
 
 #. module: crm
 #: view:crm.segmentation:0
 #: field:crm.segmentation.line,segmentation_id:0
 msgid "Segmentation"
-msgstr ""
+msgstr "Segmentacija"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Obrazac Sredstava"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Pretraži Sastanke"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Stvori novog partnera"
 
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "U postupku"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr ""
+msgstr "U tijeku"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_user)s = Responsible name"
-msgstr ""
+msgstr "%(case_user)s = Ime odgovorne osobe"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Ciljevi"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Type"
-msgstr ""
+msgstr "Slučajevi po Grupi i Tipu"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Post-prodajne usluge"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
@@ -3044,17 +3138,17 @@ msgstr ""
 #: wizard_button:caldav.crm.subscribe,display,end:0
 #: view:crm.email.add.cc:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Ime datoteke"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Pretraži Kontaktove"
 
 #. module: crm
 #: help:crm.case.rule,active:0
@@ -3062,24 +3156,26 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case rule "
 "without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na TRUE, moći ćete sakriti Pravilo Slučaja "
+"bez da ga izbrišete."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Greška !"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim_assign_wizard
 msgid "crm.claim.assign_wizard"
-msgstr ""
+msgstr "crm.claim.assign_wizard"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
 msgid "All Jobs Requests"
-msgstr ""
+msgstr "Svi Zahtjevi za Posao"
 
 #. module: crm
 #: selection:crm.case,state:0
@@ -3091,12 +3187,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazan"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Primijenjen Posao"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -3104,51 +3200,52 @@ msgid ""
 "defines a rule or repeating pattern                                 for "
 "anexception to a recurrence set"
 msgstr ""
+"Određuje pravilo ili ponavljajući obrazac za Iznimku u skupu ponavljanja."
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Relevant"
-msgstr ""
+msgstr "Relevantan"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Ime Prilike"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Uloga prilike"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Uvezi ICS"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Sažetak poziva"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Operator"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_log
 msgid "Case Communication History"
-msgstr ""
+msgstr "Povijest komunikacije Slučaja"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
 msgid "Cases by Opportunities and Type"
-msgstr ""
+msgstr "Slučajevi prema Prilikama i Tipu"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_subject)s = Case subject"
-msgstr ""
+msgstr "%(case_subject)s = subject Slučaj"
 
 #. module: crm
 #: field:crm.case,section_id:0
@@ -3166,33 +3263,33 @@ msgstr ""
 #: field:report.crm.case.section.categ2,section_id:0
 #: field:report.crm.case.section.stage,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Grupa"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
-msgstr ""
+msgstr "Opcijski Izraz"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
-msgstr ""
+msgstr "Društveni oporavak i ruralni razvoj"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "Partner je već određen ovim zahtjevom za posao."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 msgid "New"
-msgstr ""
+msgstr "Novi"
 
 #. module: crm
 #: field:crm.case,description:0
 msgid "Your action"
-msgstr ""
+msgstr "Vaša radnja"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead3
@@ -3200,53 +3297,53 @@ msgstr ""
 #: field:crm.email.add.cc,email:0
 #: view:crm.job:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: crm
 #: field:crm.case,canal_id:0
 #: field:crm.case.log,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Kanal"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
+msgstr "Email-id osoba kojima treba poslati mail"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim
 msgid "Claim Cases"
-msgstr ""
+msgstr "Slučajevi potraživanja - potraživanje Slučaja?"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "E-Mail Reminders (includes the content of the case)"
-msgstr ""
+msgstr "E-mail Podsjetnici (Iključuju sadržaj Slučaja)"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
 msgid "Cases by Leads and Stage"
-msgstr ""
+msgstr "Slučajevi po Kontaktu i Stupnju"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Datum/Vrijeme Iznimke"
 
 #. module: crm
 #: view:crm.meeting.generic_wizard:0
 msgid "Generic Wizard"
-msgstr ""
+msgstr "Osnovni Čarobnjak"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Kreiranje poslovnih prilika iz Kontakata"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanjeć"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3267,94 +3364,94 @@ msgstr ""
 #: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
-msgstr ""
+msgstr "U tijeku"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Istraži Priliku"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Očekivana Plaća"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
 msgid "Send New Mail"
-msgstr ""
+msgstr "Pošalji novi E-mail"
 
 #. module: crm
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Neispravni argumenti"
 
 #. module: crm
 #: field:crm.meeting,transparent:0
 msgid "Trensparent"
-msgstr ""
+msgstr "Transparentan"
 
 #. module: crm
 #: view:crm.case:0
 msgid "My Cases"
-msgstr ""
+msgstr "Moji Slučajevi"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead7
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Word of mouth"
-msgstr ""
+msgstr "Usmena preporuka"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Subject"
-msgstr ""
+msgstr "Kontakt Subjekt"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Pretvori u Priliku"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
 msgid "Planned"
-msgstr ""
+msgstr "Planiran"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet3
 msgid "Customer Office"
-msgstr ""
+msgstr "Ured Stranke"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Email"
-msgstr ""
+msgstr "E-mail kandidata"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage: "
-msgstr ""
+msgstr "Stupanj prodaje "
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of Action"
-msgstr ""
+msgstr "Tip radnje"
 
 #. module: crm
 #: field:crm.case.rule,act_user_id:0
 msgid "Set responsible to"
-msgstr ""
+msgstr "Postavi odgovornost na"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Meeting With Candidates"
-msgstr ""
+msgstr "Sastanak s kandidatima"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3365,6 +3462,11 @@ msgid ""
 "has decreased because he probably bought goods to another supplier. Use this "
 "functionality for recurring businesses."
 msgstr ""
+"Period je prosječan broj dana između dva ciklusa prodaje ili kupnje za ovu "
+"segmentaciju. Uglavnom se koristi za prepoznavanje je li od prethodne kupnje "
+"partnera prošlo previše vremena, tako da pretpostavimo da je njegova "
+"naklonost smanjena jer je vjerojatno u međuvremenu kupovao od drugog "
+"dobavljača. Koristite ovu funkciju kod Partnera koji višestruko kupuju."
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3372,76 +3474,76 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Search Cases by User"
-msgstr ""
+msgstr "Pretraži SLučajeve po Korisniku"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "Uvjet vezan uz Povijest Komunikacije"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_partner:0
 msgid "Mail to partner"
-msgstr ""
+msgstr "Mail Partneru"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Stablo Sredstava"
 
 #. module: crm
 #: field:crm.case.rule,act_method:0
 msgid "Call Object Method"
-msgstr ""
+msgstr "Call Object Method"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
 msgid "All Funds"
-msgstr ""
+msgstr "Sva Sredstva"
 
 #. module: crm
 #: field:crm.case.section,calendar:0
 #: view:crm.meeting:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
 msgid "Calendar"
-msgstr ""
+msgstr "Kalendar"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "Prodavač"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support_help
 msgid "HelpDesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm
 #: field:crm.case,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referenca 2"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr ""
+msgstr "Kupnja po Prodaji"
 
 #. module: crm
 #: view:crm.job:0
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Dogovori Sastanak"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Umjetnost i kultura"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3449,30 +3551,30 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Izlazni"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Historize"
-msgstr ""
+msgstr "Pretvori u povijesni oblik"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđen"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr ""
+msgstr "Zaustavljen"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,probability:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Vjerojatnost uspjeha"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3487,22 +3589,22 @@ msgstr ""
 #: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr ""
+msgstr "Odgoda nakon Datuma pokretanja"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Details"
-msgstr ""
+msgstr "Detalji Kontakta"
 
 #. module: crm
 #: field:crm.case.rule,act_section_id:0
 msgid "Set section to"
-msgstr ""
+msgstr "Postavi grupu na"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3510,7 +3612,7 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
-msgstr ""
+msgstr "Običan"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3518,7 +3620,7 @@ msgstr ""
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
-msgstr ""
+msgstr "Da biste koristili ovu radnju, morate upisati Email Partnera!"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -3527,17 +3629,17 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Trebate provjeriti postoji li već ovaj Partner!"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Qualication"
-msgstr ""
+msgstr "Kvalificiranje"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Change RRule"
-msgstr ""
+msgstr "Promijeni Pravilo"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
@@ -3547,14 +3649,14 @@ msgstr ""
 #: field:report.crm.case.section.categ2,user_id:0
 #: field:report.crm.case.section.stage,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Cases by Section, Category and Type"
-msgstr ""
+msgstr "Slučajevi po Grupi, Kategoriji i Tipu"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3562,17 +3664,17 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
 msgid "Licenced"
-msgstr ""
+msgstr "Licenciran"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Section"
-msgstr ""
+msgstr "ishodna Grupa"
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
@@ -3583,7 +3685,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
 #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Rasporedi Telefonski poziv"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3591,6 +3693,7 @@ msgstr ""
 msgid ""
 "Can not send mail with empty body,you should have description in the body"
 msgstr ""
+"Ne možete poslati mail s praznim tijelom, u okviru tijela mora biti opis"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3598,27 +3701,27 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Ugovor"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Sections"
-msgstr ""
+msgstr "Ishodne Grupe"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Planned revenue"
-msgstr ""
+msgstr "Planirani prihod"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Zdravstvena skrb"
 
 #. module: crm
 #: view:crm.case:0
@@ -3632,98 +3735,98 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
-msgstr ""
+msgstr "Dodijeli"
 
 #. module: crm
 #: field:crm.case,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Osoba Partner"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
 msgid "Office"
-msgstr ""
+msgstr "Ured"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_fundraising
 msgid "Fund Raising Cases"
-msgstr ""
+msgstr "Slučajevi prikupljanja sredstava"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Stupanj Slučaja"
 
 #. module: crm
 #: view:crm.case:0
 #: view:crm.fundraising:0
 #: view:crm.opportunity:0
 msgid "Estimates"
-msgstr ""
+msgstr "Procjene"
 
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Odgovorni korisnik"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
 #, python-format
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk_assign_wizard
 msgid "crm.helpdesk.assign_wizard"
-msgstr ""
+msgstr "crm.helpdesk.assign_wizard"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Case Partner"
-msgstr ""
+msgstr "Uvjeti vezani uz Partnera u okviru Slučaja"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Section Code"
-msgstr ""
+msgstr "Oznaka Grupe"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,date:0
 #: wizard_field:crm.phonecall.meeting_set,init,date:0
 msgid "Meeting date"
-msgstr ""
+msgstr "Datum sastanka"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "CONFIDENTIAL"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Sadržaj maila"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet2
 msgid "Not fixed"
-msgstr ""
+msgstr "Nije fiksno"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead3
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Employee"
-msgstr ""
+msgstr "Zaposlenik"
 
 #. module: crm
 #: field:crm.case,email_from:0
 msgid "Partner Email"
-msgstr ""
+msgstr "Email Partnera"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "% = The '%' Character"
-msgstr ""
+msgstr "% = The '%' Character"
 
 #. module: crm
 #: view:crm.case:0
@@ -3736,7 +3839,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3744,18 +3847,19 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne bilješke"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_user:0
 msgid ""
 "Check this if you want the rule to send a reminder by email to the user."
 msgstr ""
+"Označite želite li postaviti pravilo slanja e-mail podsjetnika korisniku."
 
 #. module: crm
 #: view:crm.case:0
@@ -3767,17 +3871,17 @@ msgstr ""
 #: view:crm.opportunity:0
 #: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "Obavezan / Opcijski"
 
 #. module: crm
 #: wizard_button:caldav.crm.import,init,open:0
 msgid "_Import"
-msgstr ""
+msgstr "-Import"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3794,7 +3898,7 @@ msgstr ""
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
 msgid "Case"
-msgstr ""
+msgstr "Slučaj"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3802,7 +3906,7 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Lowest"
-msgstr ""
+msgstr "Najniži"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3810,19 +3914,19 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Dogovori Sastanak"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Priority Range"
-msgstr ""
+msgstr "Uvjeti koji određuju Raspon Prioriteta"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3830,17 +3934,19 @@ msgid ""
 "If the partner has not purchased (or buied) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"Ako partner nije ostvario kupnju u razdoblju, umanjite procjenu sklonosti za "
+"taj činbenik. Riječ je u multiplikaciji."
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
 #: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "Masovno slanje mailova"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "E-Mail Actions"
-msgstr ""
+msgstr "E-mail Radnje"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,name:0
@@ -3848,22 +3954,22 @@ msgstr ""
 #: field:report.crm.case.section.categ2,name:0
 #: field:report.crm.case.section.stage,name:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Gotovina"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Sredstva po Kategorijama"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Inicijalni kontakt s novom strankom"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3871,83 +3977,83 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet5
 msgid "Future"
-msgstr ""
+msgstr "Budućnost"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "Spremi ICS datoteku"
 
 #. module: crm
 #: wizard_field:caldav.crm.subscribe,init,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Navedi poveznik na Izdvojeni Kalendar"
 
 #. module: crm
 #: view:crm.case.log:0
 msgid "Case logs"
-msgstr ""
+msgstr "Zapisi vezani uz Slučaj"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions on Timing"
-msgstr ""
+msgstr "Uvjeti vremenskog usklađivanja - Timinga"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk
 msgid "Helpdesk Cases"
-msgstr ""
+msgstr "Helpdesk Slučajevi"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_export
 msgid "Export ICS File"
-msgstr ""
+msgstr "Uvoz ICS datoteke"
 
 #. module: crm
 #: field:crm.case.rule,sequence:0
 #: field:crm.case.section,sequence:0
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Slijed"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 #: wizard_field:caldav.crm.import,init,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Odaberi ICS datoteku"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,display:0
 msgid "Import Message"
-msgstr ""
+msgstr "Uvezi poruku"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "Kontrolna varijabla"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act_tree
 msgid "Cases by section"
-msgstr ""
+msgstr "Sučajevi po grupi"
 
 #. module: crm
 #: view:crm.job:0
 msgid "New Jobs"
-msgstr ""
+msgstr "Novi Poslovi"
 
 #. module: crm
 #: field:crm.menu.config_wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Operacije prikupljanja Sredstava"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Newsletter"
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index 77e26792830..e8cc4ebc8d2 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/id.po b/addons/crm/i18n/id.po
index 79a2a831fbe..e74dbbeee17 100644
--- a/addons/crm/i18n/id.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 015f1cf20e3..a537246c568 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index cb20b7830a8..d64b1860f27 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ko.po b/addons/crm/i18n/ko.po
index f14a550b492..8b60dae97da 100644
--- a/addons/crm/i18n/ko.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index d050d4b0484..dc90e38b69f 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/lv.po b/addons/crm/i18n/lv.po
index 4201e5a4c66..25315787c0d 100644
--- a/addons/crm/i18n/lv.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index e2fe779bc3e..99a3fe310a6 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index 2b3e650e50a..91fd752e0fd 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 80fbd8c2dbd..8e11ab2c781 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 5e7ca6bdbf7..73e9eded2ba 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 1ac11bb8717..f34b010d995 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ro.po b/addons/crm/i18n/ro.po
index 522baecc3e6..2eece148a39 100644
--- a/addons/crm/i18n/ro.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 9022aa5b4a7..d20e5a714a1 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index 34028028949..29a95a09f36 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po
index 98725d46b93..722c0ef5fd6 100644
--- a/addons/crm/i18n/sl.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 5ab9a2dd5c7..f0021b004b3 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
 "PO-Revision-Date: 2010-02-21 19:17+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/tlh.po b/addons/crm/i18n/tlh.po
index 4dd18d1bb5a..a4ab5b8708e 100644
--- a/addons/crm/i18n/tlh.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 2c05e9a7852..da68aa13c15 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/uk.po b/addons/crm/i18n/uk.po
index 01a7fb3863e..47ec25200b6 100644
--- a/addons/crm/i18n/uk.po
+++ b/addons/crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 2afcf6857dd..bcce5100fb9 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-01-10 02:19+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-29 13:14+0000\n"
+"Last-Translator: darkblue <darkblue086@yahoo.com.cn>\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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -220,7 +220,7 @@ msgstr "业务伙伴"
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr "案例分部"
+msgstr "案例组"
 
 #. module: crm
 #: view:crm.job:0
@@ -522,7 +522,7 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #. module: crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中无效的模型名"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2769,7 +2769,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr "最大通讯记录"
+msgstr "最大通信日志"
 
 #. module: crm
 #: view:crm.lead:0
@@ -4090,3 +4090,18 @@ msgstr ""
 
 #~ msgid "Update The Proposed Menus To Be Created"
 #~ msgstr "更新创建的被提议的菜单"
+
+#~ msgid "Excluded Answers :"
+#~ msgstr "排除的答案:"
+
+#~ msgid "Profiling"
+#~ msgstr "轮廓"
+
+#~ msgid "Profiling Options"
+#~ msgstr "轮廓选项"
+
+#~ msgid "Included Answers :"
+#~ msgstr "包括回答:"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr "计算开始时间+持续时间"
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index 10c3c671083..7630146235b 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py
index c93c51dd742..7030c43cfe2 100644
--- a/addons/crm/report/__init__.py
+++ b/addons/crm/report/__init__.py
@@ -26,6 +26,7 @@ import crm_lead_report
 import crm_phonecall_report
 import crm_fundraising_report
 import crm_opportunity_report
+import crm_helpdesk_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/report/crm_helpdesk_report.py b/addons/crm/report/crm_helpdesk_report.py
new file mode 100644
index 00000000000..7a855378d19
--- /dev/null
+++ b/addons/crm/report/crm_helpdesk_report.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields,osv
+import tools
+
+class crm_helpdesk_report(osv.osv):
+    _name = "crm.helpdesk.report"
+    _description = "Helpdesk report after Sales Services"
+    _auto = False
+    _inherit = "crm.case.report"
+    _columns = {
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner' ,readonly=True),
+        'company_id': fields.many2one('res.company','Company',readonly=True),
+        'date_deadline': fields.date('Deadline'),
+        'priority': fields.selection([('5','Lowest'),('4','Low'),('3','Normal'),('2','High'),('1','Highest')], 'Priority'),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'crm_helpdesk_report')
+        cr.execute("""
+            create or replace view crm_helpdesk_report as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    c.partner_id,
+                    c.company_id,
+                    c.priority,
+                    c.date_deadline,
+                    count(*) as nbr,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_helpdesk c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.priority, c.partner_id,c.company_id,c.date_deadline
+            )""")
+crm_helpdesk_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml
new file mode 100644
index 00000000000..06a69333bd7
--- /dev/null
+++ b/addons/crm/report/crm_helpdesk_report_view.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Helpdesk report after Sales Services
+	-->
+
+        <record id="view_report_crm_helpdesk_tree" model="ir.ui.view">
+            <field name="name">crm.helpdesk.report.tree</field>
+            <field name="model">crm.helpdesk.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+               <tree string="Helpdesk">
+					<field name="name" />
+					<field name="month"/>
+					<field name="section_id" />
+                    <field name="user_id" />
+                    <field name="company_id"/>
+                    <field name="partner_id" />
+                    <field name="date_deadline" invisible="1"/>
+                    <field name="priority" invisible="1"/>
+					<field name="nbr" string="#Helpdesk" />
+	                <field name="delay_close"/>
+                    <field name="state" invisible="1"/>
+				</tree>
+            </field>
+        </record>
+        <record id="view_report_crm_helpdesk_form" model="ir.ui.view">
+            <field name="name">crm.helpdesk.report.form</field>
+            <field name="model">crm.helpdesk.report</field>
+            <field name="inherit_id" ref="view_crm_case_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_report_crm_helpdesk_graph" model="ir.ui.view">
+            <field name="name">crm.helpdesk.report.graph</field>
+            <field name="model">crm.helpdesk.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Helpdesk" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_crm_helpdesk_filter" model="ir.ui.view">
+            <field name="name">crm.helpdesk.report.select</field>
+            <field name="model">crm.helpdesk.report</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search">
+                  <group col="16" colspan="9">
+                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" default="1" />
+						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
+                        <separator orientation="vertical"/>
+						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
+						<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
+						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
+						<filter string="Deadline" icon="terp-hr" domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]"/>
+						<separator orientation="vertical"/>
+						<field name="section_id" default="context.get('section_id', False)" widget="selection"
+                    				context="{'invisible_section': False}">
+                   		 <filter icon="terp-crm"
+                        context="{'invisible_section': False}"
+                        domain="[('section_id.user_id','=',uid)]"
+                        help="My section"/>
+                        </field>
+                          <field name="company_id" widget="selection">
+                           <filter icon="terp-crm"
+                        context="{'invisible_section': False}"
+                        domain="[('section_id.user_id.company_id','=',uid)]"
+                        help="My company"/>
+                        </field>
+                         <field name="user_id" widget="selection"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Extended options..." colspan="4" col="5">
+                        <filter icon="terp-sale"
+                    		string="Lowest"
+                    		domain="[('priority','=','5')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Low"
+                    		domain="[('priority','=','4')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Normal"
+                    		domain="[('priority','=','3')]"/>
+                    	<filter icon="terp-sale"
+                    		string="High"
+                    		domain="[('priority','=','2')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Highest"
+                    		domain="[('priority','=','1')]"/>
+
+                   </group>
+                   <newline/>
+                  <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}" default="1" />
+                        <filter string="Company" icon="terp-sale" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Section" icon="terp-sale" domain="[]" context="{'group_by':'section_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                    	<separator orientation="vertical"/>
+                    	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
+                    	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
+
+                   </group>
+               </search>
+            </field>
+        </record>
+        <record id="action_report_crm_helpdesk" model="ir.actions.act_window">
+            <field name="name">Helpdesk</field>
+            <field name="res_model">crm.helpdesk.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
+            <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
+        </record>
+
+       	<record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
+	        <field name="act_window_id" ref="action_report_crm_helpdesk"/>
+	    </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_graph">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">graph</field>
+	        <field name="view_id" ref="view_report_crm_helpdesk_graph"/>
+	        <field name="act_window_id" ref="action_report_crm_helpdesk"/>
+	    </record>
+
+        <menuitem name="Helpdesk" action="action_report_crm_helpdesk" id="menu_report_crm_helpdesks_tree" parent="base.next_id_64"/>
+
+  </data>
+</openerp>
+
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index 7427fe64588..aa5eadde787 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>       
+    <data>
 
         <record id="view_crm_case_tree" model="ir.ui.view">
             <field name="name">crm.case.report.tree</field>
@@ -56,11 +56,11 @@
                   <group col="16" colspan="8">
                    		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" default="1" />
 						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
-                        <separator orientation="vertical"/>	
+                        <separator orientation="vertical"/>
 						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
 						<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
 						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
-						<separator orientation="vertical"/>	
+						<separator orientation="vertical"/>
 						<field name="section_id" default="context.get('section_id', False)" widget="selection"
                     				context="{'invisible_section': False}">
                    		 <filter icon="terp-crm"
@@ -74,7 +74,9 @@
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
-                         <field name="user_id" widget="selection"/>
+                      	<field name="user_id" select="1" widget="selection">
+	            			<filter icon="terp-crm" string="My Task" domain="[('user_id','=',uid)]" />
+               			</field>
                    </group>
                    <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="8">
@@ -87,12 +89,12 @@
                     	 <separator orientation="vertical"/>
                     	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
                     	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
-                    	
+
                    </group>
                </search>
             </field>
         </record>
-	    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>        
+	    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
 
 
         <record id="action_report_crm_case_tree" model="ir.actions.act_window">
@@ -112,7 +114,7 @@
 
         <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_categ" name="Monthly cases by section" res_model="crm.case.report" src_model="crm.case.section"/>
 
-        
+
 
 
         <!-- Closed & Open CRM Case view for Random Activities dashboard  -->
@@ -162,6 +164,6 @@
 	    	<field name="view_id" ref="board_view_crm_case_open_dashboard_tree"/>
 	    	<field name="domain">[('state','=','open')]</field>
     	</record>
-	
+
     </data>
 </openerp>
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 22264710fcf..76a9f9bfeaf 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #    
@@ -30,17 +31,10 @@ import binascii
 import time, socket
 
 
-email_re = re.compile(r"""
-    ([a-zA-Z][\w\.-]*[a-zA-Z0-9]     # username part
-    @                                # mandatory @ sign
-    [a-zA-Z0-9][\w\.-]*              # domain must start with a letter ... Ged> why do we include a 0-9 then?
-     \.
-     [a-z]{2,3}                      # TLD
-    )
-    """, re.VERBOSE)
+email_re = re.compile(r"([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6})")
 case_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
 command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
-reference_re = re.compile("<.*-tinycrm-(\\d+)@(.*)>", re.UNICODE)
+reference_re = re.compile("<.*-openobject-(\\d+)@(.*)>", re.UNICODE)
 
 priorities = {
     '1': '1 (Highest)', 
@@ -124,7 +118,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
             html += '\n\n'
         html += '[%s] %s\n' % (i+1, url)       
     return html
-    
+
 class rpc_proxy(object):
     def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='terp'):        
         self.rpc = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/%s' % (host, port, path))
@@ -163,30 +157,41 @@ class email_parser(object):
             'partner_id': adr[0].get('partner_id', False) and adr[0]['partner_id'][0] or False
         }
 
+    def _to_decode(self, s, charsets):
+       for charset in charsets:
+           if charset:
+               try:
+                   return s.decode(charset)
+               except UnicodeError:  
+                    pass         
+       try:
+           return s.decode('ascii')
+       except UnicodeError:
+           return s 
+
     def _decode_header(self, s):
         from email.Header import decode_header
-        s = decode_header(s)
-        return ''.join(map(lambda x:x[0].decode(x[1] or 'ascii', 'replace'), s))
+        s = decode_header(s)        
+        return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s))
 
     def msg_new(self, msg):
         message = self.msg_body_get(msg)
+        msg_subject = self._decode_header(msg['Subject'])
+        msg_from = self._decode_header(msg['From'])
+        msg_cc = self._decode_header(msg['Cc'] or '')
+        
         data = {
-            'name': self._decode_header(msg['Subject']), 
-            'email_from': self._decode_header(msg['From']), 
-            'email_cc': self._decode_header(msg['Cc'] or ''), 
-            'canal_id': self.canal_id, 
+            'name': msg_subject, 
+            'email_from': msg_from, 
+            'email_cc': msg_cc,             
             'user_id': False, 
             'description': message['body'], 
         }
-        try:
-            data.update(self.partner_get(self._decode_header(msg['From'])))
-        except Exception, e:
-            import netsvc
-            netsvc.Logger().notifyChannel('mailgate', netsvc.LOG_ERROR, "%s" % e)
+        data.update(self.partner_get(msg_from))
 
         try:
             id = self.rpc(self.model, 'create', data)
-            self.rpc(self.model, 'history', [id], 'Receive', True, msg['From'], message['body'])
+            self.rpc(self.model, 'history', [id], 'Receive', True, False, message['body'], msg['From'])
             #self.rpc(self.model, 'case_open', [id])
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
@@ -216,7 +221,7 @@ class email_parser(object):
 #                       'file_name':'file data',
 #                   }
 #   }
-#   #
+
     def msg_body_get(self, msg):
         message = {};
         message['body'] = '';
@@ -225,7 +230,7 @@ class email_parser(object):
         counter = 1;
         def replace(match):
             return ''
-            
+
         for part in msg.walk():
             if part.get_content_maintype() == 'multipart':
                 continue
@@ -233,7 +238,7 @@ class email_parser(object):
             if part.get_content_maintype()=='text':
                 buf = part.get_payload(decode=True)
                 if buf:
-                    txt = buf.decode(part.get_charsets()[0] or 'ascii', 'replace')
+                    txt = self._to_decode(buf, part.get_charsets())
                     txt = re.sub("<(\w)>", replace, txt)
                     txt = re.sub("<\/(\w)>", replace, txt)
                 if txt and part.get_content_subtype() == 'plain':
@@ -258,7 +263,6 @@ class email_parser(object):
             message['attachment'] = attachment
         #end for        
         return message
-    #end def
 
     def msg_user(self, msg, id):
         body = self.msg_body_get(msg)
@@ -275,7 +279,7 @@ class email_parser(object):
         body['body'] = body_data
 
         data = {
-            'description': body['body'], 
+#            'description': body['body'],
         }
         act = 'case_pending'
         if 'state' in actions:
@@ -302,7 +306,7 @@ class email_parser(object):
 
         self.rpc(self.model, act, [id])
         self.rpc(self.model, 'write', [id], data)
-        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
+        self.rpc(self.model, 'history', [id], 'Receive', True, False, body['body'], msg['From'])
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -329,17 +333,21 @@ class email_parser(object):
         body = message['body']
         act = 'case_open'
         self.rpc(self.model, act, [id])
-        body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
-        data = {
-            'description':body, 
-        }
-        self.rpc(self.model, 'write', [id], data)
-        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
+        #body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
+        #data = {
+        #    'description':body, 
+        #}
+        #self.rpc(self.model, 'write', [id], data)
+        self.rpc(self.model, 'history', [id], 'Receive', True, False, message['body'], msg['From'])
         return id
 
     def msg_test(self, msg, case_str):
         if not case_str:
             return (False, False)
+        res = self.rpc(self.model, 'search', [('id', '=', int(case_str))])        
+        if not res:
+            return (False, False)
+        
         emails = self.rpc(self.model, 'emails_get', int(case_str))
         return (int(case_str), emails)
 
@@ -348,9 +356,9 @@ class email_parser(object):
         if case_str:
             case_str = case_str.group(1)
         else:
-            case_str = case_re.search(msg.get('Subject', ''))
+            case_str = case_re.search(msg.get('Subject', ''))            
             if case_str:
-                case_str = case_str.group(1)
+                case_str = case_str.group(1)            
         (case_id, emails) = self.msg_test(msg, case_str)
         if case_id:
             if emails[0] and self.email_get(emails[0])==self.email_get(self._decode_header(msg['From'])):
@@ -363,7 +371,7 @@ class email_parser(object):
             if msg.get('Subject', ''):
                 del msg['Subject']
             msg['Subject'] = '['+str(case_id)+'] '+subject
-            msg['Message-Id'] = '<'+str(time.time())+'-tinycrm-'+str(case_id)+'@'+socket.gethostname()+'>'
+            msg['Message-Id'] = '<'+str(time.time())+'-openerpcrm-'+str(case_id)+'@'+socket.gethostname()+'>'
 
         emails = self.rpc(self.model, 'emails_get', case_id)
         priority = emails[3]
@@ -386,9 +394,7 @@ class email_parser(object):
 
 if __name__ == '__main__':
     import sys, optparse
-    parser = optparse.OptionParser(
-        usage='usage: %prog [options]', 
-        version='%prog v1.0')
+    parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
     group = optparse.OptionGroup(parser, "Note", 
         "This program parse a mail from standard input and communicate "
         "with the Open ERP server for case management in the CRM module.")
@@ -408,10 +414,6 @@ if __name__ == '__main__':
 
     msg_txt = email.message_from_file(sys.stdin)
 
-    try :
-        parser.parse(msg_txt)
-    except Exception, e:
-        if getattr(e, 'faultCode', '') and 'Connection unexpectedly closed' in e.faultCode:
-            print e
+    parser.parse(msg_txt)
  
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index c3888951d4c..b6c7b0e8735 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -32,4 +32,4 @@
 "access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
 "access_crm_opportunity_report_user","crm.opportunity.report","model_crm_opportunity_report","crm.group_crm_user",1,0,0,0
 "access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0
-
+"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,0,0,0
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 62be2041d98..405bd46076b 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -23,8 +23,7 @@ import crm_opportunity_wizard
 import crm_lead_wizard
 import crm_phonecall_wizard
 
-import wizard_crm_send_email
-import wizard_crm_new_send_email
+import crm_send_email
 import wizard_history_event
 
 
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
new file mode 100644
index 00000000000..1f1e12d2b85
--- /dev/null
+++ b/addons/crm/wizard/crm_send_email.py
@@ -0,0 +1,215 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+import base64
+import tools
+from crm import crm
+
+class crm_send_new_email(osv.osv_memory):
+    """ Sends new email for the case"""
+    _name = "crm.send.mail"
+    _description = "Case Send new email"
+
+    _columns = {
+                'email_to' : fields.char('To', size=64, required=True),
+                'email_from' : fields.char('From', size=64, required=True),
+                'email_cc' : fields.char('CC', size=128),
+                'subject': fields.char('Subject', size=128, required=True),
+                'text': fields.text('Message', required=True),
+                'state': fields.selection(crm.AVAILABLE_STATES, string='State'),
+                'doc1': fields.binary("Attachment1"),
+                'doc2': fields.binary("Attachment2"),
+                'doc3': fields.binary("Attachment3"),
+                }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """ Closes Phonecall to Opportunity form
+        """
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_send(self, cr, uid, ids, context=None):
+        """ This sends an email to ALL the addresses of the selected partners.
+        """
+        if not context:
+            context = {}
+
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+
+        model = context.get('model')
+        case_pool = self.pool.get(model)
+        res_id = context and context.get('active_id', False) or False
+
+        for data in self.read(cr, uid, ids, context=context):
+            attach = filter(lambda x: x, [data['doc1'], data['doc2'], data['doc3']])
+            attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
+
+            if context.get('mail', 'new') == 'new':
+                case = case_pool.browse(cr, uid, res_id)
+            else:
+                hist_obj = self.pool.get('crm.case.history')
+                hist = hist_obj.browse(cr, uid, res_id)
+                model = hist.log_id.model_id.model
+                model_pool = self.pool.get(model)
+                case = model_pool.browse(cr, uid, hist.log_id.res_id)
+            emails = [data['email_to']] + (data['email_cc'] or '').split(',')
+            emails = filter(None, emails)
+            body = data['text']
+
+            if case.user_id.signature:
+                body += '\n\n%s' % (case.user_id.signature)
+            body = case_pool.format_body(body)
+            email_from = data.get('email_from', False)
+            case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from)
+            
+            flag = tools.email_send(
+                email_from,
+                emails,
+                data['subject'],
+                body,
+                attach=attach,
+                reply_to=case.section_id.reply_to,
+                openobject_id=str(case.id),
+            )
+            if flag:                
+                if data['state'] == 'unchanged':
+                    pass
+                elif data['state'] == 'done':
+                    case_pool.case_close(cr, uid, [case.id])
+                elif data['state'] == 'draft':
+                    case_pool.case_reset(cr, uid, [case.id])                
+                elif data['state'] in ['cancel', 'open', 'pending']:
+                    act = 'case_' + data['state']
+                    getattr(case_pool, act)(cr, uid, [case.id])
+                cr.commit()
+
+#            Commented because form does not close due to raise
+#                raise osv.except_osv(_('Email!'), ("Email Successfully Sent"))
+#            else:
+#                raise osv.except_osv(_('Warning!'), _("Email not sent !"))
+
+        return {}
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        """
+        if not context:
+            context = {}
+
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+
+        res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
+
+        if context.get('mail') == 'reply':
+            res.update(self.get_reply_defaults(cr, uid, fields, context=context))
+            return res
+
+        model = context.get('model')
+        mod_obj = self.pool.get(model)
+        res_id = context and context.get('active_ids', []) or []
+
+        for case in mod_obj.browse(cr, uid, res_id):
+            if 'email_to' in fields:
+                res.update({'email_to': case.email_from})
+            if 'email_from' in fields:
+                res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
+                            (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from',False)})
+            if 'subject' in fields:
+                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) 
+            if 'email_cc' in fields:
+                res.update({'email_cc': case.email_cc or ''})
+            if 'text' in fields:
+                res.update({'text': case.description or ''})
+            if 'state' in fields:
+                res.update({'state': 'pending'})
+        return res
+
+    def get_reply_defaults(self, cr, uid, fields, context=None):
+        """
+        This function gets default values for reply mail
+        """
+        hist_obj = self.pool.get('crm.case.history')
+        res_ids = context and context.get('active_ids', []) or []
+        res = {}
+        for hist in hist_obj.browse(cr, uid, res_ids):
+            model = hist.log_id.model_id.model
+            model_pool = self.pool.get(model)
+            case = model_pool.browse(cr, uid, hist.log_id.res_id)
+            if 'email_to' in fields:
+                res.update({'email_to': case.email_from or hist.email_from or False})
+            if 'email_from' in fields:
+                res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
+                            (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)})
+            if 'text' in fields:
+                header = '-------- Original Message --------'                
+                sender = 'From: %s' %(hist.email_from or '')                
+                to = 'To: %s' % (hist.email_to or '')
+                sentdate = 'Date: %s' % (hist.date)
+                desc = '\n%s'%(hist.description)
+                original = [header, sender, to, sentdate, desc]
+                original = '\n'.join(original)
+                res['text']=original
+            if 'subject' in fields:
+                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) 
+            if 'state' in fields:
+                res['state']='pending'
+        return res
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @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 fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        if not context:
+            context = {}
+
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+        model = context.get('model')
+        mod_obj = self.pool.get(model)
+        if context.get('mail') == 'reply':
+            return True
+        if tools.config.get('email_from'):
+            return True
+
+        for case in mod_obj.browse(cr, uid, context.get('active_ids', [])):
+            if not case.user_id:
+                raise osv.except_osv(_('Error'), _('You must define a responsible user for this case in order to use this action!'))
+            if not case.user_id.address_id.email:
+                raise osv.except_osv(_('Warning!'), _("Please specify user's email address !"))
+
+        return True
+
+crm_send_new_email()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
new file mode 100644
index 00000000000..55769455a2a
--- /dev/null
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+<!-- Send New Mail view -->
+    
+        <record model="ir.ui.view" id="crm_send_mail_view">
+            <field name="name">crm.send.mail.form</field>
+            <field name="model">crm.send.mail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send Mail" col="2">
+                    <field name="email_from" />
+                	<field name="email_to" />
+                	<field name="email_cc" />
+                	<field name="subject" />                	
+                	<field name="doc1" />
+                	<field name="doc2" />
+                	<field name="doc3" />
+                    <separator string="" colspan="4"/>
+                    <field name="text" nolabel="1" colspan="4"/>
+                	<separator colspan="4" string="Set case state to" />
+                	<field name="state" />
+                	<separator string=" " colspan="4"/>
+                    <group colspan="4" col="3" >
+                    	<label string=" " />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Send New Mail action -->
+
+        <record model="ir.actions.act_window" id="action_crm_send_mail">
+            <field name="name">Send Mail</field>
+            <field name="res_model">crm.send.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_send_mail_view"/>
+            <field name="target">new</field>
+        </record>	
+    </data>
+</openerp>   
diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
deleted file mode 100644
index 0114ac9408f..00000000000
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ /dev/null
@@ -1,139 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import tools
-import base64
-from tools.translate import _
-
-
-email_send_form = '''<?xml version="1.0"?>
-<form string="Mass Mailing">
-    <field name="to"/>
-    <newline/>
-    <field name="cc"/>
-    <newline/>
-    <field name="subject"/>
-    <newline/>
-    <field name="text" />
-    <newline/>
-    <field name="doc1" />
-    <newline/>
-    <field name="doc2" />
-    <newline/>
-    <field name="doc3" />
-    <separator colspan="4" string="Set case state to"/>
-    <newline/>
-    <field name="state" />
-</form>'''
-
-email_send_fields = {
-    'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
-    'cc': {'string':"CC", 'type':'char', 'size':128,},
-    'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True},
-    'state':{'string':'State', 'type':'selection', 'selection':[('done','Done'),('pending','Pending'),('unchanged','Unchanged')]},
-    'doc1' :  {'string':"Attachment1", 'type':'binary'},
-    'doc2' :  {'string':"Attachment2", 'type':'binary'},
-    'doc3' :  {'string':"Attachment3", 'type':'binary'},
-    'state' :  {'string':"Set State to", 'type':'selection', 'required' : True, 'default' :'done',\
-                    'selection': [('unchanged','Unchanged'),('done','Done'),('pending','Pending')]},
-}
-
-# this sends an email to ALL the addresses of the selected partners.
-def _mass_mail_send(self, cr, uid, data, context):
-    attach = filter(lambda x: x, [data['form']['doc1'],  data['form']['doc2'],  data['form']['doc3']])
-    attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
-
-    pool = pooler.get_pool(cr.dbname)
-    case_pool=pool.get(data.get('model'))
-
-    case = case_pool.browse(cr,uid,data['ids'])[0]
-    case_pool.write(cr, uid, [case.id], {
-                'som': False,
-                'canal_id': False,
-                })
-    emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
-    emails = filter(None, emails)
-    body = data['form']['text']
-    if case.user_id.signature:
-        body += '\n\n%s' % (case.user_id.signature)
-    case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['form']['to'], details=body)
-    flag = tools.email_send(
-        case.user_id.address_id.email,
-        emails,
-        data['form']['subject'],
-        case_pool.format_body(body),
-        attach=attach,
-        reply_to=case.section_id.reply_to,
-        openobject_id=str(case.id), 
-        subtype="html"
-    )
-    if flag:
-        if data['form']['state'] == 'unchanged':
-            pass
-        elif data['form']['state'] == 'done':
-            case_pool.case_close(cr, uid, data['ids'])
-        elif data['form']['state'] == 'pending':
-            case_pool.case_pending(cr, uid, data['ids'])
-        cr.commit()
-        raise wizard.except_wizard(_('Email!'),("Email Successfully Sent"))
-    else:
-        raise wizard.except_wizard(_('Warning!'),_("Email not sent !"))
-    return {}
-
-def _get_info(self, cr, uid, data, context):
-    if not data['id']:
-        return {}
-        
-    pool = pooler.get_pool(cr.dbname)
-    case = pool.get(data.get('model')).browse(cr, uid, data['id'])
-    if not case.user_id:
-        raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
-    if not case.user_id.address_id.email:
-        raise wizard.except_wizard(_('Warning!'),_("Please specify user's email address !"))
-        
-    return {
-        'to': case.email_from, 
-        'subject': case.name, 
-        'cc': case.email_cc or ''
-    }
-    
-class wizard_send_mail(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_info],
-            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel','gtk-cancel'), ('send','Send Email','gtk-go-forward')]}
-        },
-        'send': {
-            'actions': [_mass_mail_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wizard_send_mail('crm.new.send.mail')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm/wizard/wizard_crm_send_email.py b/addons/crm/wizard/wizard_crm_send_email.py
deleted file mode 100644
index d6b3732d5e7..00000000000
--- a/addons/crm/wizard/wizard_crm_send_email.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import tools
-from tools.translate import _
-
-
-email_send_form = '''<?xml version="1.0"?>
-<form string="Mass Mailing">
-    <field name="to"/>
-    <newline/>
-    <field name="cc"/>
-    <newline/>
-    <field name="subject"/>
-    <newline/>
-    <field name="text" />
-</form>'''
-
-email_send_fields = {
-    'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
-    'cc': {'string':"CC", 'type':'char', 'size':128,},
-    'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True}
-}
-
-# this sends an email to ALL the addresses of the selected partners.
-def _mass_mail_send(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-
-    hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
-    model = hist_obj.log_id.model_id.model
-    model_pool = pool.get(model)
-    case = model_pool.browse(cr, uid, hist_obj.log_id.res_id)
-    model_pool._history(cr, uid, [case], _('Send'), history=True, email=False)
-    model_pool.write(cr, uid, [case.id], {
-                'som': False,
-                'canal_id': False,
-                })
-    emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
-    emails = filter(None, emails)
-    body = data['form']['text']
-    if case.user_id.signature:
-        body += '\n\n%s' % (case.user_id.signature)
-    tools.email_send(
-        case.user_id.address_id.email,
-        emails,
-        data['form']['subject'],
-        model_pool.format_body(body),
-        reply_to=case.section_id.reply_to,
-        openobject_id=str(case.id), 
-        subtype="html"
-    )
-    return {}
-
-def _get_info(self, cr, uid, data, context):
-    if not data['id']:
-        raise wizard.except_wizard(_('Error'),_('There is no mail to reply!'))
-    pool = pooler.get_pool(cr.dbname)
-    hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
-    model = hist_obj.log_id.model_id.model
-    model_pool = pool.get(model)
-    case = model_pool.browse(cr, uid, hist_obj.log_id.res_id)
-    if not case.email_from:
-        raise wizard.except_wizard(_('Error'),_('You must put a Partner eMail to use this action!'))
-    if not case.user_id:
-        raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
-    return {'to': case.email_from,'subject': '['+str(case.id)+'] '+case.name,'cc': case.email_cc or '', 'text': '> ' + hist_obj.description.replace('\n','\n> ')}
-    
-class wizard_send_mail(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_info],
-            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel','gtk-cancel'), ('send','Send Email','gtk-go-forward')]}
-        },
-        'send': {
-            'actions': [_mass_mail_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wizard_send_mail('crm.send.mail')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 7e70df3dc4a..dc019f9a4be 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -243,10 +243,8 @@ class crm_segmentation(osv.osv):
 
             for partner_id in partners:
                 cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
-            cr.commit()
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
-            cr.commit()
         return True
 
 crm_segmentation()
diff --git a/addons/crm_profiling/i18n/ar.po b/addons/crm_profiling/i18n/ar.po
index 74eda383b73..ad0c98e9ce9 100644
--- a/addons/crm_profiling/i18n/ar.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/bg.po b/addons/crm_profiling/i18n/bg.po
index 58f189380de..64a1a506cf6 100644
--- a/addons/crm_profiling/i18n/bg.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/bs.po b/addons/crm_profiling/i18n/bs.po
index a272976bc75..8e1913ed12b 100644
--- a/addons/crm_profiling/i18n/bs.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/ca.po b/addons/crm_profiling/i18n/ca.po
index 5a4789ce4ef..e3b51393cb6 100644
--- a/addons/crm_profiling/i18n/ca.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/cs.po b/addons/crm_profiling/i18n/cs.po
index 74eda383b73..ad0c98e9ce9 100644
--- a/addons/crm_profiling/i18n/cs.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index 85d21e11c60..e6eda33972f 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/el.po b/addons/crm_profiling/i18n/el.po
index d058e4ba0f5..e2d2748bdd0 100644
--- a/addons/crm_profiling/i18n/el.po
+++ b/addons/crm_profiling/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/crm_profiling/i18n/es.po b/addons/crm_profiling/i18n/es.po
index d2d014632e1..06962cd6dd5 100644
--- a/addons/crm_profiling/i18n/es.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/es_AR.po b/addons/crm_profiling/i18n/es_AR.po
index 0ed1fc5b5dd..413401841f1 100644
--- a/addons/crm_profiling/i18n/es_AR.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/et.po b/addons/crm_profiling/i18n/et.po
index a0929afdc4c..bc8d3650c14 100644
--- a/addons/crm_profiling/i18n/et.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/fr.po b/addons/crm_profiling/i18n/fr.po
index 455612cfb1a..0e82531d2b9 100644
--- a/addons/crm_profiling/i18n/fr.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/hr.po b/addons/crm_profiling/i18n/hr.po
index 74eda383b73..9dc75a158f0 100644
--- a/addons/crm_profiling/i18n/hr.po
+++ b/addons/crm_profiling/i18n/hr.po
@@ -1,131 +1,132 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* crm_profiling
-#
+# * crm_profiling
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 00:55+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: crm_profiling
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Ime Objekta mora početi s x_ i ne smije sadržavati posebne znakove"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
 #: field:crm_profiling.question,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_question
 msgid "Question"
-msgstr ""
+msgstr "Pitanje"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,open:0
 msgid "Open Questionnaire"
-msgstr ""
+msgstr "Otvori Upitnik"
 
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr ""
+msgstr "Ishodni profili"
 
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
 msgid "crm_profiling management"
-msgstr ""
+msgstr "crm_profiling upravljanje"
 
 #. module: crm_profiling
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_answer
 msgid "Answer"
-msgstr ""
+msgstr "Odgovor"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr ""
+msgstr "Profiliranje"
 
 #. module: crm_profiling
 #: field:crm_profiling.questionnaire,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: crm_profiling
 #: field:crm.segmentation,answer_no:0
 msgid "Excluded Answers"
-msgstr ""
+msgstr "Isključeni Odgovori"
 
 #. module: crm_profiling
 #: view:crm_profiling.answer:0
 #: view:crm_profiling.question:0
 #: field:res.partner,answers_ids:0
 msgid "Answers"
-msgstr ""
+msgstr "Odgovori"
 
 #. module: crm_profiling
 #: wizard_field:open_questionnaire,init,questionnaire_name:0
 msgid "Questionnaire name"
-msgstr ""
+msgstr "Ime Upitnka"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Use a questionnaire"
-msgstr ""
+msgstr "Koristi Upitnik"
 
 #. module: crm_profiling
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
 #: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
 #: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
 msgid "Questionnaires"
-msgstr ""
+msgstr "Upitnici"
 
 #. module: crm_profiling
 #: field:crm_profiling.questionnaire,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
 #: wizard_view:open_questionnaire,init:0
 msgid "Questionnaire"
-msgstr ""
+msgstr "Upitnik"
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne profile."
 
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr ""
+msgstr "Koristi Pravila Profiliranja"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
 #: field:crm_profiling.question,answers_ids:0
 msgid "Avalaible answers"
-msgstr ""
+msgstr "Raspoloživi odgovori"
 
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
 msgid "Included Answers"
-msgstr ""
+msgstr "Uključeni Odgovori"
 
 #. module: crm_profiling
 #: help:crm.segmentation,profiling_active:0
@@ -133,6 +134,8 @@ msgid ""
 "Check this box if you want to use this tab as part of the segmentation rule. "
 "If not checked, the criteria beneath will be ignored"
 msgstr ""
+"Označite ako želite koristiti ovu karticu (Tab) kao dio pravila "
+"segmentacije. Ako ne označite, kriterij koji slijedi biti će zanemaren"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -140,30 +143,30 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm_profiling.open_questions
 #: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
 msgid "Questions"
-msgstr ""
+msgstr "Pitanja"
 
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr ""
+msgstr "Prethodni Profil"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,end:0
 #: wizard_button:open_questionnaire,open,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "Segmentacije Partnera"
 
 #. module: crm_profiling
 #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
 msgid "Using a questionnaire"
-msgstr ""
+msgstr "Korištenje Upitnika"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
-msgstr ""
+msgstr "Spremi podatke"
diff --git a/addons/crm_profiling/i18n/hu.po b/addons/crm_profiling/i18n/hu.po
index 74eda383b73..ad0c98e9ce9 100644
--- a/addons/crm_profiling/i18n/hu.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/id.po b/addons/crm_profiling/i18n/id.po
index be6b73e28b3..72d0313ec33 100644
--- a/addons/crm_profiling/i18n/id.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index f9987308f41..ad2ca5fb998 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po
index 48f58cec38d..b3dd9d94ad9 100644
--- a/addons/crm_profiling/i18n/ko.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/lt.po b/addons/crm_profiling/i18n/lt.po
index 4f6e10cc7ff..ab6738c82f8 100644
--- a/addons/crm_profiling/i18n/lt.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/lv.po b/addons/crm_profiling/i18n/lv.po
index e83b8224e16..5d85a550139 100644
--- a/addons/crm_profiling/i18n/lv.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po
index bf75d15daa8..ba3729b6a4a 100644
--- a/addons/crm_profiling/i18n/nl.po
+++ b/addons/crm_profiling/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: crm_profiling
diff --git a/addons/crm_profiling/i18n/nl_BE.po b/addons/crm_profiling/i18n/nl_BE.po
index 7de817c3741..1e978f739b6 100644
--- a/addons/crm_profiling/i18n/nl_BE.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/pl.po b/addons/crm_profiling/i18n/pl.po
index 36569281e8b..adf2bfd4ba5 100644
--- a/addons/crm_profiling/i18n/pl.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po
index 3c5c412f440..3e84b833004 100644
--- a/addons/crm_profiling/i18n/pt.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po
index 80fbeab9d43..ea15fc7345b 100644
--- a/addons/crm_profiling/i18n/pt_BR.po
+++ b/addons/crm_profiling/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: 2009-12-12 00:07+0000\n"
-"Last-Translator: Fabio Henrique de Souza <fabiohsouza@gmail.com>\n"
+"PO-Revision-Date: 2010-03-24 01:15+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
@@ -44,12 +44,12 @@ msgstr "Perfis Filhos"
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
 msgid "crm_profiling management"
-msgstr ""
+msgstr "gerenciamento perfil_crm (profiling)"
 
 #. module: crm_profiling
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
diff --git a/addons/crm_profiling/i18n/ro.po b/addons/crm_profiling/i18n/ro.po
index 0672f2fdf48..973e4278b92 100644
--- a/addons/crm_profiling/i18n/ro.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 513f3ca7b23..f397bf58a68 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/sk.po b/addons/crm_profiling/i18n/sk.po
index d768237ef85..449d768201b 100644
--- a/addons/crm_profiling/i18n/sk.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/sl.po b/addons/crm_profiling/i18n/sl.po
index 2ba259b2765..4751c82255e 100644
--- a/addons/crm_profiling/i18n/sl.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/sv.po b/addons/crm_profiling/i18n/sv.po
index 0d4b091ad4c..390d723e6a1 100644
--- a/addons/crm_profiling/i18n/sv.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/tlh.po b/addons/crm_profiling/i18n/tlh.po
index e43ee656de1..96d6cc61e94 100644
--- a/addons/crm_profiling/i18n/tlh.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index ae3117b714d..89099d7c975 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/uk.po b/addons/crm_profiling/i18n/uk.po
index 98e4cb40bc7..e9e3037198c 100644
--- a/addons/crm_profiling/i18n/uk.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po
index 2ba560091b0..c91e1e2a57d 100644
--- a/addons/crm_profiling/i18n/zh_CN.po
+++ b/addons/crm_profiling/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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: crm_profiling
diff --git a/addons/crm_profiling/i18n/zh_TW.po b/addons/crm_profiling/i18n/zh_TW.po
index aec28121c1e..c05efc2241f 100644
--- a/addons/crm_profiling/i18n/zh_TW.po
+++ b/addons/crm_profiling/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_vertical/i18n/ar.po b/addons/crm_vertical/i18n/ar.po
index 6717a034faa..4f97f82eb59 100644
--- a/addons/crm_vertical/i18n/ar.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/bg.po b/addons/crm_vertical/i18n/bg.po
index 414131a0ac3..b8c8c425f52 100644
--- a/addons/crm_vertical/i18n/bg.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/bs.po b/addons/crm_vertical/i18n/bs.po
index a3bd156fa64..93893f0d03b 100644
--- a/addons/crm_vertical/i18n/bs.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/ca.po b/addons/crm_vertical/i18n/ca.po
index 99c101a42c9..265012ba680 100644
--- a/addons/crm_vertical/i18n/ca.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/cs.po b/addons/crm_vertical/i18n/cs.po
index a3bd156fa64..93893f0d03b 100644
--- a/addons/crm_vertical/i18n/cs.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/da.po b/addons/crm_vertical/i18n/da.po
index c0ac4d1c009..78130f5d120 100644
--- a/addons/crm_vertical/i18n/da.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/de.po b/addons/crm_vertical/i18n/de.po
index 32c47f08b3e..b253d16ce98 100644
--- a/addons/crm_vertical/i18n/de.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/el.po b/addons/crm_vertical/i18n/el.po
index 0211c3ef2e0..9621d412a66 100644
--- a/addons/crm_vertical/i18n/el.po
+++ b/addons/crm_vertical/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/crm_vertical/i18n/es.po b/addons/crm_vertical/i18n/es.po
index 464901742f6..4a15caaa659 100644
--- a/addons/crm_vertical/i18n/es.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/es_AR.po b/addons/crm_vertical/i18n/es_AR.po
index e2d348c9c32..2cbd7a8d878 100644
--- a/addons/crm_vertical/i18n/es_AR.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/et.po b/addons/crm_vertical/i18n/et.po
index 258370b69c9..e347a472d05 100644
--- a/addons/crm_vertical/i18n/et.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/fi.po b/addons/crm_vertical/i18n/fi.po
index 36b9200c634..7c6584491f7 100644
--- a/addons/crm_vertical/i18n/fi.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/fr.po b/addons/crm_vertical/i18n/fr.po
index 46e7d4ddd34..d1622be9f76 100644
--- a/addons/crm_vertical/i18n/fr.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/gl.po b/addons/crm_vertical/i18n/gl.po
index e5c7f678f35..23c2323229b 100644
--- a/addons/crm_vertical/i18n/gl.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/hr.po b/addons/crm_vertical/i18n/hr.po
index d69c15dfd3f..98a07d26ec7 100644
--- a/addons/crm_vertical/i18n/hr.po
+++ b/addons/crm_vertical/i18n/hr.po
@@ -1,22 +1,23 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* crm_vertical
-#
+# * crm_vertical
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-12-22 12:14+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 00:55+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: crm_vertical
 #: model:ir.module.module,description:crm_vertical.module_meta_information
 msgid "Simplification of the interface for CRM."
-msgstr "Pojednostavljenje sučelja za CRM"
+msgstr "Pojednostavljenje sučelja za CRM."
diff --git a/addons/crm_vertical/i18n/hu.po b/addons/crm_vertical/i18n/hu.po
index a3bd156fa64..93893f0d03b 100644
--- a/addons/crm_vertical/i18n/hu.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/id.po b/addons/crm_vertical/i18n/id.po
index 2079516442b..4484120c6cf 100644
--- a/addons/crm_vertical/i18n/id.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/it.po b/addons/crm_vertical/i18n/it.po
index 37b2860471b..27c33916881 100644
--- a/addons/crm_vertical/i18n/it.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/ko.po b/addons/crm_vertical/i18n/ko.po
index cf415f719e4..551bb7f512c 100644
--- a/addons/crm_vertical/i18n/ko.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/lt.po b/addons/crm_vertical/i18n/lt.po
index 15a0bd641b1..89cc7d2735d 100644
--- a/addons/crm_vertical/i18n/lt.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/lv.po b/addons/crm_vertical/i18n/lv.po
index cf54d53c96a..65efc212a72 100644
--- a/addons/crm_vertical/i18n/lv.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/nl.po b/addons/crm_vertical/i18n/nl.po
index 54f9693ccd7..4cf1d2a819f 100644
--- a/addons/crm_vertical/i18n/nl.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/nl_BE.po b/addons/crm_vertical/i18n/nl_BE.po
index c2bd8625179..ab62d84ba0b 100644
--- a/addons/crm_vertical/i18n/nl_BE.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/oc.po b/addons/crm_vertical/i18n/oc.po
index 9ddf0634ea1..bc1f34b9063 100644
--- a/addons/crm_vertical/i18n/oc.po
+++ b/addons/crm_vertical/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-09-18 12:52+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/pl.po b/addons/crm_vertical/i18n/pl.po
index a4d35056549..3b9fce913c3 100644
--- a/addons/crm_vertical/i18n/pl.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/pt.po b/addons/crm_vertical/i18n/pt.po
index fbb160dc352..7018d30bed7 100644
--- a/addons/crm_vertical/i18n/pt.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/pt_BR.po b/addons/crm_vertical/i18n/pt_BR.po
index 70121b4bd1b..7e33a076127 100644
--- a/addons/crm_vertical/i18n/pt_BR.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/ro.po b/addons/crm_vertical/i18n/ro.po
index fc1771cd575..451eba84528 100644
--- a/addons/crm_vertical/i18n/ro.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/ru.po b/addons/crm_vertical/i18n/ru.po
index b7557cb0f87..57be65e228f 100644
--- a/addons/crm_vertical/i18n/ru.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/sk.po b/addons/crm_vertical/i18n/sk.po
index 96424372fc2..0e5b1a49197 100644
--- a/addons/crm_vertical/i18n/sk.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/sl.po b/addons/crm_vertical/i18n/sl.po
index a73d6e98c0d..3e99f0bc3b7 100644
--- a/addons/crm_vertical/i18n/sl.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/sv.po b/addons/crm_vertical/i18n/sv.po
index a3bd156fa64..93893f0d03b 100644
--- a/addons/crm_vertical/i18n/sv.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/tr.po b/addons/crm_vertical/i18n/tr.po
index d8af41eef72..5f0662559c2 100644
--- a/addons/crm_vertical/i18n/tr.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/uk.po b/addons/crm_vertical/i18n/uk.po
index cfed9cbcf01..3243828b34e 100644
--- a/addons/crm_vertical/i18n/uk.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/zh_CN.po b/addons/crm_vertical/i18n/zh_CN.po
index 27ca3fcd6e4..bb6497dfe9b 100644
--- a/addons/crm_vertical/i18n/zh_CN.po
+++ b/addons/crm_vertical/i18n/zh_CN.po
@@ -4,19 +4,19 @@
 #
 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-03-04 15:24+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:46+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
 #: model:ir.module.module,description:crm_vertical.module_meta_information
 msgid "Simplification of the interface for CRM."
-msgstr "针对 CRM界面 的 简 化"
+msgstr "CRM简单界面"
diff --git a/addons/crm_vertical/i18n/zh_TW.po b/addons/crm_vertical/i18n/zh_TW.po
index a3bd156fa64..93893f0d03b 100644
--- a/addons/crm_vertical/i18n/zh_TW.po
+++ b/addons/crm_vertical/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/decimal_precision/__terp__.py b/addons/decimal_precision/__terp__.py
index 73426f0c8ea..113f2be8883 100644
--- a/addons/decimal_precision/__terp__.py
+++ b/addons/decimal_precision/__terp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -23,8 +23,9 @@
     "name": "Decimal Precision Configuration",
     "description": """
 This module allows to configure the price accuracy you need for different kind
-of usage: accounting, sales, purchases, ... The decimal precision is configured
-per company.
+of usage: accounting, sales, purchases, ...
+
+The decimal precision is configured per company.
 """,
     "author": "Tiny",
     "version": "0.1",
@@ -32,8 +33,8 @@ per company.
     "category" : "Generic Modules/Others",
     "init_xml": [],
     "update_xml": [
-        'decimal_precision_view.xml', 
-        'security/ir.model.access.csv', 
+        'decimal_precision_view.xml',
+        'security/ir.model.access.csv',
     ],
     "demo_xml": [],
     "installable": True,
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index 5897cdb2f99..9b0949e07e1 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -24,14 +24,18 @@
     'name': 'Carriers and deliveries',
     'version': '1.0',
     'category': 'Generic Modules/Sales & Purchases',
-    'description': """Allows you to add delivery methods in sales orders and picking. You can define your own carrier and delivery grids for prices. When creating invoices from picking, Open ERP is able to add and compute the shipping line.""",
+    'description': """Allows you to add delivery methods in sales orders and picking.
+     You can define your own carrier and delivery grids for prices.
+     When creating invoices from picking, Open ERP is able to add and compute the shipping line.
+
+     """,
     'author': 'Tiny',
     'depends': ['sale', 'purchase', 'stock'],
     'init_xml': ['delivery_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
-        'delivery_view.xml',
-        'delivery_wizard.xml',
+        'wizard/delivery_sale_order_view.xml',
+        'delivery_view.xml',        
         'partner_view.xml'
     ],
     'demo_xml': ['delivery_demo.xml'],
diff --git a/addons/delivery/delivery_wizard.xml b/addons/delivery/delivery_wizard.xml
deleted file mode 100644
index b497e6144d9..00000000000
--- a/addons/delivery/delivery_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-        <wizard id="wizard_deliver_line_add" keyword="client_action_multi" model="sale.order" name="delivery.sale.order" string="Delivery Costs"/>
-        
-    </data>
-</openerp>
diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 484defcc161..22b63f6d145 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index 01b47364b91..01cfb6734d2 100644
--- a/addons/delivery/i18n/bg.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index 4b21b84417f..f70560d53c0 100644
--- a/addons/delivery/i18n/bs.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index 74c4ca212b7..e364c73b00f 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index e0b526ea2aa..7520ea45767 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index 6886e9a3180..31c6b5b52a7 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/el.po b/addons/delivery/i18n/el.po
index 37049261979..38cef00146f 100644
--- a/addons/delivery/i18n/el.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 7d153a40fc5..eeeeb2f8ee3 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index 73a16530c30..154ed889f4f 100644
--- a/addons/delivery/i18n/es_AR.po
+++ b/addons/delivery/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index 4052f617b3c..1cc4fd8ec32 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 95dc37476eb..8ae0037f2fe 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -31,7 +31,7 @@ msgstr ">="
 #. module: delivery
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Myynnit & Ostot"
+msgstr "Myynti ja hankinta"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -46,47 +46,48 @@ msgstr "Toimitus postilla"
 #. module: delivery
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
 
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "Virhe! Rekursiivisesti rinnastettuja jäseniä ei voi luoda."
+msgstr "Virhe! Et voi luoda itseään toistavasti rinnastettuja jäseniä."
 
 #. module: delivery
 #: field:delivery.grid,state_ids:0
 msgid "States"
-msgstr "Tilat"
+msgstr "Osavaltiot"
 
 #. module: delivery
 #: 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: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
-msgstr "Tätä toimitustapaa käytetään kun laskutetaan pakkaamosta."
+msgstr ""
+"Tätä toimitustapaa käytetään kun lähetyksen toimituksesta laskutetaan."
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr "Toimitusruudukko"
+msgstr "Toimitustaulukko"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
 msgid "Start Zip"
-msgstr "Aloita postinumerointi"
+msgstr "Lähtö postinumero"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 msgid "Fixed"
-msgstr "Korjattu"
+msgstr "Kiinteä"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr "Ruudukkorivi"
+msgstr "Taulukkorivi"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -98,12 +99,12 @@ msgstr "Toimitushinnasto"
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
 msgid "Generate Draft Invoices On Receptions"
-msgstr "Luo luonnoslaskutus vastaanotoilta"
+msgstr "Luo laskuluonnos vastaanotetuista"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery line of grid"
-msgstr "Ruudukon toimitusrivi"
+msgstr "Taulukon toimitusrivi"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -113,12 +114,12 @@ msgstr "Toimitus"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr "Ruudukkorivit"
+msgstr "Taulukon rivit"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr "Ruudukko"
+msgstr "Taulukko"
 
 #. module: delivery
 #: view:res.partner:0
@@ -134,13 +135,13 @@ msgstr "Aktiivinen"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr "Ruudukon määrittely"
+msgstr "Taulukon määrittely"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Weight * Volume"
-msgstr "Paino * Määrä"
+msgstr "Paino * Tilavuus"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -150,7 +151,7 @@ msgstr "="
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "Tuotetoimitus"
+msgstr "Kuljetustuote"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -160,7 +161,7 @@ msgstr "Tila"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_carrier
 msgid "Carrier and delivery grids"
-msgstr "Rahti -ja toimitusruudukot"
+msgstr "Kuljetus- ja toimitustaulukot"
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
@@ -175,7 +176,7 @@ msgstr "Nimi"
 #. module: delivery
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Virhe: Myyntiyksikkö täytyy olla eri kategoriassa kuin mittayksikkö"
+msgstr "Virhe: Myyntiyksikkö täytyy olla eri kategoriassa kuin mittayksikkö."
 
 #. module: delivery
 #: field:delivery.grid,country_ids:0
@@ -187,7 +188,7 @@ msgstr "Maat"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Virhe: Oletusmittayksikkö ja ostojen mittayksikkö on oltava samassa "
+"Virhe: Oletus mittayksikkö ja ostojen mittayksikkö täytyy olla samassa "
 "kategoriassa."
 
 #. module: delivery
@@ -204,12 +205,12 @@ msgstr "Vaihteleva kerroin"
 #: selection:delivery.grid.line,price_type:0
 #: field:delivery.grid.line,type:0
 msgid "Variable"
-msgstr "Vaihteleva"
+msgstr "Muuttuva"
 
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr "Ruudukon nimi"
+msgstr "Taulukon nimi"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -217,14 +218,14 @@ msgstr "Ruudukon nimi"
 #: field:delivery.grid,carrier_id:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr "Rahti"
+msgstr "Kuljetusliike"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: field:stock.picking,volume:0
 msgid "Volume"
-msgstr "Määrä"
+msgstr "Tilavuus"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -247,7 +248,7 @@ msgstr "Toimitustapa"
 #. module: delivery
 #: field:sale.order,id:0
 msgid "ID"
-msgstr "Tunniste (ID)"
+msgstr "ID"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -257,12 +258,12 @@ msgstr "Operaattori"
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
 msgid "Carriers and deliveries"
-msgstr "Rahdit ja toimitukset"
+msgstr "Kuljetusliikkeet ja toimitukset"
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr "Toimitusruudukot"
+msgstr "Toimitustaulukot"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -274,12 +275,12 @@ msgstr "Paino"
 #. module: delivery
 #: field:delivery.grid,sequence:0
 msgid "Sequence"
-msgstr "Sekvenssi"
+msgstr "Sarja"
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
-msgstr "Rahtikumppani"
+msgstr "Kuljetusliike kumppani"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -288,28 +289,28 @@ msgid ""
 "define your own carrier and delivery grids for prices. When creating "
 "invoices from picking, Open ERP is able to add and compute the shipping line."
 msgstr ""
-"Sallii sinun lisäävän toimitustapoja myyntitilauksissa ja pakkauksessa. Voit "
-"määrittää oman rahtiyhtiön ja toimitusruudukot hinnoille. Luotaessa laskuja "
-"keräilystä, voi OpenERP lisätä ja laskea kuljetusrivin."
+"Mahdollistaa toimitustavan lisäämisen tilauksen käsittelyssä tai "
+"pakkauksessa. Voit määritellä omat kuljetusliikkeesi ja taulukot "
+"toimituksien hinnoille. Kun keräilyn pohjalta tehdään lasku, voi OpenERP "
+"laskea ja lisätä siihen toimitusmaksun."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr "Postita"
+msgstr "Kohde postinumero"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
 msgid "Packing to be invoiced"
-msgstr "Pakkaus joka laskutetaan"
+msgstr "Laskutettava pakkaus"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on packing."
 msgstr ""
-"Täytä tämä kenttä jos suunnitelet laskuttavasi kuljetuksen perustuen "
-"pakkaukseen."
+"Täytä tämä kenttä jos haluat laskuttaa toimituksesta pakkauksen perusteella."
 
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
@@ -329,7 +330,7 @@ msgstr "Virhe: Virheellinen EAN-koodi"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Delivery grids"
-msgstr "Toimitusruudukot"
+msgstr "Toimitustaulukot"
 
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,end:0
@@ -351,7 +352,7 @@ msgstr "Hinta"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr "ALV vaikuttaisi olevan väärin."
+msgstr "ALV ei vaikuta olevan oikein."
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index d7f11b0b432..daaf0a7c393 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -107,7 +107,7 @@ msgstr "Liste de prix de livraison"
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
 msgid "Generate Draft Invoices On Receptions"
-msgstr "Créer les factures brouillon à la réception"
+msgstr "Créer les factures brouillon sur les réceptions"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index 0a9b6342c63..abb7f23a7ef 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* delivery
-#
+# * delivery
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-26 07:23+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 21:11+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: delivery
 #: constraint:ir.model:0
@@ -47,7 +48,7 @@ msgstr "Dostava Poštom"
 #. module: delivery
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
+msgstr "Nevažeći XML format za Arhitekturu Prikaza!"
 
 #. module: delivery
 #: constraint:res.partner:0
@@ -57,17 +58,18 @@ msgstr "Greška ! Ne možete kreirati rekurzivno pridružene članove."
 #. module: delivery
 #: field:delivery.grid,state_ids:0
 msgid "States"
-msgstr "Države"
+msgstr "Stanja"
 
 #. module: delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nevažeće ime modela u definiciji akcije."
+msgstr "Nevažeće ime modela u definiciji Radnje."
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
 msgstr ""
+"Ovaj će način isporuke biti korišten kada se Račun radi kod Pakiranja."
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -77,7 +79,7 @@ msgstr "Dostavna Mreža"
 #. module: delivery
 #: field:delivery.grid,zip_from:0
 msgid "Start Zip"
-msgstr ""
+msgstr "?Start Zip"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -87,24 +89,24 @@ msgstr "Fiksno"
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr ""
+msgstr "?Grid line"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr "Cijenik Dostave"
+msgstr "Cjenik Dostave"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
 msgid "Generate Draft Invoices On Receptions"
-msgstr ""
+msgstr "Generiraj Nacrte Računa kod Zaprimanja"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery line of grid"
-msgstr ""
+msgstr "? Delivery line of grid"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -114,7 +116,7 @@ msgstr "Dostava"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr ""
+msgstr "?Grid line"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
@@ -141,7 +143,7 @@ msgstr "Definicija mreže"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Weight * Volume"
-msgstr ""
+msgstr "Težina * Volumen"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -151,7 +153,7 @@ msgstr "="
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr ""
+msgstr "Proizvod za Isporuku"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -161,7 +163,7 @@ msgstr "Uvjet"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_carrier
 msgid "Carrier and delivery grids"
-msgstr ""
+msgstr "Mreža Prijevoza i Isporuka"
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
@@ -176,7 +178,7 @@ msgstr "Naziv"
 #. module: delivery
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Greška: UOS mora biti u kategoriji drogačijoj od one u kojoj je UOM"
 
 #. module: delivery
 #: field:delivery.grid,country_ids:0
@@ -188,6 +190,7 @@ msgstr "Zemlje"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Greška: Predefinirani UOM i UOM kupnje moraju biti u istoj kategoriji."
 
 #. module: delivery
 #: view:sale.order:0
@@ -216,14 +219,14 @@ msgstr "Naziv Mreže"
 #: field:delivery.grid,carrier_id:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr "Nosač"
+msgstr "Prijevoznik"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: field:stock.picking,volume:0
 msgid "Volume"
-msgstr "Zapremina"
+msgstr "Volumen"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -256,7 +259,7 @@ msgstr "Operator"
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
 msgid "Carriers and deliveries"
-msgstr ""
+msgstr "Prijevoznici i Isporuke"
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
@@ -278,7 +281,7 @@ msgstr "Sekvenca"
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
-msgstr ""
+msgstr "Partner Prijevoznik"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -287,23 +290,28 @@ msgid ""
 "define your own carrier and delivery grids for prices. When creating "
 "invoices from picking, Open ERP is able to add and compute the shipping line."
 msgstr ""
+"Omogućuje Vam da dodate načine isporuke Prodajnim narudžbama i pakiranjima. "
+"Možete odrediti vlastitog prijevoznika i cjenike  mreže isporuke. Kada se "
+"Računi kreiraju kod preuzimanja, Open ERP može dodati i izračunati način i "
+"troškove otpreme."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr ""
+msgstr "Na Pošt. Broj"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
 msgid "Packing to be invoiced"
-msgstr ""
+msgstr "Pakiranje za koje treba izdati račun"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on packing."
 msgstr ""
+"Popunite ovo polje ako planirate Otpremu fakturirati na bazi Pakiranja."
 
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
@@ -318,7 +326,7 @@ msgstr "Prodajna Cijena"
 #. module: delivery
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Nepravilan ean kod"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -328,7 +336,7 @@ msgstr "Dostavne mreže"
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,end:0
 msgid "Cancel"
-msgstr "Poništi"
+msgstr "Otkaži"
 
 #. module: delivery
 #: field:sale.order,carrier_id:0
@@ -345,7 +353,7 @@ msgstr "Cijena"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "PDV nije točno naveden."
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index a727a081826..95a58f140cd 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index 47b526316d1..676a4b0e97f 100644
--- a/addons/delivery/i18n/id.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index 7ec5d75238f..5922cb867a0 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index 712884e123f..4abf0961f45 100644
--- a/addons/delivery/i18n/ko.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index 27aea9599c6..3358cbf1371 100644
--- a/addons/delivery/i18n/lt.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index af960a3a232..6ec3cbb3888 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index d6c5c1d2a1f..6415f03046a 100644
--- a/addons/delivery/i18n/nl_BE.po
+++ b/addons/delivery/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index 4aea7a75451..fc076c2d0f7 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 54ea4ca4f9d..51b7091b4ec 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index 28788be1c5f..bddbb2d93b7 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/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: 2009-12-07 18:08+0000\n"
+"PO-Revision-Date: 2010-03-24 01:21+0000\n"
 "Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -21,8 +21,7 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
+"O nome do objeto deve começar com x_ e não conter caracteres especiais!"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index 222f1b16d7e..31df5787ac4 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 873079b3fe4..cd057e5d735 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index 2237f238819..12e6e5b979c 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 32ab5f4e365..89b416a9c49 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/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-24 18:48+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index 4ffe274a9a7..3edacec1c81 100644
--- a/addons/delivery/i18n/tlh.po
+++ b/addons/delivery/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index f28fce7ac8c..ed93c4028b0 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index fb088a0144d..e382f4264da 100644
--- a/addons/delivery/i18n/uk.po
+++ b/addons/delivery/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 1da056817be..357619ff101 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -4,23 +4,23 @@
 #
 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:52+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:47+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -30,7 +30,7 @@ msgstr ">="
 #. module: delivery
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -40,12 +40,12 @@ msgstr "目的地"
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
 msgid "Delivery by Poste"
-msgstr "由邮政运输"
+msgstr "邮递送货"
 
 #. module: delivery
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: delivery
 #: constraint:res.partner:0
@@ -60,22 +60,22 @@ msgstr "状态"
 #. module: delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
-msgstr "当按分拣单发票时使用该送货方式。"
+msgstr "这送货方式将用在包装的发票上"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr "运费网格"
+msgstr "送货网"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
 msgid "Start Zip"
-msgstr "从邮编"
+msgstr "开始邮编"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -85,19 +85,19 @@ msgstr "固定的"
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr "表格明细"
+msgstr "网格明细"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr "货运价格表"
+msgstr "送货价格表"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
 msgid "Generate Draft Invoices On Receptions"
-msgstr "收货时产生发票草稿"
+msgstr "在接收产生发票草稿"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
@@ -107,17 +107,17 @@ msgstr "运费表格行"
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
-msgstr "运输"
+msgstr "送货"
 
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr "表格明细"
+msgstr "网格明细"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr "表格"
+msgstr "网格"
 
 #. module: delivery
 #: view:res.partner:0
@@ -133,13 +133,13 @@ msgstr "现用"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr "表格定义"
+msgstr "网格定义"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Weight * Volume"
-msgstr "重量＊体积"
+msgstr "重量* 体积"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -149,7 +149,7 @@ msgstr "="
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "产品递送"
+msgstr "产品送货"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -174,7 +174,7 @@ msgstr "名称"
 #. module: delivery
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: delivery
 #: field:delivery.grid,country_ids:0
@@ -185,7 +185,7 @@ msgstr "国家"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: delivery
 #: view:sale.order:0
@@ -214,7 +214,7 @@ msgstr "运费表格名称"
 #: field:delivery.grid,carrier_id:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr "货运公司"
+msgstr "运输公司"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -231,7 +231,7 @@ msgstr "最大值"
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,delivery:0
 msgid "Add Delivery Costs"
-msgstr "添加运输费用"
+msgstr "增加送货成本"
 
 #. module: delivery
 #: wizard_field:delivery.sale.order,init,carrier_id:0
@@ -259,7 +259,7 @@ msgstr "运输公司和送货"
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr "运费表格"
+msgstr "送货网"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -271,12 +271,12 @@ msgstr "重量"
 #. module: delivery
 #: field:delivery.grid,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
-msgstr "承运业务伙伴"
+msgstr "运输业务伙伴"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -284,24 +284,24 @@ msgid ""
 "Allows you to add delivery methods in sales orders and packing. You can "
 "define your own carrier and delivery grids for prices. When creating "
 "invoices from picking, Open ERP is able to add and compute the shipping line."
-msgstr "让你在销售单和分拣单中增加送货方式。你能定义自己的运输公司和运费表格的价格。当根据分拣单创建发票时，系统可以增加并计算运输明细"
+msgstr "允许你在销售单和包装中增加送货方式.你能定义自己的运输公司和送货网的价格.当创建领料/提货发票时,系统可以增加和计算运输明细"
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr "至邮编"
+msgstr "到达邮编"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
 msgid "Packing to be invoiced"
-msgstr "将开发票的分拣单"
+msgstr "包装要开发票"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on packing."
-msgstr "如果你计划基于分拣单开运输发票请填写这字段"
+msgstr "如果你计划基于包装开运输发票请完整填写这字段"
 
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
@@ -311,12 +311,12 @@ msgstr "送货成本"
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
 msgid "Sale Price"
-msgstr "售价"
+msgstr "销售价格"
 
 #. module: delivery
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的条码"
+msgstr "错误:无效EAN编码"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -343,9 +343,12 @@ msgstr "价格"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr "增值税似乎不正确。"
+msgstr "这增值税似乎不正确"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
 msgstr "价格类型"
+
+#~ msgid "<="
+#~ msgstr "<="
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index 8d23d796fac..b0ab99a47fc 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index c7870e43d85..efc82ae4141 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -20,77 +20,94 @@
 ##############################################################################
 
 import time
-import wizard
 import ir
-import pooler
 from tools.translate import _
 
-from tools.misc import UpdateableStr
+from osv import osv, fields
 
-delivery_form = UpdateableStr()
+class make_delivery(osv.osv_memory):
+    _name = "delivery.sale.order"
+    _description = 'Make Delievery'
 
-delivery_fields = {
-    'carrier_id' : {'string':'Delivery Method', 'type':'many2one', 'relation': 'delivery.carrier','required':True}
-}
-
-def _delivery_default(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('sale.order')
-    order = order_obj.browse(cr, uid, data['ids'])[0]
-    delivery_form.string="""<?xml version="1.0"?>
-    <form string="Create deliveries">
-        <separator colspan="4" string="Delivery Method" />
-        <field name="carrier_id" context="{'order_id': %d}"/>
-    </form>
-    """ % (data['id'],)
-
-
-    if not order.state in ('draft'):
-        raise wizard.except_wizard(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
-
-
-    carrier_id = order.partner_id.property_delivery_carrier.id
-    return {'carrier_id': carrier_id}
-
-def _delivery_set(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('sale.order')
-    line_obj = pooler.get_pool(cr.dbname).get('sale.order.line')
-    order_objs = order_obj.browse(cr, uid, data['ids'], context)
-
-    for order in order_objs:
-        grid_id = pooler.get_pool(cr.dbname).get('delivery.carrier').grid_get(cr, uid, [data['form']['carrier_id']],order.partner_shipping_id.id)
-        if not grid_id:
-            raise wizard.except_wizard(_('No grid avaible !'), _('No grid matching for this carrier !'))
-        grid_obj=pooler.get_pool(cr.dbname).get('delivery.grid')
-        grid = grid_obj.browse(cr, uid, [grid_id])[0]
-
-        taxes = grid.carrier_id.product_id.taxes_id
-        fpos = order.fiscal_position or False
-        taxes_ids = pooler.get_pool(cr.dbname).get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-        line_obj.create(cr, uid, {
-            'order_id': order.id,
-            'name': grid.carrier_id.name,
-            'product_uom_qty': 1,
-            'product_uom': grid.carrier_id.product_id.uom_id.id,
-            'product_id': grid.carrier_id.product_id.id,
-            'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
-            'tax_id': [(6,0,taxes_ids)],
-            'type': 'make_to_stock'
-        })
-
-    return {}
-
-class make_delivery(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [_delivery_default],
-            'result' : {'type' : 'form', 'arch' : delivery_form, 'fields' : delivery_fields, 'state' : [('end', 'Cancel', 'gtk-cancel'),('delivery', 'Add Delivery Costs', 'gtk-ok') ]}
-        },
-        'delivery' : {
-            'actions' : [_delivery_set],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
+    _columns = {
+        'carrier_id': fields.many2one('delivery.carrier','Delivery Method', required=True),
     }
-make_delivery("delivery.sale.order")
+
+
+    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(make_delivery, self).default_get(cr, uid, fields, context=context)
+        order_obj = self.pool.get('sale.order')
+        for order in order_obj.browse(cr, uid, context.get('active_ids', [])):
+             res.update({'carrier_id': order.partner_id.property_delivery_carrier.id})
+        return res
+    
+    def view_init(self, cr , uid , fields, context=None):
+         order_obj = self.pool.get('sale.order')
+         for order in order_obj.browse(cr, uid, context.get('active_ids', [])):     
+             if not order.state in ('draft'):
+                 raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
+         pass     
+        
+    def delivery_set(self, cr, uid, ids, context):
+        """ 
+             Adds delivery costs to Sale Order Line.
+            
+             @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:  
+        
+        """
+        rec_ids = context and context.get('active_ids',[])
+        order_obj = self.pool.get('sale.order')
+        line_obj = self.pool.get('sale.order.line')
+        grid_obj = self.pool.get('delivery.grid')
+        carrier_obj = self.pool.get('delivery.carrier')
+        acc_fp_obj = self.pool.get('account.fiscal.position')
+        order_objs = order_obj.browse(cr, uid, rec_ids, context)
+        for datas in self.browse(cr, uid, ids):    
+            for order in order_objs:
+                grid_id = carrier_obj.grid_get(cr, uid, [datas.carrier_id.id],order.partner_shipping_id.id)
+                if not grid_id:
+                    raise osv.except_osv(_('No grid available !'), _('No grid matching for this carrier !'))
+
+                if not order.state in ('draft'):
+                    raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
+                
+                grid = grid_obj.browse(cr, uid, grid_id)
+        
+                taxes = grid.carrier_id.product_id.taxes_id
+                fpos = order.fiscal_position or False
+                taxes_ids = acc_fp_obj.map_tax(cr, uid, fpos, taxes)
+                line_obj.create(cr, uid, {
+                    'order_id': order.id,
+                    'name': grid.carrier_id.name,
+                    'product_uom_qty': 1,
+                    'product_uom': grid.carrier_id.product_id.uom_id.id,
+                    'product_id': grid.carrier_id.product_id.id,
+                    'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
+                    'tax_id': [(6,0,taxes_ids)],
+                    'type': 'make_to_stock'
+                })
+    
+        return {}
+
+make_delivery()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
new file mode 100644
index 00000000000..c2609bc3923
--- /dev/null
+++ b/addons/delivery/wizard/delivery_sale_order_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Delivery Sale Order -->
+        
+		<record id="view_make_delivery_wizard" model="ir.ui.view">
+            <field name="name">Delivery Costs</field>
+            <field name="model">delivery.sale.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Deliveries">
+                	<separator colspan="4" string="Delivery Method" />
+				    <field name="carrier_id"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="delivery_set" string="Add Delivery Costs"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <act_window name="Delivery Costs"		    
+		    res_model="delivery.sale.order"
+		    src_model="sale.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="act_delivery_cost"/>
+
+       
+	</data>
+</openerp>	
diff --git a/addons/document/__init__.py b/addons/document/__init__.py
index 547205b1313..694989bdd79 100644
--- a/addons/document/__init__.py
+++ b/addons/document/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,5 +26,6 @@ import document_directory
 import directory_content
 import directory_report
 import document
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py
index a9d7026776b..2ffb708738c 100644
--- a/addons/document/__terp__.py
+++ b/addons/document/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,14 +24,14 @@
     'name': 'Integrated Document Management System',
     'version': '1.99',
     'category': 'Generic Modules/Others',
-    'description': """This is a complete document management system:    
+    'description': """This is a complete document management system:
     * User Authentication
     * Document Indexation
 
-    ATTENTION: 
-    - When you install this module in a running company that have already PDF files stored into the database, 
-      you will lose them all. 
-    - After installing this module PDF's are not longer stored into the database, 
+    ATTENTION:
+    - When you install this module in a running company that have already PDF files stored into the database,
+      you will lose them all.
+    - After installing this module PDF's are not longer stored into the database,
       but in the servers rootpad like /server/bin/filestore.
 """,
     'author': 'Tiny',
@@ -42,7 +42,8 @@
         'document_view.xml',
         'document_data.xml',
         'security/document_security.xml',
-        'security/ir.model.access.csv'
+        'security/ir.model.access.csv',
+        'report/document_report_view.xml'
     ],
     'demo_xml': [ 'document_demo.xml',],
     'installable': True,
diff --git a/addons/document/document.py b/addons/document/document.py
index 375f24cd62a..af2517c7cbb 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -157,13 +157,15 @@ class document_file(osv.osv):
             context = {}
         vals['title'] = vals['name']
         vals['parent_id'] = context.get('parent_id', False) or vals.get('parent_id', False)
+        if not vals['parent_id']:
+            vals['parent_id'] = self.pool.get('document.directory')._get_root_directory(cr,uid, context)
         if not vals.get('res_id', False) and context.get('default_res_id', False):
             vals['res_id'] = context.get('default_res_id', False)
         if not vals.get('res_model', False) and context.get('default_res_model', False):
             vals['res_model'] = context.get('default_res_model', False)
         if vals.get('res_id', False) and vals.get('res_model', False):
             obj_model = self.pool.get(vals['res_model'])
-            result = obj_model.read(cr, uid, [vals['res_id']], context=context)
+            result = obj_model.read(cr, uid, [vals['res_id']], ['name', 'partner_id', 'address_id'], context=context)
             if len(result):
                 obj = result[0]
                 if obj.get('name', False):
diff --git a/addons/document/i18n/ar.po b/addons/document/i18n/ar.po
index 79c83710e5d..e18ea0ac012 100644
--- a/addons/document/i18n/ar.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/bg.po b/addons/document/i18n/bg.po
index 0e12dff7098..d1f32251285 100644
--- a/addons/document/i18n/bg.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/bs.po b/addons/document/i18n/bs.po
index 0976f5c6064..0fcba55b202 100644
--- a/addons/document/i18n/bs.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ca.po b/addons/document/i18n/ca.po
index 853d585537c..f7d0d729eab 100644
--- a/addons/document/i18n/ca.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/cs.po b/addons/document/i18n/cs.po
index 5f46d6ea501..35d282536c0 100644
--- a/addons/document/i18n/cs.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 45661a07d13..888d0cfa283 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po
index 82fd4809f1e..a065284449a 100644
--- a/addons/document/i18n/el.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index 3fa7092a595..3ddd79861a0 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/es_AR.po b/addons/document/i18n/es_AR.po
index d7e4b3b0467..af68daa155a 100644
--- a/addons/document/i18n/es_AR.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/et.po b/addons/document/i18n/et.po
index 37e841ba901..5569d6f82c3 100644
--- a/addons/document/i18n/et.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/fi.po b/addons/document/i18n/fi.po
index 6b009d4e408..29c1b7c1bf1 100644
--- a/addons/document/i18n/fi.po
+++ b/addons/document/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 10:06+0000\n"
-"Last-Translator: NightSpirit <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 20:37+0000\n"
+"Last-Translator: smii <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -147,13 +147,13 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "File Information"
-msgstr ""
+msgstr "Tiedoston tiedot"
 
 #. module: document
 #: field:document.directory,file_ids:0
 #: view:ir.attachment:0
 msgid "Files"
-msgstr ""
+msgstr "Tiedostot"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
@@ -208,7 +208,7 @@ msgstr ""
 #. module: document
 #: selection:ir.attachment,store_method:0
 msgid "Link"
-msgstr ""
+msgstr "Linkki"
 
 #. module: document
 #: view:document.directory:0
@@ -224,7 +224,7 @@ msgstr "Ryhmät"
 #. module: document
 #: field:document.directory.content,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Raportti"
 
 #. module: document
 #: help:document.configuration.wizard,host:0
@@ -248,7 +248,7 @@ msgstr "Data"
 #. module: document
 #: view:ir.attachment:0
 msgid "Notes"
-msgstr ""
+msgstr "Huomautukset"
 
 #. module: document
 #: view:ir.attachment:0
@@ -259,7 +259,7 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 msgid "Definition"
-msgstr ""
+msgstr "Määritelmä"
 
 #. module: document
 #: constraint:ir.ui.view:0
@@ -308,7 +308,7 @@ msgstr "Hakemistot"
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Sarja"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
@@ -462,7 +462,7 @@ msgstr "PDF raportti"
 #. module: document
 #: field:document.directory.content,extension:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumenttityyppi"
 
 #. module: document
 #: field:document.directory,child_ids:0
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index 22390d59dc8..687c3dbf7cd 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po
index 1eba261d83e..65a573b017c 100644
--- a/addons/document/i18n/hi.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index 7f599d3c91a..9a915c88ba7 100644
--- a/addons/document/i18n/hr.po
+++ b/addons/document/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
-#
+# * document
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-12-21 01:41+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 10:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: document
 #: field:document.directory,create_date:0
@@ -29,7 +30,7 @@ msgstr "ID resursa"
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr "Uključi naziv stavke"
+msgstr "Uključi naziv zapisa"
 
 #. module: document
 #: constraint:ir.model:0
@@ -56,7 +57,7 @@ msgstr "Postavke dokumenta"
 #. module: document
 #: view:ir.attachment:0
 msgid "Preview"
-msgstr "Pretpregled"
+msgstr "Pregled"
 
 #. module: document
 #: field:ir.attachment,store_method:0
@@ -66,7 +67,7 @@ msgstr "Metoda pohrane"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr "Automatski konfiguriraj mapu"
+msgstr "Automatski podesi mapu"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -79,7 +80,7 @@ msgid ""
 "Check this field if you want that the name of the file start by the record "
 "name."
 msgstr ""
-"Uključite ovu opciju ako želite da naziv datoteke počinje s nazivom stavke"
+"Uključite ovu opciju ako želite da naziv datoteke počinje s nazivom zapisa"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -89,7 +90,7 @@ msgstr "Drugi resursi"
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr "Model roditelj"
+msgstr "Ishodni Model"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -147,7 +148,7 @@ msgstr "Struktura mape"
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr "Roditelj"
+msgstr "Ishodna stavka"
 
 #. module: document
 #: view:ir.attachment:0
@@ -174,7 +175,7 @@ msgstr "Korisnik posljednje promjene"
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Configure"
-msgstr "Postavi"
+msgstr "Podesi"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -267,7 +268,7 @@ msgstr "Bilješke"
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr "Indeksirani dokument"
+msgstr "Indeksirani sadržaj"
 
 #. module: document
 #: view:document.directory:0
@@ -482,7 +483,7 @@ msgstr "Vrsta dokumenta"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr "Djeca"
+msgstr "Slijedne stavke"
 
 #. module: document
 #: view:document.directory:0
diff --git a/addons/document/i18n/hu.po b/addons/document/i18n/hu.po
index 93bb20944e0..d69cf4cac21 100644
--- a/addons/document/i18n/hu.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/id.po b/addons/document/i18n/id.po
index 1b0c1e08194..1a6f1f1ae2b 100644
--- a/addons/document/i18n/id.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index 2ad352943fd..d56849427d3 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ko.po b/addons/document/i18n/ko.po
index 4e151d4d027..66e67c3e5fa 100644
--- a/addons/document/i18n/ko.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po
index ca915c45605..b17daa1ce6a 100644
--- a/addons/document/i18n/lt.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index e05dc1f9e38..5746b23a109 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/nl_BE.po b/addons/document/i18n/nl_BE.po
index 8978073f369..2ea40847ffc 100644
--- a/addons/document/i18n/nl_BE.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index 9a55234a955..833699c5262 100644
--- a/addons/document/i18n/pl.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index dce3b1f8fbc..f2249444413 100644
--- a/addons/document/i18n/pt.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index 02a575042b7..ca473836999 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ro.po b/addons/document/i18n/ro.po
index f2f89192653..aaebb4f052b 100644
--- a/addons/document/i18n/ro.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 44cdebea416..14d92c430a7 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po
index 8e01a224a69..84c36f6c24a 100644
--- a/addons/document/i18n/sl.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index 99f529889a6..8550c818416 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/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-16 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/tlh.po b/addons/document/i18n/tlh.po
index 173c522454e..056a6bc0443 100644
--- a/addons/document/i18n/tlh.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index bc8b7014b6a..28a6eb97233 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/uk.po b/addons/document/i18n/uk.po
index 791f691eb15..fc88f9c554d 100644
--- a/addons/document/i18n/uk.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 9d21cf6161a..2a5814aacb6 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -4,22 +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: 2010-02-01 23:45+0000\n"
-"Last-Translator: mrshelly <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:19+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: field:document.directory,create_date:0
 msgid "Date Created"
-msgstr "创建时间"
+msgstr "建立日期"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -35,7 +35,7 @@ msgstr "含记录名称"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
@@ -45,7 +45,7 @@ msgstr "模块ID"
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr "错误！您不能创建循环目录。"
+msgstr "错误:你无法建立递归的目录"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_configuration
@@ -60,7 +60,7 @@ msgstr "预览"
 #. module: document
 #: field:ir.attachment,store_method:0
 msgid "Storing Method"
-msgstr "存储方法"
+msgstr "保存方式"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -77,7 +77,7 @@ msgstr "文件大小"
 msgid ""
 "Check this field if you want that the name of the file start by the record "
 "name."
-msgstr "如果你想文件名以记录名称开始请选择它."
+msgstr "如果你想文件名开始是记录名称请选择它."
 
 #. module: document
 #: selection:document.directory,type:0
@@ -87,7 +87,7 @@ msgstr "其它资源"
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr "上级模式"
+msgstr "上级式样"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -102,7 +102,7 @@ msgstr "附件"
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -112,20 +112,20 @@ msgstr "静态目录"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr "目录内容类型"
+msgstr "目录内容分类"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
-msgstr "如果您想要自动筛选可见资源的话请使用定义域。"
+msgstr "如果你想使用可见资源的自动过滤这是使用的范围"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
-msgstr "如果您想要选定的对象使用与系统内部相同树结构的话请选定这个复选框。"
+msgstr "如果你想在系统中使用相同的对象树状结构请选择这"
 
 #. module: document
 #: field:document.directory,type:0
@@ -141,7 +141,7 @@ msgstr "目录结构"
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr "上级条目"
+msgstr "上级"
 
 #. module: document
 #: view:ir.attachment:0
@@ -157,7 +157,7 @@ msgstr "文件"
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr "已保存文件名"
+msgstr "保存文件名"
 
 #. module: document
 #: field:document.directory,write_uid:0
@@ -168,7 +168,7 @@ msgstr "最近修改用户"
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Configure"
-msgstr "配置"
+msgstr "设置"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -178,14 +178,14 @@ msgstr "树结构"
 #. module: document
 #: field:ir.attachment,title:0
 msgid "Resource Title"
-msgstr "资源标题"
+msgstr "标题"
 
 #. module: document
 #: model:ir.actions.todo,note:document.config_auto_directory
 msgid ""
 "This wizard will configure the URL of the server of the document management "
 "system."
-msgstr "该向导将配置文档管理系统的统一资源定位码（URL）"
+msgstr "这向导将配置文档管理系统的URL"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -197,7 +197,7 @@ msgstr "目录内容"
 msgid ""
 "If you put an object here, this directory template will appear bellow all of "
 "these objects. Don't put a parent directory if you select a parent model."
-msgstr "如果您在这填上对象则目录模板将作为这些对象的下级出现。如果您选择了一个上级模型的话不要填写上级目录。"
+msgstr "如果你在这填上对象,这目录的模板将涵盖所有的对象.如果您选择母公司模式不要填入父目录"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document
@@ -218,7 +218,7 @@ msgstr "目录类型"
 #: field:document.directory,group_ids:0
 #: field:ir.attachment,group_ids:0
 msgid "Groups"
-msgstr "用户组"
+msgstr "组"
 
 #. module: document
 #: field:document.directory.content,report_id:0
@@ -230,14 +230,14 @@ msgstr "报表"
 msgid ""
 "Put here the server address or IP. Keep localhost if you don't know what to "
 "write."
-msgstr "在此输入服务器地址或IP编号。如果你不知道怎样写请用localhost。"
+msgstr "输入服务器地址或IP.如果你不知道怎样写请保持本地"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid ""
 "This wizard will automatically configure the document management system "
 "according to modules installed on your system."
-msgstr "该向导将根据您系统安装的模块自动设置文档管理系统"
+msgstr "该向导将根据你系统安装的模块自动设置文档管理系统"
 
 #. module: document
 #: view:ir.attachment:0
@@ -253,7 +253,7 @@ msgstr "备注"
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr "索引内容"
+msgstr "内容索引"
 
 #. module: document
 #: view:document.directory:0
@@ -263,7 +263,7 @@ msgstr "定义"
 #. module: document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -273,10 +273,10 @@ msgid ""
 "    * User Authentication\n"
 "    * Document Indexation\n"
 msgstr ""
-"这是完善的文档管理系统，其特性包括：\n"
-"    * FTP 界面\n"
-"    * 用户验证\n"
-"    * 文档索引\n"
+"一个完整的文档管理系统包括:\n"
+"            * FTP界面\n"
+"            * 用户认证\n"
+"            * 文档索引\n"
 
 #. module: document
 #: field:document.directory,name:0
@@ -286,7 +286,7 @@ msgstr "名称"
 #. module: document
 #: field:document.directory.content.type,code:0
 msgid "Extension"
-msgstr "扩展名"
+msgstr "延伸"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
@@ -302,7 +302,7 @@ msgstr "虚拟文件"
 #: view:document.directory:0
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
-msgstr "目录列表"
+msgstr "目录"
 
 #. module: document
 #: view:document.directory:0
@@ -312,29 +312,29 @@ msgstr "序号"
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
 msgid "Integrated Document Management System"
-msgstr "综合的文档管理系统"
+msgstr "完整的文档管理系统"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
 #: field:ir.attachment,parent_id:0
 msgid "Directory"
-msgstr "目录"
+msgstr "说明"
 
 #. module: document
 #: field:document.directory,user_id:0
 #: field:ir.attachment,user_id:0
 msgid "Owner"
-msgstr "所有者"
+msgstr "拥有者"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration_wizard
 msgid "document.configuration.wizard"
-msgstr "document.configuration.wizard"
+msgstr "文档结构向导"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr "附加到"
+msgstr "附属于"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
@@ -357,7 +357,7 @@ msgstr "安全"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_browse
 msgid "Browse Files Using FTP"
-msgstr "使用FTP浏览文件"
+msgstr "浏览文件使用FTP"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
@@ -367,30 +367,33 @@ msgstr "目录映射到对象"
 #. module: document
 #: view:ir.attachment:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
 msgid ""
 "Select an object here and Open ERP will create a mapping for each of these "
 "objects, using the given domain, when browsing through FTP."
-msgstr "在此选择一个对象使OpenERP系统使用已给定义域为每个对象创建一个链接，以便通过FTP浏览。"
+msgstr ""
+"选择一对象,系统将创建一个每个对象的列表,使用给定的域,通过FTP浏览\"\n"
+"document,view,document.directory,0,Seq.,序列\n"
+"document,field,document.directory.content"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Others Info"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr "域"
+msgstr "隶属"
 
 #. module: document
 #: field:document.directory,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
-msgstr "修改时间"
+msgstr "修改日期"
 
 #. module: document
 #: field:document.directory.content,suffix:0
@@ -426,22 +429,22 @@ msgstr "创建者"
 #. module: document
 #: view:document.directory:0
 msgid "Auto-Generated Files"
-msgstr "自动生成的文件"
+msgstr "自动产生文件"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Search a File"
-msgstr "搜索文件"
+msgstr "搜索一个文件"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Auto Configure"
-msgstr "自动配置"
+msgstr "自动设置"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -456,7 +459,7 @@ msgstr "业务伙伴"
 #. module: document
 #: view:document.directory:0
 msgid "PDF Report"
-msgstr "PDF 报表"
+msgstr "PDF报表"
 
 #. module: document
 #: field:document.directory.content,extension:0
@@ -466,9 +469,12 @@ msgstr "文档类型"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr "下级目录"
+msgstr "子目录"
 
 #. module: document
 #: view:document.directory:0
 msgid "Contents"
 msgstr "内容"
+
+#~ msgid "Active"
+#~ msgstr "生效"
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index 6cb343e5c23..57d3f0ae14c 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/report_task/__init__.py b/addons/document/report/__init__.py
similarity index 89%
rename from addons/report_task/__init__.py
rename to addons/document/report/__init__.py
index 38945a471fe..bfdeacdaae8 100644
--- a/addons/report_task/__init__.py
+++ b/addons/document/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import report_task
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+import document_report
\ No newline at end of file
diff --git a/addons/report_document/report_document.py b/addons/document/report/document_report.py
similarity index 100%
rename from addons/report_document/report_document.py
rename to addons/document/report/document_report.py
diff --git a/addons/report_document/report_document_view.xml b/addons/document/report/document_report_view.xml
similarity index 100%
rename from addons/report_document/report_document_view.xml
rename to addons/document/report/document_report_view.xml
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index 4993ebc049e..245bcbffeab 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -11,3 +11,11 @@
 "access_document_storage_group_system","document.storage group system","model_document_storage","base.group_user",1,0,0,0
 "access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","group_document_manager",1,1,1,1
 "access_document_directory_dctx_group_system","document.directory.dctx group system","model_document_directory_dctx","base.group_system",1,1,1,1
+"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","document.group_document_manager",1,0,0,0
+"access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0
+"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","document.group_document_manager",1,0,0,0
+"access_report_files_partner_group_system","report.files.partner group system","model_report_files_partner","base.group_system",1,0,0,0
+"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","document.group_document_manager",1,0,0,0
+"access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
+"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0
+"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
diff --git a/addons/document_ftp/__terp__.py b/addons/document_ftp/__terp__.py
index 42561975463..b4c6b2c0b71 100644
--- a/addons/document_ftp/__terp__.py
+++ b/addons/document_ftp/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,9 @@
     'name': 'Integrated FTP Server with Document Management System',
     'version': '1.99',
     'category': 'Generic Modules/Others',
-    'description': """This is a support FTP Interface with document management system:    
+    'description': """This is a support FTP Interface with document management system.
+    With this module you would not only be able to access documents through open erp
+    also you would be able to connect with them through the file system using the FTP protocol.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
@@ -32,7 +34,7 @@
     'init_xml': [],
     'update_xml': [
         'document_ftp_view.xml',
-        'security/ir.model.access.csv'        
+        'security/ir.model.access.csv'
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/document_ics/i18n/ar.po b/addons/document_ics/i18n/ar.po
index cb31d2843e9..abd7f08fbc0 100644
--- a/addons/document_ics/i18n/ar.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/bg.po b/addons/document_ics/i18n/bg.po
index fab96530a71..e62a0fdf1e3 100644
--- a/addons/document_ics/i18n/bg.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/bs.po b/addons/document_ics/i18n/bs.po
index cc5a31d6b53..0ff45cd37f2 100644
--- a/addons/document_ics/i18n/bs.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/ca.po b/addons/document_ics/i18n/ca.po
index 5e2e0b86148..2bf0f2664d2 100644
--- a/addons/document_ics/i18n/ca.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/cs.po b/addons/document_ics/i18n/cs.po
index 4a2c647209b..db9e1a13a55 100644
--- a/addons/document_ics/i18n/cs.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/de.po b/addons/document_ics/i18n/de.po
index 7176812909a..4b795252e28 100644
--- a/addons/document_ics/i18n/de.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/el.po b/addons/document_ics/i18n/el.po
index 8f6c26ee0c9..410bd925ab0 100644
--- a/addons/document_ics/i18n/el.po
+++ b/addons/document_ics/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/document_ics/i18n/es.po b/addons/document_ics/i18n/es.po
index 5800697c8f7..acd84b62b46 100644
--- a/addons/document_ics/i18n/es.po
+++ b/addons/document_ics/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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/es_AR.po b/addons/document_ics/i18n/es_AR.po
index 8e947b5aad9..cee46107ecd 100644
--- a/addons/document_ics/i18n/es_AR.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/et.po b/addons/document_ics/i18n/et.po
index bb7cebcafe9..341f0b47721 100644
--- a/addons/document_ics/i18n/et.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/fi.po b/addons/document_ics/i18n/fi.po
index 5aa0cc8cf73..c4bc982f602 100644
--- a/addons/document_ics/i18n/fi.po
+++ b/addons/document_ics/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 18:35+0000\n"
-"Last-Translator: T Kortehisto <Unknown>\n"
+"PO-Revision-Date: 2010-03-19 18:37+0000\n"
+"Last-Translator: smii <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -76,7 +76,7 @@ msgstr "Kalenterin jaetut tapaamiset"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "url"
-msgstr ""
+msgstr "URL"
 
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Jäljittää tunnistetut liiketoimintamahdollisuudet myyntikanavalle."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,fund:0
@@ -210,6 +210,8 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Hallinnoi toimittajien ja asiakkaiden reklamaatioita, sisältäen sinun "
+"korjaavat tai estävät toiminnot."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -234,7 +236,7 @@ msgstr "Jaettu kalenteri"
 #. module: document_ics
 #: field:document.ics.crm.wizard,claims:0
 msgid "Claims"
-msgstr ""
+msgstr "Vaateet"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
@@ -261,7 +263,7 @@ msgstr "Ohjelmointivirheiden jäljitys"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "categories"
-msgstr ""
+msgstr "luokat"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,lead:0
@@ -311,7 +313,7 @@ msgstr ""
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
diff --git a/addons/document_ics/i18n/fr.po b/addons/document_ics/i18n/fr.po
index 823f39813be..ffc56b151c1 100644
--- a/addons/document_ics/i18n/fr.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/hr.po b/addons/document_ics/i18n/hr.po
index 62078c79134..5342f2419a7 100644
--- a/addons/document_ics/i18n/hr.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/hu.po b/addons/document_ics/i18n/hu.po
index cb31d2843e9..abd7f08fbc0 100644
--- a/addons/document_ics/i18n/hu.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/id.po b/addons/document_ics/i18n/id.po
index 06e7b2be672..4b3c545244e 100644
--- a/addons/document_ics/i18n/id.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/it.po b/addons/document_ics/i18n/it.po
index 200ec0905e4..4d7b9c159da 100644
--- a/addons/document_ics/i18n/it.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/ko.po b/addons/document_ics/i18n/ko.po
index 758ca976e45..fb882000955 100644
--- a/addons/document_ics/i18n/ko.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/lt.po b/addons/document_ics/i18n/lt.po
index 79dcd9b85eb..1f4b6dfd2ae 100644
--- a/addons/document_ics/i18n/lt.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/nl.po b/addons/document_ics/i18n/nl.po
index e85b4f670f5..652beebb1cd 100644
--- a/addons/document_ics/i18n/nl.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/nl_BE.po b/addons/document_ics/i18n/nl_BE.po
index d6cad6d9352..deab9207100 100644
--- a/addons/document_ics/i18n/nl_BE.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/pl.po b/addons/document_ics/i18n/pl.po
index f5b27818cee..87dcbd694eb 100644
--- a/addons/document_ics/i18n/pl.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/pt.po b/addons/document_ics/i18n/pt.po
index 625201bc197..d62f4b22ffe 100644
--- a/addons/document_ics/i18n/pt.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/pt_BR.po b/addons/document_ics/i18n/pt_BR.po
index 7d12eb90dd8..47cbb484427 100644
--- a/addons/document_ics/i18n/pt_BR.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/ro.po b/addons/document_ics/i18n/ro.po
index e51e900fec4..58e5bd95f7d 100644
--- a/addons/document_ics/i18n/ro.po
+++ b/addons/document_ics/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/ru.po b/addons/document_ics/i18n/ru.po
index 436c1b82935..f6f26a399ae 100644
--- a/addons/document_ics/i18n/ru.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/sl.po b/addons/document_ics/i18n/sl.po
index 6393caca77b..cab3fe497e0 100644
--- a/addons/document_ics/i18n/sl.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/sv.po b/addons/document_ics/i18n/sv.po
index 82d5cf58109..e72d431d65e 100644
--- a/addons/document_ics/i18n/sv.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/tlh.po b/addons/document_ics/i18n/tlh.po
index b2bebb84f07..b428e6e03f6 100644
--- a/addons/document_ics/i18n/tlh.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index c4def09731b..8d261d19f9c 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/uk.po b/addons/document_ics/i18n/uk.po
index cc800b5d267..b3a8d4464cc 100644
--- a/addons/document_ics/i18n/uk.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 459f7dab1a7..3b4c8478ba1 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -4,23 +4,23 @@
 #
 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-29 02:35+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:19+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -30,27 +30,27 @@ msgstr "用户标识符"
 #. module: document_ics
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr "错误！您不能创建递归目录。"
+msgstr "错误:你无法建立递归的目录"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr "招聘流程"
+msgstr "招聘过程"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure Calendars for CRM Sections"
-msgstr "设置客户关系管理组的日程表"
+msgstr "客户关系管理部分设置日程表"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr "求助台"
+msgstr "求助"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
 msgid "Open ERP Field"
-msgstr "Open ERP系统字段"
+msgstr "系统字段"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -80,62 +80,62 @@ msgstr "信息地址（url）"
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on softwares"
-msgstr "公司用于进行跟踪错误和软件支持请求"
+msgstr "公司用于跟踪缺陷和支持请求的软件"
 
 #. module: document_ics
 #: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
 msgid ""
 "This Configuration step use to create Calendars in document for all Case "
 "Sections"
-msgstr "该设置步骤用于在所有案例组创建日程表"
+msgstr "这设置步骤用于创建在所有业务个案项文档的日程表"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
-msgstr "dtend"
+msgstr "结束"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,jobs:0
 msgid ""
 "Help you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
-msgstr "帮助您组织职位招聘过程:评价、面试、电子邮件一体化"
+msgstr "帮助你组织招聘过程:评论,会议,电子邮件一体化"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "description"
-msgstr "描述"
+msgstr "说明"
 
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
-msgstr "为案例组设置日程表 "
+msgstr "部分设置日程表 "
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "从你的销售管线跟踪出销售机会"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr "这也许有助于协会筹款的进程和跟踪"
+msgstr "这可能有助于协会在资助和投资过程和跟踪"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr "管理求助台服务"
+msgstr "管理求助服务"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr "筹款运作"
+msgstr "资助和投资行动"
 
 #. module: document_ics
 #: field:document.directory.content,ics_object_id:0
@@ -145,32 +145,32 @@ msgstr "对象"
 #. module: document_ics
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr "错误！你不能创建递归的组。"
+msgstr "错误！你不能创建递归的项"
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
 msgid "Support for iCal based on Document Management System"
-msgstr "根据文档管理系统支持iCal"
+msgstr "支持iCal的文档管理系统"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "location"
-msgstr "位置"
+msgstr "本地"
 
 #. module: document_ics
 #: view:document.directory:0
 msgid "ICS Calendar"
-msgstr "ICS 日历"
+msgstr "ICS日程表"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,name:0
 msgid "ICS Value"
-msgstr "ICS 值"
+msgstr "ICS值"
 
 #. module: document_ics
 #: model:ir.module.module,description:document_ics.module_meta_information
 msgid "Allows to synchronise calendars with others applications."
-msgstr "使得日程表可与其他应用软件同步"
+msgstr "允许的同步其它应用日程表"
 
 #. module: document_ics
 #: constraint:ir.ui.view:0
@@ -182,12 +182,12 @@ msgstr "无效XML视图结构!"
 msgid ""
 "Allows you to track and manage prospects which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
-msgstr "让您跟踪，管理潜在客户（售前请求和联系人），初次联系客户的请求"
+msgstr "允许你跟踪管理潜在客户的售前请求和联系,初次联系客户的请求"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
 msgid "Name"
-msgstr "姓名"
+msgstr "名称"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
@@ -197,29 +197,29 @@ msgstr "管理用户的会议日程表"
 #. module: document_ics
 #: field:document.directory.content,ics_domain:0
 msgid "Domain"
-msgstr "定义域"
+msgstr "隶属"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
 msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
-msgstr "管理客户和供应商的索求，包括你的纠正或预防措施"
+msgstr "管理这支援和客户服务要求包括你的纠正或预防"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "last-modified"
-msgstr "最后修正"
+msgstr "最近修改"
 
 #. module: document_ics
 #: view:document.directory:0
 msgid "ICS Mapping"
-msgstr "ICS 对应"
+msgstr "ICS一览"
 
 #. module: document_ics
 #: view:crm.case:0
 msgid "Duration(In Hour)"
-msgstr "持续时间（小时）"
+msgstr "持续时间(小时)"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,document_ics:0
@@ -229,19 +229,19 @@ msgstr "共享的日程表"
 #. module: document_ics
 #: field:document.ics.crm.wizard,claims:0
 msgid "Claims"
-msgstr "索赔"
+msgstr "服务要求"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
 msgid ""
 "Help you to encode the result of a phone call or to planify a list of phone "
 "calls to process."
-msgstr "帮助你将电话呼叫结果记录或规划电话呼叫列表用来处理"
+msgstr "帮助你编电话呼叫结果或编制电话呼叫处理的列表"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstart"
-msgstr "dtstart"
+msgstr "开始"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,phonecall:0
@@ -251,7 +251,7 @@ msgstr "电话呼叫"
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
 msgid "Bug Tracking"
-msgstr "错误跟踪"
+msgstr "缺陷跟踪"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -271,17 +271,17 @@ msgstr "创建预先设置的日程表"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "created"
-msgstr "已创建"
+msgstr "创建"
 
 #. module: document_ics
 #: field:crm.case,code:0
 msgid "Calendar Code"
-msgstr "日历编码"
+msgstr "日程表代码"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "summary"
-msgstr "概要"
+msgstr "参考"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
@@ -291,17 +291,17 @@ msgstr "document.ics.crm.wizard"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "attendee"
-msgstr "出席者"
+msgstr "出勤者"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_ics_fields
 msgid "document.directory.ics.fields"
-msgstr "document.directory.ics.fields"
+msgstr "字段"
 
 #. module: document_ics
 #: field:document.directory.content,ics_field_ids:0
 msgid "Fields Mapping"
-msgstr "字段对应"
+msgstr "字段一览"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -311,9 +311,14 @@ msgstr "取消"
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
-msgstr "商机"
+msgstr "销售机会"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstamp"
-msgstr "dtstamp"
+msgstr "标记"
+
+#~ msgid ""
+#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
+#~ "outlook, Sunbird, ical, ..."
+#~ msgstr " 允许同步系统日程表,电话等等"
diff --git a/addons/document_ics/i18n/zh_TW.po b/addons/document_ics/i18n/zh_TW.po
index a9a591c9b27..50dc0305294 100644
--- a/addons/document_ics/i18n/zh_TW.po
+++ b/addons/document_ics/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: document_ics
diff --git a/addons/document_webdav/__terp__.py b/addons/document_webdav/__terp__.py
index ce11511d0fa..24893c275e1 100644
--- a/addons/document_webdav/__terp__.py
+++ b/addons/document_webdav/__terp__.py
@@ -34,8 +34,9 @@
 	"author" : "Tiny",
 	"category" : "Generic Modules/Others",
 	"website": "http://www.openerp.com",
-	"description": """ With this module, the WebDAV server for the documents is activated. You can then use any compatible browser to remotely see the attachments of OpenObject.
-	
+	"description": """ With this module, the WebDAV server for the documents is activated.
+	You can then use any compatible browser to remotely see the attachments of OpenObject.
+
 	After installation, the webDAV server can be controlled by a [webdav] section in the server's config.
 """,
 	"depends" : ["base", "document"],
diff --git a/addons/document_webdav/i18n/bg.po b/addons/document_webdav/i18n/bg.po
index 9451c33b577..1a13fa82450 100644
--- a/addons/document_webdav/i18n/bg.po
+++ b/addons/document_webdav/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:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/cs.po b/addons/document_webdav/i18n/cs.po
index 361163c0b5c..13fafd57c49 100644
--- a/addons/document_webdav/i18n/cs.po
+++ b/addons/document_webdav/i18n/cs.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: document_webdav_old
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index e4e13ad5676..fd265104057 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/i18n/de.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: document_webdav_old
diff --git a/addons/document_webdav/i18n/es.po b/addons/document_webdav/i18n/es.po
index 0b5a0e57f8b..d480732519a 100644
--- a/addons/document_webdav/i18n/es.po
+++ b/addons/document_webdav/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/hr.po b/addons/document_webdav/i18n/hr.po
index aa00f7164f5..72927b920b1 100644
--- a/addons/document_webdav/i18n/hr.po
+++ b/addons/document_webdav/i18n/hr.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: document_webdav_old
diff --git a/addons/document_webdav/i18n/pt.po b/addons/document_webdav/i18n/pt.po
index e1e72dd3917..a82237dfdfe 100644
--- a/addons/document_webdav/i18n/pt.po
+++ b/addons/document_webdav/i18n/pt.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: document_webdav_old
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
new file mode 100644
index 00000000000..057d27ed21c
--- /dev/null
+++ b/addons/document_webdav/i18n/pt_BR.po
@@ -0,0 +1,31 @@
+# Brazilian Portuguese 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-03-24 01:18+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Este é um gerenciador de documentos completo:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
diff --git a/addons/document_webdav/i18n/sl.po b/addons/document_webdav/i18n/sl.po
index c31fb814d12..71e574e1c98 100644
--- a/addons/document_webdav/i18n/sl.po
+++ b/addons/document_webdav/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:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
index d3bf8a5ca01..d88fb7be7e9 100644
--- a/addons/document_webdav/i18n/sv.po
+++ b/addons/document_webdav/i18n/sv.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: document_webdav_old
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index a7bf9604416..0fbb3657c57 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -1,20 +1,19 @@
-# Chinese (Simplified) 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 <EMAIL@ADDRESS>, 2010.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* document_ics
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-30 15:14+0000\n"
-"PO-Revision-Date: 2010-01-10 01:57+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"PO-Revision-Date: 2010-03-20 08:21+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
@@ -29,3 +28,185 @@ msgstr ""
 "\t* WebDav 接口\n"
 "\t* 用户认证\n"
 "\t* 文档索引\n"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "错误:你无法建立递归的目录"
+
+#~ msgid "Jobs Hiring Process"
+#~ msgstr "招聘过程"
+
+#~ msgid "Configure Calendars for CRM Sections"
+#~ msgstr "客户关系管理部分设置日程表"
+
+#~ msgid "Helpdesk"
+#~ msgstr "求助"
+
+#~ msgid "Open ERP Field"
+#~ msgstr "系统字段"
+
+#~ msgid "Next"
+#~ msgstr "下一个"
+
+#~ msgid "Content"
+#~ msgstr "内容"
+
+#~ msgid "Calendar of Meetings"
+#~ msgstr "会议日程表"
+
+#~ msgid "Shared Calendar Meetings"
+#~ msgstr "共享的会议日程表"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在这动作定义中有无效的模块名"
+
+#~ msgid "Used by companies to track bugs and support requests on softwares"
+#~ msgstr "公司用于跟踪缺陷和支持请求的软件"
+
+#~ msgid ""
+#~ "This Configuration step use to create Calendars in document for all Case "
+#~ "Sections"
+#~ msgstr "这设置步骤用于创建在所有业务个案项文档的日程表"
+
+#~ msgid "dtend"
+#~ msgstr "结束"
+
+#~ msgid ""
+#~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
+#~ "integration..."
+#~ msgstr "帮助你组织招聘过程:评论,会议,电子邮件一体化"
+
+#~ msgid "description"
+#~ msgstr "说明"
+
+#~ msgid "Configure Calendars for Sections "
+#~ msgstr "部分设置日程表 "
+
+#~ msgid "Tracks identified business opportunities for your sales pipeline."
+#~ msgstr "从你的销售管线跟踪出销售机会"
+
+#~ msgid ""
+#~ "This may help associations in their fund raising process and tracking."
+#~ msgstr "这可能有助于协会在资助和投资过程和跟踪"
+
+#~ msgid "Manages an Helpdesk service."
+#~ msgstr "管理求助服务"
+
+#~ msgid "Fund Raising Operations"
+#~ msgstr "资助和投资行动"
+
+#~ msgid "Object"
+#~ msgstr "对象"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "错误！你不能创建递归的项"
+
+#~ msgid "Support for iCal based on Document Management System"
+#~ msgstr "支持iCal的文档管理系统"
+
+#~ msgid ""
+#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
+#~ "outlook, Sunbird, ical, ..."
+#~ msgstr " 允许同步系统日程表,电话等等"
+
+#~ msgid "location"
+#~ msgstr "本地"
+
+#~ msgid "ICS Calendar"
+#~ msgstr "ICS日程表"
+
+#~ msgid "ICS Value"
+#~ msgstr "ICS值"
+
+#~ msgid "Allows to synchronise calendars with others applications."
+#~ msgstr "允许的同步其它应用日程表"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
+#~ msgid ""
+#~ "Allows you to track and manage prospects which are pre-sales requests or "
+#~ "contacts, the very first contact with a customer request."
+#~ msgstr "允许你跟踪管理潜在客户的售前请求和联系,初次联系客户的请求"
+
+#~ msgid "Name"
+#~ msgstr "名称"
+
+#~ msgid "Manages the calendar of meetings of the users."
+#~ msgstr "管理用户的会议日程表"
+
+#~ msgid "Domain"
+#~ msgstr "隶属"
+
+#~ msgid ""
+#~ "Manages the supplier and customers claims, including your corrective or "
+#~ "preventive actions."
+#~ msgstr "管理这支援和客户服务要求包括你的纠正或预防"
+
+#~ msgid "last-modified"
+#~ msgstr "最近修改"
+
+#~ msgid "ICS Mapping"
+#~ msgstr "ICS一览"
+
+#~ msgid "Duration(In Hour)"
+#~ msgstr "持续时间(小时)"
+
+#~ msgid "Shared Calendar"
+#~ msgstr "共享的日程表"
+
+#~ msgid "Claims"
+#~ msgstr "服务要求"
+
+#~ msgid ""
+#~ "Help you to encode the result of a phone call or to planify a list of phone "
+#~ "calls to process."
+#~ msgstr "帮助你编电话呼叫结果或编制电话呼叫处理的列表"
+
+#~ msgid "dtstart"
+#~ msgstr "开始"
+
+#~ msgid "Phone Calls"
+#~ msgstr "电话呼叫"
+
+#~ msgid "Bug Tracking"
+#~ msgstr "缺陷跟踪"
+
+#~ msgid "categories"
+#~ msgstr "分类"
+
+#~ msgid "Prospect"
+#~ msgstr "潜在客户"
+
+#~ msgid "Create Pre-Configured Calendars"
+#~ msgstr "创建预先设置的日程表"
+
+#~ msgid "created"
+#~ msgstr "创建"
+
+#~ msgid "Calendar Code"
+#~ msgstr "日程表代码"
+
+#~ msgid "summary"
+#~ msgstr "参考"
+
+#~ msgid "attendee"
+#~ msgstr "出勤者"
+
+#~ msgid "document.directory.ics.fields"
+#~ msgstr "字段"
+
+#~ msgid "Fields Mapping"
+#~ msgstr "字段一览"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Business Opportunities"
+#~ msgstr "销售机会"
+
+#~ msgid "dtstamp"
+#~ msgstr "标记"
diff --git a/addons/event/__terp__.py b/addons/event/__terp__.py
index 04285d4fd3c..654492e4ddf 100644
--- a/addons/event/__terp__.py
+++ b/addons/event/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -45,7 +45,9 @@
         'event_view.xml',
         'event_sequence.xml',
         'security/event_security.xml',
-        'security/ir.model.access.csv'
+        'security/ir.model.access.csv',
+        'wizard/event_registration_view.xml',
+        'wizard/event_registrations_partner.xml',
     ],
     'demo_xml': ['event_demo.xml'],
     'installable': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 55dea914ac5..f257c8df6e4 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -162,7 +162,7 @@
 			<field name="arch" type="xml">
 				<tree string="Registration">
 					<field name="id"/>
-					<field name="create_date"/>
+					<field name="date"/>
 					<field name="event_id"/>
 					<field name="partner_id"/>
 					<field name="nb_register"/>
@@ -331,7 +331,7 @@
 		</record>
 
 		<record model="ir.actions.act_window" id="action_event_registration">
-			<field name="name">Registration by Event</field>
+			<field name="name">Events On Registrations</field>
 			<field name="res_model">report.event.registration</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,graph</field>
diff --git a/addons/event/event_wizard.xml b/addons/event/event_wizard.xml
index fd0488dc1dc..2888bd8587f 100644
--- a/addons/event/event_wizard.xml
+++ b/addons/event/event_wizard.xml
@@ -2,17 +2,17 @@
 <openerp>
     <data>
 
-        <wizard
+<!--        <wizard
             string="Registrations"
             model="event.event"
             name="wizard_event_registration"
-            id="wizard_event_registration"/>
+            id="wizard_event_registration"/> -->
 
-        <wizard
+<!--        <wizard
             string="List Register Partners"
             model="event.event"
             name="event.event_reg_partners"
-            id="wizard_event_reg_partners"/>
+            id="wizard_event_reg_partners"/> -->
 
         <wizard string="Make Invoice"
             model="event.registration"
@@ -21,7 +21,7 @@
             menu="True"
             />
 
-        <wizard string="Confirm Registration"
+         <wizard string="Confirm Registration"
             model="event.registration"
             name="event.confirm_registration"
             id="event_confirm_registration"
diff --git a/addons/event/i18n/ar.po b/addons/event/i18n/ar.po
index 426df105704..a1855d44c07 100644
--- a/addons/event/i18n/ar.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/bg.po b/addons/event/i18n/bg.po
index 58980abb684..486f2bf0690 100644
--- a/addons/event/i18n/bg.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/bs.po b/addons/event/i18n/bs.po
index 8e28ed5816b..357f618d459 100644
--- a/addons/event/i18n/bs.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/ca.po b/addons/event/i18n/ca.po
index eeb989edd83..0815a9c44f4 100644
--- a/addons/event/i18n/ca.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/cs.po b/addons/event/i18n/cs.po
index 655ccc41992..5a5f7951333 100644
--- a/addons/event/i18n/cs.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index cd7a0f7fa54..ed0cb5572a8 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index d4209e5782b..3a84166acbf 100644
--- a/addons/event/i18n/es.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/es_AR.po b/addons/event/i18n/es_AR.po
index 4ccedf00e34..7976203a54f 100644
--- a/addons/event/i18n/es_AR.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index ff9d48c713e..1e926a6af32 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/fi.po b/addons/event/i18n/fi.po
index 81951411220..1b4c8eb6eea 100644
--- a/addons/event/i18n/fi.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index c56954b9e12..42875f6a2ad 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/i18n/fr.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-24 20:38+0000\n"
-"Last-Translator: Bruno - www.zeekom.com <Unknown>\n"
+"Last-Translator: Bruno JOLIVEAU - www.zeekom.com <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/hi.po b/addons/event/i18n/hi.po
index 5216fb0f7e8..aec45910056 100644
--- a/addons/event/i18n/hi.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/hr.po b/addons/event/i18n/hr.po
index 426df105704..8701e7362d4 100644
--- a/addons/event/i18n/hr.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/hu.po b/addons/event/i18n/hu.po
index a41b87fda71..a9f6dc42907 100644
--- a/addons/event/i18n/hu.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/id.po b/addons/event/i18n/id.po
index 8f4ac37614c..4d11ebf10ae 100644
--- a/addons/event/i18n/id.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index 00d06fc0c83..1af949ba348 100644
--- a/addons/event/i18n/it.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/ko.po b/addons/event/i18n/ko.po
index 302bcf5f707..b638e140d1b 100644
--- a/addons/event/i18n/ko.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/lt.po b/addons/event/i18n/lt.po
index 759760917d9..bd1d55de827 100644
--- a/addons/event/i18n/lt.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index b4c188ecf64..d819bec899c 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/nl_BE.po b/addons/event/i18n/nl_BE.po
index 3f7f8d5dae0..df5d84c033f 100644
--- a/addons/event/i18n/nl_BE.po
+++ b/addons/event/i18n/nl_BE.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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/pl.po b/addons/event/i18n/pl.po
index 00fe4a8b04e..8b9de7c4edc 100644
--- a/addons/event/i18n/pl.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/pt.po b/addons/event/i18n/pt.po
index 3a441cee929..3d340cfcc61 100644
--- a/addons/event/i18n/pt.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po
index 385db309252..0c20c1e8bce 100644
--- a/addons/event/i18n/pt_BR.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/ro.po b/addons/event/i18n/ro.po
index e4436db1411..c655a1580ea 100644
--- a/addons/event/i18n/ro.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po
index 51547c18929..d39ffbcf2d9 100644
--- a/addons/event/i18n/ru.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/sk.po b/addons/event/i18n/sk.po
index 781c814e21e..c6e9915f702 100644
--- a/addons/event/i18n/sk.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/sl.po b/addons/event/i18n/sl.po
index 7eccdeb7acd..3d1c70853b8 100644
--- a/addons/event/i18n/sl.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
index 5966195e4ad..94d5f34970f 100644
--- a/addons/event/i18n/sv.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/tlh.po b/addons/event/i18n/tlh.po
index 6bffe5edab0..7236ae1a4f4 100644
--- a/addons/event/i18n/tlh.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/tr.po b/addons/event/i18n/tr.po
index 03b3f1cc152..41f0d2d617a 100644
--- a/addons/event/i18n/tr.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/uk.po b/addons/event/i18n/uk.po
index 6ee20189d7e..122965ed302 100644
--- a/addons/event/i18n/uk.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index e071cf1048f..b815a1fd337 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -4,73 +4,73 @@
 #
 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: 2010-01-07 11:24+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:report.event.registration,date_end:0
 msgid "Ending date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "最小记录"
 
 #. module: event
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr "注册电子邮件"
+msgstr "记录邮件"
 
 #. module: event
 #: model:crm.case.section,name:event.event_0_crm_case_section
 msgid "Concert of Bon Jovi"
-msgstr "邦侨维演唱会"
+msgstr "Bon Jovi音乐会"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr "确认电子邮件"
+msgstr "确认邮件"
 
 #. module: event
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr "错误！你不能创建递归的组。"
+msgstr "错误！你不能创建递归的项"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr "事件注册"
+msgstr "事件记录"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.event_reg_invoice
 msgid "Make Invoice"
-msgstr "生成发票"
+msgstr "创建发票"
 
 #. module: event
 #: field:report.event.type.registration,draft_state:0
 msgid "Draft Registrations"
-msgstr "草案注册"
+msgstr "记录草稿"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "注册的事件"
+msgstr "记录的事件"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,end:0
@@ -80,7 +80,7 @@ msgstr "确定"
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr "自动配置邮件"
+msgstr "邮件自动确认"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
@@ -90,7 +90,7 @@ msgstr "歌剧门票"
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rejected:0
 msgid "Invoice Rejected"
-msgstr ""
+msgstr "发票被拒绝"
 
 #. module: event
 #: view:event.event:0
@@ -100,12 +100,12 @@ msgstr "确认事件"
 #. module: event
 #: model:crm.case.section,name:event.event_1_crm_case_section
 msgid "Opera of Verdi"
-msgstr "威尔第歌剧"
+msgstr "Verdi歌剧"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid "Draft Registration"
-msgstr ""
+msgstr "记录草稿"
 
 #. module: event
 #: wizard_view:event.reg_make_invoice,init:0
@@ -130,6 +130,11 @@ msgid ""
 "event or per event category in :\n"
 "                Events / Reporting\n"
 msgstr ""
+"组织和事件管理\n"
+"这模块允许你\n"
+"* 管理你的事务\n"
+"* 使用电子邮件自动确认和发送致谢到登记的每个事务\n"
+"....\n"
 
 #. module: event
 #: view:event.registration:0
@@ -139,7 +144,7 @@ msgstr "额外信息"
 #. module: event
 #: view:event.registration:0
 msgid "Registration"
-msgstr "登记"
+msgstr "记录"
 
 #. module: event
 #: field:event.type,name:0
@@ -158,12 +163,12 @@ msgstr "事件"
 #. module: event
 #: selection:event.event,state:0
 msgid "Confirmed"
-msgstr "已确认"
+msgstr "确认"
 
 #. module: event
 #: wizard_view:event.confirm_registration,split:0
 msgid "Registration Confirmation"
-msgstr "登记确认"
+msgstr "记录确认"
 
 #. module: event
 #: view:event.registration:0
@@ -175,42 +180,42 @@ msgstr "日期"
 #: model:ir.actions.act_window,name:event.action_registration_confirm
 #: model:ir.ui.menu,name:event.menu_action_registration_confirm
 msgid "Confirmed Registrations"
-msgstr "已确认的登记列表"
+msgstr "确认记录"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
 msgid "Mail Auto Register"
-msgstr "邮件自动注册"
+msgstr "邮件自动记录"
 
 #. module: event
 #: view:event.registration:0
 msgid "Badge"
-msgstr "徽章"
+msgstr "标志"
 
 #. module: event
 #: field:event.event,section_id:0
 msgid "Case section"
-msgstr "案例栏目"
+msgstr "业务个案项"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr "待开票"
+msgstr "开发票"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_event
 msgid "All Events"
-msgstr "全部事件"
+msgstr "所有事件"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_report_event
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: event
 #: view:event.registration:0
 msgid "Cancel Registration"
-msgstr "取消登记"
+msgstr "取消记录"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_action_event_categories
@@ -220,24 +225,24 @@ msgstr "事件分类"
 #. module: event
 #: wizard_view:event.confirm_registration,split:0
 msgid "The event limit is reached. What do you want to do?"
-msgstr ""
+msgstr "这事件到达限制.你想要怎么做?"
 
 #. module: event
 #: field:report.event.type.registration,confirm_state:0
 msgid "Confirm Registrations"
-msgstr ""
+msgstr "确认记录"
 
 #. module: event
 #: view:event.registration:0
 msgid "References"
-msgstr "引用"
+msgstr "参考"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type_registration
 #: model:ir.ui.menu,name:event.menu_report_event_type_registration
 #: view:report.event.type.registration:0
 msgid "Registration By Event Types"
-msgstr ""
+msgstr "记录的事件类型"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_config
@@ -247,27 +252,27 @@ msgstr "设置"
 #. module: event
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: event
 #: wizard_button:event.confirm_registration,split,confirm:0
 msgid "Confirm Anyway"
-msgstr "总是确认"
+msgstr "无论如何确认"
 
 #. module: event
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: event
 #: view:event.event:0
 msgid "Parent Category"
-msgstr "上级分类"
+msgstr "业务伙伴分类"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registration Invoiced"
-msgstr ""
+msgstr "记录发票"
 
 #. module: event
 #: field:report.event.type.registration,nbevent:0
@@ -282,39 +287,39 @@ msgstr "取消事件"
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
 msgid "Error Messages"
-msgstr "错误消息"
+msgstr "错误信息"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr "邮寄"
+msgstr "邮递"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr "演唱会票"
+msgstr "音乐会门票"
 
 #. module: event
 #: field:event.event,register_prospect:0
 #: model:ir.actions.act_window,name:event.action_registration_draft
 #: model:ir.ui.menu,name:event.menu_action_registration_draft
 msgid "Unconfirmed Registrations"
-msgstr ""
+msgstr "不确认记录"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr "业务伙伴已开票"
+msgstr "业务伙伴发票"
 
 #. module: event
 #: view:event.registration:0
 msgid "Communication history"
-msgstr "通讯记录"
+msgstr "沟通日志"
 
 #. module: event
 #: selection:event.event,state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: event
 #: view:event.event:0
@@ -324,19 +329,19 @@ msgstr "事件完成"
 #. module: event
 #: field:event.registration,badge_name:0
 msgid "Badge Name"
-msgstr "徽章名称"
+msgstr "标志名称"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_registration
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 msgid "Events On Registrations"
-msgstr ""
+msgstr "记录的事件"
 
 #. module: event
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类下。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_created:0
@@ -361,18 +366,18 @@ msgstr "事件说明"
 #. module: event
 #: model:ir.model,name:event.model_report_event_type_registration
 msgid "Event type on registration"
-msgstr ""
+msgstr "记录的事件类型"
 
 #. module: event
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: event
 #: field:event.registration,event_id:0
 msgid "Event Related"
-msgstr "关联的事件"
+msgstr "有关事件"
 
 #. module: event
 #: model:crm.case.section,name:event.case_section_event
@@ -384,174 +389,174 @@ msgstr "事件"
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr "登记数"
+msgstr "记录数"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,state:0
 #: view:event.registration:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_categories
 msgid "Events by section"
-msgstr ""
+msgstr "事件项"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_action_registration
 msgid "All Registrations"
-msgstr ""
+msgstr "所有记录"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use the automatic mailing for new registration"
-msgstr ""
+msgstr "如果你使用自动邮递一个新记录"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: event
 #: view:event.registration:0
 #: model:ir.actions.wizard,name:event.event_confirm_registration
 #: field:report.event.registration,confirm_state:0
 msgid "Confirm Registration"
-msgstr ""
+msgstr "确认记录"
 
 #. module: event
 #: view:event.registration:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr ""
+msgstr "事件类型"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "业务伙伴联系人"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "自动确认邮件"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send Reminder"
-msgstr ""
+msgstr "发送提醒"
 
 #. module: event
 #: selection:event.event,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: event
 #: field:event.event,date_begin:0
 #: field:report.event.registration,date_begin:0
 msgid "Beginning date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: event
 #: field:event.registration,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: event
 #: model:ir.model,name:event.model_report_event_registration
 msgid "Events on registrations"
-msgstr ""
+msgstr "记录的事件"
 
 #. module: event
 #: wizard_button:event.confirm_registration,split,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,open:0
 msgid "Open"
-msgstr ""
+msgstr "待处理"
 
 #. module: event
 #: field:event.registration,badge_title:0
 msgid "Badge Title"
-msgstr ""
+msgstr "标志称谓"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_new_event_form
 #: model:ir.ui.menu,name:event.menu_event_new_event
 msgid "New event"
-msgstr ""
+msgstr "新事件"
 
 #. module: event
 #: field:event.registration,unit_price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "单价"
 
 #. module: event
 #: model:crm.case.section,name:event.event_2_crm_case_section
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "ERP Buisness会议"
 
 #. module: event
 #: field:event.registration,badge_partner:0
 msgid "Badge Partner"
-msgstr ""
+msgstr "业务伙伴标志"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_view_confirm
 #: model:ir.ui.menu,name:event.menu_event_event_confirm
 msgid "Confirmed Events"
-msgstr ""
+msgstr "确认事件"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "最大记录"
 
 #. module: event
 #: field:event.event,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "有人赞同确认事件将发送这邮件"
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
 msgid "Ticket for Conference"
-msgstr ""
+msgstr "会议门票"
 
 #. module: event
 #: field:event.registration,case_id:0
 msgid "Case"
-msgstr ""
+msgstr "业务个案"
 
 #. module: event
 #: view:event.event:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
 msgid ""
 "Check this box if you want ot use the automatic confirmation emailing or the "
 "reminder"
-msgstr ""
+msgstr "如果你使用自动邮件确认或提醒"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -559,63 +564,66 @@ msgid ""
 "This email will be sent when the event gets confimed or when someone "
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
-msgstr ""
+msgstr "当有人确认这事件或赞同这确认时这邮件将被发送以提醒有关人等"
 
 #. module: event
 #: field:event.event,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: event
 #: field:event.registration,invoice_label:0
 msgid "Label Invoice"
-msgstr ""
+msgstr "发票标签"
 
 #. module: event
 #: view:event.registration:0
 msgid "Payments"
-msgstr ""
+msgstr "付款"
 
 #. module: event
 #: view:event.type:0
 #: field:report.event.type.registration,name:0
 msgid "Event Type"
-msgstr ""
+msgstr "事件类型"
 
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_registration
 #: model:ir.actions.wizard,name:event.wizard_event_registration
 msgid "Registrations"
-msgstr ""
+msgstr "记录"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_view_draft
 #: model:ir.ui.menu,name:event.menu_event_event_draft
 msgid "Draft Events"
-msgstr ""
+msgstr "事件草稿"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_main
 msgid "Events Organisation"
-msgstr ""
+msgstr "事件系统"
 
 #. module: event
 #: view:event.registration:0
 msgid "Actions"
-msgstr ""
+msgstr "动作"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.wizard_event_reg_partners
 msgid "List Register Partners"
-msgstr ""
+msgstr "业务伙伴记录列表"
 
 #. module: event
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误:无效EAN编码"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "自动记录邮件"
+
+#~ msgid "Action Information"
+#~ msgstr "动作信息"
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index 9e08092d399..f6bb06c558e 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index 9170cade0f5..f197adebe0a 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,12 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import event_registration
 import make_invoice
 import event_registrations_partner
 import confirm_registration
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
index 40d2196b004..e7252a1a63d 100644
--- a/addons/event/wizard/event_registration.py
+++ b/addons/event/wizard/event_registration.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,40 +15,29 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import wizard
-import pooler
+from osv import fields, osv
 
-def _event_registration(self, cr, uid, data, context):
-    event_id = data['id']
-    cr.execute('SELECT section_id FROM event_event WHERE id = %s', (event_id, ))
-    res = cr.fetchone()
-    value = {
-        'domain': [('section_id', '=', res[0])],
-        'name': 'Event registration',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'event.registration',
-        'context': { },
-        'type': 'ir.actions.act_window'
-    }
-    return value
+class event_registration_list(osv.osv_memory):
+    """ List Event Registration """
+    _name = "event.registration.list"
+    _description = "List Event Registrations"
 
-class wizard_event_registration(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _event_registration,
-                'state': 'end'
-            }
-        },
-    }
-wizard_event_registration("wizard_event_registration")
+    def open_registration(self, cr, uid, ids, context={}):
+        cr.execute('SELECT section_id FROM event_event WHERE id = %s', (context['active_id'],))
+        res = cr.fetchone()
+        return {
+            'domain': [('section_id', '=', res[0])],
+            'name': 'Event Registrations',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'event.registration',
+            'type': 'ir.actions.act_window'
+        }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+event_registration_list()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_registration_view.xml b/addons/event/wizard/event_registration_view.xml
new file mode 100644
index 00000000000..5afe437bc0f
--- /dev/null
+++ b/addons/event/wizard/event_registration_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_event_registration" model="ir.ui.view">
+            <field name="name">List Event Registrations</field>
+            <field name="model">event.registration.list</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="">
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+            	<button name="open_registration" string="Open Registrations" type="object" icon="gtk-open"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_event_registration" model="ir.actions.act_window">
+            <field name="name">Registrations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.registration.list</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_event_registration"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record model="ir.values" id="event_registration_values">
+            <field name="model_id" ref="event.model_event_event" />
+            <field name="object" eval="1" />
+            <field name="name">Event Registrations</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_event_registration'))" />
+            <field name="key">action</field>
+            <field name="model">event.event</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/event/wizard/event_registrations_partner.py b/addons/event/wizard/event_registrations_partner.py
index 199973d5677..e8fe43f97e0 100644
--- a/addons/event/wizard/event_registrations_partner.py
+++ b/addons/event/wizard/event_registrations_partner.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,57 +15,41 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import wizard
-import pooler
-
 from osv import fields, osv
+from tools.translate import _
 
-def _list_partners(self, cr, uid, data, context):
+class event_partners_list(osv.osv_memory):
+    """ Event Partners """
+    _name = "event.partners.list"
+    _description = "List Event Partners"
+
+    def list_partners(self, cr, uid, ids, context={}):
+        obj_reg = self.pool.get('event.registration')
+        mod_obj = self.pool.get('ir.model.data')
         list_partner = []
-        pool_obj=pooler.get_pool(cr.dbname)
-        obj_reg=pool_obj.get('event.registration')
-        reg_ids = obj_reg.search(cr, uid, [('event_id','in',data['ids'])])
-        data_reg = obj_reg.browse(cr, uid, reg_ids)
+        reg_ids = obj_reg.search(cr, uid, [('event_id','in',context['active_ids'])], context=context)
+        data_reg = obj_reg.browse(cr, uid, reg_ids, context=context)
         for reg in data_reg:
             if not reg.partner_id.id in list_partner:
                 list_partner.append(reg.partner_id.id)
-        data['partner_ids'] = list_partner
-        return {}
-
-class event_partners(wizard.interface):
-    def _reg_partners(self, cr, uid, data, context):
-        pool_obj = pooler.get_pool(cr.dbname)
-        mod_obj = pool_obj.get('ir.model.data') 
         result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'])        
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_partner_form')])
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+        model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_partner_form')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         return {
-            'domain': "[('id','in', ["+','.join(map(str,data['partner_ids']))+"])]",
-            'name': 'Partners',
+            'domain': "[('id','in', ["+','.join(map(str, list_partner))+"])]",
+            'name': _('Event Partners'),
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'res.partner',
             'views': [(False,'tree'),(resource_id,'form')],
             'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id'] 
+            'search_view_id': id['res_id']
         }
-        return {}
-
-    states = {
-        'init' : {
-               'actions' : [_list_partners],
-               'result': {'type': 'action' , 'action':_reg_partners, 'state':'end'}
-            },
-
-    }
-
-event_partners("event.event_reg_partners")
 
+event_partners_list()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/event/wizard/event_registrations_partner.xml b/addons/event/wizard/event_registrations_partner.xml
new file mode 100644
index 00000000000..c700bde11f9
--- /dev/null
+++ b/addons/event/wizard/event_registrations_partner.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_event_partners" model="ir.ui.view">
+            <field name="name">Event Partners</field>
+            <field name="model">event.partners.list</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             	 <form string="Event Partners">
+             	 	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+            		<button name="list_partners" string="Open Partners" type="object" icon="gtk-open"/>
+			  	 </form>
+            </field>
+		</record>
+
+		<record id="action_event_partners" model="ir.actions.act_window">
+            <field name="name">List Register Partners</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.partners.list</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_event_partners"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record model="ir.values" id="event_partner_values">
+            <field name="model_id" ref="event.model_event_event" />
+            <field name="object" eval="1" />
+            <field name="name">Event Partners</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_event_partners'))"/>
+            <field name="key">action</field>
+            <field name="model">event.event</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/event_project/i18n/ar.po b/addons/event_project/i18n/ar.po
index 9adc5f62bdc..22e579dcc4a 100644
--- a/addons/event_project/i18n/ar.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/bg.po b/addons/event_project/i18n/bg.po
index 2af04afcabe..47363d4efcf 100644
--- a/addons/event_project/i18n/bg.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/bs.po b/addons/event_project/i18n/bs.po
index 0576636dc33..813407f637e 100644
--- a/addons/event_project/i18n/bs.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/ca.po b/addons/event_project/i18n/ca.po
index f0f51605ceb..5ffd138dd00 100644
--- a/addons/event_project/i18n/ca.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/cs.po b/addons/event_project/i18n/cs.po
index 8f76250302c..cec73cc1a6a 100644
--- a/addons/event_project/i18n/cs.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/de.po b/addons/event_project/i18n/de.po
index 0f6bb9ccf63..23946e6e140 100644
--- a/addons/event_project/i18n/de.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/es.po b/addons/event_project/i18n/es.po
index bf511fd4391..694f6c25d19 100644
--- a/addons/event_project/i18n/es.po
+++ b/addons/event_project/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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/es_AR.po b/addons/event_project/i18n/es_AR.po
index 385cefedc09..c2f6dfd3ace 100644
--- a/addons/event_project/i18n/es_AR.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/et.po b/addons/event_project/i18n/et.po
index c196a995a2d..e1013400604 100644
--- a/addons/event_project/i18n/et.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/fr.po b/addons/event_project/i18n/fr.po
index b780c9e148e..7d3bce0e7df 100644
--- a/addons/event_project/i18n/fr.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/gl.po b/addons/event_project/i18n/gl.po
index 3e646a787e6..09d707fc777 100644
--- a/addons/event_project/i18n/gl.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/hi.po b/addons/event_project/i18n/hi.po
index 3b14d462bc4..72858e7ab62 100644
--- a/addons/event_project/i18n/hi.po
+++ b/addons/event_project/i18n/hi.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-15 13:24+0000\n"
-"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-16 22:57+0000\n"
+"Last-Translator: Neetesh Biswas <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "संरचना देखने के लिए अमान्य XML"
 
 #. module: event_project
 #: model:ir.actions.wizard,name:event_project.wizard_event_task
diff --git a/addons/event_project/i18n/hr.po b/addons/event_project/i18n/hr.po
index 98f2eab569a..24a622a8663 100644
--- a/addons/event_project/i18n/hr.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/hu.po b/addons/event_project/i18n/hu.po
index 9adc5f62bdc..22e579dcc4a 100644
--- a/addons/event_project/i18n/hu.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/id.po b/addons/event_project/i18n/id.po
index 5e2762c736e..4f676f97312 100644
--- a/addons/event_project/i18n/id.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/it.po b/addons/event_project/i18n/it.po
index 2d0b0b9670b..760bba8bd16 100644
--- a/addons/event_project/i18n/it.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/ko.po b/addons/event_project/i18n/ko.po
index 3f59c44e076..90c1baf6391 100644
--- a/addons/event_project/i18n/ko.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/lt.po b/addons/event_project/i18n/lt.po
index 9adc5f62bdc..22e579dcc4a 100644
--- a/addons/event_project/i18n/lt.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/nl.po b/addons/event_project/i18n/nl.po
index 4c8d63c124d..1e396bbbd59 100644
--- a/addons/event_project/i18n/nl.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/nl_BE.po b/addons/event_project/i18n/nl_BE.po
index 71752c1ab70..823f9007519 100644
--- a/addons/event_project/i18n/nl_BE.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/pl.po b/addons/event_project/i18n/pl.po
index 3361728ff76..2da3e4a6d72 100644
--- a/addons/event_project/i18n/pl.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/pt.po b/addons/event_project/i18n/pt.po
index 73ba38276dc..99ac98a9a37 100644
--- a/addons/event_project/i18n/pt.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/pt_BR.po b/addons/event_project/i18n/pt_BR.po
index cecec48e862..e5c328df892 100644
--- a/addons/event_project/i18n/pt_BR.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/ro.po b/addons/event_project/i18n/ro.po
index 9adc5f62bdc..22e579dcc4a 100644
--- a/addons/event_project/i18n/ro.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/ru.po b/addons/event_project/i18n/ru.po
index c2884bd4c59..3e8b6176a15 100644
--- a/addons/event_project/i18n/ru.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/sl.po b/addons/event_project/i18n/sl.po
index cb56ac32e00..4d3efdcf21b 100644
--- a/addons/event_project/i18n/sl.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/sv.po b/addons/event_project/i18n/sv.po
index 9adc5f62bdc..22e579dcc4a 100644
--- a/addons/event_project/i18n/sv.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/tlh.po b/addons/event_project/i18n/tlh.po
index 12c1baf5e55..b0305823411 100644
--- a/addons/event_project/i18n/tlh.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/tr.po b/addons/event_project/i18n/tr.po
index 2d19f586a03..54fec9e4d9a 100644
--- a/addons/event_project/i18n/tr.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/uk.po b/addons/event_project/i18n/uk.po
index 05a2b0ff7ef..3595e37eaed 100644
--- a/addons/event_project/i18n/uk.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/event_project/i18n/zh_CN.po b/addons/event_project/i18n/zh_CN.po
index d102a611b4b..07fd5926c66 100644
--- a/addons/event_project/i18n/zh_CN.po
+++ b/addons/event_project/i18n/zh_CN.po
@@ -7,24 +7,24 @@ 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-01-23 17:18+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "这动作定义中无效的模块名"
 
 #. module: event_project
 #: model:ir.actions.wizard,name:event_project.wizard_event_task
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: event_project
 #: wizard_button:event.project,init,done:0
@@ -39,45 +39,48 @@ msgid ""
 "    This module allow you to create retro planning for managing your "
 "events.\n"
 msgstr ""
+"事件的组织和管理.\n"
+"\n"
+"    这模块允许你在你的事件创建补充计划管理.\n"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Remaining Tasks"
-msgstr ""
+msgstr "剩下的任务"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event - Project"
-msgstr ""
+msgstr "事件 - 项目"
 
 #. module: event_project
 #: field:event.event,project_id:0
 #: wizard_field:event.project,init,project_id:0
 #: model:ir.actions.wizard,name:event_project.event_wiz
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: event_project
 #: field:event.event,task_ids:0
 msgid "Project tasks"
-msgstr ""
+msgstr "项目任务"
 
 #. module: event_project
 #: wizard_button:event.project,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr ""
+msgstr "创建补充计划"
 
 #. module: event_project
 #: wizard_view:event.project,init:0
 msgid "Event"
-msgstr ""
+msgstr "事件"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Tasks management"
-msgstr ""
+msgstr "任务管理"
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index d102a611b4b..266d41d9aea 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/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: event_project
diff --git a/addons/google_map/i18n/ar.po b/addons/google_map/i18n/ar.po
index e8fb6a3e2cb..8548c831fee 100644
--- a/addons/google_map/i18n/ar.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/bg.po b/addons/google_map/i18n/bg.po
index b2215fe0911..e434862994f 100644
--- a/addons/google_map/i18n/bg.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/bs.po b/addons/google_map/i18n/bs.po
index ce55ec3b036..81a6775e815 100644
--- a/addons/google_map/i18n/bs.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ca.po b/addons/google_map/i18n/ca.po
index bcd4b5ed3f9..6fa81a0580b 100644
--- a/addons/google_map/i18n/ca.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/cs.po b/addons/google_map/i18n/cs.po
index 71c23c531e5..6d451e8972e 100644
--- a/addons/google_map/i18n/cs.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po
index d81b44a3155..d1fdbc0c02d 100644
--- a/addons/google_map/i18n/da.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/de.po b/addons/google_map/i18n/de.po
index 47ddf0d9242..0243643ef54 100644
--- a/addons/google_map/i18n/de.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/el.po b/addons/google_map/i18n/el.po
index 6a73552c717..9367045b4de 100644
--- a/addons/google_map/i18n/el.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/es.po b/addons/google_map/i18n/es.po
index c49c7cfd575..74a769f90fd 100644
--- a/addons/google_map/i18n/es.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/es_AR.po b/addons/google_map/i18n/es_AR.po
index 400e660ffe2..a7f814db5ee 100644
--- a/addons/google_map/i18n/es_AR.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/et.po b/addons/google_map/i18n/et.po
index 17f423e7d4b..2c78b7d6709 100644
--- a/addons/google_map/i18n/et.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/fi.po b/addons/google_map/i18n/fi.po
index 901a613b861..94b7c9d7e27 100644
--- a/addons/google_map/i18n/fi.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/fr.po b/addons/google_map/i18n/fr.po
index 948fb0d3798..e3278ce0f29 100644
--- a/addons/google_map/i18n/fr.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/gl.po b/addons/google_map/i18n/gl.po
index 6c9f3d89549..17c35744862 100644
--- a/addons/google_map/i18n/gl.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/hi.po b/addons/google_map/i18n/hi.po
index 95972a79442..e26bd02d902 100644
--- a/addons/google_map/i18n/hi.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/hr.po b/addons/google_map/i18n/hr.po
index c2e1486379c..77d339dcc69 100644
--- a/addons/google_map/i18n/hr.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/hu.po b/addons/google_map/i18n/hu.po
index ce97ce4358e..8b00fdb1e1c 100644
--- a/addons/google_map/i18n/hu.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/id.po b/addons/google_map/i18n/id.po
index d7fde823717..475040f1112 100644
--- a/addons/google_map/i18n/id.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/it.po b/addons/google_map/i18n/it.po
index 1e2128fc3f9..4a0c1e4c4a5 100644
--- a/addons/google_map/i18n/it.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ko.po b/addons/google_map/i18n/ko.po
index b4c874d8fa2..d68df7cba15 100644
--- a/addons/google_map/i18n/ko.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/lt.po b/addons/google_map/i18n/lt.po
index fbb9d672c6e..f1a38450a61 100644
--- a/addons/google_map/i18n/lt.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/lv.po b/addons/google_map/i18n/lv.po
index 151d8d3c0e4..f6bd75d5acb 100644
--- a/addons/google_map/i18n/lv.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/nl.po b/addons/google_map/i18n/nl.po
index 66414cd0e43..b02e939843a 100644
--- a/addons/google_map/i18n/nl.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/nl_BE.po b/addons/google_map/i18n/nl_BE.po
index 862d5c12f6f..446c84c7760 100644
--- a/addons/google_map/i18n/nl_BE.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pl.po b/addons/google_map/i18n/pl.po
index 0bcdbcbe5d3..d80e4819ac5 100644
--- a/addons/google_map/i18n/pl.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pt.po b/addons/google_map/i18n/pt.po
index 2d39e774719..c005a724ee8 100644
--- a/addons/google_map/i18n/pt.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pt_BR.po b/addons/google_map/i18n/pt_BR.po
index 03a850fdbf0..68b6aeb0601 100644
--- a/addons/google_map/i18n/pt_BR.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ro.po b/addons/google_map/i18n/ro.po
index d181db3ecae..eec90cac4b0 100644
--- a/addons/google_map/i18n/ro.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index dbb25b27144..ffc4e91bc2f 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po
index c67081359ab..9ad6033fa77 100644
--- a/addons/google_map/i18n/sk.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sl.po b/addons/google_map/i18n/sl.po
index 24dd06c1521..61be790cb88 100644
--- a/addons/google_map/i18n/sl.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sq.po b/addons/google_map/i18n/sq.po
index a627274a27e..18e9f7cec17 100644
--- a/addons/google_map/i18n/sq.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sv.po b/addons/google_map/i18n/sv.po
index 71f24268fc6..8b3cf032d98 100644
--- a/addons/google_map/i18n/sv.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/tlh.po b/addons/google_map/i18n/tlh.po
index ab1396b7a1f..c7915b54750 100644
--- a/addons/google_map/i18n/tlh.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/tr.po b/addons/google_map/i18n/tr.po
index b2d989b43ea..30303ca9163 100644
--- a/addons/google_map/i18n/tr.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/uk.po b/addons/google_map/i18n/uk.po
index 7ac5d37075f..3f54ac45d41 100644
--- a/addons/google_map/i18n/uk.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po
index 238c20e6a6c..06092e55e10 100644
--- a/addons/google_map/i18n/zh_CN.po
+++ b/addons/google_map/i18n/zh_CN.po
@@ -4,33 +4,33 @@
 #
 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-09 02:20+0000\n"
-"Last-Translator: wyh <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
 msgid "Launch Google Map"
-msgstr ""
+msgstr "启动Google地图"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML视图结构无效"
+msgstr "无效XML视图结构!"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
-msgstr ""
+msgstr "街道2: "
 
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
@@ -38,13 +38,13 @@ msgid ""
 "The module adds google map field in partner address\n"
 "so that we can directly open google map from the\n"
 "url widget."
-msgstr ""
-"该模块增加了谷歌地图合伙人信息\n"
-"使我们可以直接打开谷歌地图从\n"
-"网址挂件。"
+msgstr "这模块增加google地图到业务伙伴地址你能在google地图直接打开网址"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Map"
-msgstr ""
+msgstr "地图"
+
+#~ msgid "Google Map"
+#~ msgstr "Google地图"
diff --git a/addons/google_map/i18n/zh_TW.po b/addons/google_map/i18n/zh_TW.po
index 195e53f358c..33db23435c9 100644
--- a/addons/google_map/i18n/zh_TW.po
+++ b/addons/google_map/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 72bd9fd4ce0..ef1160132a5 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -44,7 +44,7 @@ class hr_department(osv.osv):
     _columns = {
         'name': fields.char('Department Name', size=64, required=True),
         'complete_name': fields.function(_dept_name_get_fnc, method=True, type="char", string='Name'),
-        'company_id': fields.many2one('res.company', 'Company', select=True, required=True),
+        'company_id': fields.many2one('res.company', 'Company', select=True, required=False),
         'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
         'child_ids': fields.one2many('hr.department', 'parent_id', 'Child Departments'),
         'note': fields.text('Note'),
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f98150f815b..f8b7c58985c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -113,6 +113,8 @@
 
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index 5e65f8aa04b..8bb129df0a7 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index f13cebfacb2..a6932ded95f 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index c4624869c48..e4119940e82 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index be8db4ce029..55ecc67b99f 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index 008ad392a6b..e7ab23dd03e 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 31286d30262..faa11134d9b 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index 1510640ecec..4f11bbcd95f 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index d071e339ea2..677a441e494 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index a66e8c27e17..e71c90e4167 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 4b3bfdf6ebd..9eaebe60d3e 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 983c5382ef3..6f360e59b70 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 82f66ff42ee..401ffba0ad1 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -14,20 +14,20 @@ msgstr ""
 "MIME-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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Openerp user"
-msgstr "Openerp käyttäjä"
+msgstr "OpenERP käyttäjä"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.edit_workgroup
 #: model:ir.ui.menu,name:hr.menu_edit_workgroup
 msgid "Working Time Categories"
-msgstr "Työaika Kategoriat"
+msgstr "Työaika kategoriat"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -37,13 +37,13 @@ msgstr "Virhe! Et voi luoda itseään toistavia osastoja."
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "Vakuutustunnus"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Henkilöstö resurssit"
+msgstr "Henkilöstön hallinta"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
@@ -58,7 +58,7 @@ msgstr "Vanhemmat"
 #. module: hr
 #: 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: hr
 #: view:hr.department:0
@@ -68,7 +68,7 @@ msgstr "Osasto"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Contact  of employee"
-msgstr "Työntekijän yhteystiedot"
+msgstr "Työntekijän yhteys"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -94,7 +94,7 @@ msgstr "Perjantai"
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr "Nykyinen osasto"
+msgstr "Ylempi osasto"
 
 #. module: hr
 #: view:hr.department:0
@@ -106,17 +106,17 @@ msgstr "Huomautukset"
 #. module: hr
 #: field:hr.timesheet,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Työaika alkaen"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Työntekijähierarkia"
+msgstr "Työntekijöiden hierarkia"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguraatio"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -131,13 +131,13 @@ msgstr "Nainen"
 #. module: hr
 #: view:hr.timesheet.group:0
 msgid "Working Time Category"
-msgstr "Työaika Kategoria"
+msgstr "Työaika kategoria"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Työntekijärakenne"
+msgstr "Työntekijöiden rakenne"
 
 #. module: hr
 #: view:hr.employee:0
@@ -152,7 +152,7 @@ msgstr "Työpuhelin"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Alakategoriat"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -175,7 +175,7 @@ msgstr "Työryhmän johtaja"
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr ""
+msgstr "Alaiset"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -185,7 +185,7 @@ msgstr "Raportointi"
 #. module: hr
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr ""
+msgstr "Jäsenet"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -210,7 +210,7 @@ msgstr "Eronnut"
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Yläkategoria"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
@@ -259,7 +259,7 @@ msgstr "Tiistai"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "henkilöstö.osasto"
+msgstr "hr.department"
 
 #. module: hr
 #: field:hr.employee,user_id:0
@@ -270,12 +270,12 @@ msgstr "Liittyvä käyttäjä"
 #: field:hr.employee,category_id:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "Kategoria"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "Huomautus"
 
 #. module: hr
 #: view:hr.employee:0
@@ -285,7 +285,7 @@ msgstr "Yhteystiedot"
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr "Status"
+msgstr "Asema"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
@@ -296,7 +296,7 @@ msgstr "Maanantai"
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr "Kategoriarakenne"
+msgstr "Kategorioiden rakenne"
 
 #. module: hr
 #: field:hr.timesheet,dayofweek:0
@@ -321,7 +321,7 @@ msgstr "Virhe! Et voi luoda itseään toistavaa työntekijähierarkiaa."
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract Process"
-msgstr ""
+msgstr "Työntekijän sopimusprosessi"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
@@ -331,7 +331,7 @@ msgstr "Luo OpenERP käyttäjä"
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee Complete Form"
-msgstr ""
+msgstr "Työntekijän täysi lomake"
 
 #. module: hr
 #: view:hr.department:0
@@ -357,7 +357,7 @@ msgstr "Aloituspäivämäärä"
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr ""
+msgstr "Ylemmät käyttäjät"
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -400,7 +400,7 @@ msgstr "Torstai"
 #. module: hr
 #: field:hr.timesheet,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Työaika päättyy"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -430,7 +430,7 @@ msgstr "Kansallisuus"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other ID"
-msgstr "Muu henkilötieto"
+msgstr "Muu tunnus"
 
 #. module: hr
 #: field:hr.timesheet,name:0
@@ -473,7 +473,7 @@ msgstr "Täytä työntekijän yhteystiedot"
 #: field:hr.department,manager_id:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Esimies"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 40fbb9185e5..c9488896f87 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -209,7 +209,7 @@ msgstr "Divorcé(e)"
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Catégorie Parente"
+msgstr "Catégorie mère"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
@@ -357,7 +357,7 @@ msgstr "Date début"
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr "Utilisateurs Parents"
+msgstr "Utilisateurs parents"
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -417,7 +417,7 @@ msgstr "Catégories des employés"
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "Adresse Personnelle"
+msgstr "Adresse personnelle"
 
 #. module: hr
 #: view:hr.department:0
@@ -459,7 +459,7 @@ msgstr "Nom du département"
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Départements fils"
+msgstr "Sous-départements"
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index c4a44a78bcd..2f796406e8b 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 5e65f8aa04b..8bb129df0a7 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index a2255c33d60..964e58f1aeb 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index fe50e66d0bb..8346eeb20c9 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 625f910a1e0..251c184d6aa 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -7,13 +7,13 @@ 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-02-03 16:29+0000\n"
-"Last-Translator: Mario Riva <mario.riva@domsense.com>\n"
+"PO-Revision-Date: 2010-03-28 10:20+0000\n"
+"Last-Translator: aiedail92 <aiedail92@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -52,12 +52,12 @@ msgstr "Domenica"
 #. module: hr
 #: view:res.users:0
 msgid "Parents"
-msgstr ""
+msgstr "Genitori"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Modello di nome non valido nella definzione dell'azione."
 
 #. module: hr
 #: view:hr.department:0
@@ -417,7 +417,7 @@ msgstr "Categorie Dipendenti"
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "Indirizzo abitazione"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index 46f61b26e98..fede2d3c76e 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 152bd8f29bb..7a47f3ff377 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index 2496eb6e1a4..06af739b28d 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index f86e476f84d..8c1e8ea9ff3 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index db543272218..74fe68ee167 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index ce0bd350ab7..84d1f63da08 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index bdd6be4b7aa..c3c77c88461 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index 1f5893d97a7..2e1e8860e87 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index a905d54fe57..538a304c858 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 6d5780fbba2..880cdcb9dce 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 578718d2af0..e5a9f22c186 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index ab72cdbf0a5..33caed51415 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index fa937d1508d..ee3632d1fe4 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index aac9ac2b195..f7e62658b55 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/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-03-09 21:10+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 263e233c11b..9a7e969937f 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index 886c8709ed6..dc435056d31 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index c4b24455f09..fb73c9afa54 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index 59b9a8bbb0d..275ce30056c 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 8fd536c6702..c7b0c8751bc 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/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: 2009-12-29 02:57+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:23+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -31,12 +31,12 @@ msgstr "工作时间分类"
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "错误！您不能创建递归部门。"
+msgstr "错误:你不能建立递归部门"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "社保号"
+msgstr "身份证号"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -47,7 +47,7 @@ msgstr "人力资源"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Sunday"
-msgstr "周日"
+msgstr "日"
 
 #. module: hr
 #: view:res.users:0
@@ -57,7 +57,7 @@ msgstr "上级"
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr
 #: view:hr.department:0
@@ -67,7 +67,7 @@ msgstr "部门"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Contact  of employee"
-msgstr "员工联系方式"
+msgstr "员工分类"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -77,7 +77,7 @@ msgstr "工作电子邮件"
 #. module: hr
 #: field:hr.timesheet.group,name:0
 msgid "Group name"
-msgstr "小组名称"
+msgstr "组名"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -88,7 +88,7 @@ msgstr "公司"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Friday"
-msgstr "周五"
+msgstr "五"
 
 #. module: hr
 #: field:hr.department,parent_id:0
@@ -100,7 +100,7 @@ msgstr "上级部门"
 #: view:hr.employee:0
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: hr
 #: field:hr.timesheet,hour_from:0
@@ -110,7 +110,7 @@ msgstr "工作从"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "员工等级"
+msgstr "员工层次"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -125,7 +125,7 @@ msgstr "未婚"
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr "女"
+msgstr "女性"
 
 #. module: hr
 #: view:hr.timesheet.group:0
@@ -141,7 +141,7 @@ msgstr "员工组织结构"
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "其它社会身份号码"
+msgstr "身份ID"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -151,7 +151,7 @@ msgstr "办公电话"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "下级分类"
+msgstr "子类别"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -169,7 +169,7 @@ msgstr "员工"
 #. module: hr
 #: field:hr.timesheet.group,manager:0
 msgid "Workgroup manager"
-msgstr "工作组经理"
+msgstr "工作组主管"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
@@ -179,7 +179,7 @@ msgstr "下属"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -189,27 +189,27 @@ msgstr "成员"
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "社会安全号"
+msgstr "社保号"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
 msgid "Fill up contact information"
-msgstr "填写联系方式"
+msgstr "填写联系信息"
 
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr "离异"
+msgstr "离婚"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "上级分类"
+msgstr "上级类别"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
@@ -222,7 +222,7 @@ msgstr "部门"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "员工联系方式"
+msgstr "员工联系"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -248,17 +248,17 @@ msgstr "创建系统用户"
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "员工类别"
+msgstr "员工类型"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Tuesday"
-msgstr "周二"
+msgstr "二"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "人事部门"
+msgstr "人力资源"
 
 #. module: hr
 #: field:hr.employee,user_id:0
@@ -279,7 +279,7 @@ msgstr "备注"
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr "联系方式"
+msgstr "联系信息"
 
 #. module: hr
 #: view:hr.employee:0
@@ -289,7 +289,7 @@ msgstr "状态"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Monday"
-msgstr "周一"
+msgstr "一"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -305,7 +305,7 @@ msgstr "星期几"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Birthday"
-msgstr "生日"
+msgstr "出生日期"
 
 #. module: hr
 #: field:hr.employee,active:0
@@ -315,12 +315,12 @@ msgstr "在职"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "错误！您不能创建递归的员工等级。"
+msgstr "错误！你不能创建递归的员工"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract Process"
-msgstr "员工合同流程"
+msgstr "员工合同处理"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
@@ -330,7 +330,7 @@ msgstr "创建系统用户"
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee Complete Form"
-msgstr "填写员工表"
+msgstr "完整员工信息"
 
 #. module: hr
 #: view:hr.department:0
@@ -340,7 +340,7 @@ msgstr "公司"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Wednesday"
-msgstr "周三"
+msgstr "三"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -356,7 +356,7 @@ msgstr "开始日期"
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr "上级用户"
+msgstr "用用户"
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -382,7 +382,7 @@ msgstr "个人信息"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr
 #: view:hr.timesheet:0
@@ -394,17 +394,17 @@ msgstr "工作时间"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Thursday"
-msgstr "周四"
+msgstr "四"
 
 #. module: hr
 #: field:hr.timesheet,hour_to:0
 msgid "Work to"
-msgstr "工作至"
+msgstr "工作到"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Other"
-msgstr "其它"
+msgstr "其他"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -414,7 +414,7 @@ msgstr "员工分类"
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "家庭住址"
+msgstr "家庭地址"
 
 #. module: hr
 #: view:hr.department:0
@@ -429,7 +429,7 @@ msgstr "国籍"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other ID"
-msgstr "其他证件号"
+msgstr "其它ID"
 
 #. module: hr
 #: field:hr.timesheet,name:0
@@ -456,17 +456,17 @@ msgstr "部门名称"
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "下级部门"
+msgstr "子部门"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr "工作信息"
+msgstr "职位信息"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Fill up employee's contact information"
-msgstr "填写员工联系方式信息"
+msgstr "填写员工联系信息"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -478,15 +478,34 @@ msgstr "上司"
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 msgid "All Employees"
-msgstr "全部员工"
+msgstr "所有员工"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Saturday"
-msgstr "周六"
+msgstr "六"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_new
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_new
 msgid "New Employee"
 msgstr "新员工"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Module for human resource management. You can manage:\n"
+#~ "    * Employees and hierarchies\n"
+#~ "    * Work hours sheets\n"
+#~ "    * Attendances and sign in/out system\n"
+#~ "\n"
+#~ "    Different reports are also provided, mainly for attendance statistics.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    人力资源模块你能管理:\n"
+#~ "                  * 员工和职位\n"
+#~ "                  * 工时表\n"
+#~ "                  * 出勤和登入/登出系统\n"
+#~ "\n"
+#~ "   提供的不同报表主要为考勤统计.\n"
+#~ "    "
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 95ca537b5fd..2f8fc4626bf 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_attendance/__terp__.py b/addons/hr_attendance/__terp__.py
index d646f352255..7ea1b0b33ff 100644
--- a/addons/hr_attendance/__terp__.py
+++ b/addons/hr_attendance/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,12 @@
     'name': 'Attendances Of Employees',
     'version': '1.1',
     'category': 'Generic Modules/Human Resources',
-    'description': """This module aims to manage employee's attendances.""",
+    'description': """
+    This module aims to manage employee's attendances.
+
+    Keeps account of the attendances of the employees on the basis of the
+    actions(Sign in/Sign out) performed by them.
+       """,
     'author': 'Tiny',
     'depends': ['base', 'hr'],
     'update_xml': [
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 0c25e6eb34f..a97987dd89e 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -112,9 +112,11 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
+                  <group col="7" colspan="4">
                     <field name="state"/>
                     <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}"/>
                     <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}"/>
+                  </group>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_attendance/i18n/ar.po b/addons/hr_attendance/i18n/ar.po
index effff2c5441..b585bfb237e 100644
--- a/addons/hr_attendance/i18n/ar.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/bg.po b/addons/hr_attendance/i18n/bg.po
index eec1258fec9..6a5862ffbdc 100644
--- a/addons/hr_attendance/i18n/bg.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/bs.po b/addons/hr_attendance/i18n/bs.po
index 88960db1065..8e64a7a186a 100644
--- a/addons/hr_attendance/i18n/bs.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/ca.po b/addons/hr_attendance/i18n/ca.po
index a03955fbd83..5108ee49b3c 100644
--- a/addons/hr_attendance/i18n/ca.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/cs.po b/addons/hr_attendance/i18n/cs.po
index e9f6bb572d6..857729d0361 100644
--- a/addons/hr_attendance/i18n/cs.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index 0b05c4a327d..9436f512441 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/el.po b/addons/hr_attendance/i18n/el.po
index 8af03f1fdf5..1a6b8ab4c6b 100644
--- a/addons/hr_attendance/i18n/el.po
+++ b/addons/hr_attendance/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index f58f53faaec..12755e45b0a 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/es_AR.po b/addons/hr_attendance/i18n/es_AR.po
index e0aac4a5ead..254c61e4acb 100644
--- a/addons/hr_attendance/i18n/es_AR.po
+++ b/addons/hr_attendance/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/et.po b/addons/hr_attendance/i18n/et.po
index 45d544f1123..84a500e442b 100644
--- a/addons/hr_attendance/i18n/et.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index ad671ace1aa..80b3ddab3ce 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/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:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index ecb23cc3245..4a3cc34645e 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/hr.po b/addons/hr_attendance/i18n/hr.po
index 990ce9021c8..e6784070602 100644
--- a/addons/hr_attendance/i18n/hr.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/hu.po b/addons/hr_attendance/i18n/hu.po
index effff2c5441..b585bfb237e 100644
--- a/addons/hr_attendance/i18n/hu.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/id.po b/addons/hr_attendance/i18n/id.po
index 3a41ccbf88a..ec42558e9bf 100644
--- a/addons/hr_attendance/i18n/id.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index 670394280f9..271a1a95cc5 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/ko.po b/addons/hr_attendance/i18n/ko.po
index 89a5a78d2a3..1c0fbac4416 100644
--- a/addons/hr_attendance/i18n/ko.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/lt.po b/addons/hr_attendance/i18n/lt.po
index effff2c5441..b585bfb237e 100644
--- a/addons/hr_attendance/i18n/lt.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/lv.po b/addons/hr_attendance/i18n/lv.po
index 3d7ffad3321..6fde1451f3d 100644
--- a/addons/hr_attendance/i18n/lv.po
+++ b/addons/hr_attendance/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:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index 2112209839e..8de3170f9f3 100644
--- a/addons/hr_attendance/i18n/nl.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/nl_BE.po b/addons/hr_attendance/i18n/nl_BE.po
index f6ef6b5c5a5..c96a9c33171 100644
--- a/addons/hr_attendance/i18n/nl_BE.po
+++ b/addons/hr_attendance/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pl.po b/addons/hr_attendance/i18n/pl.po
index b81cbd83caa..9431661a07b 100644
--- a/addons/hr_attendance/i18n/pl.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po
index 497f40d8136..869af20d190 100644
--- a/addons/hr_attendance/i18n/pt.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index 2c36eb99a53..67aede9a5af 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/ro.po b/addons/hr_attendance/i18n/ro.po
index 625a55fc2f4..797bdb30b12 100644
--- a/addons/hr_attendance/i18n/ro.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/ru.po b/addons/hr_attendance/i18n/ru.po
index 89bb4dff505..cccdc5df8ae 100644
--- a/addons/hr_attendance/i18n/ru.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/sl.po b/addons/hr_attendance/i18n/sl.po
index 716481645c9..2dedfb2a1aa 100644
--- a/addons/hr_attendance/i18n/sl.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/sv.po b/addons/hr_attendance/i18n/sv.po
index 2e9dbcd96da..368288b27da 100644
--- a/addons/hr_attendance/i18n/sv.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/tlh.po b/addons/hr_attendance/i18n/tlh.po
index 7008012d3ec..4096b572fe7 100644
--- a/addons/hr_attendance/i18n/tlh.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index 34cb76a7868..4d8b9ac5a19 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/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: hr_attendance
diff --git a/addons/hr_attendance/i18n/uk.po b/addons/hr_attendance/i18n/uk.po
index 88408e31492..43a8885bdcb 100644
--- a/addons/hr_attendance/i18n/uk.po
+++ b/addons/hr_attendance/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index c906a103217..930490925e8 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/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-07 11:17+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:23+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,7 +26,7 @@ msgstr "出勤"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,init:0
@@ -35,13 +35,13 @@ msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
 #: model:ir.actions.wizard,name:hr_attendance.si_so
 #: model:ir.ui.menu,name:hr_attendance.menu_si_so
 msgid "Sign in / Sign out"
-msgstr "签入/签出"
+msgstr "签出"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
-msgstr "(*) 负的延迟意味着员工的工作时间少于记录时间。"
+msgstr "(*)正数表示员工工作小于记录"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -51,12 +51,12 @@ msgstr "员工出勤"
 #. module: hr_attendance
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,init:0
 msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr "你可以进行签入签出操作了"
+msgstr "你现在出勤跟踪准备签入/签出"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -75,7 +75,7 @@ msgstr "延迟"
 #: wizard_field:hr.si_so,si_ask_so,name:0
 #: wizard_field:hr.si_so,so_ask_si,name:0
 msgid "Employee's name"
-msgstr "员工姓名"
+msgstr "员工名"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,print:0
@@ -86,17 +86,17 @@ msgstr "打印时间表"
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error
 msgid "Print Attendance Error Report"
-msgstr "打印缺勤报表"
+msgstr "出勤错误报表"
 
 #. module: hr_attendance
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在操作定义使用了无效的模块名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_week
 msgid "Print Timesheet by week"
-msgstr "按周打印时间表"
+msgstr "打印这周时间表"
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
@@ -107,12 +107,12 @@ msgstr "员工"
 #: wizard_view:hr.attendance.print_week,init:0
 #: wizard_view:hr.attendance.report,init:0
 msgid "Select a time span"
-msgstr "选择时间段"
+msgstr "选择一时间长度"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr "已记录时间"
+msgstr "记录日期"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -123,13 +123,13 @@ msgstr "签入"
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Total period:"
-msgstr "合计时间："
+msgstr "总周期:"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action reason"
-msgstr "动作原因"
+msgstr "行动理由"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -149,7 +149,7 @@ msgstr "五月"
 #. module: hr_attendance
 #: wizard_field:hr.si_so,so_ask_si,last_time:0
 msgid "Your last sign in"
-msgstr "您最近的签入"
+msgstr "你最近的签入"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -159,7 +159,7 @@ msgstr "六月"
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_month
 msgid "Print Timesheet by month"
-msgstr "按月打印时间表"
+msgstr "打印这月时间表"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -170,22 +170,22 @@ msgstr "签出"
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
 msgid "Attendances Of Employees"
-msgstr "员工考勤"
+msgstr "员工出勤"
 
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
 msgid "Reason"
-msgstr "理由"
+msgstr "原因"
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "错误签入前先签出同样签出前先签入"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Date Signed"
-msgstr ""
+msgstr "签到日期"
 
 #. module: hr_attendance
 #: field:hr.attendance,name:0
@@ -202,7 +202,7 @@ msgstr "七月"
 msgid ""
 "You did not signed out the last time. Please enter the date and time you "
 "signed out."
-msgstr "你上次没有签出，请输入你签出的时间。"
+msgstr "最近没有签到请输入签到的日期和时间"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -213,12 +213,12 @@ msgstr "出勤原因"
 #: wizard_field:hr.attendance.print_week,init,init_date:0
 #: wizard_field:hr.attendance.report,init,init_date:0
 msgid "Starting Date"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr "出席"
+msgstr "现在"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -238,22 +238,22 @@ msgstr "十月"
 #. module: hr_attendance
 #: wizard_field:hr.si_so,si_ask_so,last_time:0
 msgid "Your last sign out"
-msgstr "您最近的签出"
+msgstr "你最近的签出"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr "最小迟到时间"
+msgstr "主要延迟"
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr "操作类型"
+msgstr "行动；类型"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr "定义出勤理由"
+msgstr "出勤原因"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -287,23 +287,23 @@ msgstr "四月"
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
 msgid "Attendances"
-msgstr "考勤列表"
+msgstr "出勤"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr "缺勤"
+msgstr "出勤错误"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr "操作"
+msgstr "行动"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.report,init,print:0
 msgid "Print Attendance Report"
-msgstr "打印考勤报表"
+msgstr "出勤报表"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -319,30 +319,30 @@ msgstr "十一月"
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
+msgstr "延迟错误被认为是自动的"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.report,init,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr "最大迟到时间（分）"
+msgstr "最大延迟(最小)"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_week,init:0
 msgid "Select a starting and a end date"
-msgstr "选择一个开始时间一个结束时间"
+msgstr "选择一开始日期和结束日期"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_week,init,end_date:0
 #: wizard_field:hr.attendance.report,init,end_date:0
 msgid "Ending Date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,so_ask_si:0
 msgid ""
 "You did not signed in the last time. Please enter the date and time you "
 "signed in."
-msgstr "你上次没有签入。请输入你签入的时间。"
+msgstr "你在最近没有签到请输入签到的日期和时间"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -372,12 +372,12 @@ msgstr "月"
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
 msgid "This module aims to manage employee's attendances."
-msgstr "本模块主要用户管理员工考勤。"
+msgstr "这模块的目的是管理员工的出勤"
 
 #. module: hr_attendance
 #: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
 msgid "Attendance Error Report"
-msgstr "缺勤报表"
+msgstr "出勤错误报表"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,year:0
@@ -398,3 +398,7 @@ msgstr "取消"
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Operation"
 msgstr "操作"
+
+#~ msgid ""
+#~ "(*) A negative delay means that the employee worked more than encoded."
+#~ msgstr "(*)负数延期表示员工的工作超过编码"
diff --git a/addons/hr_attendance/i18n/zh_TW.po b/addons/hr_attendance/i18n/zh_TW.po
index 5b6b6c64a88..b521cfbbdd3 100644
--- a/addons/hr_attendance/i18n/zh_TW.po
+++ b/addons/hr_attendance/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py
index 82503318fbe..c7c9ab18068 100644
--- a/addons/hr_attendance/wizard/print_attendance_error.py
+++ b/addons/hr_attendance/wizard/print_attendance_error.py
@@ -25,7 +25,7 @@ import pooler
 from tools.translate import _
 
 _date_form = '''<?xml version="1.0"?>
-<form string="Select a time span">
+<form string="Attendance Report">
     <separator string="Analysis Information" colspan="4"/>
     <field name="init_date"/>
     <field name="end_date"/>
@@ -62,7 +62,7 @@ class wiz_attendance(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print','Print Attendance Report'),('end','Cancel') ]}
+            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('end','Cancel', 'gtk-cancel'),('print','Print', 'gtk-ok') ]}
         },
         'print': {
             'actions': [_check_data],
diff --git a/addons/hr_attendance/wizard/print_bymonth.py b/addons/hr_attendance/wizard/print_bymonth.py
index a20f5258a7c..ae2d5df937b 100644
--- a/addons/hr_attendance/wizard/print_bymonth.py
+++ b/addons/hr_attendance/wizard/print_bymonth.py
@@ -23,7 +23,7 @@ import wizard
 import time
 
 _date_form = '''<?xml version="1.0"?>
-<form string="Select a month">
+<form string="Timesheets by month">
     <separator string="Select a month" colspan="4"/>
     <field name="month"/>
     <field name="year"/>
@@ -49,11 +49,11 @@ class wiz_bymonth(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print', 'Print Timesheet'), ('end', 'Cancel')]}
+            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[ ('end', 'Cancel', 'gtk-cancel'),('print', 'Print', 'gtk-ok')] }
         },
         'print': {
             'actions': [],
-            'result': {'type': 'print', 'report': 'hr.attendance.bymonth', 'state': 'end'}
+            'result': {'type': 'print', 'report': 'hr.attendance.bymonth', 'state': 'end' }
         }
     }
 wiz_bymonth('hr.attendance.print_month')
diff --git a/addons/hr_attendance/wizard/print_byweek.py b/addons/hr_attendance/wizard/print_byweek.py
index 8922cef8a97..d859e81aea5 100644
--- a/addons/hr_attendance/wizard/print_byweek.py
+++ b/addons/hr_attendance/wizard/print_byweek.py
@@ -23,7 +23,7 @@ import wizard
 import time
 
 _date_form = '''<?xml version="1.0"?>
-<form string="Select a time span">
+<form string="Timesheets by week">
     <separator string="Select a starting and a end date" colspan="4"/>
     <field name="init_date"/>
     <newline/>
@@ -39,7 +39,7 @@ class wiz_byweek(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print','Print Timesheet'),('end','Cancel') ]}
+            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('end','Cancel', 'gtk-cancel'), ('print','Print', 'gtk-ok')]}
         },
         'print': {
             'actions': [],
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index 6d925957534..2e9385b8c85 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
index 8a706740554..4378e4994d6 100644
--- a/addons/hr_contract/i18n/bg.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
index 8012d1504a4..084ac59f107 100644
--- a/addons/hr_contract/i18n/bs.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
index 31261f52787..a005b4d751c 100644
--- a/addons/hr_contract/i18n/ca.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
index 6d925957534..2e9385b8c85 100644
--- a/addons/hr_contract/i18n/cs.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index d9e6ce09f29..ce0146e196a 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
index 6b76dbebdb4..87ba04a5ec9 100644
--- a/addons/hr_contract/i18n/el.po
+++ b/addons/hr_contract/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index 450c4ed2fbe..7d5cf034150 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
index c97f86ebe38..1946dcbb165 100644
--- a/addons/hr_contract/i18n/es_AR.po
+++ b/addons/hr_contract/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: hr_contract
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
index bd4537cafc9..79f1e6d06e7 100644
--- a/addons/hr_contract/i18n/es_EC.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
index 0caa1599528..8e2da8acdb1 100644
--- a/addons/hr_contract/i18n/et.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
index 4de9c9bd91d..507de8cf1e9 100644
--- a/addons/hr_contract/i18n/fi.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index c0abf3d485c..f2892d1e1fc 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
index 7339dbaf065..5747a0c5fb4 100644
--- a/addons/hr_contract/i18n/hi.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
index 2be160ee496..3849969528d 100644
--- a/addons/hr_contract/i18n/hr.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po
index 6d925957534..2e9385b8c85 100644
--- a/addons/hr_contract/i18n/hu.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
index 01c9239839f..03e14251c7e 100644
--- a/addons/hr_contract/i18n/id.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
index 54e4744beef..6ce3e9d7c54 100644
--- a/addons/hr_contract/i18n/it.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
index e173c5abf8c..8db3eb35d8d 100644
--- a/addons/hr_contract/i18n/ko.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
index 6d925957534..2e9385b8c85 100644
--- a/addons/hr_contract/i18n/lt.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
index b844638caa0..d5b1161d2f2 100644
--- a/addons/hr_contract/i18n/lv.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
index eeaffb3d6ca..b0b5cf6a620 100644
--- a/addons/hr_contract/i18n/nl.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
index 1f56568023f..52b143ef8a5 100644
--- a/addons/hr_contract/i18n/nl_BE.po
+++ b/addons/hr_contract/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: hr_contract
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
index c38ac4aba6e..54174b2d631 100644
--- a/addons/hr_contract/i18n/pl.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
index 07705f3b922..b3e3f0257a5 100644
--- a/addons/hr_contract/i18n/pt.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
index 6451d8f9489..d13017982c3 100644
--- a/addons/hr_contract/i18n/pt_BR.po
+++ b/addons/hr_contract/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: hr_contract
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
index f89d580688f..fc75b1f16a3 100644
--- a/addons/hr_contract/i18n/ro.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index 1f439d0a238..1701b9eddfd 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
index fbd56e0f0d1..bcef98887c2 100644
--- a/addons/hr_contract/i18n/sl.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
index b3b1e9b9e0d..8c44af2a398 100644
--- a/addons/hr_contract/i18n/sr.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index ecc8e5fe046..f85105cdc81 100644
--- a/addons/hr_contract/i18n/sv.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
index 0071670a0f6..e93fcf12869 100644
--- a/addons/hr_contract/i18n/tlh.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index f0707dcddf5..c0f29de6c55 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
index 03298f0aece..2dd38374100 100644
--- a/addons/hr_contract/i18n/uk.po
+++ b/addons/hr_contract/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: hr_contract
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 5479898490c..ed792d9a8d3 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/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: 2009-12-01 14:19+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:26+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Hourly cost computation"
-msgstr "小时成本计算"
+msgstr "小时数成本计算"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Gross"
-msgstr "应发"
+msgstr "总数"
 
 #. module: hr_contract
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Generalities"
-msgstr "概要"
+msgstr "概论"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
 msgid "Number of children"
-msgstr "子女数"
+msgstr "下级数"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
@@ -51,12 +51,12 @@ msgstr "小时成本系数"
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Wage Types"
-msgstr "薪酬类型"
+msgstr "工资类型"
 
 #. module: hr_contract
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_contract
 #: field:hr.contract,employee_id:0
@@ -66,22 +66,22 @@ msgstr "员工"
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
-msgstr "实发"
+msgstr "净"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
 msgid "Human Resources Contracts"
-msgstr "劳动合同"
+msgstr "人力资源合同"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
 msgid "Hours in the period"
-msgstr "合同期小时数"
+msgstr "周期的小时数"
 
 #. module: hr_contract
 #: field:hr.contract,function:0
 msgid "Function"
-msgstr "职务"
+msgstr "功能"
 
 #. module: hr_contract
 #: field:hr.employee,marital_status:0
@@ -95,14 +95,14 @@ msgstr "婚姻状况"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscelleanous"
-msgstr "杂项"
+msgstr "其他"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 #: field:hr.employee,contract_ids:0
 msgid "Contracts"
-msgstr "劳动合同"
+msgstr "合同"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
@@ -114,12 +114,12 @@ msgstr "类型"
 #: view:hr.contract.wage.type:0
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type
 msgid "Wage Type"
-msgstr "薪酬类型"
+msgstr "工资类型"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
 msgid "Period Name"
-msgstr "合同期名称"
+msgstr "周期名"
 
 #. module: hr_contract
 #: model:ir.model,name:hr_contract.model_hr_employee_marital_status
@@ -129,32 +129,32 @@ msgstr "员工婚姻状况"
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical examination date"
-msgstr "体检时间"
+msgstr "体检日期"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,name:0
 msgid "Wage Type Name"
-msgstr "薪酬类型名称"
+msgstr "工资类型名称"
 
 #. module: hr_contract
 #: field:hr.contract,working_hours_per_day:0
 msgid "Working hours per day"
-msgstr "每天工作小时数"
+msgstr "每天的工作的小时数"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Salary"
-msgstr "薪水"
+msgstr "薪金"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
 msgid "End Date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: hr_contract
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构"
+msgstr "无效XML视图结构!"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -171,23 +171,23 @@ msgstr "备注"
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract
 #: model:ir.ui.menu,name:hr_contract.next_id_56
 msgid "Contract"
-msgstr "劳动合同"
+msgstr "合同"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Contract Type"
-msgstr "劳动合同类型"
+msgstr "合同类型"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
 msgid "Wage Period"
-msgstr "薪酬支付期"
+msgstr "工资周期"
 
 #. module: hr_contract
 #: field:hr.employee,audiens_num:0
 msgid "AUDIENS Number"
-msgstr ""
+msgstr "AUDIENS编号"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -197,30 +197,30 @@ msgstr "报酬"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Name"
-msgstr "劳动合同名称"
+msgstr "合同名"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
 msgid "Contract Wage Type"
-msgstr "合同薪酬类型"
+msgstr "合同工资类型"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
-msgstr "籍贯"
+msgstr "出生地"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Manager"
-msgstr "经理"
+msgstr "管理"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
 msgid "Wage period"
-msgstr "薪酬支付期"
+msgstr "工资周期"
 
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
@@ -228,25 +228,44 @@ msgstr "薪酬支付期"
 msgid ""
 "This field is used by the timesheet system to compute the price of an hour "
 "of work wased on the contract of the employee"
-msgstr "此字段被时间表系统用于计算该员工劳动合同的每小时成本。"
+msgstr "这字段使用时间表系统来计算合同员工的每小时工价"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
 msgid "Wage"
-msgstr "薪酬"
+msgstr "工资"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
 msgid "Start Date"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: hr_contract
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr "状况描述"
+msgstr "状态说明"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Contract Duration"
-msgstr "合同期"
+msgstr "合同有效期"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Add all information on the employee form to manage contracts:\n"
+#~ "    * Martial status,\n"
+#~ "    * Security number,\n"
+#~ "    * Place of birth, birth date, ...\n"
+#~ "\n"
+#~ "    You can assign several contracts per employee.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    增加员工管理合同的所有信息:\n"
+#~ "    * 婚姻状况\n"
+#~ "    * 社保号\n"
+#~ "    * 出生地点和出生日期\n"
+#~ "    \n"
+#~ "    你可以为每个员工签几个合同\n"
+#~ "    "
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
index 64e00390fdd..74d35ae497c 100644
--- a/addons/hr_contract/i18n/zh_TW.po
+++ b/addons/hr_contract/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: hr_contract
diff --git a/addons/hr_evaluation/__init__.py b/addons/hr_evaluation/__init__.py
index 7fe03d1245a..0f403959cd9 100644
--- a/addons/hr_evaluation/__init__.py
+++ b/addons/hr_evaluation/__init__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,12 +15,13 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import hr_evaluation
-
+import wizard
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_evaluation/__terp__.py b/addons/hr_evaluation/__terp__.py
index e55e8bf2972..be1ce233718 100644
--- a/addons/hr_evaluation/__terp__.py
+++ b/addons/hr_evaluation/__terp__.py
@@ -38,7 +38,9 @@
     "demo_xml" : ["hr_evaluation_demo.xml"],
     "update_xml" : [
                     "security/ir.model.access.csv",
-                    "hr_evaluation_view.xml"],
+                    "wizard/hr_evaluation_mail_view.xml",
+                    "hr_evaluation_view.xml",
+                    "report/hr_evaluation_report_view.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 057d60be219..407b94b0e55 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -67,12 +67,33 @@ class hr_evaluation_plan_phase(osv.osv):
             help="Send an anonymous summary to the employee"),
         'wait': fields.boolean('Wait Previous Phases',
             help="Check this box if you want to wait that all preceeding phases " +
-              "are finished before launching this phase.")
-
+              "are finished before launching this phase."),
+        'mail_feature': fields.boolean('Send mail for this phase',help="Check this box if you want to send mail to employees"+
+                                       "coming under this phase"),
+        'mail_body': fields.text('Email'),
+        'email_subject':fields.text('char')
     }
     _defaults = {
         'sequence' : lambda *a: 1,
+        'email_subject':_('''Regarding '''),
+        'mail_body' : lambda *a:_('''
+Date : %(date)s
+
+Dear %(employee_name)s,
+
+I am doing an evaluation regarding %(eval_name)s.
+
+Kindly submit your response.
+
+
+Thanks,
+--
+%(user_signature)s
+
+        '''),
     }
+
+
 hr_evaluation_plan_phase()
 
 class hr_employee(osv.osv):
@@ -162,9 +183,11 @@ class hr_evaluation(osv.osv):
         return {'value': {'plan_id':evaluation_plan_id}}
 
     def button_plan_in_progress(self,cr, uid, ids, context={}):
+        user_obj = self.pool.get('res.users')
         employee_obj = self.pool.get('hr.employee')
         hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
         survey_request_obj = self.pool.get('survey.request')
+        hr_eval_plan_obj = self.pool.get('hr_evaluation.plan.phase')
         curr_employee=self.browse(cr,uid, ids, context=context)[0].employee_id
         child_employees=employee_obj.browse(cr,uid, employee_obj.search(cr,uid,[('parent_id','=',curr_employee.id)],context=context))
         manager_employee=curr_employee.parent_id
@@ -180,7 +203,24 @@ class hr_evaluation(osv.osv):
                             id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id ,'user_id' : user,'survey_id' : phase.survey_id.id, 'user_to_review_id' : child.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')},context=context)
                             if not phase.wait:
                                 hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context=context)
+                            if phase.mail_feature:
+                                src = tools.config.options['email_from']
+                                user_obj_id = user_obj.browse(cr,uid,uid)
+                                val = {
+                                        'employee_name':child.name,
+                                        'user_signature':curr_employee.name,
+#                                        'company_name':user_obj_id.company_id.name,
+                                        'eval_name':phase.survey_id.title,
+                                        'date':time.strftime('%Y-%m-%d'),
+                                      }
+                                mailbody = hr_eval_plan_obj.read(cr,uid,phase.id,['mail_body','email_subject'],context=context)
+                                body = mailbody['mail_body']%val
+                                sub = mailbody['email_subject']+phase.survey_id.title
+                                dest=[child.work_email]
+                                if dest:
+                                   tools.email_send(src,dest,sub,body)
                             apprai_id.append(id)
+
                     elif phase.action == "top-down":
                         if manager_employee:
                             user = False
@@ -189,6 +229,13 @@ class hr_evaluation(osv.osv):
                             id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id,'user_id': user ,'survey_id' : phase.survey_id.id, 'user_to_review_id' :manager_employee.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')},context=context)
                             if not phase.wait:
                                 hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context=context)
+                            if phase.mail_feature:
+                                val.update({'employee_name':manager_employee.name})
+                                mailbody = hr_eval_plan_obj.read(cr,uid,phase.id,['mail_body'],context=context)
+                                body = mailbody['mail_body']%val
+                                dest = [manager_employee.work_email]
+                                if dest:
+                                        tools.email_send(src,dest,sub,body)
                             apprai_id.append(id)
                     elif phase.action == "self":
                         if curr_employee:
@@ -235,6 +282,7 @@ class survey_request(osv.osv):
     _columns = {
         'is_evaluation':fields.boolean('Is Evaluation?'),
     }
+
 survey_request()
 
 class hr_evaluation_interview(osv.osv):
@@ -253,9 +301,10 @@ class hr_evaluation_interview(osv.osv):
     def survey_req_waiting_answer(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
 #        for id in self.browse(cr, uid, ids):
-#            if id.user_id and id.user_id.address_id and id.user_id.address_id and id.user_id.address_id.email:
-#                msg = " Hello %s, \n\n We are inviting you for %s survey. \n\n Thanks,"  %(id.user_id.name, id.survey_id.title)
-#                tools.email_send(tools.config['email_from'], [id.user_id.address_id.email],\
+#            print"id",id
+#            if id.user_to_review_id and id.user_to_review_id.work_email:
+#                msg = " Hello %s, \n\n We are inviting you for %s survey. \n\n Thanks,"  %(id.user_to_review_id.name, id.survey_id.title)
+#                tools.email_send(tools.config['email_from'], [id.user_to_review_id.work_email],\
 #                                              'Invite to fill up Survey', msg)
         return True
 
@@ -288,4 +337,6 @@ class hr_evaluation_interview(osv.osv):
         self.write(cr, uid, ids, { 'state' : 'cancel'}, context=context)
         return True
 
-hr_evaluation_interview()
\ No newline at end of file
+hr_evaluation_interview()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 12f336e3bd2..21aaa5473ee 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -44,7 +44,7 @@
         </record>
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/>
 
-        <menuitem
+       <menuitem
             name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="3"/>
         <menuitem
             parent="menu_eval_hr_config"
@@ -57,6 +57,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Evaluation Plan Phase">
+                 <notebook>
+                   <page string="General">
                     <field name="plan_id" invisible="1"/>
                     <group col="6" colspan="4">
                         <field name="name"/>
@@ -84,6 +86,21 @@
                             <field name="send_anonymous_employee"/>
                         </group>
                     </group>
+                    </page>
+                    <page string="Mail Settings">
+                        <field name="mail_feature" colspan="4"/>
+                        <newline/>
+                        <separator string="Mail Body"/>
+                        <newline/>
+                        <field name="mail_body" colspan="4" nolabel="1"/>
+                        <newline/>
+                        <separator string="Legend" colspan ="4"/>
+                          <label string=" (employee_name)s: Partner name" colspan="2"/>
+                          <label string="(user_signature)s: User name" colspan="2"/>
+                          <label string="(date)s: Current Date" colspan="2"/>
+                          <label string="(eval_name)s:Evaluation Name" colspan="2"/>
+                    </page>
+                  </notebook>
                 </form>
             </field>
         </record>
@@ -309,5 +326,9 @@
             id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
 
+      <menuitem name="Evaluation Reminders" parent="menu_eval_hr"
+           id="menu_eval_send_mail"
+           action="action_hr_evaluation_send_mail"
+           sequence="45"/>
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 4393cce6490..9445fa5a8ac 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.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: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
new file mode 100644
index 00000000000..d0290bb8294
--- /dev/null
+++ b/addons/hr_evaluation/i18n/fi.po
@@ -0,0 +1,277 @@
+# Finnish 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-03-20 22:05+0000\n"
+"Last-Translator: smii <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr "Tiedot"
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr "Arvot"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr "Pisteet"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Vedos"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr "Työntekijä"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr "Arviointi"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr "Tila"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr "Lainaus"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr "Asetukset"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/report_document/__init__.py b/addons/hr_evaluation/report/__init__.py
similarity index 87%
rename from addons/report_document/__init__.py
rename to addons/hr_evaluation/report/__init__.py
index 589836526a1..507f8d6715b 100644
--- a/addons/report_document/__init__.py
+++ b/addons/hr_evaluation/report/__init__.py
@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,9 +15,9 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import report_document
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import hr_evaluation_report
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
new file mode 100644
index 00000000000..3b318905bbe
--- /dev/null
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import tools
+from osv import fields,osv
+
+class hr_evaluation_report(osv.osv):
+    _name = "hr.evaluation.report"
+    _description = "Evaluations Statistics"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'deadline': fields.date("Deadline", readonly=True),
+        'closed': fields.date("closed", readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'employee_id': fields.many2one('hr.employee', "Employee", readonly=True),
+        'nbr':fields.integer('# of Requests', readonly=True),
+        'state': fields.selection([
+            ('draft','Draft'),
+            ('wait','Plan In Progress'),
+            ('progress','Final Validation'),
+            ('done','Done'),
+            ('cancel','Cancelled'),
+        ], 'State',readonly=True),
+    }
+    _order = 'create_date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'hr_evaluation_report')
+        cr.execute("""
+            create or replace view hr_evaluation_report as (
+                 select
+                     min(l.id) as id,
+                     s.create_date as create_date,
+                     s.employee_id,
+                     s.date as deadline,
+                     s.date_close as closed,
+                     to_char(s.create_date, 'YYYY') as year,
+                     to_char(s.create_date, 'MM') as month,
+                     count(*) as nbr,
+                     s.state
+                     from
+                 hr_evaluation_interview l
+                 left join
+                     hr_evaluation_evaluation s on (s.id=l.evaluation_id)
+                 group by
+                     s.create_date,s.state,s.employee_id,
+                     s.date,s.date_close
+            )
+        """)
+hr_evaluation_report()
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
new file mode 100644
index 00000000000..fe24b7c373f
--- /dev/null
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_evaluation_report_tree" model="ir.ui.view">
+        <field name="name">hr.evaluation.report.tree</field>
+        <field name="model">hr.evaluation.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Evaluations Statistics">
+                <field name="create_date"/>
+                <field name="employee_id"/>
+                <field name="deadline"/>
+                <field name="closed" invisible="1"/>
+                <field name="year" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="nbr" sum="# of Requests"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_evaluation_report_search" model="ir.ui.view">
+        <field name="name">hr.evaluation.report.search</field>
+        <field name="model">hr.evaluation.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Evaluations">
+                <filter icon="terp-hr"
+                    string="This Year"
+                    domain="[('year','=',time.strftime('%%Y'))]"
+                    help="Evaluations of the year"/>
+                <filter icon="terp-hr"
+                    string="This Month"
+                    domain="[('month','=',time.strftime('%%m'))]"
+                    help="Evaluations of this month"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-hr"
+                    string="Deadline"
+                    domain="[('deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                <filter icon="terp-hr"
+                    string="Closed"
+                    domain="[('closed','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                <separator orientation="vertical"/>
+                <field name="employee_id"/>
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-hr" context="{'group_by':'create_date'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_evaluation_report_all" model="ir.actions.act_window">
+        <field name="name">Evaluations</field>
+        <field name="res_model">hr.evaluation.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="search_view_id" ref="view_evaluation_report_search"/>
+    </record>
+
+    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="8"/>
+    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+
+</data>
+</openerp>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index c9962231e6c..3f3948c00db 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,9 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation",hr.group_hr_user,1,0,0,0
-"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation",hr.group_hr_manager,1,1,1,1
-"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation",hr.group_hr_user,1,0,0,0
-"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan",hr.group_hr_manager,1,1,1,1
-"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase",hr.group_hr_user,1,0,0,0
-"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase",hr.group_hr_manager,1,1,1,1
-"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview",hr.group_hr_user,1,0,0,0
-"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview",hr.group_hr_manager,1,1,1,1
+"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_user",1,0,0,0
+"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","hr.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,0,0,0
+"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report",,1,0,0,0
diff --git a/addons/report_project/__init__.py b/addons/hr_evaluation/wizard/__init__.py
similarity index 88%
rename from addons/report_project/__init__.py
rename to addons/hr_evaluation/wizard/__init__.py
index eced45af748..367cabbe90b 100644
--- a/addons/report_project/__init__.py
+++ b/addons/hr_evaluation/wizard/__init__.py
@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,11 +15,11 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import report_project
+import hr_evaluation_mail
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
new file mode 100644
index 00000000000..42b0654de1b
--- /dev/null
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -0,0 +1,43 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import tools
+
+class hr_evaluation_reminder(osv.osv_memory):
+    _name = "hr.evaluation.reminder"
+    _description = "Sends Reminders to employess to fill the evaluations"
+    _columns = {
+        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluations', required=True)
+    }
+
+    def send_mail(self, cr, uid, ids, context={}):
+        hr_evaluation_obj = self.pool.get('hr_evaluation.evaluation')
+        evaluation_data = self.read(cr, uid, ids, context=context)[0]
+        for waiting_id in hr_evaluation_obj.browse(cr, uid, evaluation_data['evaluation_id'], context=context).survey_request_ids:
+            if waiting_id.state == "waiting_answer" and waiting_id.user_to_review_id.work_email :
+                msg = " Hello %s, \n\n Kindly post your response for %s survey. \n\n Thanks,"  %(waiting_id.user_to_review_id.name, waiting_id.survey_id.title)
+                tools.email_send(tools.config['email_from'], [waiting_id.user_to_review_id.work_email],\
+                                          'Reminder to fill up Survey', msg)
+        return {'type': 'ir.actions.act_window_close'}
+
+hr_evaluation_reminder()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
new file mode 100644
index 00000000000..fff55095712
--- /dev/null
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+    <data>
+    	<record id="view_hr_evaluation_send_mail" model="ir.ui.view">
+            <field name="name">hr.evaluation.send.mail</field>
+            <field name="model">hr.evaluation.reminder</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             	<form string="Evaluation Reminders">
+			    	<field name="evaluation_id"/>
+			    	<newline/>
+			    	<button special="cancel" string="Cancel" />
+              		<button name="send_mail" string="Send Mail" type="object"/>
+             	</form>
+            </field>
+		</record>
+
+    <record id="action_hr_evaluation_send_mail" model="ir.actions.act_window">
+            <field name="name">Evaluation Send Mail</field>
+            <field name="res_model">hr.evaluation.reminder</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_hr_evaluation_send_mail"/>
+           <field name="context">{'record_id':active_id}</field>
+           <field name="target">new</field>
+      </record>
+
+     </data>
+</openerp>
diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py
index 6cdf8acdd3a..03fab346c77 100644
--- a/addons/hr_expense/__terp__.py
+++ b/addons/hr_expense/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -48,7 +48,8 @@
         'hr_expense_workflow.xml',
         'hr_expense_view.xml',
         'hr_expense_report.xml',
-        'process/hr_expense_process.xml'
+        'process/hr_expense_process.xml',
+        'report/hr_expense_report_view.xml'
     ],
     'demo_xml': ['hr.expense.expense.csv'],
     'installable': True,
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index bb6a4d38577..d4747758682 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -56,17 +56,17 @@ class hr_expense_expense(osv.osv):
         'id': fields.integer('Sheet ID', readonly=True),
         'ref': fields.char('Reference', size=32),
         'date': fields.date('Date'),
-        'journal_id': fields.many2one('account.journal', 'Force Journal'),
+        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True),
         'user_id': fields.many2one('res.users', 'User', required=True),
-        'date_confirm': fields.date('Date Confirmed'),
-        'date_valid': fields.date('Date Validated'),
+        'date_confirm': fields.date('Confirmation Date', help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
+        'date_valid': fields.date('Validation Date', help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
         'user_valid': fields.many2one('res.users', 'Validation User'),
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, method=True, string='Total Amount'),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+        'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -220,6 +220,7 @@ class hr_expense_line(osv.osv):
 
             # Compute based on pricetype of employee company
             pricetype_id = self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.property_valuation_price_type.id
+            context['currency_id']=self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.currency_id.id
             pricetype=self.pool.get('product.price.type').browse(cr,uid,pricetype_id)
             amount_unit=product.price_get(pricetype.field, context)[product.id]
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 16828a87a1a..0cf1b941b5c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -68,7 +68,7 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="employee_id" select="1"/>
-                        <field name="id" select="2"/>
+                        <field name="ref" select="2"/>
                         <field name="date" select="1"/>
                         <field name="amount"/>
                         <field name="currency_id"/>
@@ -77,7 +77,6 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Expense Sheet">
-                            <field name="ref" select="2"/>
                             <newline/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
@@ -108,8 +107,8 @@
                             <separator colspan="4" string="Accounting data"/>
                             <field name="journal_id"/>
                             <separator colspan="4" string="Validation"/>
-                            <field name="date_confirm" select="2"/>
-                            <field name="date_valid" select="2"/>
+                            <field name="date_confirm" select="2" readonly = "1"/>
+                            <field name="date_valid" select="2" readonly = "1"/>
                             <field name="user_valid" select="2"/>
                             <field name="invoice_id" select="2"/>
                             <separator colspan="4" string="Notes"/>
@@ -145,6 +144,7 @@
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
+                      <field name="date" select='1'/>
                       <field name="user_id" select="1" widget="selection">
                           <filter
                             icon="gtk-execute"
diff --git a/addons/hr_expense/i18n/ar.po b/addons/hr_expense/i18n/ar.po
index d374d5bd9cf..204081ef380 100644
--- a/addons/hr_expense/i18n/ar.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index aecd1309175..6c6de6f481f 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index 5cd5763214e..9024a6619fe 100644
--- a/addons/hr_expense/i18n/bs.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index 8e694265108..87dc638146b 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index d374d5bd9cf..204081ef380 100644
--- a/addons/hr_expense/i18n/cs.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 242d47760e1..64d318c5163 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index be20221a81f..d74515b1752 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 8f3ec9f6723..a3fe8f859ac 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index 94906de215b..19f7dc87ab6 100644
--- a/addons/hr_expense/i18n/es_AR.po
+++ b/addons/hr_expense/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index a4ac79e1ae0..c3d556fd1d4 100644
--- a/addons/hr_expense/i18n/et.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index 8615d5837ef..08e61d36c8c 100644
--- a/addons/hr_expense/i18n/fi.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index 674adf0ff77..bda3622763d 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index d374d5bd9cf..b8e596949bc 100644
--- a/addons/hr_expense/i18n/hr.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index d374d5bd9cf..204081ef380 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index ce94fc3b2ca..8f9db1c5421 100644
--- a/addons/hr_expense/i18n/id.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index 34ad524d902..7117284eb10 100644
--- a/addons/hr_expense/i18n/it.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index 25e95bb9918..bff08e6ee06 100644
--- a/addons/hr_expense/i18n/ko.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index d374d5bd9cf..204081ef380 100644
--- a/addons/hr_expense/i18n/lt.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index 5d90ed0d8aa..5691e460846 100644
--- a/addons/hr_expense/i18n/lv.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index a7bc1f95256..3f4e3a99f51 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index d89ba890d8a..a19b3b62b60 100644
--- a/addons/hr_expense/i18n/nl_BE.po
+++ b/addons/hr_expense/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index 3df885c1a4d..128b287e541 100644
--- a/addons/hr_expense/i18n/pl.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index 115bf02405a..19b32aae8f1 100644
--- a/addons/hr_expense/i18n/pt.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 9bb043ca8a1..083ad5e2404 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index fdb8eefa42f..04ff3b9f74b 100644
--- a/addons/hr_expense/i18n/ro.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index 352ca30c72c..d8bf86caebb 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index 0ad06975738..4e879055210 100644
--- a/addons/hr_expense/i18n/sl.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index 3379a47c41d..d8563388828 100644
--- a/addons/hr_expense/i18n/sr.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index 0110010a562..45613d1189a 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index e4ac67e26b2..081428dba15 100644
--- a/addons/hr_expense/i18n/tlh.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 4710f7dd0de..6d5640548e8 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index 149b40b69b1..43b36f79f8d 100644
--- a/addons/hr_expense/i18n/uk.po
+++ b/addons/hr_expense/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 484d570170d..b5a4013ff8b 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -4,48 +4,48 @@
 #
 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 04:25+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:27+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
 msgid "Confirmed Expenses"
-msgstr "已确认费用申请"
+msgstr "已确认费用"
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_line
 msgid "Expense Line"
-msgstr "费用申请明细"
+msgstr "费用明细"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reimbursement0
 msgid "The accoutant reimburse the expenses"
-msgstr "会计偿还费用"
+msgstr "会计人员报销这费用"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_all_confirm
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all_confirm
 msgid "Expenses waiting validation"
-msgstr "费用等待批准生效"
+msgstr "费用等待批准"
 
 #. module: hr_expense
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 msgid "Date Confirmed"
-msgstr "确认时间"
+msgstr "日期已确认"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -61,23 +61,23 @@ msgstr "设为草稿"
 #: model:ir.actions.act_window,name:hr_expense.expense_my_confirm
 #: model:ir.ui.menu,name:hr_expense.menu_expense_my_confirm
 msgid "My expenses waiting validation"
-msgstr "我的待批准生效费用"
+msgstr "我等待批准的费用"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_all
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all
 msgid "All expenses"
-msgstr "所有费用申请"
+msgstr "所有费用"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
-msgstr "已批准"
+msgstr "批准"
 
 #. module: hr_expense
 #: field:hr.expense.line,uom_id:0
 msgid "UoM"
-msgstr "计量单位"
+msgstr "单位"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -98,41 +98,41 @@ msgstr "已取消"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Validation"
-msgstr "生效"
+msgstr "批准"
 
 #. module: hr_expense
 #: help:product.product,hr_expense_ok:0
 msgid ""
 "Determine if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
-msgstr ""
+msgstr "确定该产品可以在人力资源费用表明细中显示的产品列表"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Accepted"
-msgstr "已支付"
+msgstr "已同意"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 #: field:hr.expense.expense,ref:0
 #: field:hr.expense.line,ref:0
 msgid "Reference"
-msgstr "引用"
+msgstr "参考"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "Certified honest and conform,"
-msgstr ""
+msgstr "证明是诚实和遵守约定"
 
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "Print HR expenses"
-msgstr "打印人事费用"
+msgstr "打印人力资源费用"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_refuseexpense0
 msgid "Refuse expense"
-msgstr "拒绝费用申请"
+msgstr "拒绝费用"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -143,12 +143,12 @@ msgstr "确认"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_supplierinvoice0
 msgid "The accoutant validates the sheet"
-msgstr "会计验证该单据"
+msgstr "会计人员使这表生效"
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
 msgid "Analytic account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_supplierinvoice0
@@ -175,67 +175,67 @@ msgstr "数量"
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "价格合计"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reinvoicing0
 msgid "Some costs may be reinvoices to the customer"
-msgstr ""
+msgstr "有些成本可以要重开发票给客户"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_my
 #: model:ir.ui.menu,name:hr_expense.menu_expense_my
 msgid "My Expenses"
-msgstr "我的费用申请"
+msgstr "我的费用"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
 msgid "Sheet ID"
-msgstr ""
+msgstr "表ID"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_reimburseexpense0
 msgid "Reimburse expense"
-msgstr "付还费用"
+msgstr "报销费用"
 
 #. module: hr_expense
 #: field:hr.expense.expense,journal_id:0
 msgid "Force Journal"
-msgstr ""
+msgstr "强制分类帐"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_my_new
 #: model:ir.ui.menu,name:hr_expense.menu_expense_my_new
 msgid "New Expenses Sheet"
-msgstr "新建费用表"
+msgstr "新的费用表"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
 msgid "After creating invoice, reimburse expenses"
-msgstr ""
+msgstr "报销费用后创建发票"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reimbursement0
 msgid "Reimbursement"
-msgstr "付还"
+msgstr "报销"
 
 #. module: hr_expense
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: hr_expense
 #: field:hr.expense.line,expense_id:0
 #: model:ir.model,name:hr_expense.model_hr_expense_expense
 msgid "Expense"
-msgstr "费用申请"
+msgstr "费用"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: field:hr.expense.expense,line_ids:0
 #: view:hr.expense.line:0
 msgid "Expense Lines"
-msgstr "费用申请明细"
+msgstr "费用明细"
 
 #. module: hr_expense
 #: field:hr.expense.expense,currency_id:0
@@ -245,17 +245,17 @@ msgstr "货币"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_draftexpenses0
 msgid "Employee encode all his expenses"
-msgstr "员工自行记录他的全部费用指出"
+msgstr "员工编码所有的费用"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "已开发票"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Reimbursed"
-msgstr "已付还"
+msgstr "报销"
 
 #. module: hr_expense
 #: field:hr.expense.expense,note:0
@@ -276,27 +276,27 @@ msgstr "草稿"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Accounting data"
-msgstr "会计数据"
+msgstr "会计日期"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveexpense0
 msgid "Expense is approved."
-msgstr "费用申请已批准"
+msgstr "费用已批准"
 
 #. module: hr_expense
 #: field:hr.expense.expense,amount:0
 msgid "Total Amount"
-msgstr "总额"
+msgstr "金额合计"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_draftexpenses0
 msgid "Draft Expenses"
-msgstr "费用申请草稿"
+msgstr "费用草稿"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_id:0
@@ -308,37 +308,37 @@ msgstr "用户"
 #: field:hr.expense.expense,date:0
 #: field:hr.expense.line,date_value:0
 msgid "Date"
-msgstr "时间"
+msgstr "日期"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "Total:"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "HR Expenses"
-msgstr "人事费用"
+msgstr "人力资源费用"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_valid:0
 msgid "Date Validated"
-msgstr ""
+msgstr "日期已生效"
 
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
 msgid "Account Move"
-msgstr "过帐"
+msgstr "凭证"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_confirmedexpenses0
 msgid "The employee validates his expense sheet"
-msgstr ""
+msgstr "员工使这费用表生效"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_refused0
 msgid "The direct manager refuses the sheet.Reset as draft."
-msgstr ""
+msgstr "管理者直接拒绝这表重新设为草稿"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -349,18 +349,18 @@ msgstr "费用表"
 #: model:ir.actions.act_window,name:hr_expense.expense_all_invoiced
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all_invoiced
 msgid "Expenses waiting payment"
-msgstr "等待支付的费用申请"
+msgstr "费用等待支付"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_my_draft
 #: model:ir.ui.menu,name:hr_expense.menu_expense_my_draft
 msgid "My Draft expenses"
-msgstr "我的费用申请草稿"
+msgstr "我的费用草稿"
 
 #. module: hr_expense
 #: model:ir.module.module,shortdesc:hr_expense.module_meta_information
 msgid "Human Resources Expenses Tracking"
-msgstr "人力资源支出追踪"
+msgstr "人力资源费用跟踪"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -377,49 +377,49 @@ msgstr "取消"
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
 msgid "Reinvoice"
-msgstr "重新开票"
+msgstr "重开发票"
 
 #. module: hr_expense
 #: model:process.process,name:hr_expense.process_process_expenseprocess0
 msgid "Expense Process"
-msgstr "费用申请流程"
+msgstr "费用处理"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Other Info"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_all_draft
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all_draft
 msgid "Draft expenses"
-msgstr "费用申请草稿"
+msgstr "费用草稿"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_confirmexpense0
 msgid "Confirm expense"
-msgstr "确认费用申请"
+msgstr "确认费用"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_approveexpense0
 msgid "Approve expense"
-msgstr "批准费用申请"
+msgstr "批准费用"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: model:process.transition.action,name:hr_expense.process_transition_action_accept0
 msgid "Accept"
-msgstr "接受"
+msgstr "同意"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "This document must be dated and signed for reimbursement"
-msgstr ""
+msgstr "这报销单据必须有日期和签名"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_refuseexpense0
 msgid "Expense is refused."
-msgstr "费用申请被拒绝。"
+msgstr "费用已拒绝"
 
 #. module: hr_expense
 #: rml:hr.expense:0
@@ -431,7 +431,7 @@ msgstr "单价"
 #: model:ir.actions.act_window,name:hr_expense.expense_all_valid
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all_valid
 msgid "Expenses waiting invoice"
-msgstr "等待发票的费用申请"
+msgstr "费用等待发票"
 
 #. module: hr_expense
 #: field:hr.expense.line,product_id:0
@@ -441,7 +441,7 @@ msgstr "产品"
 #. module: hr_expense
 #: field:hr.expense.line,description:0
 msgid "Description"
-msgstr "描述"
+msgstr "说明"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -462,12 +462,12 @@ msgstr "已拒绝"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can be Expensed"
-msgstr ""
+msgstr "可支出"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "Ref."
-msgstr ""
+msgstr "参考"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_valid:0
@@ -477,7 +477,7 @@ msgstr "批准用户"
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "(Date and signature)"
-msgstr ""
+msgstr "(日期和签名)"
 
 #. module: hr_expense
 #: rml:hr.expense:0
@@ -487,7 +487,7 @@ msgstr "名称"
 #. module: hr_expense
 #: field:hr.expense.line,name:0
 msgid "Short Description"
-msgstr "简述"
+msgstr "简短说明"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveinvoice0
@@ -497,30 +497,63 @@ msgstr "创建供应商发票"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_approved0
 msgid "The direct manager approves the sheet"
-msgstr ""
+msgstr "管理者直接批准这表"
 
 #. module: hr_expense
 #: field:hr.expense.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序号"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
-msgstr "费用申请已确认。"
+msgstr "费用已确认"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: model:ir.ui.menu,name:hr_expense.next_id_49
 msgid "Expenses"
-msgstr "费用申请"
+msgstr "费用"
 
 #. module: hr_expense
 #: field:hr.expense.line,total_amount:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
 msgid "Reinvoicing"
-msgstr ""
+msgstr "重开发票"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module aims to manage employee's expenses.\n"
+#~ "\n"
+#~ "    The whole workflow is implemented:\n"
+#~ "    * Draft expense\n"
+#~ "    * Confirmation of the sheet by the employee\n"
+#~ "    * Validation by his manager\n"
+#~ "    * Validation by the accountant and invoice creation\n"
+#~ "    * Payment of the invoice to the employee\n"
+#~ "\n"
+#~ "    This module also use the analytic accounting and is compatible with\n"
+#~ "    the invoice on timesheet module so that you will be able to "
+#~ "automatically\n"
+#~ "    re-invoice your customer's expenses if your work by project.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块的目的是管理员工的费用\n"
+#~ "\n"
+#~ "    整个工作流实现:\n"
+#~ "    *费用草稿\n"
+#~ "    *确认员工工作表\n"
+#~ "    *主管审批\n"
+#~ "    *会计人员审批生成的发票\n"
+#~ "    *员工的付款发票\n"
+#~ "\n"
+#~ "    这模块还用分析会计\n"
+#~ "和使时间表的发票相一致\n"
+#~ "因此如果你工作在项目模块\n"
+#~ "你将能够自动重开客户费用发票\n"
+#~ "    "
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index a5d2fb64c01..7233534c1ed 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/report/__init__.py b/addons/hr_expense/report/__init__.py
index f55bc86bc12..4ddd1d33933 100644
--- a/addons/hr_expense/report/__init__.py
+++ b/addons/hr_expense/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,11 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 import expense
+import hr_expense_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
new file mode 100644
index 00000000000..81cb18dcc09
--- /dev/null
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields,osv
+
+
+class hr_expense_report(osv.osv):
+    _name = "hr.expense.report"
+    _description = "Expenses Statistics"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.date('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'product_qty':fields.float('Qty', readonly=True),
+        'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice',readonly=True),
+        'department_id':fields.many2one('hr.department','Department',readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'price_total':fields.float('Total Price', readonly=True),
+        'price_average':fields.float('Average Price', readonly=True),
+        'nbr':fields.integer('# of Lines', readonly=True),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('confirm', 'Waiting confirmation'),
+            ('accepted', 'Accepted'),
+            ('invoiced', 'Invoiced'),
+            ('paid', 'Reimbursed'),
+            ('cancelled', 'Cancelled')],
+            'State', readonly=True),
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'hr_expense_report')
+        cr.execute("""
+            create or replace view hr_expense_report as (
+                 select
+                     min(l.id) as id,
+                     s.date as date,
+                     s.employee_id,
+                     s.invoice_id,
+                     s.department_id,
+                     to_char(s.date, 'YYYY') as year,
+                     to_char(s.date, 'MM') as month,
+                     l.product_id as product_id,
+                     sum(l.unit_quantity * u.factor) as product_qty,
+                     s.user_id as user_id,
+                     s.company_id as company_id,
+                     sum(l.unit_quantity*l.unit_amount) as price_total,
+                     (sum(l.unit_quantity*l.unit_amount)/sum(l.unit_quantity * u.factor))::decimal(16,2) as price_average,
+                     count(*) as nbr,
+                     s.state
+                     from
+                 hr_expense_line l
+                 left join
+                     hr_expense_expense s on (s.id=l.expense_id)
+                     left join product_uom u on (u.id=l.uom_id)
+                 group by
+                     s.date, l.product_id,s.invoice_id,
+                     s.department_id,
+                     l.uom_id, s.user_id, s.state,
+                     s.company_id,s.employee_id
+            )
+        """)
+hr_expense_report()
+
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
new file mode 100644
index 00000000000..9e30e6688f2
--- /dev/null
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_hr_expense_report_tree" model="ir.ui.view">
+        <field name="name">hr.expense.report.tree</field>
+        <field name="model">hr.expense.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Expenses Statistics">
+                <field name="date"/>
+                <field name="employee_id"/>
+                <field name="user_id"/>
+                <field name="year" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="invoice_id" invisible="1"/>
+                <field name="department_id" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="product_id"/>
+                <field name="product_qty"/>
+                <field name="nbr" sum="# of Lines"/>
+                <field name="price_average" avg="Average Price"/>
+                <field name="price_total" sum="Total Price"/>
+                <field name="state" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_hr_expense_report_graph" model="ir.ui.view">
+         <field name="name">hr.expense.report.graph</field>
+         <field name="model">hr.expense.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Expenses Statistics" type="bar">
+                 <field name="product_id"/>
+                 <field name="price_total"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_hr_expense_report_search" model="ir.ui.view">
+        <field name="name">hr.expense.report.search</field>
+        <field name="model">hr.expense.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Expenses">
+                <filter icon="terp-hr"
+                    string="This Year"
+                    domain="[('year','=',time.strftime('%%Y'))]"
+                    help="Expenses of the year"/>
+                <filter icon="terp-hr"
+                    string="This Month"
+                    domain="[('month','=',time.strftime('%%m'))]"
+                    help="Expenses of this month"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-hr"
+                    string="Draft"
+                    domain="[('state','=','draft')]"/>
+                <filter icon="terp-hr"
+                    string="Expenses"
+                    default="1"
+                    domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancelled')]"/>
+                <separator orientation="vertical"/>
+                <field name="product_id"/>
+                <field name="user_id" widget="selection">
+                    <filter icon="terp-hr"
+                        string="My Expenses"
+                        domain="[('user_id','=',uid)]"/>
+                </field>
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}"/>
+                    <filter string="User" icon="terp-hr" context="{'group_by':'user_id'}" default="1"/>
+                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_hr_expense_report_all" model="ir.actions.act_window">
+        <field name="name">Expenses</field>
+        <field name="res_model">hr.expense.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_hr_expense_report_search"/>
+    </record>
+
+    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="8"/>
+    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+
+</data>
+</openerp>
diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py
index 441f7d252a9..9fc701068ef 100644
--- a/addons/hr_holidays/__init__.py
+++ b/addons/hr_holidays/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import hr
+import hr_holidays
 import report
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 2a8f07c58bb..472061e2789 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -36,9 +36,9 @@
     - An employee can make an ask for more off-days by making a new Allocation It will increase his total of that leave type available (if the request is accepted).
     - There are two ways to print the employee's holidays:
         * The first will allow to choose employees by department and is used by clicking the menu item located in
-                HR / Reporting / Holidays / Print Summary of Holidays
+                HR / Holidays Request / Print Summary of Holidays
         * The second will allow you to choose the holidays report for specific employees. Go on the list
-                HR / Human Resources / Employees
+                HR / Employees / Employees
             then select the ones you want to choose, click on the print icon and select the option
                 'Print Summary of Employee's Holidays'
     - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR' and with the role 'holidays'. You can define these features in the security tab from the user data in
@@ -51,13 +51,13 @@
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'hr_workflow.xml',
-        'hr_view.xml',
-        'hr_holidays_report.xml',
+        'hr_holidays_workflow.xml',
+        'hr_holidays_view.xml',
         'hr_holidays_wizard.xml',
+        'hr_holidays_report.xml',
         #'process/hr_holidays_process.xml'
     ],
-    'demo_xml': ['hr_holidays_demo.xml'],
+    'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate': '0086579209325',
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr_holidays.py
similarity index 59%
rename from addons/hr_holidays/hr.py
rename to addons/hr_holidays/hr_holidays.py
index 925c45303f4..efd0e8438a0 100755
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -23,34 +23,27 @@
 
 from mx import DateTime
 import time
-import datetime
-
 import pooler
 import netsvc
+import datetime
 from osv import fields, osv
 from tools.translate import _
 
 class hr_holidays_status(osv.osv):
     _name = "hr.holidays.status"
     _description = "Leave Types"
-
     def get_days(self, cr, uid, ids, employee_id, return_false, context={}):
         res = {}
-        holiday_user = self.pool.get('hr.holidays.per.user')
-        for record in self.browse(cr, uid, ids, context=context):
+        for record in self.browse(cr, uid, ids, context):
             res[record.id] = {}
             max_leaves = leaves_taken = 0
-            obj_ids = holiday_user.search(cr, uid, [('user_id','=',uid),('employee_id','=',employee_id),('holiday_status','=',record.id)], context=context)
-            if obj_ids:
-                br_ob = holiday_user.browse(cr, uid, obj_ids, context=context)[0]
-                max_leaves=br_ob.max_leaves
             if not return_false:
                 cr.execute("""SELECT type, sum(number_of_days) FROM hr_holidays WHERE employee_id = %s AND state='validate' AND holiday_status_id = %s GROUP BY type""", (str(employee_id), str(record.id)))
                 for line in cr.fetchall():
                     if line[0] =='remove':
-                        leaves_taken =  -line[1]
+                        leaves_taken = -line[1]
                     if line[0] =='add':
-                        max_leaves =   line[1]
+                        max_leaves = line[1]
             res[record.id]['max_leaves'] = max_leaves
             res[record.id]['leaves_taken'] = leaves_taken
             res[record.id]['remaining_leaves'] = max_leaves - leaves_taken
@@ -64,23 +57,24 @@ class hr_holidays_status(osv.osv):
                 return_false = True
             employee_id = context['employee_id']
         else:
-            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
+            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
             if employee_ids:
                 employee_id = employee_ids[0]
             else:
                 return_false = True
-        res = self.get_days(cr, uid, ids, employee_id, return_false, context=context)
+        if employee_id:
+            res = self.get_days(cr, uid, ids, employee_id, return_false, context=context)
         return res
 
     _columns = {
         'name' : fields.char('Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'CRM Section', help='If you link this type of leave with a section in the CRM, it will synchronize each leave asked with a case in this section, to display it in the company shared calendar for example.'),
-        'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color of the status', required=True, help='This color will be used in the leaves summary located in Reporting\Print Summary of Leaves'),
-        'limit' : fields.boolean('Allow to override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
-        'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the leave type without removing it."),
+        'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
+        'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
+        'limit' : fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+        'active' : fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves' : fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken' : fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
-        'remaining_leaves' : fields.function(_user_left_days, method=True, string='Remaining Leaves', multi='user_left_days'),
+        'remaining_leaves' : fields.function(_user_left_days, method=True, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
 
     }
     _defaults = {
@@ -89,55 +83,13 @@ class hr_holidays_status(osv.osv):
     }
 hr_holidays_status()
 
-class hr_holidays_per_user(osv.osv):
-    _name = "hr.holidays.per.user"
-    _description = "Holidays Per User"
-    _rec_name = "user_id"
-
-    def _get_remaining_leaves(self, cr, uid, ids, field_name, arg=None, context={}):
-        obj_holiday = self.pool.get('hr.holidays')
-        result = {}
-        for holiday_user in self.browse(cr, uid, ids):
-            days = 0.0
-            ids_request = obj_holiday.search(cr, uid, [('employee_id', '=', holiday_user.employee_id.id),('state', '=', 'validate'),('holiday_status_id', '=', holiday_user.holiday_status.id)], context=context)
-            if ids_request:
-                holidays = obj_holiday.browse(cr, uid, ids_request, context=context)
-                for holiday in holidays:
-                    days -= holiday.number_of_days
-            days = holiday_user.max_leaves - days
-            result[holiday_user.id] = days
-        return result
-
-    _columns = {
-        'employee_id': fields.many2one('hr.employee', "Employee's Name",required=True),
-        'user_id' : fields.many2one('res.users','User'),
-        'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", required=True),
-        'max_leaves' : fields.float('Maximum Leaves Allowed',required=True),
-        'leaves_taken' : fields.float('Leaves Already Taken',readonly=True),
-        'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the holidays per user without removing it."),
-        'notes' : fields.text('Notes'),
-        'remaining_leaves': fields.function(_get_remaining_leaves, method=True, string='Remaining Leaves', type='float'),
-        'holiday_ids': fields.one2many('hr.holidays', 'holiday_user_id', 'Holidays')
-    }
-    _defaults = {
-        'active' : lambda *a: True,
-    }
-
-    def create(self, cr, uid, vals, *args, **kwargs):
-        if vals.get('employee_id', False):
-            obj_emp=self.pool.get('hr.employee').browse(cr,uid,vals['employee_id'])
-            vals.update({'user_id': obj_emp.user_id.id})
-        return super(osv.osv,self).create(cr, uid, vals, *args, **kwargs)
-
-hr_holidays_per_user()
-
 class hr_holidays(osv.osv):
     _name = "hr.holidays"
     _description = "Holidays"
     _order = "type desc, date_from asc"
 
     def _employee_get(obj,cr,uid,context={}):
-        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)], context=context)
+        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
         if ids:
             return ids[0]
         return False
@@ -155,25 +107,32 @@ class hr_holidays(osv.osv):
         'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
-        'case_id': fields.many2one('crm.case', 'Case'),
+        'case_id': fields.many2one('crm.meeting', 'Case'),
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone"),
         'allocation_type': fields.selection([('employee','Employee Request'),('company','Company Allocation')], 'Allocation Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help='This field is only for informative purposes, to depict if the leave request/allocation comes from an employee or from the company'),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
-        'holiday_user_id' : fields.many2one('hr.holidays.per.user', 'User'),
-        'department_id':fields.many2one('hr.department','Department'),
+        'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)]} ),
     }
 
     _defaults = {
-        'employee_id': _employee_get ,
-        'state': lambda *a: 'draft',
+        'employee_id' : _employee_get ,
+        'state' : lambda *a: 'draft',
         'type': lambda *a: 'remove',
         'allocation_type': lambda *a: 'employee',
         'user_id': lambda obj, cr, uid, context: uid,
     }
     _order = 'date_from desc'
 
-    def onchange_date_from(self, cr, uid, ids, date_to, date_from, context={}):
+    def create(self, cr, uid, vals, context={}):
+        if context:
+            if context.has_key('type'):
+                vals['type'] = context['type']
+            if context.has_key('allocation_type'):
+                vals['allocation_type'] = context['allocation_type']
+        return super(osv.osv,self).create(cr, uid, vals, context)
+
+    def onchange_date_from(self, cr, uid, ids, date_to, date_from):
         result = {}
         if date_to and date_from:
             from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
@@ -188,21 +147,19 @@ class hr_holidays(osv.osv):
         }
         return result
 
-    def _update_user_holidays(self, cr, uid, ids, context={}):
-        for record in self.browse(cr, uid, ids, context=context):
+    def _update_user_holidays(self, cr, uid, ids):
+        for record in self.browse(cr, uid, ids):
             if record.state=='validate':
-                holiday_id=self.pool.get('hr.holidays.per.user').search(cr, uid, [('employee_id','=', record.employee_id.id),('holiday_status','=',record.holiday_status_id.id)], context=context)
-                if holiday_id:
-                    obj_holidays_per_user=self.pool.get('hr.holidays.per.user').browse(cr, uid,holiday_id[0], context=context)
-                    self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'leaves_taken':obj_holidays_per_user.leaves_taken + record.number_of_days}, context=context)
                 if record.case_id:
-                    if record.case_id.state <> 'draft':
-                        raise osv.except_osv(_('Warning !'),
-                    _('You can not cancel this holiday request. first You have to make its case in draft state.'))
-                    else:
-                        self.pool.get('crm.case').unlink(cr,uid,[record.case_id.id], context=context)
+                    self.pool.get('crm.meeting').unlink(cr,uid,[record.case_id.id])
+                if record.linked_request_ids:
+                    list_ids = []
+                    for id in record.linked_request_ids:
+                        list_ids.append(id.id)
+                    self.holidays_cancel(cr,uid,list_ids)
+                    self.unlink(cr,uid,list_ids)
 
-    def _check_date(self, cr, uid, ids, context={}):
+    def _check_date(self, cr, uid, ids):
         if ids:
             cr.execute('select number_of_days_temp from hr_holidays where id in ('+','.join(map(str, ids))+')')
             res =  cr.fetchall()
@@ -212,29 +169,11 @@ class hr_holidays(osv.osv):
 
     _constraints = [(_check_date, 'Start date should not be larger than end date! ', ['number_of_days'])]
 
-    def create(self, cr, uid, vals, *args, **kwargs):
-        id_holiday = super(hr_holidays, self).create(cr, uid, vals, *args, **kwargs)
-        self._create_holiday(cr, uid, [id_holiday])
-        return id_holiday
 
     def unlink(self, cr, uid, ids, context={}):
-        self._update_user_holidays(cr, uid, ids, context=context)
-        for record in self.browse(cr, uid, ids, context=context):
-            calender_leave_id= self.pool.get('resource.calendar.leaves').search(cr, uid, [('date_from','=',record.date_from),('date_to','=',record.date_to),('resource_id','=',record.employee_id.resource_id.id)], context=context)
-            self.pool.get('resource.calendar.leaves').unlink(cr, uid, calender_leave_id[0])
+        self._update_user_holidays(cr, uid, ids)
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
-    def _create_holiday(self, cr, uid, ids, context={}):
-        holidays_user_obj = self.pool.get('hr.holidays.per.user')
-        holidays_data = self.browse(cr, uid, ids[0], context=context)
-        list_holiday = []
-        ids_user_hdays = holidays_user_obj.search(cr, uid, [('employee_id', '=', holidays_data.employee_id.id),('holiday_status', '=', holidays_data.holiday_status_id.id)], context=context)
-        for hdays in holidays_user_obj.browse(cr, uid, ids_user_hdays):
-            for req in hdays.holiday_ids:
-                list_holiday.append(req.id)
-        list_holiday.append(ids[0])
-        holidays_user_obj.write(cr, uid, ids_user_hdays, {'holiday_ids': [(6, 0, list_holiday)]}, context=context)
-        return True
 
     def onchange_date_to(self, cr, uid, ids, date_from, date_to):
         result = {}
@@ -254,14 +193,15 @@ class hr_holidays(osv.osv):
     def onchange_sec_id(self, cr, uid, ids, status, context={}):
         warning = {}
         if status:
-            brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status], context=context)[0]
-            if brows_obj.section_id and not brows_obj.section_id.allow_unlink:
+            brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status])[0]
+            if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink:
                 warning = {
                     'title': "Warning for ",
                     'message': "You won\'t be able to cancel this leave request because the CRM Section of the leave type disallows."
                         }
         return {'warning': warning}
 
+
     def set_to_draft(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state':'draft',
@@ -288,11 +228,7 @@ class hr_holidays(osv.osv):
 
     def holidays_confirm(self, cr, uid, ids, *args):
         for record in self.browse(cr, uid, ids):
-#            if not record.employee_id.parent_id:
-#                raise osv.except_osv(_('Warning!'),_('You can not confirm leave for %s while %s has no manager.' %(record.employee_id.name,record.employee_id.name)))
-#            calender_id= self.pool.get('resource.calendar').search(cr, uid, [('company_id','=',record.employee_id.company_id.id),('manager','=',record.employee_id.parent_id.user_id.id)])
-#            if not calender_id:
-#                raise osv.except_osv(_('Warning!'),_('You have to define the calendar resource for %s company.' %(record.employee_id.company_id.name)))
+            user_id = False
             leave_asked = record.number_of_days_temp
             if record.type == 'remove':
                 if record.employee_id and not record.holiday_status_id.limit:
@@ -308,28 +244,27 @@ class hr_holidays(osv.osv):
             self.write(cr, uid, [record.id], {
                 'state':'confirm',
                 'number_of_days': nb,
-                'user_id': user_id,
-                'manager_id': record.employee_id.parent_id and record.employee_id.parent_id.id or False
+                'user_id': user_id
             })
-            vals= {
-                   'name':record.name,
-                   'date_from':record.date_from,
-                   'date_to':record.date_to,
-#                   'calendar_id':calender_id[0],
-                   'resource_id':record.employee_id.resource_id.id
-                 }
-        self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
+            #vals= {
+            #       'name':record.name,
+            #       'date_from':record.date_from,
+            #       'date_to':record.date_to,
+            #       'calendar_id':record.employee_id.calendar_id.id,
+            #       'company_id':record.employee_id.company_id.id,
+            #       'resource_id':record.employee_id.resource_id.id
+            #     }
+            #self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
+
         return True
 
     def holidays_refuse(self, cr, uid, ids, *args):
         vals = {
             'state':'refuse',
         }
-#        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
-#        if ids2:
-#            vals['manager_id'] = ids2[0]
-        for record in self.browse(cr, uid, ids):
-                vals['manager_id']=record.employee_id.parent_id.id
+        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        if ids2:
+            vals['manager_id'] = ids2[0]
         self.write(cr, uid, ids, vals)
         return True
 
@@ -338,9 +273,6 @@ class hr_holidays(osv.osv):
         self.write(cr, uid, ids, {
             'state':'cancel'
             })
-        for record in self.browse(cr, uid, ids):
-            calender_leave_id= self.pool.get('resource.calendar.leaves').search(cr, uid, [('date_from','=',record.date_from),('date_to','=',record.date_to),('resource_id','=',record.employee_id.resource_id.id)])
-            self.pool.get('resource.calendar.leaves').unlink(cr, uid, calender_leave_id[0])
         return True
 
     def holidays_draft(self, cr, uid, ids, *args):
@@ -349,23 +281,18 @@ class hr_holidays(osv.osv):
         })
         return True
 
-    def check_holidays(self,cr,uid,ids, context={}):
-        for record in self.browse(cr, uid, ids, context=context):
+    def check_holidays(self,cr,uid,ids):
+        for record in self.browse(cr, uid, ids):
             if not record.number_of_days:
-                raise osv.except_osv(_('Warning!'),_('Wrong leave definition.'))
+                    raise osv.except_osv(_('Warning!'),_('Wrong leave definition.'))
             if record.employee_id:
                 leave_asked = record.number_of_days
-                res = self.pool.get('hr.holidays.status').get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)
                 if leave_asked < 0.00:
                     if not record.holiday_status_id.limit:
-                        leaves_rest = res[record.holiday_status_id.id]['remaining_leaves']
-                        max_leaves = res[record.holiday_status_id.id]['max_leaves']
+                        leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
+
                         if leaves_rest < -(leave_asked):
                             raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
-                        else:
-                            leaves_taken = max_leaves -leaves_rest + record.number_of_days_temp
-                            holiday_id = self.pool.get('hr.holidays.per.user').search(cr, uid, [('employee_id','=', record.employee_id.id),('holiday_status','=',record.holiday_status_id.id)])
-                            self.pool.get('hr.holidays.per.user').write(cr,uid,holiday_id[0],{'leaves_taken':leaves_taken})
             else:
                 holiday_ids = []
                 vals = {
@@ -384,14 +311,17 @@ class hr_holidays(osv.osv):
                 employee_ids = self.pool.get('hr.employee').search(cr, uid, [])
                 for employee in employee_ids:
                     vals['employee_id'] = employee
+                    user_id = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
+                    if user_id:
+                        vals['user_id'] = user_id[0]
                     holiday_ids.append(self.create(cr, uid, vals, context={}))
-                self.holidays_confirm(cr, uid, holiday_ids, context=context)
-                self.holidays_validate(cr, uid, holiday_ids, context=context)
+                self.holidays_confirm(cr, uid, holiday_ids)
+                self.holidays_validate(cr, uid, holiday_ids)
 
-            if record.holiday_status_id.section_id and record.date_from and record.date_to and record.employee_id:
+            if record.holiday_status_id.categ_id and record.date_from and record.date_to and record.employee_id:
                 vals={}
                 vals['name']=record.name
-                vals['section_id']=record.holiday_status_id.section_id.id
+                vals['categ_id']=record.holiday_status_id.categ_id.id
                 epoch_c = time.mktime(time.strptime(record.date_to,'%Y-%m-%d %H:%M:%S'))
                 epoch_d = time.mktime(time.strptime(record.date_from,'%Y-%m-%d %H:%M:%S'))
                 diff_day = (epoch_c - epoch_d)/(3600*24)
@@ -399,9 +329,8 @@ class hr_holidays(osv.osv):
                 vals['note'] = record.notes
                 vals['user_id'] = record.user_id.id
                 vals['date'] = record.date_from
-                case_id = self.pool.get('crm.case').create(cr,uid,vals)
+                case_id = self.pool.get('crm.meeting').create(cr,uid,vals)
                 self.write(cr, uid, ids, {'case_id':case_id})
         return True
 hr_holidays()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 23d1e1a75bf..66669bd2f51 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -9,6 +9,77 @@
 				auto="False"
 				menu="False"/>
 
+
+
+
+<!-- available holidays report -->
+
+        <record id="view_report_hr_holiday_tree" model="ir.ui.view">
+            <field name="name">hr.holidays.report.tree</field>
+            <field name="model">hr.holidays.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+               <tree string="Available Holidays">
+                    <field name="employee_id"/>
+                    <field name="holiday_status_id"/>
+                    <field name="remaining_leave"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_report_hr_holiday_form" model="ir.ui.view">
+            <field name="name">hr.holidays.report.form</field>
+            <field name="model">hr.holidays.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <tree string="Available Holidays">
+                    <field name="employee_id" select="1"/>
+                    <field name="holiday_status_id" select="1"/>
+                    <field name="remaining_leave"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_report_hr_holiday_graph" model="ir.ui.view">
+            <field name="name">hr.holiday.report.graph</field>
+            <field name="model">hr.holidays.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Available Holidays" type="bar">
+                    <field name="holiday_status_id"/>
+                    <field name="remaining_leave" operator="+"/>
+                    <field group="True" name="employee_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="action_report_hr_holiday" model="ir.actions.act_window">
+            <field name="name">Available Holidays</field>
+            <field name="res_model">hr.holidays.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="view_id" ref="view_report_hr_holiday_tree"/>
+
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_hr_holiday_tree">
+                <field name="sequence" eval="1"/>
+                <field name="view_mode">tree</field>
+                <field name="view_id" ref="view_report_hr_holiday_tree"/>
+                <field name="act_window_id" ref="action_report_hr_holiday"/>
+            </record>
+
+
+        <record model="ir.actions.act_window.view" id="action_report_hr_holiday_graph">
+                <field name="sequence" eval="2"/>
+                <field name="view_mode">graph</field>
+                <field name="view_id" ref="view_report_hr_holiday_graph"/>
+                <field name="act_window_id" ref="action_report_hr_holiday"/>
+            </record>
+
+
+        <menuitem name="Available Holidays" id="menu_report_hr_holiday_tree" action="action_report_hr_holiday" parent="menu_hr_reporting_holidays"/>
+
+
 	</data>
 </openerp>
 
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_holidays_view.xml
similarity index 64%
rename from addons/hr_holidays/hr_view.xml
rename to addons/hr_holidays/hr_holidays_view.xml
index 4b8afe21a93..aa1fdd5534a 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-          <!--<menuitem
-            id="menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="40" />-->
-        <!-- Menu Items -->
-
         <record id="view_hr_holidays_filter" model="ir.ui.view">
             <field name="name">hr.holidays.filter</field>
             <field name="model">hr.holidays</field>
@@ -15,8 +8,8 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                        <group col='8' colspan='4'>
-                           <filter icon="gtk-yes" domain="[('state','=','draft')]" string="To Confirm"/>
-                           <filter icon="gtk-apply" domain="[('state','=','confirm')]" string="To Validate"/>
+                           <filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/>
+                           <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
                            <separator orientation="vertical"/>
                           <field name="name" select='1'/>
                           <field name="state" select="1">
@@ -24,18 +17,20 @@
                               <filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
                           </field>
                           <field name="user_id" select="1" widget="selection">
-                              <filter icon="terp-partner" help="My Leaves" domain="[('user_id','=',uid)]" />
+                              <filter icon="gtk-execute" help="My Leaves" domain="[('user_id','=',uid)]" />
                           </field>
                           <field name="department_id" select="1" widget="selection">
-                          		<filter icon="gtk-home" domain="[('department_id','=',context.get('department_id',False))]"
+                          		<filter icon="gtk-execute" domain="[('department_id','=',context.get('department_id',False))]"
 								help="My Departments Leaves"/>
                           </field>
                       </group>
                       <newline/>
-	                  <group colspan="4" col="20" expand='1' string='Group by...'>
-	                      <filter string='State' icon="terp-report" domain="[]" context="{'group_by' : 'state'}" />
-	                      <filter string='Employee Name' icon="terp-partner" domain="[]" context="{'group_by' : 'employee_id'}" />
-	                  </group>
+                    <group expand="1" string="Group By..." colspan="2" col="2">
+                        <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
+                    </group>
+
                  </search>
             </field>
         </record>
@@ -43,7 +38,6 @@
 
 
         <!-- Holidays: Leave Request -->
-
         <record model="ir.ui.view" id="edit_holiday_new">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
@@ -78,7 +72,6 @@
         </record>
 
         <!-- Holidays: Allocation Request -->
-
         <record model="ir.ui.view" id="allocation_leave_new">
             <field name="name">Allocation Request</field>
             <field name="model">hr.holidays</field>
@@ -109,18 +102,17 @@
             </field>
         </record>
 
-        <!-- Holidays: Company Allocation -->
-
+        <!-- Holidays: Leaves Management -->
         <record model="ir.ui.view" id="allocation_company_new">
-            <field name="name">Company Allocation</field>
+            <field name="name">Leaves Management</field>
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Company Allocation">
+                <form string="Leaves Management">
                     <field name="name" select="1"/>
                     <field name="holiday_status_id" select="1"/>
                     <field name="employee_id" select="1" />
-                    <field name="department_id"/>
+                    <!--<field name="department_id"/>-->
                     <field name="type"/>
                     <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
                     <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
@@ -153,40 +145,18 @@
                     <field name="name"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
-                    <!--<field name="number_of_days" string="Number of Days" sum='Remaining Days'/>-->
-                    <field name="number_of_days" string="Number of Days" />
+                    <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="holiday_status_id"/>
                     <field name="state"/>
-<!--                    <field name="type"/>-->
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
 
         <!-- My leave dashboard -->
-        <record id="view_hr_holiday_per_user_filter" model="ir.ui.view">
-            <field name="name">hr.holiday.per.user.filter</field>
-            <field name="model">hr.holidays.per.user</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Holiday Per User">
-                       <group col='8' colspan='4'>
-                          <field name="employee_id" select='1' widget="selection"/>
-                          <field name="user_id" select="1" widget="selection"/>
-                          <field name="holiday_status" select="1" widget="selection"/>
-                      </group>
-                      <newline/>
-	                  <group colspan="4" col="20" expand='1' string='Group by...'>
-	                      <filter string='Employee Name' icon="terp-partner" domain="[]" context="{'group_by' : 'employee_id'}" />
-	                      <filter string='Holiday Status' icon="terp-hr" domain="[]" context="{'group_by' : 'holiday_status'}" />
-	                  </group>
-
-                 </search>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_my_leave_board_form">
+<!--        <record model="ir.ui.view" id="view_my_leave_board_form">
             <field name="name">hr.holidays.per.user.form</field>
             <field name="model">hr.holidays.per.user</field>
             <field name="type">form</field>
@@ -202,33 +172,12 @@
                 </form>
             </field>
         </record>
-
-        <record model="ir.ui.view" id="view_my_leave_board_tree">
-            <field name="name">hr.holidays.per.user.tree</field>
-            <field name="model">hr.holidays.per.user</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="My Leaves" editable="top">
-                    <tree string="My Leaves" />
-                    <field name="employee_id"/>
-                    <field name="user_id"/>
-                    <field name="holiday_status"/>
-                    <field name="max_leaves"/>
-                    <field name="leaves_taken" />
-                    <field name="remaining_leaves"/>
-                    <!--<field name="notes"/>-->
-                </tree>
-            </field>
-        </record>
-
-       <!-- <menuitem
-          name="Holidays Management"
-            parent="hr.menu_hr_root"
-            id="menu_open_ask_holidays"/>-->
-	   <menuitem
-          name="Leaves" sequence="7"
+-->
+        <menuitem
+            name="Holidays Management"
             parent="hr.menu_hr_root"
             id="menu_open_ask_holidays"/>
+
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Request(s)</field>
             <field name="res_model">hr.holidays</field>
@@ -238,28 +187,23 @@
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
-	    <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_holiday"/>
-	        <field name="act_window_id" ref="open_ask_holidays"/>
-	    </record>
+     <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_holiday"/>
+        <field name="act_window_id" ref="open_ask_holidays"/>
+    </record>
 
-	    <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="edit_holiday_new"/>
-	        <field name="act_window_id" ref="open_ask_holidays"/>
-	    </record>
+    <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="edit_holiday_new"/>
+        <field name="act_window_id" ref="open_ask_holidays"/>
+    </record>
 
 
-	   <!--  <menuitem
-	          name="Holidays Requests"
-	            parent="menu_open_ask_holidays"
-	            id="menu_open_ask_holidays_new"
-	            action="open_ask_holidays"/>-->
-       	<menuitem
-            name="Leaves Requests"
+       <menuitem
+          name="Leave Requests"
             parent="menu_open_ask_holidays"
             id="menu_open_ask_holidays_new"
             action="open_ask_holidays"/>
@@ -273,41 +217,44 @@
             <field name="view_id" ref="allocation_leave_new" />
         </record>
 
-		<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_holiday"/>
-	        <field name="act_window_id" ref="open_allocation_holidays"/>
-	    </record>
+	<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_holiday"/>
+        <field name="act_window_id" ref="open_allocation_holidays"/>
+    </record>
 
-	    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="allocation_company_new"/>
-	        <field name="act_window_id" ref="open_allocation_holidays"/>
-	    </record>
+    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="allocation_leave_new"/>
+        <field name="act_window_id" ref="open_allocation_holidays"/>
+    </record>
 
 
-	    <!-- <menuitem
-	          name="Allocation Requests"
-	            parent="menu_open_ask_holidays"
-	            id="menu_open_allocation_holidays"
-	            action="open_allocation_holidays"/>-->
+     <menuitem
+          name="Allocation Requests"
+            parent="menu_open_ask_holidays"
+            id="menu_open_allocation_holidays"
+            action="open_allocation_holidays"/>
 
-        <!-- holidays status -->
-        <record id="view_hr_holiday_status_filter" model="ir.ui.view">
-            <field name="name">hr.holidays.status.filter</field>
-            <field name="model">hr.holidays.status</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Holiday Status">
-                       <group col='8' colspan='4'>
-                          <field name="name" select='1'/>
-	                  </group>
-                 </search>
-            </field>
+        <record model="ir.actions.act_window" id="open_company_allocation">
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="allocation_company_new" />
+            <field name="context">{'allocation_type':'company'}</field>
         </record>
 
+        <menuitem
+            name="Leaves Management"
+            parent="menu_open_ask_holidays"
+            id="menu_open_company_allocation"
+            action="open_company_allocation"
+            groups="hr.group_hr_manager"
+            sequence="40"/>
+
+        <!-- holidays status -->
         <record model="ir.ui.view" id="edit_holiday_status_form">
             <field name="name">hr.holidays.status.form</field>
             <field name="model">hr.holidays.status</field>
@@ -315,10 +262,10 @@
             <field name="arch" type="xml">
                 <form string="Leave Type">
                     <field colspan="4" name="name" select="1"/>
-                    <field name="color_name" select="2"/>
-                    <field name="section_id" select="2" widget="selection"/>
                     <field name="limit" select="2"/>
                     <field name="active" select="2"/>
+                    <field name="categ_id"  select="1" widget="selection"/>
+                    <field name="color_name" select="2"/>
                 </form>
             </field>
         </record>
@@ -340,40 +287,21 @@
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_hr_holiday_status_filter"/>
         </record>
 
         <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-		<!--<menuitem
-            action="open_view_holiday_status"
-            id="menu_open_view_holiday_status"
-            parent="hr.menu_hr_configuration"/>-->
         <menuitem name="Leaves Statuses"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
             parent="hr.menu_open_view_attendance_reason_config"/>
 
     <!--  Shortcuts -->
-        <act_window name="My Holiday Requests"
+        <act_window name="Holidays"
             domain="[('employee_id', '=', active_id), ('type','=','remove')]"
             res_model="hr.holidays"
             src_model="hr.employee"
             view_id ="eval('edit_holiday_new')"
             id="act_hr_employee_holiday_request"/>
 
-		<record model="ir.actions.act_window" id="action_holiday_per_user">
-            <field name="name">Holiday Per User</field>
-            <field name="res_model">hr.holidays.per.user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_my_leave_board_tree"/>
-            <field name="search_view_id" ref="view_hr_holiday_per_user_filter"/>
-        </record>
-
-		<menuitem name="Holiday Per User"
-            action="action_holiday_per_user"
-            id="menu_holiday_per_user"
-            parent="hr.menu_open_view_attendance_reason_config"/>
-
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index fb505d65497..a747571c943 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -11,10 +11,11 @@
             name="Holidays"
             parent="hr.menu_hr_reporting"
             sequence="3" />
-	<wizard string="Print Summary of Holidays"
+	<wizard string="Holidays by Departement"
 		  name="hr.holidays.summary"
 		  id="holidays_summary"/>
-	<menuitem name="Print Summary of Holidays" parent="menu_hr_reporting_holidays"
+	<menuitem name="Leaves by Departement" parent="menu_hr_reporting_holidays"
+                  icon="STOCK_PRINT"
 		 action="holidays_summary"
 		 type="wizard"
 		 id="menu_holidays_summary" sequence="20"/>
@@ -24,7 +25,7 @@
 		 <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
   	 </record>
 
-	<wizard string="Print Summary of Employee's Holidays"
+	<wizard string="Employee's Holidays"
 		model="hr.employee" name="hr.holidays.summary.employee"
 		keyword="client_print_multi" id="wizard_holidays_summary" />
  	</data>
diff --git a/addons/hr_holidays/hr_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
similarity index 100%
rename from addons/hr_holidays/hr_workflow.xml
rename to addons/hr_holidays/hr_holidays_workflow.xml
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index 58d15ef97cd..a4c8c82fa99 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 86f92030ead..ab515d9d8a9 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index 880fd49c973..ebc0e7f6380 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 37bbc3dd52c..5f4656cbd36 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index ca62ef62bd2..5c8c25fc49c 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index e8c2b4f601c..65f273fbc50 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 74326550614..303a6a5104d 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index ff174d941d4..9ade226f6ac 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index b3a69fc32b6..5976f6fe3c6 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.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: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index 5db219b8e96..eef43f8b95d 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/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 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index 9657d2212a6..e727c747f7c 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index e4a8f20522f..8aa97a2cf68 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 32cd0d2e645..bbd0f5ae965 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index c23535c1216..453b1726454 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index 9df89f3ef81..c447222196a 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 6eb013ae330..593de018bfb 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 524f4febc3b..1796d82c133 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index 7ee26eca39c..b93d36bb933 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index eec7e376683..b5f593d4b33 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index 6abc79baabf..27657fd6b3e 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 261d122f6f1..54309e484e8 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index 54a7f64a28d..fac83d8864d 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.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: hr_holidays
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 57f5d604705..23c5f27fc59 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index 1ca8c938dae..96f4f84121c 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 534a4320496..5a7585e11b4 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.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: hr_holidays
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index b1100faf6de..7ec310081f6 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index d37f485c774..56efed4f8a5 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.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: hr_holidays
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 3f89aa800cd..d5d0d83c74d 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index 7ee07bd4d3c..1f3d8b08bf3 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 60e69ace218..740e8e4d16f 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/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-03-09 22:05+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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: hr_holidays
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index f6e6b007af2..4417ac76370 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/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-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index 879b5fa36e7..c785a5ee37e 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.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: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 3a1b5e077e1..ce6efce9df8 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index f8eba19e437..9e35879f3bf 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.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: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 8ee345a2b57..abe62d19b0d 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -1,73 +1,72 @@
-# Simplified Chinese translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_holidays
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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-20 15:10+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
+"PO-Revision-Date: 2010-03-20 08:28+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "New Holidays Request"
-msgstr "新建假日申请"
+msgstr "新的假期申请"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
 msgid "All Holidays Requests"
-msgstr "所有假日申请"
+msgstr "所有假期请求"
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "剩余准假"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
 msgid "Requests Awaiting for Validation"
-msgstr "申请等待批准生效"
+msgstr "申请等待批准"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr "淡蓝色"
+msgstr "浅蓝"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr "棕色"
+msgstr "棕"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "of the"
-msgstr ""
+msgstr "这"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Off-Days' Summary"
-msgstr "请假概述"
+msgstr "休息日摘要"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
 msgid "Employee Holidays"
-msgstr "员工假日"
+msgstr "员工假期"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -80,27 +79,27 @@ msgstr "设为草稿"
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidays0
 msgid "Holidays"
-msgstr "假日"
+msgstr "假期"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "to"
-msgstr "至"
+msgstr "到"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
-msgstr "淡青色"
+msgstr "浅青色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr "淡绿色"
+msgstr "浅绿色"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
 msgid "Employee Declaration"
-msgstr "员工声明"
+msgstr "员工申请"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -117,12 +116,12 @@ msgstr "拒绝申请"
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_approved0
 msgid "Approved"
-msgstr "已核准"
+msgstr "批准"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Both"
-msgstr "两者"
+msgstr "两个"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -138,7 +137,7 @@ msgstr "确定"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
 msgid "My Holidays Requests"
-msgstr "我的假日申请"
+msgstr "我的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
@@ -151,84 +150,84 @@ msgstr "备注"
 #: field:hr.holidays.log,holiday_status:0
 #: field:hr.holidays.per.user,holiday_status:0
 msgid "Holiday's Status"
-msgstr "假日状态"
+msgstr "假期状态"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
 msgid "Request is refused."
-msgstr "申请被拒绝。"
+msgstr "申请拒绝"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Holidays Management"
-msgstr "假日管理"
+msgstr "假期管理"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Analyze from"
-msgstr ""
+msgstr "来自分析"
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Holidays"
-msgstr "假日概要"
+msgstr "假期摘要"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_calendar0
 msgid "The holiday is set in the calendar"
-msgstr ""
+msgstr "这假期设到日程表"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Holiday status"
-msgstr "假日状态"
+msgstr "假期状态"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr "假日状态"
+msgstr "假期状态"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "Vacation end day"
-msgstr "假期结束日"
+msgstr "批准结束日期"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "Holidays Allowed"
-msgstr "允许的假日"
+msgstr "假期允许"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_legaldeclaration0
 msgid "Legal Declaration Document to declare new employee"
-msgstr "申报一个新员工的法律文档"
+msgstr "法定的新员工"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr "品红色"
+msgstr "紫红色"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
 msgid "Holidays Per User"
-msgstr "各个用户的假日"
+msgstr "每个用户的假期"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Define holiday status"
-msgstr "定义假日状态"
+msgstr "设定假期状态"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Confirmed"
-msgstr "已确认"
+msgstr "确认"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,date_from:0
 #: wizard_field:hr.holidays.summary.employee,init,date_from:0
 msgid "From"
-msgstr "来自"
+msgstr "从"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -240,17 +239,17 @@ msgstr "确认"
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
 msgid "My Awaiting Confirmation Holidays Requests"
-msgstr "我的待确认假日申请"
+msgstr "我等待确认的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
 msgid "Employee_id"
-msgstr ""
+msgstr "员工_ID"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
 msgid "Encoding of annual available holidays."
-msgstr ""
+msgstr "可得到的年度假期编号"
 
 #. module: hr_holidays
 #: field:hr.holidays,employee_id:0
@@ -262,108 +261,108 @@ msgstr "员工"
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Validation"
-msgstr ""
+msgstr "等待批准"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
 msgid "Employee get holidays"
-msgstr ""
+msgstr "员工获得假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
-msgstr "浅橙色"
+msgstr "浅橙红色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr ""
+msgstr "淡黄色"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,nb_holidays:0
 msgid "Number of Holidays Requested"
-msgstr ""
+msgstr "申请的假期编号"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
 msgid "My Holiday Requests"
-msgstr ""
+msgstr "我的假期申请草稿"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 msgid "Number of Days"
-msgstr ""
+msgstr "天数"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,name:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr ""
+msgstr "假期状态"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
 #: wizard_view:hr.holidays.summary.employee,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "报表选项"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_approved0
 msgid "His manager approves the request"
-msgstr ""
+msgstr "管理者批准这申请"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
 msgid "If holidays available, employee can take it and fill it."
-msgstr ""
+msgstr "如果有假期可用"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "You have to select at least 1 Employee. Try again."
-msgstr ""
+msgstr "你必须至少选择1部门再试一次"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
 msgid "My Validated Holidays Requests"
-msgstr ""
+msgstr "我批准的假期申请"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary.employee,init,emp:0
 msgid "Employee(s)"
-msgstr ""
+msgstr "员工"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days:0
 msgid "Number of Days in this Holiday Request"
-msgstr ""
+msgstr "申请的假期天数"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
 #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
 msgid "Holidays Per Employee"
-msgstr ""
+msgstr "每个员工的假期"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to override Limit"
-msgstr ""
+msgstr "允许覆盖的限制"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_user_id:0
 msgid "Holidays user"
-msgstr ""
+msgstr "用户假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
-msgstr ""
+msgstr "淡紫色"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_log
@@ -373,17 +372,17 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
 msgid "Print Summary of Employee's Holidays"
-msgstr ""
+msgstr "打印员工假期摘要"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_calendar0
 msgid "Calendar"
-msgstr ""
+msgstr "日历"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Vacation start day"
-msgstr ""
+msgstr "批准结束日期"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -421,164 +420,182 @@ msgid ""
 "                Administration / Users / Users\n"
 "            for example, you maybe will do it for the user 'admin'.\n"
 msgstr ""
+"人力资源:假期跟踪和工作流\n"
+"\n"
+"这模块允许你管理假期和假期请求每个员工能为每个可用假期的状态定义一个数字\n"
+"\n"
+"备注:\n"
+"同步内部日程(使用业务关系管理模块)它可以:接受自动创建一个假期申请,你要在事务节连接到假期状态.你能设置信息和偏好的颜色\n"
+"                人力资源 / 设置 / 假期状态\n"
+"    - 员工能请求负数的假期 (如假期为-2日), 它被转换为询问系统要求更多的休息日. 它将增加有效总假期 (如果申请批准).\n"
+"    - 有两种方法打印员工的假期:\n"
+"        * 允许按部门分员工，通过在菜单点击\n"
+"                人力资源 / 假期申请 / 打印假期摘要\n"
+"        * 允许你为指定的员工选择假期\n"
+"                人力资源 / 员工 / 所有员工\n"
+"            然后选择你想打印的内容后点击打印图标\n"
+"                '打印员工假期摘要'\n"
+"    - 这向导允许你选择打印确认或有效的假期'. \n"
+"                Administration / Users / Users\n"
+"            例如, 你可能是 'admin'.\n"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "Notification"
-msgstr ""
+msgstr "通知"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysrequest0
 msgid "Employee fills in a request for holidays"
-msgstr ""
+msgstr "员工填写假期申请"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
 msgid "Holiday is set in the calendar."
-msgstr ""
+msgstr "在日历设定假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Coral"
-msgstr ""
+msgstr "浅珊瑚色"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
 msgid "My Available Holidays"
-msgstr ""
+msgstr "我可用的假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "黑"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
 msgid "My Refused Holidays Requests"
-msgstr ""
+msgstr "我拒接的假期申请"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_setholiday0
 msgid "Set Holiday"
-msgstr ""
+msgstr "设定假期"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
 msgid "My Draft Holidays Requests"
-msgstr ""
+msgstr "我的假期申请草稿"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,max_leaves:0
 msgid "Maximum Leaves Allowed"
-msgstr ""
+msgstr "最大准假允许"
 
 #. module: hr_holidays
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Ivory"
-msgstr ""
+msgstr "象牙白"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
 msgid "My Holidays Request"
-msgstr ""
+msgstr "物品的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr ""
+msgstr "状态颜色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr ""
+msgstr "批准和确认"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr ""
+msgstr "准假已得到"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "holidays."
-msgstr ""
+msgstr "假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
 msgid "Document for employee"
-msgstr ""
+msgstr "员工文档"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
 msgid "Reufse"
-msgstr ""
+msgstr "拒绝"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "部分"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "Holiday manager"
-msgstr ""
+msgstr "假期管理"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,active:0
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "有效"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
 msgid "My Holidays Request Draft"
-msgstr ""
+msgstr "我的假期申请草稿"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
 msgid "Approved Request"
-msgstr ""
+msgstr "批准请求"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysrequest0
 msgid "Holidays Request"
-msgstr ""
+msgstr "假期申请"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
 msgid "Holidays Requests Awaiting for Validation"
-msgstr ""
+msgstr "假期申请等待批准"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "普通"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "General Information"
-msgstr ""
+msgstr "一般信息"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -586,140 +603,143 @@ msgstr ""
 #: wizard_button:hr.holidays.summary,init,end:0
 #: wizard_button:hr.holidays.summary.employee,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
 msgid "Holidays def Request"
-msgstr ""
+msgstr "假期申请定义"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Validated"
-msgstr ""
+msgstr "批准"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
 msgid "My Holidays Request Refused"
-msgstr ""
+msgstr "我拒绝的假期申请"
 
 #. module: hr_holidays
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_holidays
 #: wizard_button:hr.holidays.summary,init,checkdept:0
 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.holidays_summary
 #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
 msgid "Print Summary of Holidays"
-msgstr ""
+msgstr "打印假期摘要"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "部门"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 #: model:process.node,name:hr_holidays.process_node_refused0
 msgid "Refused"
-msgstr ""
+msgstr "已拒绝"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
 msgid "Request is approved."
-msgstr ""
+msgstr "申请批准"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
 msgid "Holidays Definition"
-msgstr ""
+msgstr "假期定义"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,holiday_type:0
 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "选择假期类型"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 msgid "Case"
-msgstr ""
+msgstr "成本"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
 msgid "Holiday per user"
-msgstr ""
+msgstr "每个用户的假期"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
 msgid "Encode number of available holidays"
-msgstr ""
+msgstr "可得到的假期编号"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_legaldeclaration0
 msgid "Secretariat Social"
-msgstr ""
+msgstr "社保"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr ""
+msgstr "紫色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr ""
+msgstr "红色"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr ""
+msgstr "人力资源:假期管理"
 
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
 msgid "Holidays Process"
-msgstr ""
+msgstr "假期处理"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
 msgid "You have to select at least 1 Department. Try again."
-msgstr ""
+msgstr "你必须至少选择1部门再试一次"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
 msgid "My Holidays Request Validated"
-msgstr ""
+msgstr "我批准的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_req_id:0
 msgid "Holiday Request ID"
-msgstr ""
+msgstr "假期申请ID"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "浅黄色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Pink"
-msgstr ""
+msgstr "浅粉红色"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_refused0
 msgid "His manager refuses the request"
-msgstr ""
+msgstr "管理者拒绝这申请"
+
+#~ msgid "Action"
+#~ msgstr "行动"
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 2d09dbece6a..a4c8c82fa99 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/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: hr_holidays
diff --git a/addons/hr_holidays/report/__init__.py b/addons/hr_holidays/report/__init__.py
index 39882f6cd59..00783721fe3 100644
--- a/addons/hr_holidays/report/__init__.py
+++ b/addons/hr_holidays/report/__init__.py
@@ -20,5 +20,6 @@
 ##############################################################################
 
 import holidays_summary_report
+import available_holidays
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
new file mode 100644
index 00000000000..259aea0dec9
--- /dev/null
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -0,0 +1,33 @@
+from osv import fields,osv
+import tools
+
+class hr_holidays_report(osv.osv):
+    _name = "hr.holidays.report"
+    _auto = False
+    _columns = {
+        'employee_id': fields.many2one ('hr.employee', 'Employee', readonly=True),
+        'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True),
+ #       'max_leave': fields.float('Allocated Leaves', readonly=True),
+#        'taken_leaves': fields.float('Taken Leaves', readonly=True),
+        'remaining_leave': fields.float('Remaining Leaves',readonly=True), 
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'hr_holidays_report')
+        cr.execute("""
+            create or replace view hr_holidays_report as (
+                select
+                    min(h.id) as id,
+                    h.employee_id as employee_id,
+                    h.holiday_status_id as holiday_status_id,
+                    sum(number_of_days) as remaining_leave
+                from
+                    hr_holidays h
+                left join hr_holidays_status s on (s.id = h.holiday_status_id)
+                where h.state = 'validate'
+                and h.employee_id is not null
+                and s.active <> 'f'
+                group by h.holiday_status_id, h.employee_id
+            )""")
+hr_holidays_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index e0cb697b3b9..c61e8f733b4 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -44,7 +44,6 @@ def strToDate(dt):
 
 def emp_create_xml(self,cr,uid,dept,holiday_type,row_id,empid,name,som,eom):
     display={}
-
     if dept==0:
         count=0
         p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr,uid,[('employee_id','in',[empid,False]), ('type', '=', 'remove')])
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
new file mode 100644
index 00000000000..59a0a361eeb
--- /dev/null
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields,osv
+
+class hr_holidays_report(osv.osv):
+    _name = "hr.holidays.report"
+    _description = "Leaves Statistics"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.datetime('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'date_from' : fields.datetime('Start Date', readonly=True),
+        'date_to' : fields.datetime('End Date', readonly=True),
+        'number_of_days_temp': fields.float('Number of Days', readonly=True),
+        'employee_id' : fields.many2one('hr.employee', "Employee's Name",readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'state': fields.selection([('draft', 'Draft'),
+                                   ('confirm', 'Waiting Validation'),
+                                   ('refuse', 'Refused'),
+                                   ('validate', 'Validated'),
+                                   ('cancel', 'Cancelled')]
+                                   ,'State', readonly=True),
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'hr_holidays_report')
+        cr.execute("""
+            create or replace view hr_holidays_report as (
+                 select
+                     min(s.id) as id,
+                     date_trunc('seconds',s.create_date) as date,
+                     date_trunc('day',s.date_from) as date_from,
+                     date_trunc('day',s.date_to) as date_to,
+                     s.number_of_days_temp,
+                     s.employee_id,
+                     s.user_id as user_id,
+                     to_char(s.create_date, 'YYYY') as year,
+                     to_char(s.create_date, 'MM') as month,
+                     s.state
+                     from
+                 hr_holidays s
+                 group by
+                     s.create_date,s.state,s.date_from,s.date_to,
+                     s.number_of_days_temp,s.employee_id,s.user_id
+            )
+        """)
+hr_holidays_report()
+
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
new file mode 100644
index 00000000000..6a8d1461799
--- /dev/null
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_hr_holidays_report_tree" model="ir.ui.view">
+        <field name="name">hr.holidays.report.tree</field>
+        <field name="model">hr.holidays.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Leaves Statistics">
+                <field name="date"/>
+                <field name="employee_id"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <field name="number_of_days_temp"/>
+                <field name="year" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_hr_holidays_report_graph" model="ir.ui.view">
+         <field name="name">hr.holidays.report.graph</field>
+         <field name="model">hr.holidays.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Leaves Statistics" type="bar">
+                 <field name="employee_id"/>
+                 <field name="number_of_days_temp" operator="+"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_hr_holidays_report_search" model="ir.ui.view">
+        <field name="name">hr.holidays.report.search</field>
+        <field name="model">hr.holidays.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Leaves">
+                <filter icon="terp-hr"
+                    string="This Year"
+                    domain="[('year','=',time.strftime('%%Y'))]"
+                    help="Leaves of the year"/>
+                <filter icon="terp-hr"
+                    string="This Month"
+                    domain="[('month','=',time.strftime('%%m'))]"
+                    help="Leaves of this month"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-hr"
+                    string="Today's Start Leave"
+                    domain="[('date_from','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                <filter icon="terp-hr"
+                    string="Today's End Leave"
+                    domain="[('date_to','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                <separator orientation="vertical"/>
+                <field name="employee_id"/>
+                <field name="user_id" widget="selection">
+                    <filter icon="terp-sale"
+                        string="My Leaves"
+                        default="1"
+                        domain="[('user_id','=',uid)]"/>
+                </field>
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-sale" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_hr_holidays_report_all" model="ir.actions.act_window">
+        <field name="name">Leaves</field>
+        <field name="res_model">hr.holidays.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_hr_holidays_report_search"/>
+    </record>
+
+    <menuitem action="action_hr_holidays_report_all" id="menu_hr_holidays_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+
+</data>
+</openerp>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index a7fc3d153b5..a7426724594 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1
-"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1
-"access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1
+"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,0,0,0
+"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,0
+"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","hr.group_hr_manager",1,1,1,1
+"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","hr.group_hr_manager",1,1,1,1
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
index a621e6d5912..c4e92a196dc 100644
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -26,7 +26,7 @@ import pooler
 
 
 form='''<?xml version="1.0"?>
-<form string="Report Options">
+<form string="Employee's Holidays">
     <field name="date_from" colspan="2" />
     <field name="holiday_type" colspan="2" />
     <field name="emp" colspan="4" invisible="True"/>
@@ -67,7 +67,7 @@ class wizard_report(wizard.interface):
     states={
         'init':{
             'actions':[_check],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('checkemp', 'Print')]}
+            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('checkemp', 'Print', 'gtk-ok')]}
         },
         'checkemp': {
             'actions': [],
diff --git a/addons/hr_recruitment/__terp__.py b/addons/hr_recruitment/__terp__.py
index e40319ef524..a19ef25515b 100644
--- a/addons/hr_recruitment/__terp__.py
+++ b/addons/hr_recruitment/__terp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'HR - Recruitement',
     'version': '1.0',
-    'category': 'Generic Modules/HR',
+    'category': 'Generic Modules/Human Resources',
     'description': """
 Manages job positions and the recruitement process. It's integrated with the
 survey module to allows you to define interview for different jobs.
@@ -42,10 +42,11 @@ system to store and search in your CV base.
         'hr_recruitment_wizard.xml',
         'hr_recruitment_view.xml',
         'hr_recruitment_menu.xml',
-        'report_hr_recruitment_view.xml',
+#        'report_hr_recruitment_view.xml',
         'security/hr_recruitment_security.xml',
         'security/ir.model.access.csv',
         'board_hr_recruitment_statistical_view.xml',
+        'report/hr_recruitment_report_view.xml'
      ],
     'demo_xml': [
         'hr_recruitment_demo.xml'
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index c86de0f9737..46400fa3da0 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -148,23 +148,31 @@
                         <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
-                                <field name="email"/>
+                                <field name="email_to"/>
+                                <field name="email_from"/>
                                 <button
-                                   string="Add a CC"
-                                   name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                   icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                           <field name="description"/>
-                           <field name="email"/>
-                           <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(crm.action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'hr.applicant'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(crm.action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'hr.applicant'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index b49de4f66d5..7ba9abfe812 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -1,3 +1,67 @@
-from osv import fields,osv
-import tools
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields,osv
+from hr_recruitment import hr_recruitment
+
+class hr_recruitment_report(osv.osv):
+    _name = "hr.recruitment.report"
+    _description = "Recruitments Statistics"
+    _inherit = "crm.case.report"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.datetime('Date', readonly=True),
+        'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True),
+        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
+        'department_id':fields.many2one('hr.department','Department',readonly=True),
+        'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
+
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'hr_recruitment_report')
+        cr.execute("""
+            create or replace view hr_recruitment_report as (
+                 select
+                     min(s.id) as id,
+                     s.date as date,
+                     to_char(s.date, 'YYYY') as name,
+                     to_char(s.date, 'MM') as month,
+                     s.state,
+                     s.company_id,
+                     s.user_id,
+                     s.job_id,
+                     s.type_id,
+                     s.department_id,
+                     s.priority,
+                     s.stage_id,
+                     count(*) as nbr
+                 from hr_applicant s
+                 group by
+                     s.date,s.state,s.company_id,s.user_id,s.stage_id,s.type_id,s.priority,
+                     s.job_id,s.department_id
+            )
+        """)
+hr_recruitment_report()
 
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
new file mode 100644
index 00000000000..30f1ec3d8ed
--- /dev/null
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="view_hr_recruitment_report_tree" model="ir.ui.view">
+        <field name="name">hr.recruitment.report.tree</field>
+        <field name="model">hr.recruitment.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Recruitments Statistics">
+                <field name="date"/>
+                <field name="user_id"/>
+                <field name="job_id"/>
+                <field name="stage_id"/>
+                <field name="department_id"/>
+                <field name="type_id"/>
+                <field name="company_id"/>
+                <field name="state"/>
+                <field name="name" invisible="1"/>
+                <field name="month" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_hr_recruitment_report_graph" model="ir.ui.view">
+         <field name="name">hr.recruitment.report.graph</field>
+         <field name="model">hr.recruitment.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Recruitments Statistics" type="bar">
+                 <field name="job_id"/>
+                 <field name="nbr" operator="+"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_hr_recruitment_report_search" model="ir.ui.view">
+        <field name="name">hr.recruitment.report.search</field>
+        <field name="model">hr.recruitment.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Recruitments">
+                <filter icon="terp-hr"
+                    string="This Year"
+                    domain="[('year','=',time.strftime('%%Y'))]"
+                    help="Recruitments of the year"/>
+                <filter icon="terp-hr"
+                    string="This Month"
+                    domain="[('month','=',time.strftime('%%m'))]"
+                    help="Recruitments of this month"/>
+                <separator orientation="vertical"/>
+                <filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
+				<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
+				<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
+                <separator orientation="vertical"/>
+                <field name="company_id" widget="selection"/>
+                <field name="user_id" widget="selection">
+                    <filter icon="terp-sale"
+                        string="My Recruitments"
+                        default="1"
+                        domain="[('user_id','=',uid)]"/>
+                </field>
+                <newline/>
+                <group expand="1" string="Extended options..." colspan="10" col="12">
+                    <filter icon="terp-hr"
+                    		string="Not Good"
+                    		domain="[('priority','=','5')]"/>
+                    <filter icon="terp-hr"
+                    		string="On Average"
+                    		domain="[('priority','=','4')]"/>
+                    <filter icon="terp-hr"
+                    		string="Good"
+                    		domain="[('priority','=','3')]"/>
+                    <filter icon="terp-hr"
+                    		string="Very Good"
+                    		domain="[('priority','=','2')]"/>
+                    <filter icon="terp-hr"
+                    		string="Excellent"
+                    		domain="[('priority','=','1')]"/>
+                </group>
+
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                   <filter string="User" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" default="1" />
+                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}"/>
+                   <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}"/>
+                   <separator orientation="vertical"/>
+                   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
+                   <filter string="Jobs" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
+            	   <separator orientation="vertical"/>
+            	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
+            	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'name'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_hr_recruitment_report_all" model="ir.actions.act_window">
+        <field name="name">Recruitments</field>
+        <field name="res_model">hr.recruitment.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
+    </record>
+	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
+    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+
+</data>
+</openerp>
diff --git a/addons/hr_recruitment/report_hr_recruitment_view.xml b/addons/hr_recruitment/report_hr_recruitment_view.xml
deleted file mode 100644
index 1fbce7663ea..00000000000
--- a/addons/hr_recruitment/report_hr_recruitment_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-  </data>
-</openerp>
diff --git a/addons/hr_timesheet/i18n/ar.po b/addons/hr_timesheet/i18n/ar.po
index ac2118a20e9..592d9289a7c 100644
--- a/addons/hr_timesheet/i18n/ar.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index fd1c8c215a7..36bb157a6cb 100644
--- a/addons/hr_timesheet/i18n/bg.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/bs.po b/addons/hr_timesheet/i18n/bs.po
index 53c9c3646c0..e77637bde04 100644
--- a/addons/hr_timesheet/i18n/bs.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index 6e048f18cb1..5bc758263ff 100644
--- a/addons/hr_timesheet/i18n/ca.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po
index e9429a9e4b1..7ace8c6aabc 100644
--- a/addons/hr_timesheet/i18n/cs.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index 7eb901b3db7..6fd9ba3a577 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/el.po b/addons/hr_timesheet/i18n/el.po
index a0a885677ab..072ca98bbee 100644
--- a/addons/hr_timesheet/i18n/el.po
+++ b/addons/hr_timesheet/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index 47d05e70f99..26f74ab60e5 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -7,14 +7,13 @@ 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-11-17 07:12+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-03-20 21:36+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -113,7 +112,7 @@ msgstr "Producto"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "août"
-msgstr ""
+msgstr "agosto"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -158,7 +157,7 @@ msgstr "Tiempo total"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juillet"
-msgstr ""
+msgstr "julio"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
@@ -172,14 +171,14 @@ msgstr "Hoja de asistencia"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "janvier"
-msgstr ""
+msgstr "enero"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juin"
-msgstr ""
+msgstr "junio"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_my
@@ -234,7 +233,7 @@ msgstr "¡XML inválido para la definición de la vista!"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "avril"
-msgstr ""
+msgstr "abril"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
@@ -256,7 +255,7 @@ msgstr "Seleccionar usuarios"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "novembre"
-msgstr ""
+msgstr "noviembre"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
@@ -284,7 +283,7 @@ msgstr "Estado actual"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "octobre"
-msgstr ""
+msgstr "octubre"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -296,7 +295,7 @@ msgstr "Estadísticas de análisis"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "décembre"
-msgstr ""
+msgstr "diciembre"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,info:0
@@ -346,7 +345,7 @@ msgstr "Recursos humanos (codificación de horarios)"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mars"
-msgstr ""
+msgstr "marzo"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
@@ -359,7 +358,7 @@ msgstr "Total"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mai"
-msgstr ""
+msgstr "mayo"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
@@ -376,7 +375,7 @@ msgstr "Cambiar trabajo"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "février"
-msgstr ""
+msgstr "febrero"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -470,7 +469,7 @@ msgstr "Horario de empleados"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "septembre"
-msgstr ""
+msgstr "septiembre"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
diff --git a/addons/hr_timesheet/i18n/es_AR.po b/addons/hr_timesheet/i18n/es_AR.po
index 56dbe9ea27e..dc2dc025ef8 100644
--- a/addons/hr_timesheet/i18n/es_AR.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/et.po b/addons/hr_timesheet/i18n/et.po
index 71dadc062e7..daf8b9b2c1b 100644
--- a/addons/hr_timesheet/i18n/et.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index db471f119c8..96ae92ba6a9 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 684aced34e2..0beab6826ab 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index ac2118a20e9..592d9289a7c 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hu.po b/addons/hr_timesheet/i18n/hu.po
index ac2118a20e9..592d9289a7c 100644
--- a/addons/hr_timesheet/i18n/hu.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index 9230d36251e..2293c74843f 100644
--- a/addons/hr_timesheet/i18n/id.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index db138743929..f6605404be1 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ko.po b/addons/hr_timesheet/i18n/ko.po
index ff11c93c0bf..4f39888143a 100644
--- a/addons/hr_timesheet/i18n/ko.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index ac2118a20e9..592d9289a7c 100644
--- a/addons/hr_timesheet/i18n/lt.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/lv.po b/addons/hr_timesheet/i18n/lv.po
index 52407863531..ce81bf81ba9 100644
--- a/addons/hr_timesheet/i18n/lv.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index 251ebcd1426..cf31544f772 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index 3ba343df6f5..a8d7792f50c 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index 59487c6e9a9..1cd88a0726b 100644
--- a/addons/hr_timesheet/i18n/pt.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index f08a5211251..0a9b8106e77 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.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: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ro.po b/addons/hr_timesheet/i18n/ro.po
index c27d3793c32..2d8cabd7a14 100644
--- a/addons/hr_timesheet/i18n/ro.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po
index fd01970b87c..faf48091f94 100644
--- a/addons/hr_timesheet/i18n/ru.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sl.po b/addons/hr_timesheet/i18n/sl.po
index 2c2d40b3626..a3f250bc9b5 100644
--- a/addons/hr_timesheet/i18n/sl.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sq.po b/addons/hr_timesheet/i18n/sq.po
index dbb24307bf5..702f6d51f73 100644
--- a/addons/hr_timesheet/i18n/sq.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index 138575beae3..bd2056af036 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/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-03-09 21:26+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/tlh.po b/addons/hr_timesheet/i18n/tlh.po
index d7206435ff1..b3da130ba35 100644
--- a/addons/hr_timesheet/i18n/tlh.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 0a5070c8991..e4dedef8226 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/uk.po b/addons/hr_timesheet/i18n/uk.po
index f57b099a6bc..fa249ad2950 100644
--- a/addons/hr_timesheet/i18n/uk.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index 77578322a09..af8968206f2 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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: 2010-01-10 02:05+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -26,7 +26,7 @@ msgstr "选择月份"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -37,7 +37,7 @@ msgstr "员工时间表"
 #: model:ir.actions.wizard,name:hr_timesheet.si_so
 #: model:ir.ui.menu,name:hr_timesheet.menu_si_so
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "项目的签入/签出"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result_end:0
@@ -53,17 +53,17 @@ msgstr "（留空表示当前时间）"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同种类."
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Sign in status"
-msgstr "签如状态"
+msgstr "签入状态"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "(Keep empty for current time)"
-msgstr ""
+msgstr "(留空表示当前时间)"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_out,server_date:0
@@ -73,7 +73,7 @@ msgstr "当前日期"
 #. module: hr_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在这动作定义中有无效的模块名."
 
 #. module: hr_timesheet
 #: wizard_button:hr.analytical.timesheet,init,report:0
@@ -85,23 +85,23 @@ msgstr "打印"
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "最低辅助核算额"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,server_date:0
 msgid "Current Server Date"
-msgstr "当前状态"
+msgstr "当前服务器时间"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date_start:0
 #: wizard_field:hr_timesheet.si_so,sign_out,date:0
 msgid "Starting Date"
-msgstr "起始日"
+msgstr "开始日期"
 
 #. module: hr_timesheet
 #: field:hr.employee,product_id:0
 msgid "Product"
-msgstr "货品"
+msgstr "产品"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -113,30 +113,30 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr "分析日记账"
+msgstr "辅助核算分类帐"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "小时"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet
 msgid "Employee Timesheet"
-msgstr "员工工作时间表"
+msgstr "员工时间表"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "统计完成的工作"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form
 msgid "Working Hours"
-msgstr "工时"
+msgstr "工作小时"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -146,7 +146,7 @@ msgstr "时间表明细"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr "总计时间"
+msgstr "总时间"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -197,7 +197,7 @@ msgstr "签入"
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form
 msgid "Working Hours of The Day"
-msgstr "该日工时"
+msgstr "这天的工作小时"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
@@ -212,17 +212,17 @@ msgstr "总成本"
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_day
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date:0
 msgid "Closing Date"
-msgstr "终止日期"
+msgstr "结束日期"
 
 #. module: hr_timesheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -234,12 +234,12 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic line"
-msgstr ""
+msgstr "辅助核算明细"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类"
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet_users,init:0
@@ -261,12 +261,12 @@ msgstr "签入/签出"
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "在最近会计期间完成的工作"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr ""
+msgstr "关键日期"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,state:0
@@ -284,7 +284,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis stats"
-msgstr ""
+msgstr "辅助核算统计"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -307,13 +307,13 @@ msgstr "员工姓名"
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Consultancy - Senior Developer"
-msgstr ""
+msgstr "顾问 - 高级开发"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form
 msgid "My Working Hours"
-msgstr "我的工时"
+msgstr "我的工作小时"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
@@ -323,18 +323,18 @@ msgstr "时间表明细"
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 msgid "Sum"
-msgstr ""
+msgstr "总数"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my
 msgid "My Working Hours of The Day"
-msgstr "该日我的工时"
+msgstr "这天我的工作小时"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
 msgid "Human Resources (Timesheet encoding)"
-msgstr ""
+msgstr "人力资源(时间表编码)"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -347,7 +347,7 @@ msgstr ""
 #: xsl:hr.analytical.timesheet:0
 #: xsl:hr.analytical.timesheet_users:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -364,7 +364,7 @@ msgstr "开始工作"
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result:0
 msgid "Change Work"
-msgstr "改变工作"
+msgstr "修改工作"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -376,7 +376,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr ""
+msgstr "按月份统计"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -389,7 +389,7 @@ msgstr "月"
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算科目"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
@@ -404,22 +404,22 @@ msgstr ""
 #. module: hr_timesheet
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的(EAN)条码"
+msgstr "错误:无效的EAN编码"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr ""
+msgstr "按用户统计"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Line"
-msgstr "工作时间表明细"
+msgstr "时间表明细"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis summary"
-msgstr "分析汇总"
+msgstr "辅助核算摘要"
 
 #. module: hr_timesheet
 #: wizard_field:hr.analytical.timesheet,init,year:0
@@ -446,19 +446,19 @@ msgstr "用户"
 #. module: hr_timesheet
 #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
 msgid "Working Time"
-msgstr "工作时间"
+msgstr "工作的时间"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "To be invoiced"
-msgstr ""
+msgstr "要开发票"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr "员工工作时间表"
+msgstr "员工时间表"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -470,4 +470,4 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr "工作时间表列表"
+msgstr "时间表"
diff --git a/addons/hr_timesheet/i18n/zh_TW.po b/addons/hr_timesheet/i18n/zh_TW.po
index 730d58bf19b..9272aa6d7f5 100644
--- a/addons/hr_timesheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet_invoice/__terp__.py b/addons/hr_timesheet_invoice/__terp__.py
index cbb2ace596a..f335c7dbd77 100644
--- a/addons/hr_timesheet_invoice/__terp__.py
+++ b/addons/hr_timesheet_invoice/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -36,7 +36,9 @@ reports, eso.""",
         'security/ir.model.access.csv',
         'hr_timesheet_invoice_view.xml',
         'hr_timesheet_invoice_wizard.xml',
-        'hr_timesheet_invoice_report.xml'
+        'hr_timesheet_invoice_report.xml',
+        'report/report_analytic_view.xml',
+        'report/hr_timesheet_invoice_report_view.xml',
     ],
     'demo_xml': ['hr_timesheet_invoice_demo.xml'],
     'installable': True,
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index 68ce8509dca..783acbc5692 100644
--- a/addons/hr_timesheet_invoice/i18n/ar.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index ab1f7ad6e08..e100df3796e 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index 1175949f311..9ba73c10d93 100644
--- a/addons/hr_timesheet_invoice/i18n/bs.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index d09a453bce6..8445c039a28 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 59bf6550a99..71507f404ec 100644
--- a/addons/hr_timesheet_invoice/i18n/cs.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 35126f31be1..b2b259a917e 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index 839e30d4e2d..bcf9cece41e 100644
--- a/addons/hr_timesheet_invoice/i18n/el.po
+++ b/addons/hr_timesheet_invoice/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index e007de9cb75..ce41396de61 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index 8af0b8747d1..9198521eed0 100644
--- a/addons/hr_timesheet_invoice/i18n/es_AR.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index fe92bc500b0..4fe6f5e8493 100644
--- a/addons/hr_timesheet_invoice/i18n/et.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index 026299f7e4b..1759017a8d5 100644
--- a/addons/hr_timesheet_invoice/i18n/fi.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index ff0bd1b1ebb..987f32075e4 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index 398314d200d..783acbc5692 100644
--- a/addons/hr_timesheet_invoice/i18n/hr.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index 68ce8509dca..783acbc5692 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index 026a2f1f5ab..66d0e19a802 100644
--- a/addons/hr_timesheet_invoice/i18n/id.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index 0317b318d53..4146d6b0887 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index e216631a403..ddca67ed31b 100644
--- a/addons/hr_timesheet_invoice/i18n/ko.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index 68ce8509dca..783acbc5692 100644
--- a/addons/hr_timesheet_invoice/i18n/lt.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/lv.po b/addons/hr_timesheet_invoice/i18n/lv.po
index 2c7dd5d1410..963b9abc67a 100644
--- a/addons/hr_timesheet_invoice/i18n/lv.po
+++ b/addons/hr_timesheet_invoice/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:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index c4ebe279f1c..85ed869ad4e 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index d53aaeeb505..eb86586929a 100644
--- a/addons/hr_timesheet_invoice/i18n/nl_BE.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 2c14f69fb60..14de3bbd0b1 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index 7d964140da2..8803138f112 100644
--- a/addons/hr_timesheet_invoice/i18n/pt.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index a67a51bf8d4..f4a17d8c0a0 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index 5b83c4eee89..adf4a837553 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index cadc311fa5a..d92670e526b 100644
--- a/addons/hr_timesheet_invoice/i18n/ru.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index 24f70a510fa..b9eb783468a 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index a5d595b4477..5c43034977e 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index ea73423b3d9..4b568d04d39 100644
--- a/addons/hr_timesheet_invoice/i18n/tlh.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 373e2cd1934..07d30419aa2 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index cdc58f009c9..0e6f32ecd4f 100644
--- a/addons/hr_timesheet_invoice/i18n/uk.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 472ce565560..47b7fc426c4 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -4,86 +4,86 @@
 #
 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 13:24+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Type of invoicing"
-msgstr ""
+msgstr "发票类型"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Profit"
-msgstr ""
+msgstr "利润"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Force to use a specific product"
-msgstr ""
+msgstr "强制使用特定产品"
 
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Income"
-msgstr ""
+msgstr "收入"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Visible name"
-msgstr ""
+msgstr "可见的名称"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1:0
 msgid "Start of period"
-msgstr "开始日期"
+msgstr "期初日期"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,price:0
 msgid ""
 "The cost of each work done will be displayed on the invoice. You probably "
 "don't want to check this."
-msgstr ""
+msgstr "每个工作的成本将显示在发票上.你可能不想检查它"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
 msgid "Invoice analytic lines"
-msgstr ""
+msgstr "辅助核算的发票"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,time:0
 msgid "Display time in the history of works"
-msgstr ""
+msgstr "显示时间在工作日志"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_draft_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_draft_analytic_accounts
 msgid "Draft Analytic Accounts"
-msgstr ""
+msgstr "辅助核算项目草稿"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,time:0
 #: wizard_field:hr.timesheet.invoice.create,init,time:0
 msgid "Time spent"
-msgstr "花费时间"
+msgstr "花费的时间"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "开发票金额"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
@@ -91,63 +91,63 @@ msgid ""
 "Check this field if you plan to automatically generate invoices based on the "
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
-msgstr ""
+msgstr "如果你计划自动生成发票基于成本在辅助核算项目:时间表、费用....选择这字段你能设定自动发票的辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,name:0
 msgid "The detail of each work done will be displayed on the invoice"
-msgstr ""
+msgstr "每个工作的详情将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0
 msgid "Select period"
-msgstr "选择期间"
+msgstr "销售周期"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Period to enddate"
-msgstr ""
+msgstr "周期的结束日期"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:hr.timesheet.invoice.create,init,create:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "创建发票"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Period from startdate"
-msgstr ""
+msgstr "周期的开始日期"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,time:0
 msgid "The time of each work done will be displayed on the invoice"
-msgstr ""
+msgstr "每个工作完成的时间将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,balance_product:0
 msgid "Balance product"
-msgstr ""
+msgstr "产品余额"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_final_invoice_create
 msgid "Final Invoice"
-msgstr ""
+msgstr "最终发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.final.invoice.create,init:0
 msgid "Do you want details for each line of the invoices ?"
-msgstr "您需要发票的明细项吗？"
+msgstr "你想看详情每一发票行?"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "日期代码"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
 msgid "Entries to invoice"
-msgstr ""
+msgstr "凭证开发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:account.analytic.profit,init:0
@@ -157,7 +157,7 @@ msgstr "选择"
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:account.analytic.profit,init,report:0
@@ -169,90 +169,90 @@ msgstr "打印"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_analytic_accounts
 msgid "Open Analytic Accounts"
-msgstr ""
+msgstr "待处理辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Filter on Accounts"
-msgstr ""
+msgstr "科目过滤"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.account_analytic_profit
 #: model:ir.ui.menu,name:hr_timesheet_invoice.print_account_analytic_profit
 msgid "Timesheet Profit"
-msgstr ""
+msgstr "时间表利润"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "销售价格表"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,name:0
 msgid "Display detail of work in the invoice line."
-msgstr ""
+msgstr "显示发票行的工作详情"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr ""
+msgstr "成本分类账或凭证名称"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "打印日期"
 
 #. module: hr_timesheet_invoice
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
 #: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
 msgid "Types of Invoicing"
-msgstr ""
+msgstr "发票类型"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Theorical"
-msgstr ""
+msgstr "理论"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced_my
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced_my
 msgid "My Uninvoiced Entries"
-msgstr ""
+msgstr "我未开票项目"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,name:0
 #: wizard_field:hr.timesheet.invoice.create,init,name:0
 msgid "Name of entry"
-msgstr ""
+msgstr "凭证名称"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Employee or Journal Name"
-msgstr ""
+msgstr "员工或分类帐名称"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Currency"
-msgstr ""
+msgstr "货币"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,product:0
 msgid ""
 "Complete this field only if you want to force to use a specific product. "
 "Keep empty to use the real product that comes from the cost."
-msgstr ""
+msgstr "如果你想强制使用特定的产品只有完成这字段如果留空使用实际产品来自成本"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced
 msgid "Uninvoiced Entries"
-msgstr ""
+msgstr "未开票项"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:hr.timesheet.final.invoice.create,init,create:0
@@ -262,12 +262,12 @@ msgstr "创建发票"
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.final.invoice.create,init:0
 msgid "Invoice Balance amount"
-msgstr "发票余额"
+msgstr "发票余额金额"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Invoice rate by user"
-msgstr ""
+msgstr "发票使用的税率"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,date_from:0
@@ -277,110 +277,110 @@ msgstr "从"
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_invoiced:0
 msgid "Total invoiced"
-msgstr ""
+msgstr "发票合计"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "周期到"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,balance_product:0
 msgid "The product that will be used to invoice the remaining amount."
-msgstr ""
+msgstr "这产品将使用这发票的剩余金额"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr "成本明细帐"
+msgstr "成本分类账"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,date:0
 msgid "Display date in the history of works"
-msgstr ""
+msgstr "显示这工作的日志日期"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,date:0
 #: wizard_field:hr.timesheet.invoice.create,init,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,factor:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "折扣%"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Eff."
-msgstr ""
+msgstr "有效"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,accounts:0
 msgid "Analytic Accounts"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Total:"
-msgstr ""
+msgstr "合计:"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Credit"
-msgstr ""
+msgstr "贷方"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0
 msgid "End of period"
-msgstr "期末"
+msgstr "周期结束日期"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Balance"
-msgstr ""
+msgstr "结余"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Reinvoice Costs"
-msgstr ""
+msgstr "再开票成本"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Totals:"
-msgstr ""
+msgstr "合计:"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,date_to:0
 msgid "To"
-msgstr "至"
+msgstr "到"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Do you want to show details of work in invoice ?"
-msgstr ""
+msgstr "你想显示这工作发票的详细资料"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "周期从"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_max:0
 msgid "Max. Invoice Price"
-msgstr ""
+msgstr "最大开票价"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:account.analytic.profit,init,end:0
@@ -394,27 +394,27 @@ msgstr "取消"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,employee_ids:0
 msgid "Employee"
-msgstr ""
+msgstr "员工"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,date:0
 msgid "The real date of each work will be displayed on the invoice"
-msgstr ""
+msgstr "每个工作实际日期将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,price:0
 msgid "Display cost of the item you reinvoice"
-msgstr ""
+msgstr "显示这项成本在你再开的发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Choose accounts you want to invoice"
-msgstr ""
+msgstr "选择你想要开发票的科目"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,product:0
@@ -429,59 +429,74 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,name:0
 msgid "Internal name"
-msgstr ""
+msgstr "内部名称"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,journal_ids:0
 msgid "Journal"
-msgstr "日记帐"
+msgstr "分类帐"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Units"
-msgstr ""
+msgstr "单位"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
 msgid "Invoice on analytic lines"
-msgstr ""
+msgstr "辅助核算的发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_pending_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_pending_analytic_accounts
 msgid "Pending Analytic Accounts"
-msgstr ""
+msgstr "未决的辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "开票日期"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
 msgid "Invoice rate"
-msgstr ""
+msgstr "发票税率"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Types of invoicing"
-msgstr ""
+msgstr "发票类型"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Invoicing"
-msgstr ""
+msgstr "计价折扣"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_invoice_analytic_accounts
 msgid "Unclosed Invoiceable Accounts"
-msgstr ""
+msgstr "未关闭的可开票项目"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 #: wizard_field:hr.timesheet.final.invoice.create,init,price:0
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
-msgstr ""
+msgstr "成本"
+
+#~ msgid ""
+#~ "\n"
+#~ "Module to generate invoices based on costs (human resources, expenses, "
+#~ "...).\n"
+#~ "You can define price lists in analytic account, make some theoretical "
+#~ "revenue\n"
+#~ "reports, eso."
+#~ msgstr ""
+#~ "\n"
+#~ "模块生成发票基于成本(人力资源,费用....)\n"
+#~ "你能在辅助核算项目定义价格表,建立一些理论收入的报表"
+
+#~ msgid "Invoice on analytic entries"
+#~ msgstr "辅助核算凭证发票"
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index ae68658342c..902c6471d97 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_TW.po
+++ b/addons/hr_timesheet_invoice/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: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/report/__init__.py b/addons/hr_timesheet_invoice/report/__init__.py
index 9d87b1fdd1c..b351c097a12 100644
--- a/addons/hr_timesheet_invoice/report/__init__.py
+++ b/addons/hr_timesheet_invoice/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,12 +15,14 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import cost_ledger
 import account_analytic_profit
+import report_analytic
+import hr_timesheet_invoice_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
similarity index 100%
rename from addons/report_timesheet/report_timesheet.py
rename to addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
similarity index 100%
rename from addons/report_timesheet/report_timesheet_view.xml
rename to addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
diff --git a/addons/report_analytic/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py
similarity index 100%
rename from addons/report_analytic/report_analytic.py
rename to addons/hr_timesheet_invoice/report/report_analytic.py
diff --git a/addons/report_analytic/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
similarity index 100%
rename from addons/report_analytic/report_analytic_view.xml
rename to addons/hr_timesheet_invoice/report/report_analytic_view.xml
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index 670f835a50d..6349b4f766c 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -1,3 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","hr.group_hr_user",1,0,0,0
 "access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
+"access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
+"access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
+"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_user",1,0,0,0
+"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_user",1,0,0,0
+"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_user",1,0,0,0
+"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_user",1,0,0,0
+"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_user",1,0,0,0
+"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_user",1,0,0,0
diff --git a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
index c2d4aecd171..90861b6f5a9 100644
--- a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
@@ -86,7 +86,7 @@ class wizard_report(wizard.interface):
     states={
         'init':{
             'actions':[],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('report', 'Print')]}
+            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('report', 'Print', 'gtk-ok')]}
         },
         'report':{
             'actions':[_check],
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 9f3a3ae4486..1f9efe9641f 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -187,7 +187,7 @@ class final_invoice_create(wizard.interface):
     states = {
         'init' : {
             'actions' : [_get_defaults],
-            'result' : {'type':'form', 'arch':_create_form, 'fields':_create_fields, 'state': [('end','Cancel'),('create','Create invoices')]},
+            'result' : {'type':'form', 'arch':_create_form, 'fields':_create_fields, 'state': [('end','Cancel', 'gtk-cancel'),('create','Create invoices', 'gtk-ok')]},
         },
         'create' : {
             'actions' : [],
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 21c7b3df150..ac575a625e4 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -221,7 +221,7 @@ class invoice_create(wizard.interface):
     states = {
         'init' : {
             'actions' : [_get_accounts],
-            'result' : {'type':'form', 'arch':_create_form, 'fields':_create_fields, 'state': [('end','Cancel'),('create','Create Invoices')]},
+            'result' : {'type':'form', 'arch':_create_form, 'fields':_create_fields, 'state': [('end','Cancel', 'gtk-cancel'),('create','Create Invoices', 'gtk-ok')]},
         },
         'create' : {
             'actions' : [],
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 77e8115cd45..3702bcb0f1d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -123,7 +123,7 @@
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
                                     <field name="to_invoice"/>
-                                    <field invisible="1" name="journal_id" required="0"/>
+                                    <field invisible="1" name="journal_id"/>
                                     <field invisible="1" name="product_id"/>
                                     <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                                     <field name="amount"/>
@@ -308,6 +308,17 @@
                 </field>
             </field>
         </record>
+        <record id="view_attendance_tree_who" model="ir.ui.view">
+            <field name="name">hr.attendance.tree</field>
+            <field name="model">hr.attendance</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_attendance.view_attendance_who"/>
+            <field name="arch" type="xml">
+                <field name="action_desc" position="after">
+                    <field name="sheet_id"/>
+                </field>
+            </field>
+        </record>
 
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
 <!--         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>  -->
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index e205cdc6a9f..2da7db718b8 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index 4ed90a1d649..63d4825902d 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index 805613f3014..ce6c34d9b65 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index 8ade970fd85..783bf7cb6b0 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 1c367484e8e..f5db2d676d3 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index 957d0a4345d..9c735dbfbeb 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 30604e586cf..cb90aa414b5 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index 7676fc14e86..60d1e3ed199 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index 9945bc1c3b6..e11be30b528 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index ed42e1c0c8a..242e8611254 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index 53bc4cd266e..c4c788d00de 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index 42896b59674..7a9536a9612 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index e205cdc6a9f..2da7db718b8 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index e205cdc6a9f..2da7db718b8 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 3de92b6bfb6..60af8043398 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index 5a6baeb2cc2..03cc6908c1d 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index d1b11cd7b6b..c84ad0e4f65 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 5e1b7e06dd2..54f58f4a8fc 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index 5254d3613b2..3a93323fb08 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index de42f76c966..c74fc5f3663 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index f0cf9299bcc..ef9c75b10cd 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index c1be1fa6581..3d418926b85 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index 7f1cf98abc7..2493301c85d 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index a16c01779b9..088f4fa5849 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index e205cdc6a9f..2da7db718b8 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index eb7a5d9d9bc..656d5f5abc7 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index a39ef5c8982..6602fc1a089 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index 1181fe5378f..44719e9f4f4 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index 2b01bbfa788..10f2bc018c9 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 3a97b468abb..f7ab209d444 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index 59f2891a72d..5fe3756d8b1 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index d048cd59774..db4896a48c2 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -4,29 +4,29 @@
 #
 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 13:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_review0
 msgid "Review end of day check day is complete"
-msgstr ""
+msgstr "审查结束每天检查完成"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
-msgstr ""
+msgstr "你不能有两个重叠的时间表请使用菜单\"我的当前时间表\"来避免这问题"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -34,40 +34,40 @@ msgstr ""
 #: field:hr_timesheet_sheet.sheet.account,sheet_id:0
 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0
 msgid "Sheet"
-msgstr ""
+msgstr "表"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
-msgstr ""
+msgstr "出勤合计"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
 msgid "My timesheets to confirm"
-msgstr ""
+msgstr "确认我的时间表"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timeshet range"
-msgstr ""
+msgstr "时间表范围"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Today"
-msgstr ""
+msgstr "今天"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
 msgid "Confirm timesheet sheet"
-msgstr ""
+msgstr "确认时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -75,194 +75,194 @@ msgstr ""
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Timesheet"
-msgstr ""
+msgstr "时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Defines employee's timesheet entry"
-msgstr ""
+msgstr "定义员工时间表条目"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet sheet"
-msgstr ""
+msgstr "时间表草稿"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "我当前的时间表"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
-msgstr ""
+msgstr "确认"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Present"
-msgstr ""
+msgstr "现在"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
 msgid "Refuse"
-msgstr ""
+msgstr "拒绝"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated Timesheet"
-msgstr ""
+msgstr "批准时间表"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
+msgstr "你必须选择一个当前日期是在时间表的日期中"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Difference"
-msgstr ""
+msgstr "差合计"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
 msgid "Phone call encoding"
-msgstr ""
+msgstr "电话呼叫编码"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
 msgid "Timesheet by Day"
-msgstr ""
+msgstr "时间表按天"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Defines the task work entry into timesheet line"
-msgstr ""
+msgstr "定义在时间表明细中工作任务条目"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
 msgid ""
 "Allowed difference between the sign in/out and the timesheet computation for "
 "one sheet. Set this to 0 if you do not want any control."
-msgstr ""
+msgstr "允许在签出签入的差和计算时间表.如果你不想控制设为0"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Timesheet by Days"
-msgstr ""
+msgstr "时间表按天"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "timesheet is confirmed at the end of the week / month"
-msgstr ""
+msgstr "时间表确认结束在这周/月"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Project Timesheet"
-msgstr ""
+msgstr "项目时间表"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "日期从"
 
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet Process"
-msgstr ""
+msgstr "人力资源时间表处理"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
 msgid "Analytic cost"
-msgstr ""
+msgstr "辅助核算成本"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
-msgstr ""
+msgstr "出勤"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
 msgid "Confirm"
-msgstr ""
+msgstr "确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr ""
+msgstr "时间表明细"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
 msgid "Encode your timesheet line"
-msgstr ""
+msgstr "编码你的时间表明细"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirm Timesheet"
-msgstr ""
+msgstr "确认时间表"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Control by the project manager"
-msgstr ""
+msgstr "项目经理控制"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "New"
-msgstr ""
+msgstr "新的"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
 msgid "Timesheet sheet confirm at the end of the period"
-msgstr ""
+msgstr "时间表表确认的结束周期"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr ""
+msgstr "总时间"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "时间表明细"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
 msgid "Confirm timesheet at the end of the period"
-msgstr ""
+msgstr "确认时间表周期的结束"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "No employee defined"
-msgstr ""
+msgstr "没定义员工"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "Confirmed Timesheet"
-msgstr ""
+msgstr "确认时间表"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -272,82 +272,82 @@ msgstr "设置"
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Week"
-msgstr ""
+msgstr "周"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily View"
-msgstr ""
+msgstr "每天视图"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
 msgid "Timesheets by period"
-msgstr ""
+msgstr "时间表周期"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign In"
-msgstr ""
+msgstr "签入"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
 msgid "My Department's Timesheet"
-msgstr ""
+msgstr "我部门的时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Go to:"
-msgstr ""
+msgstr "到:"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
 msgid "Phone call"
-msgstr ""
+msgstr "电话呼叫"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
 #: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Timesheet"
-msgstr ""
+msgstr "总时间表"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
 msgid "Review of work"
-msgstr ""
+msgstr "工作审查"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice on Work"
-msgstr ""
+msgstr "在这周的发票"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Encode Your hours and Sign in / out"
-msgstr ""
+msgstr "编码你的小时和签入/签出"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_review0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
 msgid "Review"
-msgstr ""
+msgstr "审查"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -357,161 +357,161 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
 #: view:res.company:0
 msgid "Timesheets"
-msgstr ""
+msgstr "时间表"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
 msgid "Timesheets To Confirm"
-msgstr ""
+msgstr "时间表确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "日期到"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Current Status"
-msgstr ""
+msgstr "当前状态"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Invoice on timesheet"
-msgstr ""
+msgstr "这时间表的发票"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice based on timesheet"
-msgstr ""
+msgstr "发票基于时间表"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
-msgstr ""
+msgstr "科目时间表"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Creates invoice based on timesheet"
-msgstr ""
+msgstr "基于时间表创建发票"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
 msgid "Timesheets To Validate"
-msgstr ""
+msgstr "时间表批准"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference"
-msgstr ""
+msgstr "时间表允许差"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,period_ids:0
 msgid "Period"
-msgstr ""
+msgstr "周期"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance entry moves into the timesheet"
-msgstr ""
+msgstr "时间表出勤登入条目"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
 msgid "Creates your analytic cost accoording to quantity"
-msgstr ""
+msgstr "创建你的辅助核算成本"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "时间表明细"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr ""
+msgstr "时间表科目"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Timesheet is validate by project manager."
-msgstr ""
+msgstr "项目管理批准的时间表"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
 msgid "Whatever time u spent for phone call"
-msgstr ""
+msgstr "无论什么时间你花费的电话呼叫"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validate Timesheet"
-msgstr ""
+msgstr "批准时间表"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
 msgid "My Department's Timesheet to Confirm"
-msgstr ""
+msgstr "确认我部门的时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,attendances_ids:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
 msgid "Attendances"
-msgstr ""
+msgstr "出勤"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
 msgid "Create Analytic cost"
-msgstr ""
+msgstr "创建辅助核算成本"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
-msgstr ""
+msgstr "签出"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
-msgstr ""
+msgstr "日间"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
 #: field:hr_timesheet_sheet.sheet.day,total_difference:0
 msgid "Difference"
-msgstr ""
+msgstr "差别"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
@@ -521,77 +521,117 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
-msgstr ""
+msgstr "缺席"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "At the end of the period (week/month)"
-msgstr ""
+msgstr "在此周期结束:周/月"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "timesheet entry is into draft state."
-msgstr ""
+msgstr "时间表条目进入到草稿状态"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
 msgid "Analytic cost is created"
-msgstr ""
+msgstr "已创建的辅助核算成本"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr ""
+msgstr "发票率"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
 msgid "Encode how much time u spent on phone call"
-msgstr ""
+msgstr "编码花费多少时间来完成电话呼叫"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
 msgid "Review of your work at the end of the day"
-msgstr ""
+msgstr "你工作审查结束日期"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
 msgid "Analytic accounts"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
 msgid "My timesheets"
-msgstr ""
+msgstr "我的时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Accept"
-msgstr ""
+msgstr "同意"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
 msgid "Current date"
-msgstr ""
+msgstr "当前日期"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
 msgid "Unvalidated Timesheets"
-msgstr ""
+msgstr "不可用的时间表"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
 msgid "My Department's Timesheet to Validate"
-msgstr ""
+msgstr "批准我部门的时间表"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module help you easily encode and validate timesheet and attendances\n"
+#~ "within the same view. The upper part of the view is for attendances and\n"
+#~ "track (sign in/sign out) events. The lower part is for timesheet.\n"
+#~ "\n"
+#~ "Others tabs contains statistics views to help you analyse your\n"
+#~ "time or the time of your team:\n"
+#~ "* Time spent by day (with attendances)\n"
+#~ "* Time spent by project\n"
+#~ "\n"
+#~ "This module also implement a complete timesheet validation process:\n"
+#~ "* Draft sheet\n"
+#~ "* Confirmation at the end of the period by the employee\n"
+#~ "* Validation by the project manager\n"
+#~ "\n"
+#~ "The validation can be configured in te company:\n"
+#~ "* Period size (day, week, month, year)\n"
+#~ "* Maximal difference between timesheet and attendances\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块帮助你简单编码和使时间表生效并加入到一些视图.\n"
+#~ "在视图的上部分是出勤和跟踪(签入/签出)事件,下部分是时间表\n"
+#~ "\n"
+#~ "    其它标签包括统计视图以帮助你分析你的时间\n"
+#~ "或者你团队的时间:\n"
+#~ "    *每天的时间花费(和出勤)\n"
+#~ "    *项目的时间花费\n"
+#~ "\n"
+#~ "    这模块还实现一个完整的时间表批准处理:\n"
+#~ "    *时间表草稿\n"
+#~ "    *确认员工的周期结束\n"
+#~ "    *批准项目管理\n"
+#~ "\n"
+#~ "    公司确认能批准:\n"
+#~ "    *周期大小(日,周,月,年)\n"
+#~ "    *在时间表和出勤的最大差别\n"
+#~ "    "
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index cf08351596c..49507ae8712 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
index c56d89e669a..592354e85fc 100644
--- a/addons/idea/__terp__.py
+++ b/addons/idea/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,13 @@
     'name': 'Idea Manager',
     'version': '0.1',
     'category': 'Tools',
-    'description': """This module allows your user to easily and efficiently participate in the innovation of the enterprise. It allows everybody to express ideas about different subjects. Then, others users can comment these ideas and vote for particular ideas. Each idea as a score based on the different votes. The managers can obtain an easy view on best ideas from all the users. Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
+    'description': """
+    This module allows your user to easily and efficiently participate in the innovation of the enterprise.
+    It allows everybody to express ideas about different subjects.
+    Then, others users can comment these ideas and vote for particular ideas.
+    Each idea as a score based on the different votes.
+    The managers can obtain an easy view on best ideas from all the users.
+    Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
     'author': 'Tiny',
     'website': 'http://openerp.com',
     'depends': ['base'],
@@ -34,7 +40,7 @@
         'idea_view.xml',
         'idea_workflow.xml',
         'security/idea_security.xml',
-        'security/ir.model.access.csv',        
+        'security/ir.model.access.csv',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/idea/i18n/ar.po b/addons/idea/i18n/ar.po
index bcf2c6c9bb3..128811d298d 100644
--- a/addons/idea/i18n/ar.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/bg.po b/addons/idea/i18n/bg.po
index 06ce9d3dad9..c41313b0c4d 100644
--- a/addons/idea/i18n/bg.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/bs.po b/addons/idea/i18n/bs.po
index c52b86ca9c3..29cb31b95e5 100644
--- a/addons/idea/i18n/bs.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/ca.po b/addons/idea/i18n/ca.po
index 0e9984517b9..b314b62bf60 100644
--- a/addons/idea/i18n/ca.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/cs.po b/addons/idea/i18n/cs.po
index d731deb13af..84c920f5366 100644
--- a/addons/idea/i18n/cs.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/de.po b/addons/idea/i18n/de.po
index f66e994dbf6..5d8b9b018f8 100644
--- a/addons/idea/i18n/de.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/el.po b/addons/idea/i18n/el.po
index 7c74c397bb8..241e5628397 100644
--- a/addons/idea/i18n/el.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/es.po b/addons/idea/i18n/es.po
index d5542abb519..7e6da2e7a06 100644
--- a/addons/idea/i18n/es.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/es_AR.po b/addons/idea/i18n/es_AR.po
index 11b8204abd8..c7aac5d92aa 100644
--- a/addons/idea/i18n/es_AR.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/et.po b/addons/idea/i18n/et.po
index 4ef10820aa4..eb2813d37e1 100644
--- a/addons/idea/i18n/et.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/fi.po b/addons/idea/i18n/fi.po
index ab1fc228cd9..0d364d1f373 100644
--- a/addons/idea/i18n/fi.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/fr.po b/addons/idea/i18n/fr.po
index da89cd762d0..c763380b653 100644
--- a/addons/idea/i18n/fr.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 020d7d042ba..30f63529cbf 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/i18n/hr.po
@@ -1,172 +1,174 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* idea
-#
+# * idea
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 10:38+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: idea
 #: field:idea.category,name:0
 #: field:idea.idea,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr ""
+msgstr "Vrlo dobro"
 
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,stat_vote_ids:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistika"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
 #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
 msgid "My Ideas"
-msgstr ""
+msgstr "Moje ideje"
 
 #. module: idea
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Not Voted"
-msgstr ""
+msgstr "Nije izglasan"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
 msgid "My Open Ideas"
-msgstr ""
+msgstr "Moje otvorene Ideje"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea
 #: model:ir.ui.menu,name:idea.menu_ideas
 #: model:ir.ui.menu,name:idea.menu_ideas1
 msgid "Ideas"
-msgstr ""
+msgstr "Ideje"
 
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Slijedne Kategorije"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr ""
+msgstr "Nova Ideja"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr ""
+msgstr "Ideje po Kategorijama"
 
 #. module: idea
 #: field:idea.vote,score:0
 #: field:idea.vote.stat,score:0
 msgid "Score"
-msgstr ""
+msgstr "Bodovanje"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's vote"
-msgstr ""
+msgstr "Glasanje za Ideju"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
 msgid "Statistics on Votes"
-msgstr ""
+msgstr "Statistika Glasanja"
 
 #. module: idea
 #: 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: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Category for an idea"
-msgstr ""
+msgstr "Kategorija za Ideju"
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Upravitelj Idejama"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
 msgid "Vote Statistics"
-msgstr ""
+msgstr "Statistika Glasovanja"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Opened"
-msgstr ""
+msgstr "Otvoren"
 
 #. module: idea
 #: field:idea.idea,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Good"
-msgstr ""
+msgstr "Dobro"
 
 #. module: idea
 #: field:idea.idea,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Normal"
-msgstr ""
+msgstr "Običan"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "Statistika Glasovanja o Ideji"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "idea.vote"
-msgstr ""
+msgstr "idea.vote"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -177,38 +179,38 @@ msgstr ""
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr ""
+msgstr "Vaš komentar"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_config
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
 #: model:ir.ui.menu,name:idea.menu_idea_category
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr ""
+msgstr "Stat"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr ""
+msgstr "Moj glas"
 
 #. module: idea
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Votes"
-msgstr ""
+msgstr "Glasovi"
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
@@ -220,51 +222,58 @@ msgid ""
 "managers can obtain an easy view on best ideas from all the users. Once "
 "installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"Ovaj modul omogućuje Vašem korisniku da lako i jednostavno sudjeluje u "
+"unaprijeđenju poslovanja u okviru tvrtke. Omogućuje svakome da izrazi Ideje "
+"o različitim temama i područjima. Tada ostali korisnici mogu komentirati "
+"ideju i glasovati prema tome koje ideje smatraju važnima. Svaka ideja dobija "
+"zbroj bodova na osnovi glasovanja. Voditelji tako mogu imati jasan uvid u "
+"ideje djelatnika i o tome kako su one percipirane u tvrtki. Po instalaciji, "
+"odaberite izbornik \"Ideje\" u glavnom izborniku \"Pomagala\"."
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Datum stvaranja"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "Zbrajanje glasova"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
 msgid "Number of Votes"
-msgstr ""
+msgstr "Broj glasova"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "idea.idea"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
 msgid "My Draft Ideas"
-msgstr ""
+msgstr "Moje Ideje u Nacrtu."
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 msgid "Vote"
-msgstr ""
+msgstr "Glasuj"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr ""
+msgstr "Loše"
 
 #. module: idea
 #: view:idea.idea:0
 #: model:ir.ui.menu,name:idea.menu_idea_idea
 msgid "All Ideas"
-msgstr ""
+msgstr "Sve ideje"
 
 #. module: idea
 #: view:idea.comment:0
@@ -272,62 +281,62 @@ msgstr ""
 #: field:idea.idea,comment_ids:0
 #: model:ir.model,name:idea.model_idea_comment
 msgid "Comments"
-msgstr ""
+msgstr "Komentari"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "Zbrajanje komentara"
 
 #. module: idea
 #: field:idea.idea,title:0
 msgid "Idea Summary"
-msgstr ""
+msgstr "Sižetak Ideje"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr ""
+msgstr "Kategorija Ideja"
 
 #. module: idea
 #: field:idea.category,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sižetak"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open
 msgid "Open Ideas"
-msgstr ""
+msgstr "Otvorene Ideje"
 
 #. module: idea
 #: view:idea.idea:0
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr ""
+msgstr "Statistika glasovanja o Idejama"
 
 #. module: idea
 #: view:idea.comment:0
 #: field:idea.comment,content:0
 #: view:idea.idea:0
 msgid "Comment"
-msgstr ""
+msgstr "Komentar"
 
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr ""
+msgstr "Ishodne Kategorije"
 
 #. module: idea
 #: field:idea.idea,user_id:0
 msgid "Creator"
-msgstr ""
+msgstr "Kreator"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "Pomagala"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
@@ -335,46 +344,46 @@ msgstr ""
 #: field:idea.vote,idea_id:0
 #: field:idea.vote.stat,idea_id:0
 msgid "Idea"
-msgstr ""
+msgstr "Ideja"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Vrlo loše"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazan"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
 msgid "All Votes"
-msgstr ""
+msgstr "Svi glasovi"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Close"
-msgstr ""
+msgstr "Zaključi"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "Prosječan zbroj bodova"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr ""
+msgstr "Sadržaj Ideje"
diff --git a/addons/idea/i18n/hu.po b/addons/idea/i18n/hu.po
index 8cd5331f1e3..c946b0b2e71 100644
--- a/addons/idea/i18n/hu.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/id.po b/addons/idea/i18n/id.po
index 2d76e5335d2..39ea2324830 100644
--- a/addons/idea/i18n/id.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/it.po b/addons/idea/i18n/it.po
index 9e0b7c471c2..8d30f9d7421 100644
--- a/addons/idea/i18n/it.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -119,7 +119,7 @@ msgstr "Categoria per un'idea"
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Gestore di idee"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
diff --git a/addons/idea/i18n/ko.po b/addons/idea/i18n/ko.po
index d3fac20f1dc..65cbd005492 100644
--- a/addons/idea/i18n/ko.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index b0836e130e6..edc405512bd 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/nl.po b/addons/idea/i18n/nl.po
index 245ee07f620..9772b25c1cc 100644
--- a/addons/idea/i18n/nl.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/pl.po b/addons/idea/i18n/pl.po
index 955005ecb07..ecef5d063f9 100644
--- a/addons/idea/i18n/pl.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/pt.po b/addons/idea/i18n/pt.po
index 90bb6684dbf..10ffb5ad410 100644
--- a/addons/idea/i18n/pt.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/pt_BR.po b/addons/idea/i18n/pt_BR.po
index e0857d3a70a..3e76f32db8e 100644
--- a/addons/idea/i18n/pt_BR.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/ro.po b/addons/idea/i18n/ro.po
index c1d68868d9f..a544481ca25 100644
--- a/addons/idea/i18n/ro.po
+++ b/addons/idea/i18n/ro.po
@@ -7,13 +7,13 @@ 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-11-17 06:57+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-16 13:31+0000\n"
+"Last-Translator: George Dumitrescu <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -380,7 +380,7 @@ msgstr "Punctaj mediu"
 #. module: idea
 #: view:idea.idea:0
 msgid "Open"
-msgstr "Deschidere"
+msgstr "Deschide"
 
 #. module: idea
 #: help:idea.idea,description:0
diff --git a/addons/idea/i18n/ru.po b/addons/idea/i18n/ru.po
index e484e0a56f1..9f8622ada30 100644
--- a/addons/idea/i18n/ru.po
+++ b/addons/idea/i18n/ru.po
@@ -7,13 +7,13 @@ 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: 2008-11-01 16:03+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-03-30 10:33+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -44,7 +44,7 @@ msgstr "Мои идеи"
 #. module: idea
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -119,7 +119,7 @@ msgstr "Категория идеи"
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Менеджер идеи"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
@@ -222,6 +222,13 @@ msgid ""
 "managers can obtain an easy view on best ideas from all the users. Once "
 "installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"Этот модуль позволяет вашему пользователю  легко и эффективно участвовать в "
+"инновациях бизнеса. Он позволяет каждому выразить идеи о различных вопросах. "
+"После этого, другие пользователи могут прокомментировать эти идеи и провести "
+"голосование за идеи. Каждая идея как счет основанный на различных "
+"голосованиях. Менеджеры могут получить легкий взгляд на самые лучшие идеии "
+"от всех пользователей. Как только установлено, проверите меню «идеи» в  "
+"главном меню «Инструменты»."
 
 #. module: idea
 #: field:idea.comment,create_date:0
@@ -242,7 +249,7 @@ msgstr "Кол-во голосов"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "идеи.идеи"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
@@ -307,7 +314,7 @@ msgstr "Открытые идеи"
 #: view:idea.idea:0
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr ""
+msgstr "Статистика голосования"
 
 #. module: idea
 #: view:idea.comment:0
diff --git a/addons/idea/i18n/sk.po b/addons/idea/i18n/sk.po
index 5d6844efe43..90576dd27c9 100644
--- a/addons/idea/i18n/sk.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/sl.po b/addons/idea/i18n/sl.po
index 1a4a043db32..083bc2b5d0e 100644
--- a/addons/idea/i18n/sl.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/sv.po b/addons/idea/i18n/sv.po
index f5fb413e351..ac5c1717539 100644
--- a/addons/idea/i18n/sv.po
+++ b/addons/idea/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-16 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/tlh.po b/addons/idea/i18n/tlh.po
index ff3a44af615..2c63662a8b6 100644
--- a/addons/idea/i18n/tlh.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/tr.po b/addons/idea/i18n/tr.po
index d19cab47569..45aa863cb4b 100644
--- a/addons/idea/i18n/tr.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/uk.po b/addons/idea/i18n/uk.po
index 28205c2486a..ed8d301780a 100644
--- a/addons/idea/i18n/uk.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index e7554d4263a..8544f1cc65a 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -4,180 +4,180 @@
 #
 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-16 16:10+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 08:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
 #: field:idea.category,name:0
 #: field:idea.idea,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "分类"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr ""
+msgstr "非常好"
 
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,stat_vote_ids:0
 msgid "Statistics"
-msgstr ""
+msgstr "统计"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
 #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
 msgid "My Ideas"
-msgstr ""
+msgstr "我的创意"
 
 #. module: idea
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Not Voted"
-msgstr ""
+msgstr "没投票"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
 msgid "My Open Ideas"
-msgstr ""
+msgstr "我待处理的创意"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea
 #: model:ir.ui.menu,name:idea.menu_ideas
 #: model:ir.ui.menu,name:idea.menu_ideas1
 msgid "Ideas"
-msgstr ""
+msgstr "创意"
 
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "子分类"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr ""
+msgstr "新的创意"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr ""
+msgstr "创意分类"
 
 #. module: idea
 #: field:idea.vote,score:0
 #: field:idea.vote.stat,score:0
 msgid "Score"
-msgstr ""
+msgstr "得分"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's vote"
-msgstr ""
+msgstr "创意投票"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
 msgid "Statistics on Votes"
-msgstr ""
+msgstr "统计投票"
 
 #. module: idea
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Category for an idea"
-msgstr ""
+msgstr "创意分类"
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "创意管理"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
 msgid "Vote Statistics"
-msgstr ""
+msgstr "投票统计"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Opened"
-msgstr ""
+msgstr "待处理"
 
 #. module: idea
 #: field:idea.idea,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Good"
-msgstr ""
+msgstr "好"
 
 #. module: idea
 #: field:idea.idea,description:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Normal"
-msgstr ""
+msgstr "一般"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "创意投票统计"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "idea.vote"
-msgstr ""
+msgstr "创意投票"
 
 #. module: idea
 #: field:idea.comment,user_id:0
 #: field:idea.vote,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr ""
+msgstr "你的评价"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_config
@@ -188,27 +188,27 @@ msgstr "设置"
 #: model:ir.actions.act_window,name:idea.action_idea_category
 #: model:ir.ui.menu,name:idea.menu_idea_category
 msgid "Categories"
-msgstr "事务分类"
+msgstr "分类"
 
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr ""
+msgstr "开始"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr ""
+msgstr "我的投票"
 
 #. module: idea
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Votes"
-msgstr ""
+msgstr "投票"
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
@@ -220,51 +220,53 @@ msgid ""
 "managers can obtain an easy view on best ideas from all the users. Once "
 "installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"这模块允许你在创新的企业里简单和有效地使用.它允许每个人去表达不同的主题,其他用户能评价这些创意和对特定的创意进行投票.每个创意所得投票决定得分.\n"
+"管理人员可以很容易得到所有用户创意.一旦安装,在工具主菜单查看创意菜单."
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "投票数"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
 msgid "Number of Votes"
-msgstr ""
+msgstr "投票数"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "创意"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
 msgid "My Draft Ideas"
-msgstr ""
+msgstr "我的创意草稿"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 msgid "Vote"
-msgstr ""
+msgstr "投票"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr ""
+msgstr "坏"
 
 #. module: idea
 #: view:idea.idea:0
 #: model:ir.ui.menu,name:idea.menu_idea_idea
 msgid "All Ideas"
-msgstr ""
+msgstr "所有创意"
 
 #. module: idea
 #: view:idea.comment:0
@@ -272,62 +274,62 @@ msgstr ""
 #: field:idea.idea,comment_ids:0
 #: model:ir.model,name:idea.model_idea_comment
 msgid "Comments"
-msgstr ""
+msgstr "评论"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "评论数"
 
 #. module: idea
 #: field:idea.idea,title:0
 msgid "Idea Summary"
-msgstr ""
+msgstr "创意摘要"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr ""
+msgstr "创意分类"
 
 #. module: idea
 #: field:idea.category,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open
 msgid "Open Ideas"
-msgstr ""
+msgstr "待处理的创意"
 
 #. module: idea
 #: view:idea.idea:0
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr ""
+msgstr "开始对创意投票"
 
 #. module: idea
 #: view:idea.comment:0
 #: field:idea.comment,content:0
 #: view:idea.idea:0
 msgid "Comment"
-msgstr ""
+msgstr "评论"
 
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr ""
+msgstr "上级分类"
 
 #. module: idea
 #: field:idea.idea,user_id:0
 msgid "Creator"
-msgstr ""
+msgstr "建立者"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "工具"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
@@ -335,46 +337,49 @@ msgstr ""
 #: field:idea.vote,idea_id:0
 #: field:idea.vote.stat,idea_id:0
 msgid "Idea"
-msgstr ""
+msgstr "创意"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr ""
+msgstr "非常坏"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "已取消"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
 msgid "All Votes"
-msgstr ""
+msgstr "所有投票"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "平均分"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Open"
-msgstr ""
+msgstr "待处理"
 
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr ""
+msgstr "这创意的内容"
+
+#~ msgid "Accepted"
+#~ msgstr "已同意"
diff --git a/addons/idea/i18n/zh_TW.po b/addons/idea/i18n/zh_TW.po
index 6814dc169c9..ce2bc191f16 100644
--- a/addons/idea/i18n/zh_TW.po
+++ b/addons/idea/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index 43d5a189247..618367dfef7 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -39,20 +39,21 @@
 
     """,
     'author': 'Tiny',
-    'depends': [ 
-                    'account', 
-                    'account_report', 
-                    'base_vat', 
-                    'base_iban', 
-                    'account_chart'
+    'depends': [
+                'account',
+                'account_report',
+                'base_vat',
+                'base_iban',
+                'account_chart'
                 ],
     'init_xml': [],
     'update_xml': [
-                    'account_pcmn_belgium.xml', 
-                    'l10n_be_wizard.xml',
-                    'l10n_be_sequence.xml', 
-                    'fiscal_templates.xml',
-                    'security/ir.model.access.csv'
+                'account_pcmn_belgium.xml',
+                'l10n_be_wizard.xml',
+                'wizard/l10n_be_account_vat_declaration_view.xml',
+                'l10n_be_sequence.xml',
+                'fiscal_templates.xml',
+                'security/ir.model.access.csv'
                    ],
     'demo_xml': [
                     'account.report.report.csv'
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 8f45f3dd940..b2d5a405ee8 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -3084,35 +3084,35 @@
             <field ref="a41" name="parent_id"/>
         </record>
         <record id="a4110" model="account.account.template">
-            <field name="name">T.V.A. due</field>
+            <field name="name">T.V.A. déductible</field>
             <field name="code">4110</field>
             <field name="type">view</field>
             <field name="user_type" ref="user_type_view"/>
             <field ref="a411" name="parent_id"/>
         </record>
         <record id="vat_refund0" model="account.account.template">
-            <field name="name">T.V.A. due 0%</field>
+            <field name="name">T.V.A. déductible 0%</field>
             <field name="code">411000</field>
             <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund06" model="account.account.template">
-            <field name="name">T.V.A. due 6%</field>
+            <field name="name">T.V.A. déductible 6%</field>
             <field name="code">4110001</field>
             <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund12" model="account.account.template">
-            <field name="name">T.V.A. due 12%</field>
+            <field name="name">T.V.A. déductible 12%</field>
             <field name="code">4110002</field>
             <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund21" model="account.account.template">
-            <field name="name">T.V.A. due 21%</field>
+            <field name="name">T.V.A. déductible 21%</field>
             <field name="code">4110003</field>
             <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 8d6633b0d88..4395f13380e 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,17 +15,15 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from osv import osv
 
 class res_company(osv.osv):
     _inherit = "res.company"
     _description = 'res.company'
 
-
     def _get_default_ad(self, addresses):
         city = post_code = address = ""
         for ads in addresses:
@@ -39,4 +37,4 @@ class res_company(osv.osv):
         return city, post_code, address
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/i18n/ar.po b/addons/l10n_be/i18n/ar.po
index 7fe06732100..043499279bf 100644
--- a/addons/l10n_be/i18n/ar.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/bg.po b/addons/l10n_be/i18n/bg.po
index be4bf537ca6..3f7539f3fdd 100644
--- a/addons/l10n_be/i18n/bg.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/bs.po b/addons/l10n_be/i18n/bs.po
index fb3ee19cb15..32f2abc702b 100644
--- a/addons/l10n_be/i18n/bs.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/ca.po b/addons/l10n_be/i18n/ca.po
index b5c2b2b9b9e..551041af39c 100644
--- a/addons/l10n_be/i18n/ca.po
+++ b/addons/l10n_be/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/cs.po b/addons/l10n_be/i18n/cs.po
index c2a8c84b7d4..5b7e165f79c 100644
--- a/addons/l10n_be/i18n/cs.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/de.po b/addons/l10n_be/i18n/de.po
index 77e99779c7d..58a15e7e8d7 100644
--- a/addons/l10n_be/i18n/de.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index 87d6121f9e7..6ca628bed53 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/es_AR.po b/addons/l10n_be/i18n/es_AR.po
index 110aea62cc3..a2a5ceb975d 100644
--- a/addons/l10n_be/i18n/es_AR.po
+++ b/addons/l10n_be/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/et.po b/addons/l10n_be/i18n/et.po
index ceac0445859..2f9957fbafb 100644
--- a/addons/l10n_be/i18n/et.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/fr.po b/addons/l10n_be/i18n/fr.po
index 7edae00eb94..fe03b69af90 100644
--- a/addons/l10n_be/i18n/fr.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/hr.po b/addons/l10n_be/i18n/hr.po
index 7f7d1e894f1..c7f95bbe2e1 100644
--- a/addons/l10n_be/i18n/hr.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/hu.po b/addons/l10n_be/i18n/hu.po
index 7fe06732100..043499279bf 100644
--- a/addons/l10n_be/i18n/hu.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/id.po b/addons/l10n_be/i18n/id.po
index 58a62420fc4..fd866de0367 100644
--- a/addons/l10n_be/i18n/id.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/it.po b/addons/l10n_be/i18n/it.po
index 2f295399292..b71fa907024 100644
--- a/addons/l10n_be/i18n/it.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/ko.po b/addons/l10n_be/i18n/ko.po
index 7e11fc01c1a..c35cde86cd0 100644
--- a/addons/l10n_be/i18n/ko.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/lt.po b/addons/l10n_be/i18n/lt.po
index 7fe06732100..043499279bf 100644
--- a/addons/l10n_be/i18n/lt.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/nl.po b/addons/l10n_be/i18n/nl.po
index 9c8a9ae9e48..e223b712993 100644
--- a/addons/l10n_be/i18n/nl.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/nl_BE.po b/addons/l10n_be/i18n/nl_BE.po
index 95f6bf90582..303432cc362 100644
--- a/addons/l10n_be/i18n/nl_BE.po
+++ b/addons/l10n_be/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/pl.po b/addons/l10n_be/i18n/pl.po
index 7fe06732100..043499279bf 100644
--- a/addons/l10n_be/i18n/pl.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/pt.po b/addons/l10n_be/i18n/pt.po
index 225045f8dbe..0db393528b6 100644
--- a/addons/l10n_be/i18n/pt.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/pt_BR.po b/addons/l10n_be/i18n/pt_BR.po
index 1a614bbd891..cfdf79539d6 100644
--- a/addons/l10n_be/i18n/pt_BR.po
+++ b/addons/l10n_be/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/ro.po b/addons/l10n_be/i18n/ro.po
index 7fe06732100..043499279bf 100644
--- a/addons/l10n_be/i18n/ro.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/ru.po b/addons/l10n_be/i18n/ru.po
index 575c508f0ec..495f8f24506 100644
--- a/addons/l10n_be/i18n/ru.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/sl.po b/addons/l10n_be/i18n/sl.po
index 18c4b68c8e5..9b0a0a901b7 100644
--- a/addons/l10n_be/i18n/sl.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/sv.po b/addons/l10n_be/i18n/sv.po
index fabd21a5d1b..be7f9ca789e 100644
--- a/addons/l10n_be/i18n/sv.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/tlh.po b/addons/l10n_be/i18n/tlh.po
index 887f546c2bb..6d41ee1679e 100644
--- a/addons/l10n_be/i18n/tlh.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 0fc7bc5ad10..f0a9d98e258 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/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:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/uk.po b/addons/l10n_be/i18n/uk.po
index a0767a613a0..89252a04713 100644
--- a/addons/l10n_be/i18n/uk.po
+++ b/addons/l10n_be/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/zh_CN.po b/addons/l10n_be/i18n/zh_CN.po
index 013058908aa..e6ae229c6dd 100644
--- a/addons/l10n_be/i18n/zh_CN.po
+++ b/addons/l10n_be/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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: l10n_be
diff --git a/addons/l10n_be/i18n/zh_TW.po b/addons/l10n_be/i18n/zh_TW.po
index 9851784560a..f5ee1b03848 100644
--- a/addons/l10n_be/i18n/zh_TW.po
+++ b/addons/l10n_be/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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index c20f1c62420..86c4d828b70 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -21,7 +21,7 @@
         type="wizard"
         id="partner_wizard_vat_menu"/>
 
-    <wizard
+<!--    <wizard
         string="Periodical VAT Declaration"
         name="wizard.account.xml.vat.declaration"
         menu="False"
@@ -32,7 +32,7 @@
         parent="menu_finance_belgian_statement"
         action="wizard_xml_vat_declaration"
         type="wizard"
-        id="account_wizard_vat_declaration"/>
+        id="account_wizard_vat_declaration"/> -->
 
    	<wizard
         string="Partner VAT intra"
diff --git a/addons/l10n_be/wizard/__init__.py b/addons/l10n_be/wizard/__init__.py
index 1050e8e2ee9..b811c54a6e4 100644
--- a/addons/l10n_be/wizard/__init__.py
+++ b/addons/l10n_be/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,14 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import account_vat_declaration
 import partner_vat_listing
 import wizard_vat_intra
+import l10n_be_account_vat_declaration
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
similarity index 62%
rename from addons/l10n_be/wizard/account_vat_declaration.py
rename to addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 6533493ce23..490709b15ec 100644
--- a/addons/l10n_be/wizard/account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,69 +15,62 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import wizard
 import time
 import datetime
-import pooler
 import base64
-
+from osv import osv, fields
 from tools.translate import _
 
-form_fyear = """<?xml version="1.0"?>
-<form string="Select Period">
-    <field name="period" />
-</form>"""
+class l10n_be_vat_declaration(osv.osv_memory):
+    """ Vat Declaration """
+    _name = "l1on_be.vat.declaration"
+    _description = "Vat Declaration"
 
-fields_fyear = {
-    'period': {'string': 'Period', 'type': 'many2one', 'relation': 'account.period', 'required': True,},
-}
+    _columns = {
+        'period_id': fields.many2one('account.period','Period', required=True),
+        'msg': fields.text('File created', size=64, readonly=True),
+        'file_save' : fields.binary('Save File'),
+    }
 
-form = """<?xml version="1.0"?>
-<form string="Notification">
-     <separator string="XML Flie has been Created."  colspan="4"/>
-     <field name="msg" colspan="4" nolabel="1"/>
-     <field name="file_save" />
-</form>"""
+    _defaults = {
+        'msg': lambda *a:'''Save the File with '".xml"' extension.''',
+    }
 
-fields = {
-    'msg': {'string':'File created', 'type':'text', 'size':'100','readonly':True},
-    'file_save':{'string': 'Save File',
-        'type': 'binary',
-        'readonly': True,},
-}
+    def create_xml(self, cr, uid, ids, context={}):
+        obj_fyear = self.pool.get('account.fiscalyear')
+        obj_tax_code = self.pool.get('account.tax.code')
+        obj_acc_period = self.pool.get('account.period')
+        obj_user = self.pool.get('res.users')
+        obj_comp = self.pool.get('res.company')
+        obj_data = self.pool.get('ir.model.data')
 
-
-class wizard_vat_declaration(wizard.interface):
-
-    def _create_xml(self, cr, uid, data, context):
         list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
-        pool_obj = pooler.get_pool(cr.dbname)
-        #obj_company = pool_obj.get('res.company').browse(cr,uid,1)
-        obj_company = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id
+        obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         user_cmpny = obj_company.name
         vat_no=obj_company.partner_id.vat
         if not vat_no:
             raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
 
-        tax_ids = pool_obj.get('account.tax.code').search(cr,uid,[])
+        tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
-        ctx['period_id'] = data['form']['period'] #added context here
-        tax_info = pool_obj.get('account.tax.code').read(cr,uid,tax_ids,['code','sum_period'],context=ctx)
+        data  = self.read(cr, uid, ids)[0]
+        ctx['period_id'] = data['period_id'] #added context here
+        tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
-        address=post_code=city=''
+        address = post_code = city = ''
         if not obj_company.partner_id.address:
-                address=post_code=city=''
+            address = post_code = city = ''
+
+        city, post_code, address = obj_comp._get_default_ad(obj_company.partner_id.address)
 
-        city, post_code, address = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address)
 
-        obj_fyear = pool_obj.get('account.fiscalyear')
         year_id = obj_fyear.find(cr, uid)
-        
-        account_period=pool_obj.get('account.period').browse(cr, uid, data['form']['period'])
+
+        account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
         current_year = account_period.fiscalyear_id.name
         period_code = account_period.code
 
@@ -93,7 +86,7 @@ class wizard_vat_declaration(wizard.interface):
         starting_month = account_period.date_start[5:7]
         ending_month = account_period.date_stop[5:7]
         if starting_month != ending_month:
-            #starting month and ending month of selected period are not the same 
+            #starting month and ending month of selected period are not the same
             #it means that the accounting isn't based on periods of 1 month but on quarters
             quarter = str(((int(starting_month) - 1) / 3) + 1)
             data_of_file += '<QUARTER>'+quarter+'</QUARTER>\n\t\t\t'
@@ -110,21 +103,10 @@ class wizard_vat_declaration(wizard.interface):
                     data_of_file +='\n\t\t\t\t<D'+str(int(item['code'])) +'>' + str(int(item['sum_period']*100)) +  '</D'+str(int(item['code'])) +'>'
 
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
-        data['form']['msg']='Save the File with '".xml"' extension.'
-        data['form']['file_save']=base64.encodestring(data_of_file)
-        return data['form']
+        data['file_save'] = base64.encodestring(data_of_file)
+        self.write(cr, uid, ids, {'file_save':data['file_save']}, context=context)
 
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':form_fyear, 'fields':fields_fyear, 'state':[('end','Cancel'),('go','Create XML')]},
-        },
-        'go': {
-            'actions': [_create_xml],
-            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Ok')]},
-        }
-    }
+l10n_be_vat_declaration()
 
-wizard_vat_declaration('wizard.account.xml.vat.declaration')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
new file mode 100644
index 00000000000..f0c19198bf3
--- /dev/null
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<menuitem
+        id="menu_finance_belgian_statement"
+        name="Belgium Statements"
+        parent="account.menu_finance_legal_statement"/>
+
+    	<record id="view_vat_declaration" model="ir.ui.view">
+            <field name="name">Select Period</field>
+            <field name="model">l1on_be.vat.declaration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Select Period">
+               	<group  colspan="4" >
+					<field name="period_id" select="1"/>
+              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1"/>
+              	 </group>
+              	 <separator string="XML Flie has been Created." colspan="4"/>
+              	 <group colspan="4" >
+					<field name="msg" nolabel="1" colspan="4"/>
+			    	<field name="file_save" readonly="True"/>
+			     </group>
+              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_vat_declaration" model="ir.actions.act_window">
+            <field name="name">Vat Declaraion</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">l1on_be.vat.declaration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_vat_declaration"/>
+            <field name="target">new</field>
+    	</record>
+
+	    <menuitem
+	        name="Periodical VAT Declaration"
+	        parent="menu_finance_belgian_statement"
+	        action="action_vat_declaration"
+	        id="l10_be_vat_declaration"/>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/partner_vat_listing.py b/addons/l10n_be/wizard/partner_vat_listing.py
index 09876a2c31c..ba5620a0b4e 100644
--- a/addons/l10n_be/wizard/partner_vat_listing.py
+++ b/addons/l10n_be/wizard/partner_vat_listing.py
@@ -230,19 +230,19 @@ class wizard_vat(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel'),('go_step','View Clients')]},
+            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel', 'gtk-cancel'),('go_step','View Clients', 'gtk-ok')]},
         },
         'go_step': {
             'actions': [_get_partner],
-            'result': {'type':'form', 'arch':client_form, 'fields':client_fields, 'state':[('end','Cancel'),('go','Create XML')]},
+            'result': {'type':'form', 'arch':client_form, 'fields':client_fields, 'state':[('end','Cancel', 'gtk-cancel'),('go','Create XML', 'gtk-ok')]},
         },
         'go': {
             'actions': [_create_xml],
-            'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok')]},
+            'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok', 'gtk-cancel')]},
         }
 
     }
 
 wizard_vat('list.vat.detail')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/wizard_vat_intra.py b/addons/l10n_be/wizard/wizard_vat_intra.py
index 605313e3541..e29e2d9dcea 100644
--- a/addons/l10n_be/wizard/wizard_vat_intra.py
+++ b/addons/l10n_be/wizard/wizard_vat_intra.py
@@ -222,11 +222,11 @@ class parter_vat_intra(wizard.interface):
     states = {
         'init': {
             'actions': [_get_europe_country],
-            'result': {'type': 'form', 'arch':form_intra, 'fields': fields_intra, 'state':[('end','Cancel'),('go','Create XML') ]}
+            'result': {'type': 'form', 'arch':form_intra, 'fields': fields_intra, 'state':[('end','Cancel', 'gtk-cancel'),('go','Create XML', 'gtk-ok') ]}
                 },
          'go': {
             'actions': [_create_xml],
-            'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok')]},
+            'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok', 'gtk-cancel')]},
                 }
              }
-parter_vat_intra('vat.intra.xml')
\ No newline at end of file
+parter_vat_intra('vat.intra.xml')
diff --git a/addons/l10n_ch/i18n/ar.po b/addons/l10n_ch/i18n/ar.po
index b387f15ca94..40bc1f6acb8 100644
--- a/addons/l10n_ch/i18n/ar.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/bg.po b/addons/l10n_ch/i18n/bg.po
index bc5db51da06..9149182d55a 100644
--- a/addons/l10n_ch/i18n/bg.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/bs.po b/addons/l10n_ch/i18n/bs.po
index 7da538016ad..a668c7b500e 100644
--- a/addons/l10n_ch/i18n/bs.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ca.po b/addons/l10n_ch/i18n/ca.po
index 0fa24942212..60461816e52 100644
--- a/addons/l10n_ch/i18n/ca.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/cs.po b/addons/l10n_ch/i18n/cs.po
index 62f2f912d75..b6310657562 100644
--- a/addons/l10n_ch/i18n/cs.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/de.po b/addons/l10n_ch/i18n/de.po
index 119721a870b..53dacde1358 100644
--- a/addons/l10n_ch/i18n/de.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/es.po b/addons/l10n_ch/i18n/es.po
index d71483b2cbd..56e0106c2d2 100644
--- a/addons/l10n_ch/i18n/es.po
+++ b/addons/l10n_ch/i18n/es.po
@@ -7,13 +7,13 @@ 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:24+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-21 22:07+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
@@ -324,7 +324,7 @@ msgstr "Doña"
 #. module: l10n_ch
 #: rml:l10n_ch.invoice.bvr:0
 msgid "Concerne:"
-msgstr ""
+msgstr "Concierne:"
 
 #. module: l10n_ch
 #: model:res.partner.bank.type,name:l10n_ch.bvpost
diff --git a/addons/l10n_ch/i18n/es_AR.po b/addons/l10n_ch/i18n/es_AR.po
index 21cd45200f9..1d8a22ae5a2 100644
--- a/addons/l10n_ch/i18n/es_AR.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/et.po b/addons/l10n_ch/i18n/et.po
index 7acb2d29799..18cd60ebae1 100644
--- a/addons/l10n_ch/i18n/et.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/fr.po b/addons/l10n_ch/i18n/fr.po
index 17cecca5bfd..3e9213002e6 100644
--- a/addons/l10n_ch/i18n/fr.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/hr.po b/addons/l10n_ch/i18n/hr.po
index 5106e03e6a9..40bc1f6acb8 100644
--- a/addons/l10n_ch/i18n/hr.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/hu.po b/addons/l10n_ch/i18n/hu.po
index b387f15ca94..40bc1f6acb8 100644
--- a/addons/l10n_ch/i18n/hu.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/id.po b/addons/l10n_ch/i18n/id.po
index 05c5901ad01..64dfdf15091 100644
--- a/addons/l10n_ch/i18n/id.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index 092e087213a..b002fc387d7 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ko.po b/addons/l10n_ch/i18n/ko.po
index 3b9a6f1db7b..96e50ea35de 100644
--- a/addons/l10n_ch/i18n/ko.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/lt.po b/addons/l10n_ch/i18n/lt.po
index b387f15ca94..40bc1f6acb8 100644
--- a/addons/l10n_ch/i18n/lt.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/nl.po b/addons/l10n_ch/i18n/nl.po
index 02317fe1a20..aaf2b27e36b 100644
--- a/addons/l10n_ch/i18n/nl.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/nl_BE.po b/addons/l10n_ch/i18n/nl_BE.po
index 9c47a70c80c..7a8a1351cb8 100644
--- a/addons/l10n_ch/i18n/nl_BE.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/pl.po b/addons/l10n_ch/i18n/pl.po
index 75049942904..ea0d9cf34aa 100644
--- a/addons/l10n_ch/i18n/pl.po
+++ b/addons/l10n_ch/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/pt.po b/addons/l10n_ch/i18n/pt.po
index fa690e5e973..c7420b091da 100644
--- a/addons/l10n_ch/i18n/pt.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/pt_BR.po b/addons/l10n_ch/i18n/pt_BR.po
index c512a72ff04..7ec1c1f6ca3 100644
--- a/addons/l10n_ch/i18n/pt_BR.po
+++ b/addons/l10n_ch/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ro.po b/addons/l10n_ch/i18n/ro.po
index 5106e03e6a9..40bc1f6acb8 100644
--- a/addons/l10n_ch/i18n/ro.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/ru.po b/addons/l10n_ch/i18n/ru.po
index 0a310712297..80077100839 100644
--- a/addons/l10n_ch/i18n/ru.po
+++ b/addons/l10n_ch/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/sl.po b/addons/l10n_ch/i18n/sl.po
index dcddfb72b4d..64a5b2cc341 100644
--- a/addons/l10n_ch/i18n/sl.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/sv.po b/addons/l10n_ch/i18n/sv.po
index e4aa6fa1304..f63a4c49bb3 100644
--- a/addons/l10n_ch/i18n/sv.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 806c6f9ef16..ac168e71c06 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/uk.po b/addons/l10n_ch/i18n/uk.po
index 9e997ef0bba..0a085655386 100644
--- a/addons/l10n_ch/i18n/uk.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch/i18n/zh_CN.po b/addons/l10n_ch/i18n/zh_CN.po
index 2c5a74ba2d2..be0638b1c61 100644
--- a/addons/l10n_ch/i18n/zh_CN.po
+++ b/addons/l10n_ch/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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: l10n_ch
diff --git a/addons/l10n_ch/i18n/zh_TW.po b/addons/l10n_ch/i18n/zh_TW.po
index 5106e03e6a9..40bc1f6acb8 100644
--- a/addons/l10n_ch/i18n/zh_TW.po
+++ b/addons/l10n_ch/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: l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/__terp__.py b/addons/l10n_ch_chart_c2c_pcg/__terp__.py
index fe6e9a04511..c59104be292 100644
--- a/addons/l10n_ch_chart_c2c_pcg/__terp__.py
+++ b/addons/l10n_ch_chart_c2c_pcg/__terp__.py
@@ -33,7 +33,7 @@
 					"l10n_ch"
                 ],
     "author" : "Camptocamp",
-    "description": "Swiws account chart that add also tax template definition",
+    "description": "Swiss account chart that also add tax template definition",
     "website" : "camptocamp.com",
     "category" : "Localisation/Account Charts",
     "init_xml" : [
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ar.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ar.po
index 220b80b09ac..c8ddfa87bc3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ar.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/bg.po b/addons/l10n_ch_chart_c2c_pcg/i18n/bg.po
index cb87eac17ca..6935e6e74c4 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/bg.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/bs.po b/addons/l10n_ch_chart_c2c_pcg/i18n/bs.po
index 8707f7204ff..134ce07f978 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/bs.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ca.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ca.po
index 46cb62f9b16..07395b51e5a 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ca.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/cs.po b/addons/l10n_ch_chart_c2c_pcg/i18n/cs.po
index 220b80b09ac..c8ddfa87bc3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/cs.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/de.po b/addons/l10n_ch_chart_c2c_pcg/i18n/de.po
index cc76151c377..0e45545e202 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/de.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po b/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
index 99ee8cfb4ff..1e3e3559bf4 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/es_AR.po b/addons/l10n_ch_chart_c2c_pcg/i18n/es_AR.po
index e3f529e8c1f..0d73abf0aa5 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/es_AR.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/et.po b/addons/l10n_ch_chart_c2c_pcg/i18n/et.po
index d6e546cc2e0..92ddb6bfbc2 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/et.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/fr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/fr.po
index 8db4434ff5b..f8dc1f3fcbd 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/fr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/hr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/hr.po
index 220b80b09ac..c8ddfa87bc3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/hr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/hu.po b/addons/l10n_ch_chart_c2c_pcg/i18n/hu.po
index 220b80b09ac..c8ddfa87bc3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/hu.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/id.po b/addons/l10n_ch_chart_c2c_pcg/i18n/id.po
index febaf23fd1c..0cba7565b12 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/id.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/it.po b/addons/l10n_ch_chart_c2c_pcg/i18n/it.po
index 6b6e61f4166..80cd1879e5c 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/it.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ko.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ko.po
index 59554cd5372..51102c6f638 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ko.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/lt.po b/addons/l10n_ch_chart_c2c_pcg/i18n/lt.po
index 220b80b09ac..c8ddfa87bc3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/lt.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/nl.po b/addons/l10n_ch_chart_c2c_pcg/i18n/nl.po
index 5b93d08c381..6b37d942a61 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/nl.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/nl_BE.po b/addons/l10n_ch_chart_c2c_pcg/i18n/nl_BE.po
index 74ad3f79454..4621944b83c 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/nl_BE.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/pl.po b/addons/l10n_ch_chart_c2c_pcg/i18n/pl.po
index 3b70ae8f39b..ca8abee4640 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/pl.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/pt.po b/addons/l10n_ch_chart_c2c_pcg/i18n/pt.po
index ef00a7d8ecc..07ac48b048f 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/pt.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/pt_BR.po b/addons/l10n_ch_chart_c2c_pcg/i18n/pt_BR.po
index d8b33da7b48..8e8d018f6d2 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/pt_BR.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ro.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ro.po
index 220b80b09ac..c8ddfa87bc3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ro.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po
index 290d7930e4c..515d00bc174 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/sl.po b/addons/l10n_ch_chart_c2c_pcg/i18n/sl.po
index 5614480d3cf..45855c90f13 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/sl.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/sv.po b/addons/l10n_ch_chart_c2c_pcg/i18n/sv.po
index 546667e7a94..126479ff6f9 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/sv.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index c66fe5f0c0d..e8fa2d0dc71 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/uk.po b/addons/l10n_ch_chart_c2c_pcg/i18n/uk.po
index dec5aeeee32..f2dce10cbf1 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/uk.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/zh_CN.po b/addons/l10n_ch_chart_c2c_pcg/i18n/zh_CN.po
index 220b80b09ac..c8ddfa87bc3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/zh_CN.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/zh_TW.po b/addons/l10n_ch_chart_c2c_pcg/i18n/zh_TW.po
index 220b80b09ac..c8ddfa87bc3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/zh_TW.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/i18n/ar.po b/addons/l10n_chart_uk_minimal/i18n/ar.po
index 8946fdd7780..b3f2c51fef4 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ar.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/bg.po b/addons/l10n_chart_uk_minimal/i18n/bg.po
index bfd68894071..85852a130e8 100644
--- a/addons/l10n_chart_uk_minimal/i18n/bg.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/bs.po b/addons/l10n_chart_uk_minimal/i18n/bs.po
index 8946fdd7780..b3f2c51fef4 100644
--- a/addons/l10n_chart_uk_minimal/i18n/bs.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/ca.po b/addons/l10n_chart_uk_minimal/i18n/ca.po
index 8f2b2e47e23..e61b3e7679a 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ca.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/cs.po b/addons/l10n_chart_uk_minimal/i18n/cs.po
index 8946fdd7780..b3f2c51fef4 100644
--- a/addons/l10n_chart_uk_minimal/i18n/cs.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/de.po b/addons/l10n_chart_uk_minimal/i18n/de.po
index ff0d795a349..f72b5486187 100644
--- a/addons/l10n_chart_uk_minimal/i18n/de.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/es.po b/addons/l10n_chart_uk_minimal/i18n/es.po
index 49ccdfc244a..5937752a071 100644
--- a/addons/l10n_chart_uk_minimal/i18n/es.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/es_AR.po b/addons/l10n_chart_uk_minimal/i18n/es_AR.po
index 93ba747602e..9b2a2557946 100644
--- a/addons/l10n_chart_uk_minimal/i18n/es_AR.po
+++ b/addons/l10n_chart_uk_minimal/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/et.po b/addons/l10n_chart_uk_minimal/i18n/et.po
index 211ca8848b0..56de983d287 100644
--- a/addons/l10n_chart_uk_minimal/i18n/et.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/fr.po b/addons/l10n_chart_uk_minimal/i18n/fr.po
index da292b14c54..e6a19083186 100644
--- a/addons/l10n_chart_uk_minimal/i18n/fr.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/hr.po b/addons/l10n_chart_uk_minimal/i18n/hr.po
index 9f4c9312b89..7b88f310f88 100644
--- a/addons/l10n_chart_uk_minimal/i18n/hr.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/hu.po b/addons/l10n_chart_uk_minimal/i18n/hu.po
index 8946fdd7780..b3f2c51fef4 100644
--- a/addons/l10n_chart_uk_minimal/i18n/hu.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/id.po b/addons/l10n_chart_uk_minimal/i18n/id.po
index e4ebd03fd20..b26e27661f1 100644
--- a/addons/l10n_chart_uk_minimal/i18n/id.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/it.po b/addons/l10n_chart_uk_minimal/i18n/it.po
index 025d643c390..3c86639b58e 100644
--- a/addons/l10n_chart_uk_minimal/i18n/it.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/ko.po b/addons/l10n_chart_uk_minimal/i18n/ko.po
index 801a50912a1..951c3c395bd 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ko.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/lt.po b/addons/l10n_chart_uk_minimal/i18n/lt.po
index a9ec2810d4c..fa0f536544e 100644
--- a/addons/l10n_chart_uk_minimal/i18n/lt.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/nl.po b/addons/l10n_chart_uk_minimal/i18n/nl.po
index 2c548a55841..af520871634 100644
--- a/addons/l10n_chart_uk_minimal/i18n/nl.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/nl_BE.po b/addons/l10n_chart_uk_minimal/i18n/nl_BE.po
index 0c87a17b31c..dd2d298f5e9 100644
--- a/addons/l10n_chart_uk_minimal/i18n/nl_BE.po
+++ b/addons/l10n_chart_uk_minimal/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/oc.po b/addons/l10n_chart_uk_minimal/i18n/oc.po
index 8095e942a52..99e9b88251c 100644
--- a/addons/l10n_chart_uk_minimal/i18n/oc.po
+++ b/addons/l10n_chart_uk_minimal/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-03-12 14:00+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/pl.po b/addons/l10n_chart_uk_minimal/i18n/pl.po
index 8946fdd7780..b3f2c51fef4 100644
--- a/addons/l10n_chart_uk_minimal/i18n/pl.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/pt.po b/addons/l10n_chart_uk_minimal/i18n/pt.po
index 8e171e99012..070e90792c7 100644
--- a/addons/l10n_chart_uk_minimal/i18n/pt.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/pt_BR.po b/addons/l10n_chart_uk_minimal/i18n/pt_BR.po
index ba6d4bf1f36..fc62bec207f 100644
--- a/addons/l10n_chart_uk_minimal/i18n/pt_BR.po
+++ b/addons/l10n_chart_uk_minimal/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/ro.po b/addons/l10n_chart_uk_minimal/i18n/ro.po
index 8946fdd7780..b3f2c51fef4 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ro.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/ru.po b/addons/l10n_chart_uk_minimal/i18n/ru.po
index a9b6ef50840..0a9c054a561 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ru.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/sl.po b/addons/l10n_chart_uk_minimal/i18n/sl.po
index 6e4b9d8afcb..dea57442c28 100644
--- a/addons/l10n_chart_uk_minimal/i18n/sl.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/sv.po b/addons/l10n_chart_uk_minimal/i18n/sv.po
index 0908a07fca4..de3a2dd68f5 100644
--- a/addons/l10n_chart_uk_minimal/i18n/sv.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/tlh.po b/addons/l10n_chart_uk_minimal/i18n/tlh.po
index 34fa2c35db4..9a0e845a060 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tlh.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index 5d66f122c71..72b07f150d3 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/uk.po b/addons/l10n_chart_uk_minimal/i18n/uk.po
index db1ed23f772..42e0772a38c 100644
--- a/addons/l10n_chart_uk_minimal/i18n/uk.po
+++ b/addons/l10n_chart_uk_minimal/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/zh_CN.po b/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
index fcd2c75eedf..c285b849850 100644
--- a/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
+++ b/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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-01-30 13:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 07:54+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
@@ -41,7 +41,7 @@ msgstr "收入"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
 msgid "Tax"
-msgstr "?"
+msgstr "税"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
@@ -63,7 +63,7 @@ msgstr ""
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
 msgid "Payable"
-msgstr ""
+msgstr "应付账款"
 
 #. module: l10n_chart_uk_minimal
 #: model:ir.module.module,shortdesc:l10n_chart_uk_minimal.module_meta_information
@@ -73,7 +73,7 @@ msgstr ""
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "权益"
 
 #. module: l10n_chart_uk_minimal
 #: constraint:account.tax.code.template:0
diff --git a/addons/l10n_chart_uk_minimal/i18n/zh_TW.po b/addons/l10n_chart_uk_minimal/i18n/zh_TW.po
index cd5689f4b77..a47e1194c97 100644
--- a/addons/l10n_chart_uk_minimal/i18n/zh_TW.po
+++ b/addons/l10n_chart_uk_minimal/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:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_fr/i18n/ar.po b/addons/l10n_fr/i18n/ar.po
index 33a53820aa0..deb32559f53 100644
--- a/addons/l10n_fr/i18n/ar.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/bg.po b/addons/l10n_fr/i18n/bg.po
index 3b9b4209310..f94472f1ed5 100644
--- a/addons/l10n_fr/i18n/bg.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/bs.po b/addons/l10n_fr/i18n/bs.po
index 33a53820aa0..deb32559f53 100644
--- a/addons/l10n_fr/i18n/bs.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/ca.po b/addons/l10n_fr/i18n/ca.po
index dc426d3e32c..9150c78c2b7 100644
--- a/addons/l10n_fr/i18n/ca.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/cs.po b/addons/l10n_fr/i18n/cs.po
index 33a53820aa0..deb32559f53 100644
--- a/addons/l10n_fr/i18n/cs.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/de.po b/addons/l10n_fr/i18n/de.po
index d62a6a7babd..ae0415c0da2 100644
--- a/addons/l10n_fr/i18n/de.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index ff1c62cd924..2d7f7c543a4 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/es_AR.po b/addons/l10n_fr/i18n/es_AR.po
index 7b04bba14cc..101fc2e3a52 100644
--- a/addons/l10n_fr/i18n/es_AR.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/et.po b/addons/l10n_fr/i18n/et.po
index 5bee90aeea2..a264bea6e41 100644
--- a/addons/l10n_fr/i18n/et.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index 4df42254310..aa18c32097d 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -8,13 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-07-27 16:34+0000\n"
-"Last-Translator: Christian Draux - reseaucerta.org "
-"<christian.draux@reseaucerta.org>\n"
+"Last-Translator: Christian Draux - reseaucerta.org <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
@@ -48,6 +47,13 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
+"Générer un plan comptable à partir d'un modèle. Vous devrez fournir le nom "
+"de l'entreprise, le modèle de plan comptable utilisé, le nombre de chiffres "
+"des numéros de compte, ainsi que les coordonnées bancaires et la monnaie de "
+"tenue de chaque journal. Ainsi une copie du plan comptable sera générée.\n"
+"\t Cet assistant peut être lancé depuis Finance & "
+"Comptabilité/Configuration/Comptabilité financière/Modèles/Générer le plan "
+"de comptes à partir d'un modèle."
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
@@ -93,7 +99,7 @@ msgstr ""
 #. module: l10n_fr
 #: wizard_view:l10n.fr.bilan.report,init:0
 msgid "Select year"
-msgstr "Sélectionné l'année"
+msgstr "Sélectionner l'année"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
diff --git a/addons/l10n_fr/i18n/hr.po b/addons/l10n_fr/i18n/hr.po
index 33a53820aa0..deb32559f53 100644
--- a/addons/l10n_fr/i18n/hr.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/hu.po b/addons/l10n_fr/i18n/hu.po
index 33a53820aa0..deb32559f53 100644
--- a/addons/l10n_fr/i18n/hu.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/id.po b/addons/l10n_fr/i18n/id.po
index d047705feaf..75e2f51ed91 100644
--- a/addons/l10n_fr/i18n/id.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/it.po b/addons/l10n_fr/i18n/it.po
index c9ddb5e9c35..e22d871670d 100644
--- a/addons/l10n_fr/i18n/it.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/ko.po b/addons/l10n_fr/i18n/ko.po
index ca822417eb3..2beb2aee4e2 100644
--- a/addons/l10n_fr/i18n/ko.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/lt.po b/addons/l10n_fr/i18n/lt.po
index 43069b644c5..bae3a939fc3 100644
--- a/addons/l10n_fr/i18n/lt.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/nl.po b/addons/l10n_fr/i18n/nl.po
index e3e9f537b8f..a5aa0654565 100644
--- a/addons/l10n_fr/i18n/nl.po
+++ b/addons/l10n_fr/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/nl_BE.po b/addons/l10n_fr/i18n/nl_BE.po
index 69aa0ffc6da..a39dcc46f69 100644
--- a/addons/l10n_fr/i18n/nl_BE.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/oc.po b/addons/l10n_fr/i18n/oc.po
index e1cab19a46d..bbba0beebf6 100644
--- a/addons/l10n_fr/i18n/oc.po
+++ b/addons/l10n_fr/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-03-12 14:22+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index c49fbe96a69..596bc7a49da 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/pt.po b/addons/l10n_fr/i18n/pt.po
index f548dbae42c..16d325a1255 100644
--- a/addons/l10n_fr/i18n/pt.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/pt_BR.po b/addons/l10n_fr/i18n/pt_BR.po
index f0a96f1a71a..c658246dc0d 100644
--- a/addons/l10n_fr/i18n/pt_BR.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/ro.po b/addons/l10n_fr/i18n/ro.po
index 33a53820aa0..deb32559f53 100644
--- a/addons/l10n_fr/i18n/ro.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/ru.po b/addons/l10n_fr/i18n/ru.po
index 3ad385d7413..45cc58b7f0c 100644
--- a/addons/l10n_fr/i18n/ru.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/sl.po b/addons/l10n_fr/i18n/sl.po
index f918a8087ee..75af0e0f4ba 100644
--- a/addons/l10n_fr/i18n/sl.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/sv.po b/addons/l10n_fr/i18n/sv.po
index 7ccc5925cc4..64bfe6fb7b0 100644
--- a/addons/l10n_fr/i18n/sv.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/tlh.po b/addons/l10n_fr/i18n/tlh.po
index e6ee53ccb1f..5198d08a013 100644
--- a/addons/l10n_fr/i18n/tlh.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index 77f8ccf7670..07f2517ca57 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/uk.po b/addons/l10n_fr/i18n/uk.po
index 20eaa3cab29..96c911a6848 100644
--- a/addons/l10n_fr/i18n/uk.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/zh_CN.po b/addons/l10n_fr/i18n/zh_CN.po
index 7635c85cb18..44e6dd69aa4 100644
--- a/addons/l10n_fr/i18n/zh_CN.po
+++ b/addons/l10n_fr/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/zh_TW.po b/addons/l10n_fr/i18n/zh_TW.po
index 6d0b94bc22d..6a6f5526f84 100644
--- a/addons/l10n_fr/i18n/zh_TW.po
+++ b/addons/l10n_fr/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_lu/i18n/ar.po b/addons/l10n_lu/i18n/ar.po
index bab1ad78d91..e81204db222 100644
--- a/addons/l10n_lu/i18n/ar.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/bg.po b/addons/l10n_lu/i18n/bg.po
index e968d61cbc0..3059892ff5a 100644
--- a/addons/l10n_lu/i18n/bg.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/bs.po b/addons/l10n_lu/i18n/bs.po
index 5858f47e599..8e057e2aa92 100644
--- a/addons/l10n_lu/i18n/bs.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/ca.po b/addons/l10n_lu/i18n/ca.po
index 4e33eb5c8ed..ff388dd2066 100644
--- a/addons/l10n_lu/i18n/ca.po
+++ b/addons/l10n_lu/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:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/cs.po b/addons/l10n_lu/i18n/cs.po
index bab1ad78d91..e81204db222 100644
--- a/addons/l10n_lu/i18n/cs.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/de.po b/addons/l10n_lu/i18n/de.po
index ed7054ea46a..a1287ce4ce2 100644
--- a/addons/l10n_lu/i18n/de.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/es.po b/addons/l10n_lu/i18n/es.po
index 4c8327f968e..e11455841a8 100644
--- a/addons/l10n_lu/i18n/es.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/es_AR.po b/addons/l10n_lu/i18n/es_AR.po
index 30770a83e0c..9aeaaab4589 100644
--- a/addons/l10n_lu/i18n/es_AR.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/et.po b/addons/l10n_lu/i18n/et.po
index fdb9f9f2efe..a9eb6d29c0a 100644
--- a/addons/l10n_lu/i18n/et.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/fr.po b/addons/l10n_lu/i18n/fr.po
index c602743a6e6..03a74c468db 100644
--- a/addons/l10n_lu/i18n/fr.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/hr.po b/addons/l10n_lu/i18n/hr.po
index 02b908882b3..64830a17bd7 100644
--- a/addons/l10n_lu/i18n/hr.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/hu.po b/addons/l10n_lu/i18n/hu.po
index 5858f47e599..8e057e2aa92 100644
--- a/addons/l10n_lu/i18n/hu.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/id.po b/addons/l10n_lu/i18n/id.po
index 4a23c854b9d..bde3ad97c69 100644
--- a/addons/l10n_lu/i18n/id.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/it.po b/addons/l10n_lu/i18n/it.po
index d5abaa17310..e04e82045bb 100644
--- a/addons/l10n_lu/i18n/it.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/ko.po b/addons/l10n_lu/i18n/ko.po
index ecb7fa00682..5049a935b00 100644
--- a/addons/l10n_lu/i18n/ko.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/lt.po b/addons/l10n_lu/i18n/lt.po
index ea663b15e8f..fd08a52974b 100644
--- a/addons/l10n_lu/i18n/lt.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/nl.po b/addons/l10n_lu/i18n/nl.po
index 53ac267c588..4a5c3a7e261 100644
--- a/addons/l10n_lu/i18n/nl.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/nl_BE.po b/addons/l10n_lu/i18n/nl_BE.po
index 464017b1d5b..de4695557ce 100644
--- a/addons/l10n_lu/i18n/nl_BE.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/oc.po b/addons/l10n_lu/i18n/oc.po
index 5ec333cc9ff..41b0632ed06 100644
--- a/addons/l10n_lu/i18n/oc.po
+++ b/addons/l10n_lu/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-03-12 13:54+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/pl.po b/addons/l10n_lu/i18n/pl.po
index f168be71265..2500afa0c1f 100644
--- a/addons/l10n_lu/i18n/pl.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/pt.po b/addons/l10n_lu/i18n/pt.po
index 40451787303..0f023be1868 100644
--- a/addons/l10n_lu/i18n/pt.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/pt_BR.po b/addons/l10n_lu/i18n/pt_BR.po
index 9dc4f9e6a9a..8877aed5f05 100644
--- a/addons/l10n_lu/i18n/pt_BR.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/ro.po b/addons/l10n_lu/i18n/ro.po
index 5858f47e599..8e057e2aa92 100644
--- a/addons/l10n_lu/i18n/ro.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/ru.po b/addons/l10n_lu/i18n/ru.po
index 0d0b51febcd..fda2c2e0e82 100644
--- a/addons/l10n_lu/i18n/ru.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/sl.po b/addons/l10n_lu/i18n/sl.po
index 840e5c6dcca..692cffa2a2c 100644
--- a/addons/l10n_lu/i18n/sl.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/sv.po b/addons/l10n_lu/i18n/sv.po
index 69572d13c0e..3fd601bd919 100644
--- a/addons/l10n_lu/i18n/sv.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/tlh.po b/addons/l10n_lu/i18n/tlh.po
index 3e3026c0338..176ee4f3fd0 100644
--- a/addons/l10n_lu/i18n/tlh.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 0a999b8594d..a2184847908 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/uk.po b/addons/l10n_lu/i18n/uk.po
index 16d2bf58e29..e418efceaf9 100644
--- a/addons/l10n_lu/i18n/uk.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/l10n_lu/i18n/zh_CN.po b/addons/l10n_lu/i18n/zh_CN.po
index 5ab9ec2ca82..89ea8978d53 100644
--- a/addons/l10n_lu/i18n/zh_CN.po
+++ b/addons/l10n_lu/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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: l10n_lu
diff --git a/addons/l10n_lu/i18n/zh_TW.po b/addons/l10n_lu/i18n/zh_TW.po
index 8ad82232fbc..029aa55b64c 100644
--- a/addons/l10n_lu/i18n/zh_TW.po
+++ b/addons/l10n_lu/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: l10n_lu
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py
index bc7dfcbfef7..e7ebb27a238 100644
--- a/addons/lunch/__terp__.py
+++ b/addons/lunch/__terp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,21 +15,27 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
     "name": "Lunch Module",
     "author": "Tiny",
+    "Description": """
+    The lunch module is for keeping record of the order placing and payment of the orders.
+    The products are defined under categories and the payment records are maintained user wise
+    Every user has a cashbox which keeps track of the amount paid for a particular order.
+
+    """,
     "version": "0.1",
     "depends": ["base"],
     "category" : "Generic Modules/Others",
     "init_xml": [],
     "update_xml": [
-        'security/ir.model.access.csv', 
-        'lunch_wizard.xml', 
-        'lunch_view.xml', 
+        'security/ir.model.access.csv',
+        'lunch_wizard.xml',
+        'lunch_view.xml',
         'lunch_report.xml',
         #'process/lunch_process.xml'
     ],
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index ee7676d4423..6a7df28b2d1 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -210,10 +210,22 @@ class mail_gateway(osv.osv):
             }
         return res
 
-    def _decode_header(self, s):
+    def _to_decode(self, s, charsets):
+       for charset in charsets:
+           if charset:
+               try:
+                   return s.decode(charset)
+               except UnicodeError:  
+                    pass         
+       try:
+           return s.decode('ascii')
+       except UnicodeError:
+           return s 
+
+    def _decode_header(self, s):        
         from email.Header import decode_header
         s = decode_header(s)
-        return ''.join(map(lambda x:x[0].decode(x[1] or 'ascii', 'replace'), s))
+        return ''.join(map(lambda x:self._to_decode(x[0], x[1]), s))
 
     def msg_new(self, cr, uid, msg, model):
         message = self.msg_body_get(msg)
@@ -250,7 +262,7 @@ class mail_gateway(osv.osv):
             if part.get_content_maintype()=='text':
                 buf = part.get_payload(decode=True)
                 if buf:
-                    txt = buf.decode(part.get_charsets()[0] or 'ascii', 'replace')
+                    txt = self._to_decode(buf, part.get_charsets())
                     txt = re.sub("<(\w)>", replace, txt)
                     txt = re.sub("<\/(\w)>", replace, txt)
                 if txt and part.get_content_subtype() == 'plain':
@@ -362,13 +374,11 @@ class mail_gateway(osv.osv):
                 del msg['Subject']
             msg['Subject'] = '[%s] %s' %(str(res_id), subject)            
 
-        em = [user_email, from_email] + (cc_email or '').split(',')
+        em = [user_email or '', from_email] + (cc_email or '').split(',')
         emails = map(self.emails_get, filter(None, em))
-
         mm = [self._decode_header(msg['From']), self._decode_header(msg['To'])]+self._decode_header(msg.get('Cc','')).split(',')
         msg_mails = map(self.emails_get, filter(None, mm))
-
-        emails = filter(lambda m: m and m not in msg_mails, emails)        
+        emails = filter(lambda m: m and m not in msg_mails, emails)
         try:
             self.msg_send(msg, mailgateway.reply_to, emails, priority, res_id)
             if hasattr(self.pool.get(res_model), 'msg_send'):
diff --git a/addons/membership/__terp__.py b/addons/membership/__terp__.py
index 3d8deb6ef75..49297bc010d 100644
--- a/addons/membership/__terp__.py
+++ b/addons/membership/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -41,8 +41,9 @@ invoice and send propositions for membership renewal.
     'init_xml': ['membership_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/membership_invoice_view.xml',
         'membership_view.xml',
-        'membership_wizard.xml',
+        'wizard/membership_unpaid_invoice_view.xml',
         'process/membership_process.xml'
     ],
     'demo_xml': ['membership_demo.xml'],
diff --git a/addons/membership/i18n/ar.po b/addons/membership/i18n/ar.po
index c2db03ed445..e81e2fac6ae 100644
--- a/addons/membership/i18n/ar.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/bg.po b/addons/membership/i18n/bg.po
index a9116ee45b6..f125b67cb86 100644
--- a/addons/membership/i18n/bg.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/bs.po b/addons/membership/i18n/bs.po
index 1e754dc2cce..7c3b2eb2733 100644
--- a/addons/membership/i18n/bs.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ca.po b/addons/membership/i18n/ca.po
index 2ab8a028b54..1e8cda2bf8b 100644
--- a/addons/membership/i18n/ca.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/cs.po b/addons/membership/i18n/cs.po
index c1d712510fc..8115eeea676 100644
--- a/addons/membership/i18n/cs.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index b3891092fcc..3ec3534f998 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index 3a5c52fda96..da52998aba8 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/es_AR.po b/addons/membership/i18n/es_AR.po
index e43f1fea91e..ed7a6920423 100644
--- a/addons/membership/i18n/es_AR.po
+++ b/addons/membership/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/et.po b/addons/membership/i18n/et.po
index 106506bf96b..14d262a8115 100644
--- a/addons/membership/i18n/et.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po
index 9ec2e4ba8ae..02b36dfa2f5 100644
--- a/addons/membership/i18n/fi.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index 890b9dfc094..36612292795 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
index c2db03ed445..e81e2fac6ae 100644
--- a/addons/membership/i18n/hr.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/hu.po b/addons/membership/i18n/hu.po
index de555a46193..1af1461f2c5 100644
--- a/addons/membership/i18n/hu.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/id.po b/addons/membership/i18n/id.po
index 3bacf1d3612..878d5385e04 100644
--- a/addons/membership/i18n/id.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po
index c8946ce28cb..d11c9563849 100644
--- a/addons/membership/i18n/it.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ko.po b/addons/membership/i18n/ko.po
index 7c4dc89ca30..548bf4b2197 100644
--- a/addons/membership/i18n/ko.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/lt.po b/addons/membership/i18n/lt.po
index 6246ed1fa84..6352f23e8e9 100644
--- a/addons/membership/i18n/lt.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
index 820fa3353a8..dfafc9b6863 100644
--- a/addons/membership/i18n/nl.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/nl_BE.po b/addons/membership/i18n/nl_BE.po
index 48453f012a1..c9a1abebe85 100644
--- a/addons/membership/i18n/nl_BE.po
+++ b/addons/membership/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
index de3497cf7c8..3eacbd37a27 100644
--- a/addons/membership/i18n/pl.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pt.po b/addons/membership/i18n/pt.po
index 522a03046c2..2f66bfa6912 100644
--- a/addons/membership/i18n/pt.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
index 30a2d3ee0b2..c2cc3640345 100644
--- a/addons/membership/i18n/pt_BR.po
+++ b/addons/membership/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ro.po b/addons/membership/i18n/ro.po
index 29470a45614..547ce6270fe 100644
--- a/addons/membership/i18n/ro.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ru.po b/addons/membership/i18n/ru.po
index e3704710000..28359c3dc57 100644
--- a/addons/membership/i18n/ru.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
index f8f9562b600..4ca5bee87a9 100644
--- a/addons/membership/i18n/sk.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sl.po b/addons/membership/i18n/sl.po
index 731b3ea6e8c..d72ec0f2a25 100644
--- a/addons/membership/i18n/sl.po
+++ b/addons/membership/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index 720ebc1e012..eaa1f21374f 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/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-16 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/tlh.po b/addons/membership/i18n/tlh.po
index 62fcaffe119..e76339fd130 100644
--- a/addons/membership/i18n/tlh.po
+++ b/addons/membership/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 0263c9695e4..a66d06ebbb4 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/uk.po b/addons/membership/i18n/uk.po
index a4f5a5bbfa6..d7b45c51fe9 100644
--- a/addons/membership/i18n/uk.po
+++ b/addons/membership/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index f3720157d29..0fcc36e492e 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -7,24 +7,24 @@ 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: 2010-01-10 02:12+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "发票关联"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
 msgid "Membership Process"
-msgstr "会员流程"
+msgstr "会员处理"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -35,7 +35,7 @@ msgstr "付费会员"
 #. module: membership
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中输入的对象名称错误"
+msgstr "在这动作定义中无效的模块名"
 
 #. module: membership
 #: field:report.partner_member.year,currency:0
@@ -46,52 +46,52 @@ msgstr "货币"
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
 msgid "Set an associate member of partner."
-msgstr ""
+msgstr "设为准成员的业务伙伴"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr "发票已经付款。"
+msgstr "支付发票"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr ""
+msgstr "定义会员产品"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "日期到"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr "等待开票"
+msgstr "等待发票"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "产品给会员"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "准会员"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "是准会员"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "准业务伙伴"
 
 #. module: membership
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "错误!你不能创建递归科目。"
+msgstr "错误!你不能创建递归的账户"
 
 #. module: membership
 #: constraint:account.invoice:0
@@ -101,7 +101,7 @@ msgstr ""
 #. module: membership
 #: field:product.product,membership_date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "日期格式"
 
 #. module: membership
 #: field:membership.membership_line,partner:0
@@ -112,12 +112,12 @@ msgstr "业务伙伴"
 #: model:ir.actions.act_window,name:membership.action_membership_members_free
 #: model:ir.ui.menu,name:membership.menu_members_free
 msgid "Free members"
-msgstr "免费会员列表"
+msgstr "免费会员"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "支付发票"
 
 #. module: membership
 #: view:res.partner:0
@@ -127,7 +127,7 @@ msgstr "业务伙伴"
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr ""
+msgstr "格式"
 
 #. module: membership
 #: constraint:membership.membership_line:0
@@ -137,7 +137,7 @@ msgstr ""
 #. module: membership
 #: wizard_button:wizard_invoice_membership,init,ok:0
 msgid "Confirm"
-msgstr "确认"
+msgstr "确定"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -147,12 +147,12 @@ msgstr "创建"
 #. module: membership
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件!"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
-msgstr ""
+msgstr "会员明细"
 
 #. module: membership
 #: field:membership.membership_line,state:0
@@ -162,7 +162,7 @@ msgstr "状态"
 #. module: membership
 #: field:res.partner,membership_start:0
 msgid "Start membership date"
-msgstr ""
+msgstr "入会日期"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
@@ -174,7 +174,7 @@ msgstr "付费会员"
 #: model:ir.ui.menu,name:membership.menu_report_partner_member_year
 #: view:report.partner_member.year:0
 msgid "Membership by Years"
-msgstr ""
+msgstr "会籍年份"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_reporting
@@ -184,7 +184,7 @@ msgstr "报表"
 #. module: membership
 #: view:res.partner:0
 msgid "Members"
-msgstr "会员列表"
+msgstr "成员"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -195,7 +195,7 @@ msgstr "非会员"
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
 msgid "Open invoice."
-msgstr ""
+msgstr "待处理发票"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_conf
@@ -205,43 +205,43 @@ msgstr "设置"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "定义会员产品"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr ""
+msgstr "已开发票的会员可能是准会员"
 
 #. module: membership
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位和计量单位必须是不同类型"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_membership_products
 #: view:product.product:0
 msgid "Membership products"
-msgstr ""
+msgstr "会员产品"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_members_waiting
 msgid "Future members (invoice not confirmed)"
-msgstr ""
+msgstr "未来会员(发票没确认)"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
-msgstr ""
+msgstr "设立协会"
 
 #. module: membership
 #: model:product.template,name:membership.member_product_1_product_template
 msgid "Membership Product - 2"
-msgstr ""
+msgstr "会员产品 - 2"
 
 #. module: membership
 #: model:product.template,name:membership.member_product_0_product_template
 msgid "Membership Product - 1"
-msgstr ""
+msgstr "会员产品 - 1"
 
 #. module: membership
 #: field:report.partner_member.year,canceled_amount:0
@@ -249,12 +249,12 @@ msgstr ""
 #: field:report.partner_member.year_new,canceled_amount:0
 #: field:report.partner_member.year_new,canceled_number:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr "会员销售价格表"
+msgstr "会员售价表"
 
 #. module: membership
 #: field:report.partner_member.year,invoiced_amount:0
@@ -262,7 +262,7 @@ msgstr "会员销售价格表"
 #: field:report.partner_member.year_new,invoiced_amount:0
 #: field:report.partner_member.year_new,invoiced_number:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "开发票"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -273,13 +273,13 @@ msgstr "免费会员"
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr "会员销售价格表版本"
+msgstr "会员售价表版本"
 
 #. module: membership
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:采购单位和计量单位不能是同一类型"
 
 #. module: membership
 #: help:res.partner,membership_amount:0
@@ -289,7 +289,7 @@ msgstr ""
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
-msgstr ""
+msgstr "准会员"
 
 #. module: membership
 #: constraint:account.invoice:0
@@ -299,17 +299,17 @@ msgstr ""
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr "取消会员资格时间"
+msgstr "取消会员日期"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
 msgid "Membership Products"
-msgstr ""
+msgstr "会员产品"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "会员发票支付"
 
 #. module: membership
 #: field:report.partner_member.year,paid_amount:0
@@ -317,13 +317,13 @@ msgstr ""
 #: field:report.partner_member.year_new,paid_amount:0
 #: field:report.partner_member.year_new,paid_number:0
 msgid "Paid"
-msgstr "已付款"
+msgstr "已付"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Invoiced Member"
-msgstr ""
+msgstr "已开发票的会员"
 
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
@@ -333,61 +333,61 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,member_lines:0
 msgid "Membership"
-msgstr "会员"
+msgstr "会籍"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Specify if this product is a membership product"
-msgstr ""
+msgstr "如果这产品是会籍产品指定"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Waiting Member"
-msgstr ""
+msgstr "等待会员"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr ""
+msgstr "协会业务伙伴"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_invoiced
 #: model:ir.ui.menu,name:membership.menu_members_invoiced
 msgid "Invoiced members"
-msgstr ""
+msgstr "已开发票的会员"
 
 #. module: membership
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "您不能同时具有两个重叠的价格表版本。"
+msgstr "你不能有2个价格表版本"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_old
 #: model:ir.ui.menu,name:membership.menu_members_old
 msgid "Old members"
-msgstr ""
+msgstr "旧会员"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
 msgid "Membership amount"
-msgstr ""
+msgstr "会员数"
 
 #. module: membership
 #: wizard_view:wizard_invoice_membership,init:0
 msgid "Choose invoice details"
-msgstr ""
+msgstr "选择发票细节"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Old Member"
-msgstr ""
+msgstr "旧会员"
 
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr ""
+msgstr "到"
 
 #. module: membership
 #: field:report.partner_member.year,waiting_amount:0
@@ -400,12 +400,12 @@ msgstr "等待"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
 msgid "Draft invoice is now open."
-msgstr ""
+msgstr "发票现在是待处理"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_waiting
 msgid "Future members"
-msgstr ""
+msgstr "未来的会员"
 
 #. module: membership
 #: wizard_button:wizard_invoice_membership,init,end:0
@@ -416,13 +416,13 @@ msgstr "取消"
 #: model:ir.actions.act_window,name:membership.action_membership_members_associated
 #: model:ir.ui.menu,name:membership.menu_members_associated
 msgid "Associated members"
-msgstr ""
+msgstr "准会员"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_paid
 #: model:ir.ui.menu,name:membership.menu_members_paid
 msgid "Paid members"
-msgstr ""
+msgstr "付费会员"
 
 #. module: membership
 #: view:product.product:0
@@ -432,92 +432,92 @@ msgstr "信息"
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
-msgstr ""
+msgstr "账户发票明细"
 
 #. module: membership
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以x_开头并且不能含特殊的字符"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
-msgstr ""
+msgstr "会员草稿发票"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Canceled Member"
-msgstr ""
+msgstr "取消会员"
 
 #. module: membership
 #: model:product.price.type,name:membership.product_price_type_memberprice
 #: field:product.template,member_price:0
 msgid "Member Price"
-msgstr ""
+msgstr "会员价格"
 
 #. module: membership
 #: field:res.partner,free_member:0
 msgid "Free member"
-msgstr ""
+msgstr "免费会员"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
 msgid "Stop membership date"
-msgstr ""
+msgstr "停止会员日期"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
 #: model:ir.ui.menu,name:membership.menu_members
 msgid "Current members"
-msgstr "现有会员列表"
+msgstr "当前的会员"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_partner_member_year_new
 #: model:ir.ui.menu,name:membership.menu_report_partner_member_year_new
 #: view:report.partner_member.year_new:0
 msgid "New Membership by Years"
-msgstr ""
+msgstr "年新会员"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "已开发票会员"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr ""
+msgstr "取消日期"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "等待会员"
 
 #. module: membership
 #: model:ir.actions.wizard,name:membership.wizard_invoice_membership
 msgid "Invoice Membership"
-msgstr ""
+msgstr "发票会员"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
 #: wizard_field:wizard_invoice_membership,init,product:0
 msgid "Membership product"
-msgstr ""
+msgstr "会员产品"
 
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的(EAN)条码"
+msgstr "错误:无效EAN代码"
 
 #. module: membership
 #: field:report.partner_member.year,year:0
 #: field:report.partner_member.year_new,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: membership
 #: field:res.partner,membership_state:0
 msgid "Current membership state"
-msgstr "当前会员资格状态"
+msgstr "当前会员状态"
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
index ce1ad44fdea..93c998909ec 100644
--- a/addons/membership/i18n/zh_TW.po
+++ b/addons/membership/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 3e22529332f..dd23cb61145 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -151,13 +151,14 @@
         <menuitem name="Members" parent="menu_member" id="menu_members" sequence="2" action="action_membership_members"/>
 
         <!-- PARTNERS -->
-
+<!--
         <wizard
             string="Invoice Membership"
             model="res.partner"
             name="wizard_invoice_membership"
             id="wizard_invoice_membership"
             />
+ -->
 
 
         <record model="ir.ui.view" id="view_partner_tree">
diff --git a/addons/membership/membership_wizard.xml b/addons/membership/membership_wizard.xml
deleted file mode 100644
index 67068ff151d..00000000000
--- a/addons/membership/membership_wizard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-
-	<wizard name="wizard.invoice.membership.unpaid"
-			id="invoice_membership_unpaid"
-			model="res.partner"
-			keyword="client_action_multi"
-			string="List Unpaid Partners"
-			menu="False" />
-
-	<menuitem name="List Unpaid Partners" id="menu_unpaid_membership"
-			action="invoice_membership_unpaid" type="wizard"
-			parent="menu_member" />
-
-	</data>
-</openerp>
diff --git a/addons/membership/wizard/__init__.py b/addons/membership/wizard/__init__.py
index bffa2fb6a21..07d484d7125 100644
--- a/addons/membership/wizard/__init__.py
+++ b/addons/membership/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import  invoice_membership
-import unpaid_partner_invoice
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+import membership_invoice
+import membership_unpaid_invoice
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py
deleted file mode 100644
index 2eb63ad6c96..00000000000
--- a/addons/membership/wizard/invoice_membership.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields
-import wizard
-import pooler
-import time
-from tools.translate import _
-
-def _invoice_membership(self, cr, uid, data, context):
-    partner_ids = data['ids']
-    product_id = data['form']['product']
-    pool = pooler.get_pool(cr.dbname)
-    cr.execute('''
-            SELECT partner_id, id, type
-            FROM res_partner_address
-            WHERE partner_id =ANY(%s)''',(partner_ids,))
-    fetchal = cr.fetchall()
-    if not fetchal:
-        raise wizard.except_wizard(_('Error !'), _('No Address defined for this partner'))
-    partner_address_ids = {}
-    for x in range(len(fetchal)):
-        pid = fetchal[x][0]
-        id = fetchal[x][1]
-        type = fetchal[x][2]
-        if partner_address_ids.has_key(pid) and partner_address_ids[pid]['type'] == 'invoice':
-            continue
-        partner_address_ids[pid] = {'id': id, 'type': type}
-
-    invoice_list= []
-    invoice_obj = pool.get('account.invoice')
-    partner_obj = pool.get('res.partner')
-    product_obj = pool.get('product.product')
-    invoice_line_obj = pool.get(('account.invoice.line'))
-    invoice_tax_obj = pool.get(('account.invoice.tax'))
-    product = product_obj.read(cr, uid, product_id, ['uom_id'])
-
-    for partner_id in partner_ids:
-        account_id = partner_obj.read(cr, uid, partner_id, ['property_account_receivable'])['property_account_receivable'][0]
-        read_fpos = partner_obj.read(cr, uid, partner_id, ['property_account_position'])
-        fpos_id = read_fpos['property_account_position'] and read_fpos['property_account_position'][0]
-        line_value =  {
-            'product_id' : product_id,
-            }
-        quantity = 1
-        line_dict = invoice_line_obj.product_id_change(cr, uid, {}, product_id, product['uom_id'][0], quantity, '', 'out_invoice', partner_id, fpos_id, context=context)
-        line_value.update(line_dict['value'])
-        if line_value['invoice_line_tax_id']:
-            tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
-            line_value['invoice_line_tax_id'] = tax_tab
-        invoice_id = invoice_obj.create(cr, uid, {
-            'partner_id' : partner_id,
-            'address_invoice_id': partner_address_ids[partner_id]['id'],
-            'account_id': account_id,
-            'fiscal_position': fpos_id or False
-            }
-        )
-        line_value['invoice_id'] = invoice_id
-        invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context)
-        invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]})
-        invoice_list.append(invoice_id)
-        if line_value['invoice_line_tax_id']:
-            tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
-            for tax in tax_value:
-                invoice_tax_obj.create(cr, uid, tax, context=context)
-
-    result = pool.get('ir.model.data')._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-    res = pool.get('ir.model.data').read(cr, uid, result, ['res_id'])
-
-    value = {
-            'domain': [
-                ('id', 'in', invoice_list),
-                ],
-            'name': 'Membership invoice',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'type': 'ir.actions.act_window',
-            'res_id' : invoice_list,
-            'search_view_id' : res['res_id']
-        }
-    return value
-
-wizard_arch= """<?xml version="1.0"?>
-<form string="Choose invoice details">
-    <field
-        name="product"
-        domain="[('membership','=','True')]"
-        context="product='membership_product'"
-        />
-</form>"""
-
-class wizard_invoice_membership(wizard.interface):
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {
-                'type' : 'form',
-                'arch' : wizard_arch,
-                'fields' : {
-                        'product': {
-                            'string': 'Membership product',
-                            'type': 'many2one',
-                            'relation': 'product.product',
-                            'required': True
-                        },
-                },
-                'state' : [('end', 'Cancel'),('ok', 'Confirm') ]}
-        },
-        'ok' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                        'action': _invoice_membership,
-                        'state' : 'end'
-            },
-        },
-
-    }
-
-wizard_invoice_membership("wizard_invoice_membership")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
new file mode 100644
index 00000000000..45d5c538b15
--- /dev/null
+++ b/addons/membership/wizard/membership_invoice.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class membership_invoice(osv.osv_memory):
+    _name = "membership.invoice"
+    _description = "Membership Invoice From Partner"
+    _columns ={
+        'product_id': fields.many2one('product.product','Membership Product', required=True),
+               }
+
+    def membership_invoice(self, cr, uid, ids, context={}):
+        invoice_obj = self.pool.get('account.invoice')
+        partner_obj = self.pool.get('res.partner')
+        product_obj = self.pool.get('product.product')
+        invoice_line_obj = self.pool.get(('account.invoice.line'))
+        invoice_tax_obj = self.pool.get(('account.invoice.tax'))
+        partner_ids = context['active_ids']
+        for data in self.read(cr, uid, ids, context=context):
+            product_id = data['product_id']
+            cr.execute('''
+                        SELECT partner_id, id, type
+                        FROM res_partner_address
+                        WHERE partner_id =ANY(%s)''',(partner_ids,))
+            fetchal = cr.fetchall()
+            if not fetchal:
+                raise osv.except_osv(_('Error !'), _('No Address defined for this partner'))
+            partner_address_ids = {}
+            for x in range(len(fetchal)):
+                pid = fetchal[x][0]
+                id = fetchal[x][1]
+                type = fetchal[x][2]
+                if partner_address_ids.has_key(pid) and partner_address_ids[pid]['type'] == 'invoice':
+                        continue
+                partner_address_ids[pid] = {'id': id, 'type': type}
+
+            invoice_list= []
+            product = product_obj.read(cr, uid, product_id, ['uom_id'], context=context)
+
+            for partner_id in partner_ids:
+                account_id = partner_obj.read(cr, uid, partner_id, ['property_account_receivable'], context=context)['property_account_receivable'][0]
+                read_fpos = partner_obj.read(cr, uid, partner_id, ['property_account_position'], context=context)
+                fpos_id = read_fpos['property_account_position'] and read_fpos['property_account_position'][0]
+                line_value =  {
+                    'product_id' : product_id,
+                     }
+                quantity = 1
+                line_dict = invoice_line_obj.product_id_change(cr, uid, {}, product_id, product['uom_id'][0], quantity, '', 'out_invoice', partner_id, fpos_id, context=context)
+                line_value.update(line_dict['value'])
+                if line_value['invoice_line_tax_id']:
+                    tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
+                    line_value['invoice_line_tax_id'] = tax_tab
+                invoice_id = invoice_obj.create(cr, uid, {
+                    'partner_id' : partner_id,
+                    'address_invoice_id': partner_address_ids[partner_id]['id'],
+                    'account_id': account_id,
+                    'fiscal_position': fpos_id or False
+                    }
+                )
+                line_value['invoice_id'] = invoice_id
+                invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
+                invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
+                invoice_list.append(invoice_id)
+                if line_value['invoice_line_tax_id']:
+                    tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
+                    for tax in tax_value:
+                           invoice_tax_obj.create(cr, uid, tax, context=context)
+
+            return  {
+                'domain': [('id', 'in', invoice_list)],
+                'name': 'Membership Invoice',
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'account.invoice',
+                'type': 'ir.actions.act_window',
+                }
+
+membership_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
new file mode 100644
index 00000000000..c18c53d6679
--- /dev/null
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+  	  <record id="view_membership_invoice_view" model="ir.ui.view">
+            <field name="name">membership.invoice.view.form</field>
+            <field name="model">membership.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Membership Invoice">
+                	<group colspan="4" >
+                     	<field name="product_id" context="{'product':membership_product}" domain="[('membership','=',True)]"/>
+                    </group>
+                    <group colspan="4" col="6">
+                        <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+           	            <button  icon="gtk-ok" string="Confirm" name="membership_invoice" type="object"/>
+                    </group>
+                </form>
+            </field>
+  	  </record>
+
+       <record id="action_membership_invoice_view" model="ir.actions.act_window">
+           <field name="name">Membership Invoice</field>
+           <field name="res_model">membership.invoice</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+          <field name="view_id" ref="view_membership_invoice_view"/>
+          <field name="target">new</field>
+       </record>
+
+		<record id="action_idea_post_vote_values" model="ir.values">
+	            <field name="model_id" ref="base.model_res_partner" />
+	            <field name="object" eval="1" />
+	            <field name="name">vote</field>
+	            <field name="key2">client_action_multi</field>
+	            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_membership_invoice_view'))"/>
+	            <field name="key">action</field>
+	            <field name="model">res.partner</field>
+	    </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/membership/wizard/unpaid_partner_invoice.py b/addons/membership/wizard/membership_unpaid_invoice.py
similarity index 50%
rename from addons/membership/wizard/unpaid_partner_invoice.py
rename to addons/membership/wizard/membership_unpaid_invoice.py
index 20585f6570c..1b9a6ac3464 100644
--- a/addons/membership/wizard/unpaid_partner_invoice.py
+++ b/addons/membership/wizard/membership_unpaid_invoice.py
@@ -18,32 +18,32 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import time
 
-import wizard
-import pooler
+from osv import fields, osv
 
-wizard_arch= """<?xml version="1.0"?>
-<form string="Choose invoice details">
-    <field
-        name="product"
-        domain="[('membership','=','True')]"
-        context="product='membership_product'"
-        />
-</form>"""
+class member_unpaid_invoice(osv.osv_memory):
+    _name = "membership.unpaid.invoice"
+    _description = "List of Unpaid Partner"
+    _columns ={
+        'product': fields.many2one('product.product','Membership product', size=64,required=True, help='Select Membership product'),
+               }
 
-def _invoice_membership(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    partners = []
-    cr.execute('''select p.id from res_partner as p \
+    def _invoice_membership(self, cr, uid, ids, context):
+        model_obj = self.pool.get('ir.model.data')
+        partners = []
+        result = model_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = model_obj.read(cr, uid, result, ['res_id'], context=context)
+        for data in self.read(cr, uid, ids, context=context):
+            cr.execute('''select p.id from res_partner as p \
                 left join account_invoice as i on p.id=i.partner_id \
                 left join account_invoice_line as il on i.id=il.invoice_id \
                 left join product_product as pr on pr.id=il.product_id \
                 where i.state = 'open' and pr.id=%s \
-                group by p.id''' % (data['form']['product']))
-    map(lambda x: partners.append(x[0]),cr.fetchall())
-    result = pool.get('ir.model.data')._get_id(cr, uid, 'base', 'view_res_partner_filter')
-    res = pool.get('ir.model.data').read(cr, uid, result, ['res_id'])
-    value = {
+                group by p.id''' % (data['product']))
+        map(lambda x: partners.append(x[0]),cr.fetchall())
+
+        return {
             'domain': [('id', 'in', partners)],
             'name': 'Unpaid Partners',
             'view_type': 'form',
@@ -53,34 +53,7 @@ def _invoice_membership(self, cr, uid, data, context):
             'res_id' : partners,
             'search_view_id' : res['res_id']
         }
-    return value
 
-class wizard_unpaid_inv(wizard.interface):
+member_unpaid_invoice()
 
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {
-                'type' : 'form',
-                'arch' : wizard_arch,
-                'fields' : {
-                        'product': {
-                            'string': 'Membership product',
-                            'type': 'many2one',
-                            'relation': 'product.product',
-                            'help': 'Select Membership product',
-                            'required': True
-                        },
-                },
-                'state' : [('end', 'Cancel'),('ok', 'Unpaid Partners') ]}
-        },
-        'ok' : {
-            'actions' : [],
-            'result' : {'type' : 'action', 'action': _invoice_membership, 'state' : 'end'},
-        },
-
-    }
-
-wizard_unpaid_inv("wizard.invoice.membership.unpaid")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/membership/wizard/membership_unpaid_invoice_view.xml b/addons/membership/wizard/membership_unpaid_invoice_view.xml
new file mode 100644
index 00000000000..52825386cb7
--- /dev/null
+++ b/addons/membership/wizard/membership_unpaid_invoice_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+  	  <record id="view_unpaid_invoice_view" model="ir.ui.view">
+            <field name="name">unpaid.invoice.view.form</field>
+            <field name="model">membership.unpaid.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="List Unpaid Partners">
+                	<group colspan="4" >
+                           <field name="product" context="{'product':membership_product}" domain="[('membership','=',True)]"/>
+                    </group>
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+           				<button  icon="gtk-ok" string="Unpaid Partners" name="_invoice_membership" type="object"/>
+                   </group>
+               </form>
+            </field>
+  	  </record>
+
+       <record id="action_unpaid_invoice_view" model="ir.actions.act_window">
+           <field name="name">List Unpaid Partners</field>
+           <field name="res_model">membership.unpaid.invoice</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+          <field name="view_id" ref="view_unpaid_invoice_view"/>
+          <field name="target">new</field>
+       </record>
+
+        <menuitem name="List Unpaid Partners" id="menu_unpaid_invoice"
+			action="action_unpaid_invoice_view"
+			parent="menu_member" />
+
+     </data>
+</openerp>
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index b219d932141..39d97d0ba11 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -20,8 +20,9 @@
 ##############################################################################
 
 import mrp
+import stock
+import product
 import installer
-import mrp_wizard
 import wizard
 import report
 import company
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index a147266ce1d..acf25b160e0 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -60,8 +60,14 @@
         'security/ir.model.access.csv',
         'mrp_workflow.xml',
         'mrp_data.xml',
-        'mrp_wizard_view.xml',
+        'wizard/mrp_product_produce_view.xml',
+        'wizard/make_procurement_view.xml',
+        'wizard/change_production_qty_view.xml',
+        'wizard/orderpoint_procurement_view.xml',
+        'wizard/mrp_price_view.xml',
+        'wizard/mrp_workcenter_load_view.xml',
         'mrp_view.xml',
+        'wizard/schedulers_all_view.xml',
         'mrp_wizard.xml',
         'mrp_report.xml',
         'company_view.xml',
@@ -69,6 +75,8 @@
         'process/service_product_process.xml',
         'process/procurement_process.xml',
         'mrp_installer.xml',
+        'report/mrp_report_view.xml',
+        'report/mrp_production_order_view.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
     'installable': True,
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index d175a38aed9..406de140a0c 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/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: mrp
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index d97190840f4..c0bfc16aa98 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.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-01-15 20:33+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\n"
+"PO-Revision-Date: 2010-03-31 09:02+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -1889,7 +1889,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_root
 msgid "Manufacturing"
-msgstr ""
+msgstr "Производство"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 9a416133183..737e69e0ea3 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/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: mrp
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index 0bb5783753c..6b1a1f9d8f4 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 777bd353771..43405b23ceb 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/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: mrp
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index b8c38894b5e..fdf3a1bc3dc 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index f23a9e225d6..979733ed22b 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 3cde4e19ca2..6d221871751 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index 4e6b6f88dca..3358e029308 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index b83a0cfd2f6..7e4b5597093 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index 9a5485923c2..5121d802519 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 08:30+0000\n"
-"Last-Translator: NightSpirit <Unknown>\n"
+"PO-Revision-Date: 2010-03-22 14:50+0000\n"
+"Last-Translator: Henri Kovalainen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Moves Created"
-msgstr "Luotuja Siirtoja"
+msgstr "Luodut siirrot"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr "Syklien määrä"
+msgstr "Kiertojen määrä"
 
 #. module: mrp
 #: help:mrp.procurement.compute.all,init,automatic:0
@@ -34,46 +34,46 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
-"Laukaisee automaattisen hankinnan kaikille tuotteille joiden "
-"virtuaalivaraston arvo on alle 0. Et välttämättä halua käyttää tätä "
-"mahdollisuutta, ehdotamme että käytätte MTO asetuksia tuotteille."
+"Liipaisee automaattisen hankinnan kaikille tuotteille joiden näennäisvarasto "
+"on alle 0. Tätä vaihtoehtoa ei yleensä käytetä, vaan tuotteille on parempi "
+"määrittää varastosäännöt."
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr "Tuotantoresurssisuunnittelu"
+msgstr "Tuotannon resurssien suunnittelu"
 
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr ""
+msgstr "Revisio"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
 msgid "Compute Stock Minimum Rules Only"
-msgstr "Laske vain varaston minimit"
+msgstr "Laske vain varaston minimirajat"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
 msgid "Exceptions Procurements"
-msgstr "Hankintapoikkeukset"
+msgstr "Hankinnan poikkeukset"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Workcenters"
-msgstr "Reitittävät työkeskittymät"
+msgstr "Reitittävät työpisteet"
 
 #. module: mrp
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr "Käytetään vain tietoja varten, ei laskentaan."
+msgstr "Ei käytetä laskutoimituksiin - vain tietoja varten."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -89,24 +89,24 @@ msgstr "Pakkauslista"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 msgid "Stockable Stock"
-msgstr "Varastoitavissa oleva Varasto"
+msgstr "Varastoitavissa oleva varasto"
 
 #. module: mrp
 #: field:mrp.procurement,origin:0
 #: field:mrp.production,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Lähde"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguraatio"
 
 #. module: mrp
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr ""
+msgstr "Viite"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -122,18 +122,18 @@ msgstr "Automaattinen tilauspiste"
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr "Kokoelma / Pakkaus"
+msgstr "Sarja / Pakkaus"
 
 #. module: mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
 
 #. module: mrp
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
-msgstr "Turvallisuussyistä asiakkaalle luvatut päivät"
+msgstr "Nämä päivät lisätään asiakkaalle luvattuun aikaan turvallisuussyistä"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -143,17 +143,17 @@ msgstr "Kustannukset tunnissa"
 #. module: mrp
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Best price (not yet active!)"
-msgstr "Sopivin hinta (ei vielä voimassa!)"
+msgstr "Paras hinta (ei vielä aktiivinen!)"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Product & Location"
-msgstr "Tuote ja Sijainti"
+msgstr "Tuote ja paikka"
 
 #. module: mrp
 #: view:res.company:0
 msgid "MRP & Logistic Scheduler"
-msgstr "MRP -ja Logistiikka-ajastin"
+msgstr "Tuotanto- ja logistiikka-aikataulut"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -161,8 +161,9 @@ msgid ""
 "Number of operation this workcenter can do in parallel. If this workcenter "
 "represent a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
-"Monia osaston tehtäviä voi tehdä samanaikaisesti. Jos osastotiimi koostuu "
-"viidestä henkilöstä, on työvahvuus jokaisessa syklissä viisi."
+"Tässä työpisteessä samanaikaisesti suoritettavien tehtävien lukumäärä. Jos "
+"piste koostuu esim. viidestä henkilöstä, on kapasiteetti jokaisessa "
+"kierrossa viisi."
 
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
@@ -185,47 +186,47 @@ msgstr "Tuotteen määrä"
 #. module: mrp
 #: field:mrp.production,move_lines:0
 msgid "Products Consummed"
-msgstr "Kulutetut Tuotteet"
+msgstr "Kulutetut tuotteet"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
-msgstr "Syklitili"
+msgstr "Kierroksien tili"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Capacity Information"
-msgstr "Kapasiteettitiedot"
+msgstr "Kapasiteetin tiedot"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Packing Exception"
-msgstr "Pakkauspoikkeus"
+msgstr "Poikkeus pakkauksessa"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 msgid "A purchase order is created for a sub-contracting demand."
-msgstr "Ostotilaus on luotu ali-supistumisen vuoksi."
+msgstr "Ostotilaus luodaan alihankinnan tarpeisiin."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Destination Location"
-msgstr "Kohteen sijainti"
+msgstr "Kohteen paikka"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analyyttinen tilikirjanpito"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Do nothing"
-msgstr ""
+msgstr "Älä tee mitään"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Partner Ref"
-msgstr ""
+msgstr "Kumppani viite"
 
 #. module: mrp
 #: help:mrp.procurement.orderpoint.compute,init,automatic:0
@@ -245,12 +246,12 @@ msgstr "Suunnitellut tavarat"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
 msgid "you can see the minimum stock rules from product"
-msgstr "voit nähdä tuotteesta varaston minimiarvot"
+msgstr "Voit nähdä tuotteesta varaston minimirajat"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
-msgstr ""
+msgstr "Sarja / Haamu"
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute,init:0
@@ -260,19 +261,19 @@ msgstr "Tämä ohjattu toiminto ajoittaa hankinnat."
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Ref."
-msgstr ""
+msgstr "Sisäinen viite"
 
 #. module: mrp
 #: view:mrp.procurement:0
 #: field:mrp.procurement,state:0
 #: field:mrp.production,state:0
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "Stockable Production Order"
-msgstr "Varastoimiseen kelpaava tuotantojärjestys"
+msgstr "Varastoitava tuotantotilaus"
 
 #. module: mrp
 #: help:mrp.bom,position:0
@@ -296,13 +297,13 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
-"Kun sähköinen varasto menee minimi määrän alapuolelle, Open ERP luo "
-"hankinnan, joka muuttaa sähköisen varaston maksimimäärään."
+"Kun näennäsvaraston saldo menee alle minimimäärän, OpenERP luo hankinnan "
+"kasvattaakseen näennäisen varaston maksimimäärän tasolle."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Stockable Make to Stock"
-msgstr ""
+msgstr "Varastoitava, valmistetaan varastoon"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -317,7 +318,7 @@ msgstr "Tuotantotilaukset"
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Määrä"
 
 #. module: mrp
 #: selection:mrp.procurement,priority:0
@@ -328,7 +329,7 @@ msgstr "Ei kiireellinen"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procure Service Product"
-msgstr "Hankintapalvelutuote"
+msgstr "Hanki palvelutuote"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -349,12 +350,12 @@ msgstr "Tuotannon suunnitellut tuotteet"
 #. module: mrp
 #: field:mrp.workcenter,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Työaika"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Details"
-msgstr ""
+msgstr "Tiedot"
 
 #. module: mrp
 #: model:process.process,name:mrp.process_process_procurementprocess0
@@ -376,12 +377,14 @@ msgstr "Kiireellinen"
 #: help:mrp.bom,product_rounding:0
 msgid ""
 "Rounding applied on the product quantity. For integer only values, put 1.0"
-msgstr "Tuotteen määrä on pyöristetty. Kokonaislukuarvoihin laita 1.0"
+msgstr ""
+"Tuotteen määrään käytettävä pyöristys. Käyttääksesi vain kokonaislukuja, "
+"aseta 1.0"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Materiaalilasku"
+msgstr "Osaluettelo"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -390,34 +393,34 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
-"Jätä tyhjäksi jos teet hankintoja samassa paikassa kuin valmiita tuotteita "
-"tarvitaan. Aseta paikka jos teet hankintoja muualla. Tämä voi olla kumppanin "
-"sijainti jos tuotat valmistustoimintoja alihankintana."
+"Jätä tyhjäksi jos tuotanto tapahtuu samassa paikassa kuin valmiita tuotteita "
+"tarvitaan. Aseta paikka jos tuotanto tapahtuu muualla. Tämä voi olla myös "
+"kumppanin sijainti jos tuotanto tapahtuu alihankintana."
 
 #. module: mrp
 #: field:mrp.procurement,move_id:0
 msgid "Reservation"
-msgstr ""
+msgstr "Varaus"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Materiaalirakennelasku"
+msgstr "Osaluettelon rakenne"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,product_id:0
 msgid "product"
-msgstr ""
+msgstr "tuote"
 
 #. module: mrp
 #: selection:mrp.property,composition:0
 msgid "max"
-msgstr "suurin"
+msgstr "max"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Product to stock rules"
-msgstr ""
+msgstr "Tuotteen varastorajat"
 
 #. module: mrp
 #: wizard_button:product_price,init,price:0
@@ -432,7 +435,7 @@ msgstr "Tee hankinta"
 #. module: mrp
 #: field:mrp.bom.revision,date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "Muokkauspäivä"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
@@ -441,28 +444,29 @@ msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
 msgstr ""
-"Täytä tämä jos haluat vain automaattiset analyyttisen tilin kohdat "
-"tuotantomääräyksiin."
+"Täytä tämä vain jos haluat automaattiset analyyttiset tilimerkinnät "
+"tuotantotilauksista."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
 msgid "If Procure method is Make to order and supply method is produce"
-msgstr "Jos hankintatapa on tee tilaukseen ja toimitustapa on hankinta"
+msgstr ""
+"Jos hankintatapa on \"Valmista tilauksesta\" ja hankintatyyppi on tuotanto"
 
 #. module: mrp
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr "Oston kokonaisaika"
+msgstr "Oston läpimenoaika"
 
 #. module: mrp
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr "Tuotannon sijainti"
+msgstr "Tuotannon paikka"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr "Muuta määrää"
+msgstr "Muuta määrä"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -477,18 +481,18 @@ msgstr "Tekijä"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Stockable Product Stock"
-msgstr ""
+msgstr "Varastoitava tuotteen varasto"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "Tuotteen myyntiyksikkö"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Production Procure Products"
-msgstr "Tuotannon hankintatuotteet"
+msgstr "Tuotanto hankkii tuotteet"
 
 #. module: mrp
 #: model:process.process,name:mrp.process_process_serviceproductprocess0
@@ -498,7 +502,7 @@ msgstr "Palvelutuoteprosessi"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "Procurement convert into the draft purchase order."
-msgstr "Hankinta muunnettu ostotilausluonnokseksi."
+msgstr "Hankinta muuntuu ostotilauksen luonnokseksi."
 
 #. module: mrp
 #: field:mrp.procurement,message:0
@@ -508,7 +512,7 @@ msgstr "Viimeisin virhe"
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr "BoM rivit"
+msgstr "Osaluettelon rivit"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
@@ -518,7 +522,7 @@ msgstr "Aika ennen tuotantoa"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Routing workcenter usage"
-msgstr ""
+msgstr "Reititys työpisteiden käyttö"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -528,34 +532,36 @@ msgstr "Kulutetut tuotteet"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr "Virhe! Et voi luoda itseään toistavaa BoM:a."
+msgstr "Virhe! Et voi luoda itseään toistavaa osaluetteloa."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid "If Product type is Stockable and procure method is make to stock"
 msgstr ""
+"Jos tuotteen tyyppi on \"Varastoitava\" ja hankintatapa on \"Valmista "
+"varastoon\""
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturity Lead Time"
-msgstr "Valmistuksen kokonaisaika"
+msgstr "Valmistuksen läpimenoaika"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
 msgid "Exceptions Procurements to Fix"
-msgstr "Korjattavat hankintapoikkeukset"
+msgstr "Korjattavat poikkeukset hankinnoissa"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Ready"
-msgstr ""
+msgstr "Valmis"
 
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Workcenter Operations"
-msgstr "Työkeskittymän vaiheet"
+msgstr "Työpisteen toimenpiteet"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
@@ -566,40 +572,39 @@ msgstr "Tuotantomääräysten suunnittelu"
 #. module: mrp
 #: help:mrp.workcenter,time_efficiency:0
 msgid "Factor that multiplies all times expressed in the workcenter."
-msgstr ""
-"Tekijä, joka kertoo kaikki ajat, jotka on määritetty työkeskittymässä."
+msgstr "Kerroin jolla kaikki tämän työpisteen ajat kerrottaan."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr "Yhden syklin kesto tunneissa."
+msgstr "Yhden kierron kesto tunneissa."
 
 #. module: mrp
 #: field:mrp.production,date_finnished:0
 msgid "End Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
 msgid ""
 "This is the internal picking list take bring the raw materials to the "
 "production plan."
-msgstr "Tämä sisäinen keräyslista tuo raakamateriaalit tuotantosuunnitelmaa."
+msgstr "Tämä sisäinen keräyslista tuo raaka-aineet tuotantosuunnitelmaan."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "In Production"
-msgstr ""
+msgstr "Tuotannossa"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr "Määräkerroin"
+msgstr "Määrän kerroin"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "Odottaa"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -608,64 +613,64 @@ msgstr ""
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr ""
+msgstr "Reititys"
 
 #. module: mrp
 #: wizard_button:mrp.workcenter.load,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Tulosta"
 
 #. module: mrp
 #: field:mrp.workcenter,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable and consumable"
-msgstr "Varastoitaviin ja kulutettaviin"
+msgstr "Varastoitaville ja kulutettaville"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
 msgid "Per month"
-msgstr "kuukaudessa"
+msgstr "Kuukaudessa"
 
 #. module: mrp
 #: field:mrp.procurement,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr "UoS määrä"
+msgstr "Myyntiyksikkö määrä"
 
 #. module: mrp
 #: rml:bom.structure:0
 msgid "Product Name"
-msgstr "Tuotenimi"
+msgstr "Tuotteen nimi"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Printing date"
-msgstr ""
+msgstr "Tulostuspäivä"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr ""
+msgstr "Tarjouspyyntö"
 
 #. module: mrp
 #: field:mrp.bom,revision_type:0
 msgid "indice type"
-msgstr ""
+msgstr "Luettelon tyyppi"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Production orders are created for the product manufacturing."
-msgstr "Tuotantomääräykset ovat luotu tuotteen valmistusta varten."
+msgstr "Tuotantotilaukset luodaan tuotteen valmistusta varten."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "WorkCenter"
-msgstr "Työkeskus"
+msgstr "Työpiste"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -675,40 +680,41 @@ msgstr "Minimimäärä"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production orders"
-msgstr "Tuotanto määräykset"
+msgstr "Tuotannon tilaukset"
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 #: field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
-msgstr "BoM hierarkia"
+msgstr "Osalistahierarkia"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Lines"
-msgstr "Hankintarivit"
+msgstr "Hankinnan rivit"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
 msgid "If Product type is service and procure method is Make to stock"
-msgstr "Jos tuotteen tyyppi on palvelu ja hankintatapa on tee varastoon"
+msgstr ""
+"Jos tuotteen tyyppi on palvelu ja hankintatapa on \"Valmista varastoon\""
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "If Product type is service"
-msgstr "Jos tuotetyyppi on palvelu"
+msgstr "Jos tuotteen tyyppi on palvelu"
 
 #. module: mrp
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr "Varopäivät"
+msgstr "Turvapäivät"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,cycle_total:0
 msgid "Total Cycles"
-msgstr "Syklimäärä"
+msgstr "Kierrot yhteensä"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -718,12 +724,12 @@ msgstr "Valmis tuotantoon"
 #. module: mrp
 #: field:mrp.bom.revision,name:0
 msgid "Modification name"
-msgstr "Muunnoksen nimi"
+msgstr "Muutoksen nimi"
 
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr "BoM -tyyppi"
+msgstr "Osalistan tyyppi"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -736,34 +742,34 @@ msgid ""
 "This wizard will planify the procurement for this product. This procurement "
 "may generate task, production orders or purchase orders."
 msgstr ""
-"Tämä ohjattu toiminto suunnittelee tämän tuotteen hankinnat. Tämä hankinta "
-"saattaa luoda tehtäviä kuten tuotantomääräykset tai ostotilaukset."
+"Tämä ohjattu toiminto suunnittelee tuotteen koko hankinnan. Hankinta voi "
+"luoda tehtäviä, tuotantotilauksia tai ostotilauksia."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
 msgid "The system waits for requested products in stock."
-msgstr "Järjestelmä odottaa vaadittu tuotteita varastosta."
+msgstr "Järjestelmä odottaa vaadittuja tuotteita varastoon."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemto0
 msgid "Serivce Stockable Order"
-msgstr ""
+msgstr "Huolto varastoitava tilaus"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
 msgid "From minimum stock rules, it goes for procure product."
-msgstr "Varaston vähimmäismäärästä se menee hankintatuotteeksi."
+msgstr "Varaston minimirajasta tulee tuotteen hankinta."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
 msgid "Stockable Product"
-msgstr ""
+msgstr "Varastoitava tuote"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production done"
-msgstr "Tuotanto on valmis"
+msgstr "Tuotanto valmis"
 
 #. module: mrp
 #: rml:bom.structure:0
@@ -771,7 +777,7 @@ msgstr "Tuotanto on valmis"
 #: field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
-msgstr ""
+msgstr "Koodi"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -788,12 +794,12 @@ msgstr "Ominaisuusryhmä"
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr ""
+msgstr "Ylempi osaluettelo"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "References"
-msgstr ""
+msgstr "Viitteet"
 
 #. module: mrp
 #: wizard_button:change_production_qty,confirm,end:0
@@ -807,7 +813,7 @@ msgstr ""
 #: wizard_button:product.product.procurement,init,end:0
 #: wizard_button:product_price,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -817,17 +823,17 @@ msgstr "Siirrä tuote"
 #. module: mrp
 #: selection:mrp.workcenter,type:0
 msgid "Machine"
-msgstr ""
+msgstr "Kone"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr "Tee varastoon"
+msgstr "Valmista varastoon"
 
 #. module: mrp
 #: field:mrp.workcenter,name:0
 msgid "Workcenter Name"
-msgstr "Työkeskuksen nimi"
+msgstr "Työpisteen nimi"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -837,7 +843,7 @@ msgstr "Aloita tuotanto"
 #. module: mrp
 #: selection:mrp.property,composition:0
 msgid "min"
-msgstr ""
+msgstr "min"
 
 #. module: mrp
 #: help:mrp.workcenter,note:0
@@ -845,45 +851,45 @@ msgid ""
 "Description of the workcenter. Explain here what's a cycle according to this "
 "workcenter."
 msgstr ""
-"Työkeskuksen kuvaus. Selitä tähän tämän työkeskuksen syklin tehtävät."
+"Työpisteen kuvaus. Selitä tässä mitä kierros tarkoittaa tässä työpisteessä."
 
 #. module: mrp
 #: rml:bom.structure:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
 msgid "Human Resource"
-msgstr "Henkilöstö"
+msgstr "Ihmistyö"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
 #: field:mrp.routing,workcenter_lines:0
 msgid "Workcenters"
-msgstr "Työkeskukset"
+msgstr "Työpisteet"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "UOM"
-msgstr ""
+msgstr "Mittayksikkö"
 
 #. module: mrp
 #: selection:mrp.procurement,procure_method:0
 msgid "on order"
-msgstr "tilauksesta"
+msgstr "tilaukseen"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
 #: model:ir.ui.menu,name:mrp.mrp_Sched_all
 msgid "Compute All Schedulers"
-msgstr "Laske kaikki ajastimet"
+msgstr "Laske kaikki aikataulut"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycle"
-msgstr "Syklinnumero"
+msgstr "Kierrosnumero"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -895,22 +901,22 @@ msgstr "Syklinnumero"
 #: field:mrp.routing.workcenter,name:0
 #: field:stock.warehouse.orderpoint,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycle"
-msgstr "Syklinnumero"
+msgstr "Kierrosnumero"
 
 #. module: mrp
 #: wizard_field:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount measuring unit"
-msgstr "Mittausyksikön määrä"
+msgstr "Määrän mittayksikkö"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Run procurement"
-msgstr "Aja hankinta"
+msgstr "Suorita hankinta"
 
 #. module: mrp
 #: help:res.company,schedule_range:0
@@ -919,9 +925,9 @@ msgid ""
 "procurements. All procurement that are not between today and today+range are "
 "skipped for futur computation."
 msgstr ""
-"Ajastus analysoi tämän aikakehyksen laskettaessa hankintoja. Kaikki ne "
-"hankinnat jotka eivät ole tämän päivän ja aikavälin välissä siirretään "
-"tuleviin laskelmiin."
+"Aikataulutus analysoi tässä määrätyn pituisen ajanjakson laskiessaan "
+"hankintoja. Kaikki hankinnat jotka eivät ole nykypäivän ja nykypäivän + "
+"aikavälin puitteissa ohitetaan ja huomioidaan vasta tulevissa laskelmissa."
 
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
@@ -931,27 +937,27 @@ msgstr "Ajan hyötysuhde"
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
 msgid "Security days for each manufacturing operation."
-msgstr "Varopäivät jokaiselle tuotantotoiminnolle."
+msgstr "Turvapäivät jokaiselle tuotannon toiminnolle."
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute.all,init:0
 msgid "Scheduler Parameters"
-msgstr "Ajastimen määritykset"
+msgstr "Aikataulutuksen parametrit"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
 msgid "A cycle is defined in the workcenter definition."
-msgstr "Sykli on kuvattu työkeskuksen kuvauksessa."
+msgstr "Kierto on kuvattu työpisteen kuvauksessa."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in cycles"
-msgstr "Määrä sykleissä"
+msgstr "Määrä kierroissa"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 msgid "Finished Products Location"
-msgstr "Valmiin tuotteen sijainti"
+msgstr "Valmiiden tuotteiden paikka"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,uom_id:0
@@ -966,12 +972,12 @@ msgstr "Hankintatapa"
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analyyttinen päiväkirja"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
 msgid "Per week"
-msgstr "viikossa"
+msgstr "Viikossa"
 
 #. module: mrp
 #: wizard_button:mrp.procurement.compute,init,compute:0
@@ -988,7 +994,7 @@ msgstr "Odota saatavilla olevia tuotteita varaukseen"
 #. module: mrp
 #: wizard_button:change_production_qty,confirm,validate:0
 msgid "Validate"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
@@ -1003,14 +1009,14 @@ msgstr "Tuntinumero"
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Notes"
-msgstr ""
+msgstr "Huomautukset"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
 #: view:mrp.bom:0
 #: field:mrp.production,bom_id:0
 msgid "Bill of Material"
-msgstr "Materiaalilasku"
+msgstr "Osaluettelo"
 
 #. module: mrp
 #: wizard_view:mrp.workcenter.load,init:0
@@ -1020,17 +1026,17 @@ msgstr "Valitse aikayksikkö"
 #. module: mrp
 #: wizard_field:product_price,init,number:0
 msgid "Number of products to produce"
-msgstr "Valmistettavien tuotteiden määrä"
+msgstr "Valmistettavien tuotteiden lukumäärä"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "Sijainti, mihin järjestelmä varastoi valmiit tuotteet."
+msgstr "Paikka jonne järjestelmä varastoi valmiit tuotteet."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material routing"
-msgstr "Materiaalireititys"
+msgstr "Materiaalien reititys"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
@@ -1040,12 +1046,12 @@ msgstr "Päivästä päivään"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum stock rule"
-msgstr "Alin varastoarvo"
+msgstr "Varaston minimiraja"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Revisions"
-msgstr ""
+msgstr "Revisiot"
 
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
@@ -1055,80 +1061,80 @@ msgstr "Tuotteen hyötysuhde"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
 msgid "Orderpoint minimum rule"
-msgstr "Tilauspisteen minimiarvo"
+msgstr "Tilauspisteen minimiraja"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemts0
 msgid "Service Make to Stock"
-msgstr ""
+msgstr "Palvelu valmista varastoon"
 
 #. module: mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Ref"
-msgstr ""
+msgstr "Myynnin viite"
 
 #. module: mrp
 #: field:mrp.procurement,priority:0
 #: field:mrp.production,priority:0
 #: rml:mrp.production.order:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteetti"
 
 #. module: mrp
 #: field:mrp.procurement,location_id:0
 #: field:stock.warehouse.orderpoint,location_id:0
 msgid "Location"
-msgstr ""
+msgstr "Paikka"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_new
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
 msgid "New Procurement"
-msgstr "Uusi Hankinta"
+msgstr "Uusi hankinta"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr "Tuotantotilaus N° :"
+msgstr "Tuotantotilaus nro:"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
 msgid "Tool"
-msgstr ""
+msgstr "Työkalu"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid ""
 "Location where the system will look for products used in raw materials."
 msgstr ""
-"Sijainti, josta järjestelmä etsii tuotteita joita on käytetty "
-"raakamateriaaleissa."
+"Paikka josta järjestelmä etsii tuotteita joita on käytetty raaka-aineissa."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 #: wizard_field:product.product.procurement,init,date_planned:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Suunniteltu päivämäärä"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "Procurement orders"
-msgstr "Hankintamääräykset"
+msgstr "Hankintatilaukset"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Valmista varastoon"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
 msgid "If product type is service and procure method is Make to order"
-msgstr "Jos tuotetyyppi on palvelu ja hankintatapa on tee tilaukseen"
+msgstr ""
+"Jos tuotteen tyyppi on palvelu ja hankintatapa on \"Valmista tilaukseen\""
 
 #. module: mrp
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range"
-msgstr "Ajastimen aikaväli"
+msgstr "Aikataulutuksen aikaväli"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -1139,7 +1145,7 @@ msgstr "Maksimimäärä"
 #: model:ir.model,name:mrp.model_mrp_procurement
 #: view:mrp.procurement:0
 msgid "Procurement"
-msgstr ""
+msgstr "Hankinta"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.product_procurement_wizard
@@ -1159,17 +1165,17 @@ msgstr "Varaston minimihankinta"
 #. module: mrp
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr "Tämä on kokonaisaika/varoaika jokaiselle ostotilaukselle."
+msgstr "Tämä on läpimeno-/turva-aika jokaiselle ostotilaukselle."
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr "BoM Rakenne"
+msgstr "Osaluettelon rakenne"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
@@ -1179,29 +1185,29 @@ msgstr "Tuntitili"
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "alphabetical indices"
-msgstr ""
+msgstr "Aakkosellinen järjestys"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Procurement for raw materials."
-msgstr "Raakamateriaalien hankinta"
+msgstr "Raaka-aineiden hankinta."
 
 #. module: mrp
 #: view:mrp.procurement:0
 #: field:mrp.procurement,note:0
 #: rml:mrp.production.order:0
 msgid "Note"
-msgstr ""
+msgstr "Huomautus"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procure Stockable Product"
-msgstr ""
+msgstr "Hanki varastoitava tuote"
 
 #. module: mrp
 #: field:mrp.bom,method:0
 msgid "Method"
-msgstr ""
+msgstr "Tapa"
 
 #. module: mrp
 #: wizard_view:product_price,init:0
@@ -1211,7 +1217,7 @@ msgstr "Maksettu?"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Define a routing to describe the manufacturing steps."
-msgstr "Määritä reititys kuvamaan valmistusvaiheita."
+msgstr "Määritä reititys kuvamaan valmistuksen vaiheita."
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1219,7 +1225,7 @@ msgstr "Määritä reititys kuvamaan valmistusvaiheita."
 #: field:mrp.workcenter,active:0
 #: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
@@ -1236,24 +1242,24 @@ msgstr "Hanki tuotteita"
 #: field:mrp.procurement,property_ids:0
 #: view:mrp.property:0
 msgid "Properties"
-msgstr ""
+msgstr "Ominaisuudet"
 
 #. module: mrp
 #: field:mrp.procurement,date_planned:0
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Arvioitu päivämäärä"
 
 #. module: mrp
 #: view:mrp.procurement:0
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Lisätiedot"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Define the product structure, with sub-products and/or components."
-msgstr "Määritä tuoterakenne jossa mukana lisätuotteet ja/tai komponentit."
+msgstr "Määritä tuotteen rakenne, jossa on osatuotteet ja/tai komponentit."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
@@ -1261,12 +1267,12 @@ msgid ""
 "Procurement is created if the product quantity is lower than the minimum "
 "limit."
 msgstr ""
-"Luodaan hankinta ja tuotteen määrä on alempi kuin määritetty alaraja."
+"Hankinta luodaan jos tuotteen lukumäärä on alempi kuin määritetty minimiraja."
 
 #. module: mrp
 #: field:mrp.procurement,date_close:0
 msgid "Date Closed"
-msgstr "Sulkemispäivämäärä"
+msgstr "Sulkemispäivä"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1276,18 +1282,18 @@ msgstr "Yleinen tili"
 #. module: mrp
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr "Ominaisuusyhdistelmä"
+msgstr "Ominaisuuksien koostumus"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 #: model:ir.ui.menu,name:mrp.menu_production_orders_waiting4
 msgid "Production Orders Waiting Products"
-msgstr "Tuotantomääräykset odottavat tuotteita"
+msgstr "Tuotantotilaukset jotka odottavat tuotteita"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "SO Number"
-msgstr ""
+msgstr "Myyntitilaus nro"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_change_production_qty
@@ -1298,23 +1304,23 @@ msgstr "Muuta tuotteen määrää."
 #: selection:mrp.procurement,state:0
 #: selection:mrp.production,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: mrp
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr "Hankintamäärä pyöristetään tähän kertoimeen."
+msgstr "Hankinnan määrä pyöristetään ylös tähän moninkertaan."
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr "Uusintatilaus Tila"
+msgstr "Uusintatilauksen tapa"
 
 #. module: mrp
 #: 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: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -1325,7 +1331,7 @@ msgstr "Keskeinen dokumentti tuotteiden hankintaan"
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
 msgid "Production Orders in Progress"
-msgstr "Tuotantomääräykset kehittymässä"
+msgstr "Tuotantotilaukset jotka keskeneräisiä"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
@@ -1334,12 +1340,12 @@ msgstr "Tuotantomääräykset kehittymässä"
 #: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr "Varaston alarajat"
+msgstr "Varaston minimirajat"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
-msgstr "Syklin kapasiteetti"
+msgstr "Kapasiteetti per kierros"
 
 #. module: mrp
 #: field:mrp.bom,product_id:0
@@ -1349,23 +1355,23 @@ msgstr "Syklin kapasiteetti"
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Tuote"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Tunnit yhteensä"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 msgid "Raw Materials Location"
-msgstr "Raakamateriaalien sijainti"
+msgstr "Raaka-aineiden paikka"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Tuotteen BoM Rakenne"
+msgstr "Tuotteen osaluettelon rakenne"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1373,7 +1379,7 @@ msgstr "Tuotteen BoM Rakenne"
 #: field:mrp.production.product.line,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Tuotteen mittayksikkö"
 
 #. module: mrp
 #: help:mrp.procurement,origin:0
@@ -1381,37 +1387,38 @@ msgid ""
 "Reference of the document that created this procurement.\n"
 "This is automatically completed by Open ERP."
 msgstr ""
-"Dokumentin viite joka loi tämän hankinnan.\n"
-"Open ERP on luonut tämän automaattisesti."
+"Viite dokumenttiin joka loi tämän hankinnan.\n"
+"OpenERP määrittää tämän automaattisesti."
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
-msgstr "Tuotantotuotteet"
+msgstr "Tuotannon tuotteet"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
 msgid "Product type is Stockable and procure method is make to stock"
 msgstr ""
-"Tuotteen tyyppi on \"varastoitavissa\" ja hankintatapa on \"tee varastoon\""
+"Tuotteen tyyppi on varastoitava ja hankintatapa on \"Valmista varastoon\""
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
-"BoM:n tai komponentin kelpoisuus. Jätä tyhjäksi jos aina kelvollinen."
+"Osaluettelon tai komponentin voimassaolo. Jätä tyhjäksi jos se on voimassa "
+"aina."
 
 #. module: mrp
 #: field:mrp.procurement,product_uos:0
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Tuotteen myyntiyksikkö"
 
 #. module: mrp
 #: field:mrp.procurement,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Tuotteen mittayksikkö"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1419,7 +1426,7 @@ msgstr ""
 #: field:mrp.routing.workcenter,workcenter_id:0
 #: view:mrp.workcenter:0
 msgid "Workcenter"
-msgstr "Työkeskus"
+msgstr "Työpiste"
 
 #. module: mrp
 #: selection:mrp.procurement,priority:0
@@ -1436,12 +1443,12 @@ msgstr "Ostotilaus"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Workcenters"
-msgstr "Tuotantokeskukset"
+msgstr "Tuotannon työpisteet"
 
 #. module: mrp
 #: view:mrp.property.group:0
 msgid "Properties categories"
-msgstr "Kategoriaominaisuudet"
+msgstr "Ominaisuuksien kategoriat"
 
 #. module: mrp
 #: help:mrp.procurement,procure_method:0
@@ -1449,72 +1456,72 @@ msgid ""
 "If you encode manually a procurement, you probably want to use a make to "
 "order method."
 msgstr ""
-"Jos teet manuaalisesti hankinnan, saatat haluta käyttää \"tee tilaus\" - "
-"tapaa."
+"Jos syötät hankinnan manuaalisesti, haluat todennäköisesti käytää \"Valmista "
+"tilaukseen\"-tapaa."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Source Location"
-msgstr ""
+msgstr "Lähteen paikka"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 msgid "Stockable Order Request"
-msgstr ""
+msgstr "Varastoitavan tilauksen pyyntö"
 
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
 msgid "Scheduled Products"
-msgstr "Ajoitetut tuotteet"
+msgstr "Aikataulutetut tuotteet"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr ""
+msgstr "Tuotannon tuotteiden kulutus"
 
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "numeric indices"
-msgstr ""
+msgstr "Numeerinen järjestys"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
 msgid "If Procure method is Make to order and supply method is buy"
-msgstr "Jos hankintatapa on \"tee tilaus\" ja toimitustapa on \"osta\""
+msgstr "Jos hankintatapa on \"Valmista tilaukseen\" ja hankitatyyppi on osto"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
 msgid "if Product type is Stockable in procurement order"
-msgstr "Jos tuotteen tyyppi on \"Varastoitavissa\" hankintatilauksessa"
+msgstr "Jos tuotteen tyyppi hankintatilauksessa on varastoitavissa"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: view:mrp.production:0
 #: rml:mrp.production.order:0
 msgid "Work Orders"
-msgstr "Työmääräykset"
+msgstr "Työtilaukset"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
 msgid "Cost per cycle"
-msgstr "Kustannukset sykleittäin"
+msgstr "Kustannus per kierto"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of material revisions"
-msgstr "Materiaalitarkastusten lasku"
+msgstr "Osaluettelon revisiot"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Planification"
-msgstr ""
+msgstr "Suunnittelu"
 
 #. module: mrp
 #: rml:bom.structure:0
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "BOM"
-msgstr "BOM"
+msgstr "Osaluettelo"
 
 #. module: mrp
 #: help:mrp.bom,type:0
@@ -1526,11 +1533,17 @@ msgid ""
 "sale order to the picking without going through the production order.The "
 "normal BoM will generate one production order per BoM level."
 msgstr ""
+"Käytä haamu-osaluetteloa raaka-aineille jotka lasketaan yhdelle "
+"tuotantotilaukselle automaattisesti, eikä jokaiselle portaalle erikseen. Jos "
+"\"Sarja / Haamu\" on määritetty osaluettelon juuritasolle käsitellään se "
+"sarjana tai pakkauksena: tuotteet korvataan komponenteilla myyntitilauksesta "
+"keräilyyn, eikä tuotantotilausta tehdä lainkaan. Normaali osalista luo "
+"tuotantotilauksen jokaiselle osalistan portaalle."
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr "Yhden syklin aika (tunneissa)"
+msgstr "Yhden kierron aika (tuntia)"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,done:0
@@ -1549,18 +1562,18 @@ msgstr "Sisäinen hankintapyyntö"
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr "Tuotantomääräys"
+msgstr "Tuotantotilaus"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Compute Data"
-msgstr "Laske tietoja"
+msgstr "Laske tiedot"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Categories"
-msgstr "Ominaisuuskategoriat"
+msgstr "Ominaisuuksien kategoriat"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
@@ -1571,61 +1584,61 @@ msgstr "Laske vain hankinnat"
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
-msgstr "Tuotteen UoS määrä"
+msgstr "Tuotteen myyntiyksikkö määrä"
 
 #. module: mrp
 #: rml:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr "BOM -Rakenne"
+msgstr "Osaluettelon rakenne"
 
 #. module: mrp
 #: field:mrp.bom,date_stop:0
 msgid "Valid Until"
-msgstr "Mihin asti kelvollinen"
+msgstr "Voimassaolo"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
 msgid "Temporary Procurement Exceptions"
-msgstr "Väliaikaiset hankintapoikkeukset"
+msgstr "Väliaikaiset hankinnan poikkeukset"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
 msgid "Valid From"
-msgstr ""
+msgstr "Voimassa alkaen"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr "Normaali BoM"
+msgstr "Normaali osaluettelo"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr "Tuotteen UOS määrä"
+msgstr "Tuotteen myyntiyksikkö määrä"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute,init:0
 #: wizard_view:mrp.procurement.orderpoint.compute,init:0
 msgid "Parameters"
-msgstr ""
+msgstr "Parametrit"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Confirm"
-msgstr ""
+msgstr "Vahvista"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Workcenters Utilisation"
-msgstr "Työkeskusten käyttöaste"
+msgstr "Työpisteiden käyttöaste"
 
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
@@ -1653,7 +1666,7 @@ msgstr "Luo keräily uudelleen"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceonorder0
 msgid "If procurement is make to order"
-msgstr "Jos hankinta on \"tee tilaukseen\""
+msgstr "Jos hankinta on \"Valmista tilaukseen\""
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -1663,13 +1676,13 @@ msgstr "Tilauksessa"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 msgid "Minimum Stock Rule"
-msgstr "Varaston minimiarvo"
+msgstr "Varaston minimiraja"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
 msgid "New Bill of Materials"
-msgstr "Uusi materiaalilasku"
+msgstr "Uusi osaluettelo"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
@@ -1684,7 +1697,7 @@ msgstr "Jakson tyyppi"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Total Qty"
-msgstr "Yhteismäärä"
+msgstr "Yhteensä"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
@@ -1695,38 +1708,38 @@ msgstr "Tuntien lukumäärä"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
 msgid "Procurement Orders"
-msgstr "Hankintamääräykset"
+msgstr "Hankintatilaukset"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property
 msgid "Property"
-msgstr ""
+msgstr "Ominaisuus"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr "Näkyvä reititys"
+msgstr "Ylempi reititys"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
-msgstr "Asennuksen kesto tunneissa."
+msgstr "Asetuksiin kuluva aika tunneissa."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Peruttu"
 
 #. module: mrp
 #: selection:mrp.property,composition:0
 msgid "plus"
-msgstr ""
+msgstr "plus"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
 #: field:mrp.procurement,bom_id:0
 msgid "BoM"
-msgstr "BoM"
+msgstr "Osaluettelo"
 
 #. module: mrp
 #: help:mrp.bom,routing_id:0
@@ -1736,91 +1749,89 @@ msgid ""
 "operations and to plan futur loads on workcenters based on production "
 "plannification."
 msgstr ""
-"Lista toiminnoista (lista työkeskuksista) jotka valmistavat lopullisen "
-"tuotteen. Reititystä käytetään pääasiallisesti laskemaan työkeskuksen "
-"kustannuksia toimintojen aikana ja suunnittelemaan tulevia kuormituksia "
-"jotka perustuvat tuotannon suunnitteluun."
+"Lista toiminnoista (työpisteistä) jotka tuotteen valmistaminen vaatii. "
+"Reititystä käytetään pääasiallisesti työpisteiden kustannusten laskentaan ja "
+"kuormitusten suunnitteluun."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Waiting Goods"
-msgstr "Odottavat tuotteet"
+msgstr "Odottaa tuotteita"
 
 #. module: mrp
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product Process"
-msgstr ""
+msgstr "Varastoitava tuote prosessi"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_new
 #: model:ir.ui.menu,name:mrp.menu_production_orders_new
 msgid "New Production Order"
-msgstr "Uusi tuotantomääräys"
+msgstr "Uusi tuotantotilaus"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "A Request for Quotation is created and sent to the supplier."
-msgstr "Tarjouspyyntö on luotu ja lähetetty tavarantoimittajalle."
+msgstr "Tarjouspyyntö luodaan ja lähetetään toimittajalle."
 
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
-msgstr ""
+msgstr "Viimeinen järjestys"
 
 #. module: mrp
 #: field:mrp.bom,revision_ids:0
 #: view:mrp.bom.revision:0
 msgid "BoM Revisions"
-msgstr "BoM tarkistukset"
+msgstr "Osaluettelon revisiot"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Retry"
-msgstr ""
+msgstr "Yritä uudelleen"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 #: selection:mrp.production,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: mrp
 #: selection:mrp.procurement,priority:0
 #: selection:mrp.production,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaali"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
 msgid "When any procuere products, it comes into the prpcurement orders"
-msgstr ""
-"Jos kysymyksessä mikä tahansa hankintatuote, se tulee hankintatilaukseen"
+msgstr "Jos on hankittavia tuotteita, ne tulevat hankintatilauksiin"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 #: model:ir.ui.menu,name:mrp.menu_production_orders_start
 msgid "Production Orders To Start"
-msgstr "Tuotantomääräykset aloittamisesta"
+msgstr "Tuotantotilaukset jotka voidaan aloittaa"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Reason"
-msgstr "Hankintasyy"
+msgstr "Hankinnan syy"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
 msgid "An entry is being made from billing material to routing."
-msgstr ""
+msgstr "Tehdään merkintä osalistasta reititykseen."
 
 #. module: mrp
 #: help:mrp.workcenter,timesheet_id:0
 msgid "The normal working time of the workcenter."
-msgstr "Työkeskuksen normaali työaika."
+msgstr "Työpisteen normaali työaika."
 
 #. module: mrp
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr "Max.tilaus"
+msgstr "Tilaa maksimiin"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -1828,7 +1839,7 @@ msgstr "Max.tilaus"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Materials"
-msgstr "Materiaalilasku"
+msgstr "Osaluettelo"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procureserviceproduct0
@@ -1838,7 +1849,7 @@ msgstr "Hankintatilauksessa jos tuotteen tyyppi on palvelu"
 #. module: mrp
 #: selection:mrp.procurement,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "varastosta"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1847,7 +1858,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: view:mrp.routing.workcenter:0
 msgid "General Information"
-msgstr ""
+msgstr "Yleistiedot"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1857,7 +1868,7 @@ msgstr "Tuotannot"
 #. module: mrp
 #: wizard_button:product.product.procurement,done,end:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: mrp
 #: field:mrp.production,sale_name:0
@@ -1867,13 +1878,13 @@ msgstr "Myyntinimi"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Create minimum stock rules"
-msgstr "Luo varaston alinarvo"
+msgstr "Luo varaston minimirajat"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,warehouse_id:0
 #: field:stock.warehouse.orderpoint,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Varasto"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -1890,7 +1901,7 @@ msgstr "Palvelutuote"
 #. module: mrp
 #: field:mrp.procurement,close_move:0
 msgid "Close Move at end"
-msgstr ""
+msgstr "Sulje siirto lopussa"
 
 #. module: mrp
 #: wizard_view:change_production_qty,confirm:0
@@ -1908,49 +1919,49 @@ msgstr "Muuta tuotteen määrää"
 #: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Running"
-msgstr ""
+msgstr "Kesken"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_root
 msgid "Manufacturing"
-msgstr "Valmistava"
+msgstr "Tuotannon hallinta"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
 msgid "Unscheduled procurements"
-msgstr "Odottamattomat hankinnat"
+msgstr "Hankinnat joilla ei ole aikataulua"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
 #: model:ir.ui.menu,name:mrp.menu_bom_tree
 msgid "Bill of Material Structure"
-msgstr "Materiaalirakenteen lasku"
+msgstr "Osaluettelon rakenne"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
 msgid "Workcenter load"
-msgstr "Työkeskuksen kuormitus"
+msgstr "Työpisteen kuormitus"
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
 msgid "Time in hours for the cleaning."
-msgstr "Puhdistamisen kuluvat työtunnit"
+msgstr "Siivoukseen kuluva aika tunneissa."
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Details"
-msgstr "Hankinnan yksityiskohdat"
+msgstr "Hankinnan tiedot"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
 msgid "You can see its bill of material which are used to make product"
-msgstr ""
+msgstr "Voit nähdä osaluettelon jota käytetään tuotteen valmistukseen"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
@@ -1968,10 +1979,10 @@ msgstr "Varastossa"
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sarja"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
-msgstr ""
+msgstr "Osaluettelon komponentit"
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index b5cececc9e3..e55720e2c9e 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-11 20:49+0000\n"
+"PO-Revision-Date: 2010-03-30 14:06+0000\n"
 "Last-Translator: TeMPO <info@tempo-consulting.fr>\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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -55,12 +55,12 @@ msgstr ""
 "Déclenche un approvisionnement automatique pour tous les produits qui ont un "
 "stock virtuel inférieur à 0. Vous ne devriez normalement pas utiliser cette "
 "option, nous vous suggérons d'utiliser une configuration de type "
-"\"Production à la demande\" sur les produits."
+"\"Production sur commande\" sur les produits."
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr "Gestion des Ressources de Production"
+msgstr "Planification des ressources de productions"
 
 #. module: mrp
 #: constraint:ir.actions.act_window:0
@@ -82,7 +82,7 @@ msgstr "Calculer seulement les règles du stock minimum"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
 msgid "Exceptions Procurements"
-msgstr "Approvisionnements en Exception"
+msgstr "Approvisionnements en exceptions"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -108,7 +108,7 @@ msgstr "Liste des Colisages"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 msgid "Stockable Stock"
-msgstr "Stock Stockable"
+msgstr "Stock de produit stockable"
 
 #. module: mrp
 #: field:mrp.procurement,origin:0
@@ -153,8 +153,8 @@ msgstr "XML non valide pour l'architecture de la vue"
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
 msgstr ""
-"Ce sont les jours ajoutés à ce que vous avez promis au clients pour des "
-"raisons de sécurité"
+"C'est un délai de sécurité qui vient s'ajouter à ce que vous avez promis au "
+"clients."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -189,7 +189,7 @@ msgstr ""
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
 msgid "Ask New Products"
-msgstr "Demander de Nouveaux Produits"
+msgstr "Demande de nouveaux produits"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_reordering
@@ -222,7 +222,7 @@ msgstr "Information sur la Capacité"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Packing Exception"
-msgstr "Exception de Colisage"
+msgstr "Exception de colisage"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
@@ -232,7 +232,7 @@ msgstr "Un ordre d'achat est créé pour une demande sous-traitée."
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Destination Location"
-msgstr "Emplacement de Destination"
+msgstr "Emplacement de destination"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -247,19 +247,19 @@ msgstr "Ne rien faire"
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Partner Ref"
-msgstr "Réf. Partenaire"
+msgstr "Réf partenaire"
 
 #. module: mrp
 #: help:mrp.procurement.orderpoint.compute,init,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
-"Si le stock du produit est inférieur à 0, il sera traité comme un point de "
-"commande."
+"Si le stock d'un produit est négatif, il est considéré comme un point de "
+"commande"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in hours"
-msgstr "Montant en Heures"
+msgstr "Montant en heures"
 
 #. module: mrp
 #: field:mrp.production,product_lines:0
@@ -269,7 +269,7 @@ msgstr "Biens Prévus"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
 msgid "you can see the minimum stock rules from product"
-msgstr "Vous pouvez voir les règles de stock minimum pour ce produit"
+msgstr "Vous pouvez visualiser les règles de stock minimum pour le produit"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
@@ -306,7 +306,7 @@ msgstr "Référence vers une position dans un plan externe."
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "Stockable Request"
-msgstr "Requête Stockable"
+msgstr "Demande stockable"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceonorder0
@@ -320,9 +320,8 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
-"Lorsque le stock virtuel descend en dessous de la Quantité Minimale, Open "
-"ERP génère un approvisionnement pour amener le stock virtuel au niveau de la "
-"Quantité Maximale."
+"Quand le stock virtuel descendra en dessous de la quantité minimale, OpenERP "
+"générera un approvisionnement pour porter le stock virtuel à la quantité Max."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockmts0
@@ -854,7 +853,7 @@ msgstr "Machine"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr "Production sur stock"
+msgstr "Sur stock"
 
 #. module: mrp
 #: field:mrp.workcenter,name:0
@@ -1089,7 +1088,7 @@ msgstr "Rendement produit"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
 msgid "Orderpoint minimum rule"
-msgstr "Règle de point de commande minimum"
+msgstr "Règle de stock minimum"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemts0
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 6569608de60..526b0fc1069 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index d4283b4233c..254e59ddde7 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 7005ec52f4a..7ec4388218d 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 9e8ae39615b..1969a623e19 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 506b4442955..c30d6115bdc 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 3550df10863..ccf4358bc28 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index f13a24e1103..7106ff5670f 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index 003dd9df45b..f56ad983e2c 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 2562e74f343..83711002cff 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 42ed8dddfcb..d7b1d15ae6f 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index b1aaa3c6cc9..d0b46d7ee40 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 7a3fa1151c5..a5bd09b8da7 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 7b0ef8c94f2..cf3fc9234cf 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -7,24 +7,24 @@ 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 15:56+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-03-30 10:42+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Moves Created"
-msgstr ""
+msgstr "Перемещение создано"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr ""
+msgstr "№ цикла"
 
 #. module: mrp
 #: help:mrp.procurement.compute.all,init,automatic:0
@@ -37,34 +37,34 @@ msgstr ""
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr ""
+msgstr "Планирование материальных ресурсов"
 
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr ""
+msgstr "Ревизия"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Правила вычисления минимального запаса"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
 msgid "Exceptions Procurements"
-msgstr ""
+msgstr "Исключения поставок"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Workcenters"
-msgstr ""
+msgstr "Используемые мощности маршрута"
 
 #. module: mrp
 #: help:mrp.property,composition:0
@@ -75,7 +75,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
 msgid "Routings"
-msgstr ""
+msgstr "Маршруты"
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
@@ -85,7 +85,7 @@ msgstr "Упаковочный лист"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 msgid "Stockable Stock"
-msgstr ""
+msgstr "Склад для складирования"
 
 #. module: mrp
 #: field:mrp.procurement,origin:0
@@ -107,7 +107,7 @@ msgstr "Ссылка"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr ""
+msgstr "Конечный продукт"
 
 #. module: mrp
 #: wizard_field:mrp.procurement.compute.all,init,automatic:0
@@ -118,7 +118,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr ""
+msgstr "Установить / Упаковать"
 
 #. module: mrp
 #: constraint:ir.ui.view:0
@@ -149,7 +149,7 @@ msgstr "Продукция и местоположения"
 #. module: mrp
 #: view:res.company:0
 msgid "MRP & Logistic Scheduler"
-msgstr ""
+msgstr "ПМР и Логистическое планирование"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index 8e579cfd4d8..fd3ebdc335a 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index de149970a3f..bca323256e8 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 3acfed7d841..94e3942736e 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index 062be7252ef..dedabeeb88b 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index f66accb626b..ebfb1d41338 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index 1e83106c698..041e4b2067d 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index b6f563d07c6..6f3db8936d1 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -4,27 +4,27 @@
 #
 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 01:06+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-29 00:43+0000\n"
+"Last-Translator: digitalsatori <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Moves Created"
-msgstr "已创建的调拨"
+msgstr "创建调拨"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr "周期数"
+msgstr "周期"
 
 #. module: mrp
 #: help:mrp.procurement.compute.all,init,automatic:0
@@ -32,22 +32,22 @@ msgid ""
 "Triggers an automatic procurement for all products that have a virtual stock "
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
-msgstr "触发所有虚拟库存为小于0的产品请求。建议您不要使用这个选项，可使用货品订货型生产的设置。"
+msgstr "触发所有虚拟库存为小于0产品自动的产品需求.你或者不应该使用这个选项.建议你使用产品按单生产的设置"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr "物料需求计划"
+msgstr "MRP(产品需求计划)"
 
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr "修订版"
+msgstr "版本"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
@@ -64,12 +64,12 @@ msgstr "异常需求单"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Workcenters"
-msgstr "工作中心"
+msgstr "工艺路线的工作中心"
 
 #. module: mrp
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr "不是用来计算，仅仅是提供信息。"
+msgstr "不是用来计算.仅仅是信息"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -123,7 +123,7 @@ msgstr "套/包"
 #. module: mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: mrp
 #: help:res.company,security_lead:0
@@ -134,34 +134,34 @@ msgstr "提供答应给客户的确保天数"
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
 msgid "Cost per hour"
-msgstr "小时成本"
+msgstr "每小时成本"
 
 #. module: mrp
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Best price (not yet active!)"
-msgstr "最优价（尚未激活!)"
+msgstr "最优价(尚未激活!)"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Product & Location"
-msgstr "货品&货位"
+msgstr "产品&库位"
 
 #. module: mrp
 #: view:res.company:0
 msgid "MRP & Logistic Scheduler"
-msgstr "MRP 与 物流调度"
+msgstr "MRP&物流调度"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
 "Number of operation this workcenter can do in parallel. If this workcenter "
 "represent a team of 5 workers, the capacity per cycle is 5."
-msgstr "可同时运行的操作数量。 如果一个工作中心代表一个拥有5名工人的队伍， 则循环能力为5。"
+msgstr "一些运作可以并行.如果一个工作中心有5个工人"
 
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
 msgid "Ask New Products"
-msgstr "是否新货品"
+msgstr "新的产品需求"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_reordering
@@ -174,12 +174,12 @@ msgstr "自动生成需求单"
 #: field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
-msgstr "货品数量"
+msgstr "产品数量"
 
 #. module: mrp
 #: field:mrp.production,move_lines:0
 msgid "Products Consummed"
-msgstr "所消耗的产品"
+msgstr "产品消耗"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -199,47 +199,47 @@ msgstr "分拣单异常"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 msgid "A purchase order is created for a sub-contracting demand."
-msgstr "采购单是为满足子合同需求而创建的"
+msgstr "采购单是为满足子合同要求而创建的"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Destination Location"
-msgstr "目标货位"
+msgstr "目标库位"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Analytic Accounting"
-msgstr "分析科目"
+msgstr "分析会计"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Do nothing"
-msgstr "什么也不做"
+msgstr "不做任何动作"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Partner Ref"
-msgstr "业务伙伴引用"
+msgstr "业务伙伴参考"
 
 #. module: mrp
 #: help:mrp.procurement.orderpoint.compute,init,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
-msgstr "如果产品的库存量小于0，这会作为一个订购点。"
+msgstr "如果仓库的产品小于0它像一个订购点"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in hours"
-msgstr "小时数"
+msgstr "每小时金额"
 
 #. module: mrp
 #: field:mrp.production,product_lines:0
 msgid "Scheduled goods"
-msgstr "计划中的货品"
+msgstr "安排的货物"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
 msgid "you can see the minimum stock rules from product"
-msgstr "你能看到货品最低库存规则"
+msgstr "你能看到产品最低库存规则"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
@@ -266,17 +266,17 @@ msgstr "状态"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "Stockable Production Order"
-msgstr "可库存生产订单"
+msgstr "可库存生产单"
 
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
-msgstr "外部计划位置的引用"
+msgstr "外部计划位置的参考"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "Stockable Request"
-msgstr "可库存需求"
+msgstr "可库存请求"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceonorder0
@@ -289,12 +289,12 @@ msgstr "订单的服务"
 msgid ""
 "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
-msgstr "当虚拟库存到最低量，系统产生一个产品请求使虚拟库存达到最大数量。"
+msgstr "当虚拟库存到最低量.系统产生一个产品需求使虚拟库存达到最大数量."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Stockable Make to Stock"
-msgstr "可库存备货型生产"
+msgstr "可库存按库存生产"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -325,7 +325,7 @@ msgstr "生成服务需求单"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Confirm Production"
-msgstr "确认生产单"
+msgstr "确认生产"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
@@ -336,7 +336,7 @@ msgstr "需求单"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production scheduled products"
-msgstr "计划生产"
+msgstr "产品生产安排"
 
 #. module: mrp
 #: field:mrp.workcenter,timesheet_id:0
@@ -356,7 +356,7 @@ msgstr "需求流程"
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
 msgid "Scheduled Date"
-msgstr "计划日期"
+msgstr "安排日期"
 
 #. module: mrp
 #: selection:mrp.procurement,priority:0
@@ -368,7 +368,7 @@ msgstr "紧急"
 #: help:mrp.bom,product_rounding:0
 msgid ""
 "Rounding applied on the product quantity. For integer only values, put 1.0"
-msgstr "货品数量会四舍五入。 如只有整数值请输入1.0。"
+msgstr "产品数量舍入.整个为1.0"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -381,12 +381,12 @@ msgid ""
 "Keep empty if you produce at the location where the finished products are "
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
-msgstr "如果您在所需成品地点生产，请留空。如在固定地点生产请设置地点。如果您外包这块生产业务，这也可以是业务伙伴的地点。"
+msgstr "如果你在本地生产这成品你需要留空"
 
 #. module: mrp
 #: field:mrp.procurement,move_id:0
 msgid "Reservation"
-msgstr "预定"
+msgstr "保留"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -406,12 +406,12 @@ msgstr "最大"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Product to stock rules"
-msgstr "货品库存规则"
+msgstr "产品库存规则"
 
 #. module: mrp
 #: wizard_button:product_price,init,price:0
 msgid "Print product price"
-msgstr "打印产品价格"
+msgstr "产品报价"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,done:0
@@ -421,7 +421,7 @@ msgstr "生成需求单"
 #. module: mrp
 #: field:mrp.bom.revision,date:0
 msgid "Modification Date"
-msgstr "修改时间"
+msgstr "修改日期"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
@@ -429,12 +429,12 @@ msgstr "修改时间"
 msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
-msgstr "只在当你想在生产单中自动核算时完成这个。"
+msgstr "如果你需要生产单的自动辅助核算项目凭证只有完成这个."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
 msgid "If Procure method is Make to order and supply method is produce"
-msgstr "如果获得方式是订货型生产并且供应方式是生产"
+msgstr "如果获得方式是来自订单并且供应方式是生产"
 
 #. module: mrp
 #: field:res.company,po_lead:0
@@ -444,12 +444,12 @@ msgstr "采购所需时间"
 #. module: mrp
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr "生产地点"
+msgstr "产品库位"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr "改变数量"
+msgstr "修改数量"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -464,13 +464,13 @@ msgstr "作者"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Stockable Product Stock"
-msgstr "可库存货品库存"
+msgstr "可库存产品库存"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr "产品销售计量单位"
+msgstr "产品销售单位"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -480,7 +480,7 @@ msgstr "生产需求单"
 #. module: mrp
 #: model:process.process,name:mrp.process_process_serviceproductprocess0
 msgid "Service Product Process"
-msgstr "服务货品进程"
+msgstr "服务产品进程"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -490,7 +490,7 @@ msgstr "需求单转为采购订单草稿。"
 #. module: mrp
 #: field:mrp.procurement,message:0
 msgid "Latest error"
-msgstr "最近的错误"
+msgstr "最新错误"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -500,49 +500,49 @@ msgstr "物料清单明细"
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr "生产前时间"
+msgstr "生产准备时间"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Routing workcenter usage"
-msgstr "工艺路线工作中心使用情况"
+msgstr "工艺路线使用的工作中心"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consumed Products"
-msgstr "消耗的产品"
+msgstr "消耗产品"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr "错误！您不能创建循环的物料清单。"
+msgstr "错误!你不能创建递归的物料清单"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid "If Product type is Stockable and procure method is make to stock"
-msgstr "如果货品类型是可库存并且获得方式是备货型生产"
+msgstr "如果产品类型是可库存并且获得方式是来自库存"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturity Lead Time"
-msgstr "生产所需时间"
+msgstr "生产准备时间"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
 msgid "Exceptions Procurements to Fix"
-msgstr "需修正的例外请料单"
+msgstr "异常产品需求修正"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Ready"
-msgstr "就绪"
+msgstr "准备好"
 
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Workcenter Operations"
-msgstr "工作中心操作"
+msgstr "工作中心运作"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
@@ -553,12 +553,12 @@ msgstr "生产单计划"
 #. module: mrp
 #: help:mrp.workcenter,time_efficiency:0
 msgid "Factor that multiplies all times expressed in the workcenter."
-msgstr "该系数是用来调节工作中心循环及生产前、后持续时间"
+msgstr "在工作中心任何时候都表示为乘法的系数"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr "一个循环的小时数"
+msgstr "一个周期的工作小时数"
 
 #. module: mrp
 #: field:mrp.production,date_finnished:0
@@ -585,7 +585,7 @@ msgstr "数量倍数"
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Waiting"
-msgstr "等待中"
+msgstr "等待"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -610,7 +610,7 @@ msgstr "类型"
 #: model:process.node,note:mrp.process_node_stockproduct0
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable and consumable"
-msgstr "为可库存和消耗"
+msgstr "为了可库存和消耗"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
@@ -636,17 +636,17 @@ msgstr "打印日期"
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr "询价"
+msgstr "要求报价"
 
 #. module: mrp
 #: field:mrp.bom,revision_type:0
 msgid "indice type"
-msgstr "指数类型"
+msgstr "指标类型"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Production orders are created for the product manufacturing."
-msgstr "创建生产单用于产品生产"
+msgstr "生产单创建产品生产"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -656,7 +656,7 @@ msgstr "工作中心"
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
-msgstr "最小数量"
+msgstr "最少数量"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -667,7 +667,7 @@ msgstr "生产单"
 #: field:mrp.bom,child_complete_ids:0
 #: field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
-msgstr "物料清单体系"
+msgstr "物料清单层次"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -677,29 +677,29 @@ msgstr "需求单明细"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
 msgid "If Product type is service and procure method is Make to stock"
-msgstr "如果产品类型是服务并且获得方式是备货型生产"
+msgstr "如果产品类型是服务并且获得方式是来自订单"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "If Product type is service"
-msgstr "如果产品的类型是服务的话"
+msgstr "如果产品的类型是服务"
 
 #. module: mrp
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr "备用天数"
+msgstr "确保天数"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,cycle_total:0
 msgid "Total Cycles"
-msgstr "循环总数"
+msgstr "总周期"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Ready to Produce"
-msgstr "生产准备就绪"
+msgstr "准备生产"
 
 #. module: mrp
 #: field:mrp.bom.revision,name:0
@@ -726,7 +726,7 @@ msgstr "该向导将计划本产品的需求单。这可能会产生任务，生
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
 msgid "The system waits for requested products in stock."
-msgstr "系统等待库存的货品需求"
+msgstr "系统等待库存被请求的产品"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemto0
@@ -755,12 +755,12 @@ msgstr "生产完成"
 #: field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "小时数"
+msgstr "小时编号"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
@@ -796,7 +796,7 @@ msgstr "取消"
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
-msgstr "移动产品"
+msgstr "产品调拨"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
@@ -806,7 +806,7 @@ msgstr "机器"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr "备货型生产"
+msgstr "按库存生产"
 
 #. module: mrp
 #: field:mrp.workcenter,name:0
@@ -828,12 +828,12 @@ msgstr "最小"
 msgid ""
 "Description of the workcenter. Explain here what's a cycle according to this "
 "workcenter."
-msgstr "工作中心描述，解释说明该工作中心的循环。"
+msgstr "根据中工作中心说明在什么循环"
 
 #. module: mrp
 #: rml:bom.structure:0
 msgid "-"
-msgstr "－"
+msgstr "-"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
@@ -861,12 +861,12 @@ msgstr "已定购而未交货"
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
 #: model:ir.ui.menu,name:mrp.mrp_Sched_all
 msgid "Compute All Schedulers"
-msgstr "计算所有日程"
+msgstr "所有调度"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycle"
-msgstr "循环数"
+msgstr "周期数"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -901,37 +901,37 @@ msgid ""
 "This is the time frame analysed by the scheduler when computing "
 "procurements. All procurement that are not between today and today+range are "
 "skipped for futur computation."
-msgstr "这是调度程序在计算请料单时得到的时间框架。所有不在该时间框架之内的请料单会被跳转，以后再计算。"
+msgstr "计算产品需求调度的时间分析.所有不在今天和今天 + 跳转范围的产品需求."
 
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
 msgid "Time Efficiency"
-msgstr "时间效率"
+msgstr "有效时间"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
 msgid "Security days for each manufacturing operation."
-msgstr "每个生产操作的备用天数。"
+msgstr "每个生产活动的确保天数"
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute.all,init:0
 msgid "Scheduler Parameters"
-msgstr "计划参数"
+msgstr "调度参数"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
 msgid "A cycle is defined in the workcenter definition."
-msgstr "工作中心定义的循环设定。"
+msgstr "工作中心定义的循环设定."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in cycles"
-msgstr "循环数"
+msgstr "循环金额"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 msgid "Finished Products Location"
-msgstr "成品货位"
+msgstr "成品库位"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,uom_id:0
@@ -941,7 +941,7 @@ msgstr "计量单位"
 #. module: mrp
 #: field:mrp.procurement,procure_method:0
 msgid "Procurement Method"
-msgstr "获得方式"
+msgstr "产品需求方式"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -963,7 +963,7 @@ msgstr "计算需求单"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Wait for available products for reservation"
-msgstr "等待可采用产品预留"
+msgstr "等待有效产品的预留"
 
 #. module: mrp
 #: wizard_button:change_production_qty,confirm,validate:0
@@ -1005,12 +1005,12 @@ msgstr "产品生产数量"
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "系统将储存成品的货位"
+msgstr "系统的成品库存位置 - 库位"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material routing"
-msgstr "物料工艺路线"
+msgstr "产品个工艺路线"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
@@ -1020,27 +1020,27 @@ msgstr "逐日"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum stock rule"
-msgstr "最低库存量规则"
+msgstr "最少库存规则"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Revisions"
-msgstr "修订记录"
+msgstr "修改"
 
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Product Efficiency"
-msgstr "材料效率"
+msgstr "生产效率"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
 msgid "Orderpoint minimum rule"
-msgstr "再订货点规则"
+msgstr "最少采购点规则"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemts0
 msgid "Service Make to Stock"
-msgstr "定义为备货型生产的服务"
+msgstr "服务来自库存"
 
 #. module: mrp
 #: field:mrp.production,sale_ref:0
@@ -1058,7 +1058,7 @@ msgstr "优先级"
 #: field:mrp.procurement,location_id:0
 #: field:stock.warehouse.orderpoint,location_id:0
 msgid "Location"
-msgstr "货位"
+msgstr "库位"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_new
@@ -1069,7 +1069,7 @@ msgstr "新建需求单"
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr "生产单编码："
+msgstr "生产单号:"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
@@ -1080,7 +1080,7 @@ msgstr "工具"
 #: help:mrp.production,location_src_id:0
 msgid ""
 "Location where the system will look for products used in raw materials."
-msgstr "系统查找产品原料的存放货位。"
+msgstr "系统查找产品使用的原料的存放库位"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -1096,17 +1096,17 @@ msgstr "需求单"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
 msgid "Make to Stock"
-msgstr "备货型生产"
+msgstr "按库存生产"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
 msgid "If product type is service and procure method is Make to order"
-msgstr "如果产品类型是服务并且获得方式是订货型生产"
+msgstr "如果产品类型是服并且获得方式是来自订单"
 
 #. module: mrp
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range"
-msgstr "调度器范围"
+msgstr "调度范围"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -1122,7 +1122,7 @@ msgstr "需求单"
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.product_procurement_wizard
 msgid "Procurement Request"
-msgstr "需求单"
+msgstr "产品需求"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_price
@@ -1132,12 +1132,12 @@ msgstr "产品成本构成"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "Minimum Stock Procure"
-msgstr "最低库存量需求单"
+msgstr "最低库存采购"
 
 #. module: mrp
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr "这是每个采购订单的导致／备用时间"
+msgstr "这是导致/每个采购订单的安全时间"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1157,12 +1157,12 @@ msgstr "时间科目"
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "alphabetical indices"
-msgstr "字模顺序"
+msgstr "按字母顺序顺序排列的指标"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Procurement for raw materials."
-msgstr "原材料需求单"
+msgstr "原材料需求"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -1174,7 +1174,7 @@ msgstr "备注"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procure Stockable Product"
-msgstr "生成可库存货品需求单"
+msgstr "生产可库存产品"
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1197,12 +1197,12 @@ msgstr "定义一个工艺路线来描述生产的步骤"
 #: field:mrp.workcenter,active:0
 #: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "生成货品需求单"
+msgstr "生产产品"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1220,13 +1220,13 @@ msgstr "属性"
 #: field:mrp.procurement,date_planned:0
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr "计划日期"
+msgstr "安排日期"
 
 #. module: mrp
 #: view:mrp.procurement:0
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr ""
+msgstr "额外信息"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
@@ -1238,7 +1238,7 @@ msgstr "定义产品结构、子产品或组件"
 msgid ""
 "Procurement is created if the product quantity is lower than the minimum "
 "limit."
-msgstr "当产品数量低于最低库存量时将自动创建需求单。"
+msgstr "如果产品数量低于最低额建立产品需求."
 
 #. module: mrp
 #: field:mrp.procurement,date_close:0
@@ -1248,7 +1248,7 @@ msgstr "关闭日期"
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
 msgid "General Account"
-msgstr "总帐"
+msgstr "总账"
 
 #. module: mrp
 #: field:mrp.property,composition:0
@@ -1269,7 +1269,7 @@ msgstr "销售订单编号"
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_change_production_qty
 msgid "Change Product Qty."
-msgstr ""
+msgstr "改变产品数量"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -1280,7 +1280,7 @@ msgstr "完成"
 #. module: mrp
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr "需求单数量取整后至此倍数."
+msgstr "产品需求数量将在这个倍数范围内."
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,logic:0
@@ -1291,18 +1291,18 @@ msgstr "再订货模式"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "Central document to procure products"
-msgstr "需求货品的主单据"
+msgstr "获得产品的主单据"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
 msgid "Production Orders in Progress"
-msgstr "处理中的生产单"
+msgstr "生产单进展"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
@@ -1311,7 +1311,7 @@ msgstr "处理中的生产单"
 #: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr "最小存货规则"
+msgstr "最小库存规则"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1326,23 +1326,23 @@ msgstr "每循环生产能力"
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
-msgstr "货品"
+msgstr "产品"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr "小时总数"
+msgstr "总小时数"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 msgid "Raw Materials Location"
-msgstr "原材料货位"
+msgstr "原材料库位"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "产品物料清单结构"
+msgstr "物料清单结构"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1357,7 +1357,7 @@ msgstr "产品计量单位"
 msgid ""
 "Reference of the document that created this procurement.\n"
 "This is automatically completed by Open ERP."
-msgstr "创建该请料单文件的参考.这由ERP系统自动完成"
+msgstr "创建这产品需求的参考单据.系统自动完成"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1367,19 +1367,19 @@ msgstr "该生产批此产品"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
 msgid "Product type is Stockable and procure method is make to stock"
-msgstr "货品类型是可库存并且获得方式是备货型生产"
+msgstr "产品类型是可库存并且获得方式是来自订单"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
-msgstr "货品类型是可库存并且获得方式是备货型生产"
+msgstr "物料清单或组件有效.留空为总是有效"
 
 #. module: mrp
 #: field:mrp.procurement,product_uos:0
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr "货品销售单位"
+msgstr "产品销售单位"
 
 #. module: mrp
 #: field:mrp.procurement,product_uom:0
@@ -1421,50 +1421,50 @@ msgstr "属性分类"
 msgid ""
 "If you encode manually a procurement, you probably want to use a make to "
 "order method."
-msgstr "如果你手动填需求单，你可能要使用订货型生产的获得方式."
+msgstr "如果你手动产品需求.你可能要建立订单的方式."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Source Location"
-msgstr "来源货位"
+msgstr "来源库位"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 msgid "Stockable Order Request"
-msgstr "可库存订单需求"
+msgstr "可库存订单请求"
 
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
 msgid "Scheduled Products"
-msgstr "已安排货品"
+msgstr "安排的产品"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr "生产的货品消耗"
+msgstr "生产产品消耗"
 
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "numeric indices"
-msgstr "数字索引"
+msgstr "指标数值"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
 msgid "If Procure method is Make to order and supply method is buy"
-msgstr "如果获得方式是订货型生产并供应方式是采购"
+msgstr "如果获得方式是来自订单并供应方式是采购"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
 msgid "if Product type is Stockable in procurement order"
-msgstr "如果需求单的货品类型是可库存"
+msgstr "如果在产品需求单的产品类型是可库存的"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: view:mrp.production:0
 #: rml:mrp.production.order:0
 msgid "Work Orders"
-msgstr "任务单"
+msgstr "工作单"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1497,23 +1497,23 @@ msgid ""
 "sale order to the picking without going through the production order.The "
 "normal BoM will generate one production order per BoM level."
 msgstr ""
-"关于多级物料清单，如只需生成一个综合生产单，应在下级层采用虚拟物料清单，而不是普通物料清单。如采用普通物料清单，每一级的物料清单都将会生成一份生产单。创建"
-"虚拟物料清单时要在其根级选择“虚拟／设定”。"
+"在生产单并且不是每层上计算自动计算原料明细中使用的虚拟物料清单.如果你产品清单的顶层为“虚项/套件”它被认为是一套或者一包:这产品被组件所取代可以绕过生产"
+"单而通过销售单来领料/提货.普通物料清单将按每个产品清单层生成一个生产单."
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr "一个循环的时间(小时)"
+msgstr "一个周期的时间(小时)"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,done:0
 msgid "Your procurement request has been sent !"
-msgstr "你的需求单已发送!"
+msgstr "你的产品需求请求已发送!"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,init:0
 msgid "Internal Procurement Request"
-msgstr "内部需求单"
+msgstr "内部的产品需求请求"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -1533,18 +1533,18 @@ msgstr "计算数据"
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Categories"
-msgstr "属性类型"
+msgstr "属性分类"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
 msgid "Compute Procurements Only"
-msgstr "仅计算需求单"
+msgstr "仅计算产品需求"
 
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
-msgstr ""
+msgstr "产品销售单位数量"
 
 #. module: mrp
 #: rml:bom.structure:0
@@ -1561,7 +1561,7 @@ msgstr "有效期到"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
 msgid "Temporary Procurement Exceptions"
-msgstr "临时需求单异常"
+msgstr "临时产品需求异常"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
@@ -1577,7 +1577,7 @@ msgstr "普通物料清单"
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr "货品销售单位数量"
+msgstr "产品销售单位数量"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -1593,29 +1593,29 @@ msgstr "参数"
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Confirm"
-msgstr "审核"
+msgstr "确定"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Workcenters Utilisation"
-msgstr "工作中心利用率"
+msgstr "使用工作中心"
 
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
 msgid ""
 "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
 "production."
-msgstr "材料效率.如果为0.9表示生产损失为10%"
+msgstr "生产效率.如果为0.9表示生产损失10%"
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
-msgstr "货品舍入"
+msgstr "产品舍入"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr "任务单"
+msgstr "工作单"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1625,23 +1625,23 @@ msgstr "重新创建分拣单"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceonorder0
 msgid "If procurement is make to order"
-msgstr "如果需求单获得方式是订货型生产"
+msgstr "如果产品需求是来自订单"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr "订货型"
+msgstr "按订单"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 msgid "Minimum Stock Rule"
-msgstr "最低库存量规则"
+msgstr "最少库存规则"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
 msgid "New Bill of Materials"
-msgstr "新物料清单"
+msgstr "新的物料清单"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
@@ -1651,12 +1651,12 @@ msgstr "生产后时间"
 #. module: mrp
 #: wizard_field:mrp.workcenter.load,init,time_unit:0
 msgid "Type of period"
-msgstr "期间类型"
+msgstr "周期类型"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Total Qty"
-msgstr "总数"
+msgstr "总数量"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
@@ -1667,7 +1667,7 @@ msgstr "小时数"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
 msgid "Procurement Orders"
-msgstr "需求单"
+msgstr "产品需求单"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property
@@ -1682,7 +1682,7 @@ msgstr "上级工艺路线"
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
-msgstr ""
+msgstr "准备小时数"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1692,7 +1692,7 @@ msgstr "已取消"
 #. module: mrp
 #: selection:mrp.property,composition:0
 msgid "plus"
-msgstr "加"
+msgstr "正"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -1707,7 +1707,7 @@ msgid ""
 "product. The routing is mainly used to compute workcenter costs during "
 "operations and to plan futur loads on workcenters based on production "
 "plannification."
-msgstr "生产成品所需的工作中心操作表。 路线主要是操作时用于计算工作中心的成本 ，并根据生产计划算出工作中心的未来负荷"
+msgstr "这生产成品的运作列表(工作中心列表)工艺路线主要是用于计算这生产计划的工作中心的成本和计划未来的工作中心的未来负荷"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1717,13 +1717,13 @@ msgstr "等待原料"
 #. module: mrp
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product Process"
-msgstr "可库存产品流程"
+msgstr "可库存产品进程"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_new
 #: model:ir.ui.menu,name:mrp.menu_production_orders_new
 msgid "New Production Order"
-msgstr "新生产单"
+msgstr "新的生产单"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_rfq0
@@ -1733,7 +1733,7 @@ msgstr "建立询价和发送到供应商"
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
-msgstr "最后指数"
+msgstr "最近指标"
 
 #. module: mrp
 #: field:mrp.bom,revision_ids:0
@@ -1761,23 +1761,23 @@ msgstr "一般"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
 msgid "When any procuere products, it comes into the prpcurement orders"
-msgstr "当生产单需要任原料时生成需求清单"
+msgstr "当生产任何产品时它生成产品需求单"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 #: model:ir.ui.menu,name:mrp.menu_production_orders_start
 msgid "Production Orders To Start"
-msgstr "即将启动的生产单"
+msgstr "启动生产单"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Reason"
-msgstr "需求原因"
+msgstr "产品需求原因"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
 msgid "An entry is being made from billing material to routing."
-msgstr "通过物料清单定义工艺路线"
+msgstr "条目来自产品路线"
 
 #. module: mrp
 #: help:mrp.workcenter,timesheet_id:0
@@ -1800,12 +1800,12 @@ msgstr "物料清单"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procureserviceproduct0
 msgid "In procurement order, if product type is service"
-msgstr "如果是服务型产品需求单"
+msgstr "如果产品是服务在产品需求单"
 
 #. module: mrp
 #: selection:mrp.procurement,procure_method:0
 msgid "from stock"
-msgstr "计划生产"
+msgstr "按库存生产"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1819,7 +1819,7 @@ msgstr "一般信息"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Productions"
-msgstr "生产单"
+msgstr "生产"
 
 #. module: mrp
 #: wizard_button:product.product.procurement,done,end:0
@@ -1829,12 +1829,12 @@ msgstr "关闭"
 #. module: mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
-msgstr "销售订单编号"
+msgstr "销售名称"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Create minimum stock rules"
-msgstr "创建最低库存规则"
+msgstr "建立最少库存规则"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,warehouse_id:0
@@ -1852,12 +1852,12 @@ msgstr "生产单编码"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service Product"
-msgstr "服务型产品"
+msgstr "服务"
 
 #. module: mrp
 #: field:mrp.procurement,close_move:0
 msgid "Close Move at end"
-msgstr "最后关闭调拨"
+msgstr "关闭变动结束"
 
 #. module: mrp
 #: wizard_view:change_production_qty,confirm:0
@@ -1891,13 +1891,13 @@ msgstr "生产管理"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
 msgid "Unscheduled procurements"
-msgstr "未安排的需求单"
+msgstr "未安排的产品需求"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
 #: model:ir.ui.menu,name:mrp.menu_bom_tree
 msgid "Bill of Material Structure"
-msgstr "物料清单组成"
+msgstr "物料清单结构"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
@@ -1912,7 +1912,7 @@ msgstr "清理小时数"
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Details"
-msgstr "需求单细节"
+msgstr "产品需求详情"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1922,12 +1922,12 @@ msgstr "你可以看到生产产品使用的物料清单"
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End"
-msgstr "计划完成日期"
+msgstr "安排结束"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
-msgstr "备货型"
+msgstr "按库存"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
@@ -1935,10 +1935,68 @@ msgstr "备货型"
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "物料清单组成"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module to manage the manufacturing process in Open "
+#~ "ERP.\n"
+#~ "\n"
+#~ "    Features:\n"
+#~ "    * Make to Stock / Make to Order (by line)\n"
+#~ "    * Multi-level BoMs, no limit\n"
+#~ "    * Multi-level routing, no limit\n"
+#~ "    * Routing and workcenter integrated with analytic accounting\n"
+#~ "    * Scheduler computation periodically / Just In Time module\n"
+#~ "    * Multi-pos, multi-warehouse\n"
+#~ "    * Different reordering policies\n"
+#~ "    * Cost method by product: standard price, average price\n"
+#~ "    * Easy analysis of troubles or needs\n"
+#~ "    * Very flexible\n"
+#~ "    * Allows to browse Bill of Materials in complete structure\n"
+#~ "        that include child and phantom BoMs\n"
+#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    consumable of services. Services are completely integrated with the "
+#~ "rest\n"
+#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    in a BoM to automatically purchase on order the assembly of your "
+#~ "production.\n"
+#~ "\n"
+#~ "    Reports provided by this module:\n"
+#~ "    * Bill of Material structure and components\n"
+#~ "    * Load forecast on workcenters\n"
+#~ "    * Print a production order\n"
+#~ "    * Stock forecasts\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这基础模块用来管理系统的生产过程的管理:\n"
+#~ "\n"
+#~ " 特征:\n"
+#~ "    *按库存生产/按单生产(明细)\n"
+#~ "    *多层物料清单(没限制)\n"
+#~ "    *多层工艺路线(没限制)\n"
+#~ "    *工艺路线和生产中心整合与辅助核算项目\n"
+#~ "    *定期调度计算/准时生产模块\n"
+#~ "    *多POS和多仓库\n"
+#~ "    *不同的再下单策略\n"
+#~ "    *产品的成本计算方法:平均价、标准价\n"
+#~ "    *困难和需要的简单分析\n"
+#~ "    *非常灵活\n"
+#~ "    *允许浏览产品清单的完整的结构包括子物料清单和虚项\n"
+#~ "    \n"
+#~ "    它支持完整的整和的和规划的可库存货物,可订购服务.服务是完全集成在软件上.比如,你能设定一个子合同服务,\n"
+#~ "    在物料清单上自动采购你生产的订单组合\n"
+#~ "\t\n"
+#~ "    这模块提供的报表:\n"
+#~ "    *物料清单的结构和组成\n"
+#~ "    *工作中心的工作负荷\n"
+#~ "    *打印生产单\n"
+#~ "    *库存预测\n"
+#~ "    "
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index 37bc9c565b1..5303015f8f4 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index e879a2b1228..227c9846172 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 40fd2e46525..fe7d45cdb6c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -134,6 +134,17 @@ class mrp_bom(osv.osv):
     _name = 'mrp.bom'
     _description = 'Bills of Material'
     def _child_compute(self, cr, uid, ids, name, arg, context={}):
+        """ 
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID of mrp.production object
+             @param name: 
+             @param arg: 
+
+             @return:  True
+        
+        """  
         result = {}
         for bom in self.browse(cr, uid, ids, context=context):
             result[bom.id] = map(lambda x: x.id, bom.bom_lines)
@@ -144,7 +155,7 @@ class mrp_bom(osv.osv):
                 sids = self.pool.get('mrp.bom').search(cr, uid, [('bom_id','=',False),('product_id','=',bom.product_id.id)])
                 if sids:
                     bom2 = self.pool.get('mrp.bom').browse(cr, uid, sids[0], context=context)
-                    result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
+                    result[bom.id] += map(lambda x: x.id, bom2.bom_lines)                 
         return result
     def _compute_type(self, cr, uid, ids, field_name, arg, context):
         res = dict(map(lambda x: (x,''), ids))
@@ -189,6 +200,8 @@ class mrp_bom(osv.osv):
         'child_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'child_complete_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
+        'multi_level_bom': fields.boolean('Multi-level BoM'),
+
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -196,7 +209,8 @@ class mrp_bom(osv.osv):
         'product_qty': lambda *a: 1.0,
         'product_rounding': lambda *a: 1.0,
         'type': lambda *a: 'normal',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c)
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c),
+        'multi_level_bom': lambda *a: 0, 
     }
     _order = "sequence"
     _sql_constraints = [
@@ -298,11 +312,12 @@ class mrp_bom(osv.osv):
         rev_ids = res[0]['revision_ids']
         idx = 1
         new_idx = []
+        bom_rev_obj = self.pool.get('mrp.bom.revision')
         for rev_id in rev_ids:
             if res[0]['revision_type'] == 'numeric':
-                self.pool.get('mrp.bom.revision').write(cr, uid, [rev_id], {'indice' : idx})
+                bom_rev_obj.write(cr, uid, [rev_id], {'indice' : idx})
             else:
-                self.pool.get('mrp.bom.revision').write(cr, uid, [rev_id], {'indice' : "%c"%(idx+96,)})
+                bom_rev_obj.write(cr, uid, [rev_id], {'indice' : "%c"%(idx+96,)})
             idx+=1
         return True
 
@@ -375,30 +390,7 @@ class one2many_domain(fields.one2many):
 class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Production'
-    _date_name  = 'date_planned'
-
-    def _get_sale_order(self,cr,uid,ids,field_name=False):
-        move_obj=self.pool.get('stock.move')
-        def get_parent_move(move_id):
-            move = move_obj.browse(cr,uid,move_id)
-            if move.move_dest_id:
-                return get_parent_move(move.move_dest_id.id)
-            return move_id
-        productions=self.read(cr,uid,ids,['id','move_prod_id'])
-        res={}
-        for production in productions:
-            res[production['id']]=False
-            if production.get('move_prod_id',False):
-                parent_move_line=get_parent_move(production['move_prod_id'][0])
-                if parent_move_line:
-                    move = move_obj.browse(cr,uid,parent_move_line)
-                    #TODO: fix me sale module can not be used here,
-                    #as may be mrp can be installed without sale module
-                    if field_name=='name':
-                        res[production['id']]=move.sale_line_id and move.sale_line_id.order_id.name or False
-                    if field_name=='client_order_ref':
-                        res[production['id']]=move.sale_line_id and move.sale_line_id.order_id.client_order_ref or False
-        return res
+    _date_name  = 'date_planned'    
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context={}):
         result = {}
@@ -424,11 +416,12 @@ class mrp_production(osv.osv):
             result[prod.id] = prod.date_planned[:10]
         return result
 
-    def _sale_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        return self._get_sale_order(cr,uid,ids,field_name='name')
-
-    def _sale_ref_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        return self._get_sale_order(cr,uid,ids,field_name='client_order_ref')
+    def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        res = {}
+        for f in field_names:
+            for order_id in ids:
+                res[order_id] = {f:False}
+        return res
 
     _columns = {
         'name': fields.char('Reference', size=64, required=True),
@@ -470,8 +463,8 @@ class mrp_production(osv.osv):
         'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
         'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
 
-        'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name', help='Indicate the name of sale order.'),
-        'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
+        'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'),
+        'sale_ref': fields.function(_ref_calc, method=True, multi='sale_ref', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
@@ -533,15 +526,18 @@ class mrp_production(osv.osv):
 
     def action_compute(self, cr, uid, ids, properties=[]):
         results = []
+        bom_obj = self.pool.get('mrp.bom')
+        prod_line_obj = self.pool.get('mrp.production.product.line')
+        workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
         for production in self.browse(cr, uid, ids):
             cr.execute('delete from mrp_production_product_line where production_id=%s', (production.id,))
             cr.execute('delete from mrp_production_workcenter_line where production_id=%s', (production.id,))
             bom_point = production.bom_id
             bom_id = production.bom_id.id
             if not bom_point:
-                bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, production.product_id.id, production.product_uom.id, properties)
+                bom_id = bom_obj._bom_find(cr, uid, production.product_id.id, production.product_uom.id, properties)
                 if bom_id:
-                    bom_point = self.pool.get('mrp.bom').browse(cr, uid, bom_id)
+                    bom_point = bom_obj.browse(cr, uid, bom_id)
                     routing_id = bom_point.routing_id.id or False
                     self.write(cr, uid, [production.id], {'bom_id': bom_id, 'routing_id': routing_id})
 
@@ -552,32 +548,34 @@ class mrp_production(osv.osv):
             #   self.write(cr, uid, [production.id], {'location_src_id': bom_point.routing_id.location_id.id})
 
             factor = production.product_qty * production.product_uom.factor / bom_point.product_uom.factor
-            res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
+            res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
             results = res[0]
             results2 = res[1]
             for line in results:
                 line['production_id'] = production.id
-                self.pool.get('mrp.production.product.line').create(cr, uid, line)
+                prod_line_obj.create(cr, uid, line)
             for line in results2:
                 line['production_id'] = production.id
-                self.pool.get('mrp.production.workcenter.line').create(cr, uid, line)
+                workcenter_line_obj.create(cr, uid, line)
         return len(results)
 
     def action_cancel(self, cr, uid, ids):
+        move_obj = self.pool.get('stock.move')
         for production in self.browse(cr, uid, ids):
             if production.move_created_ids:
-                self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in production.move_created_ids])
-            self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in production.move_lines])
+                move_obj.action_cancel(cr, uid, [x.id for x in production.move_created_ids])
+            move_obj.action_cancel(cr, uid, [x.id for x in production.move_lines])
         self.write(cr, uid, ids, {'state':'cancel'}) #,'move_lines':[(6,0,[])]})
         return True
 
     #XXX: may be a bug here; lot_lines are unreserved for a few seconds;
     #     between the end of the picking list and the call to this function
     def action_ready(self, cr, uid, ids):
+        move_obj = self.pool.get('stock.move')
         self.write(cr, uid, ids, {'state':'ready'})
         for production in self.browse(cr, uid, ids):
             if production.move_prod_id:
-                self.pool.get('stock.move').write(cr, uid, [production.move_prod_id.id],
+                move_obj.write(cr, uid, [production.move_prod_id.id],
                         {'location_id':production.location_dest_id.id})
         return True
 
@@ -596,7 +594,23 @@ class mrp_production(osv.osv):
                res = False        
         return res
 
-    def do_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
+    def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
+        """ 
+            To produce final product base on production mode (consume/consume&produce).
+            If Production mode is consume, all stock move lines of raw materials will be done/consumed.
+            If Production mode is consume & produce, all stock move lines of raw materials will be done/consumed
+            and stock move lines of final product will be also done/produced.
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param production_id: the ID of mrp.production object
+             @param production_qty: specify qty to produce
+             @param production_mode: specify production mode (consume/consume&produce).
+
+             @return:  True
+        
+        """              
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id)
         
@@ -604,14 +618,19 @@ class mrp_production(osv.osv):
         final_product_todo = []        
         
         if production_mode in ['consume','consume_produce']:
+            # To consume remaining qty of raw materials 
             consumed_products = {}
             produced_qty = 0
             for consumed_product in production.move_lines2:
+                if consumed_product.scraped:
+                    continue
                 if not consumed_products.get(consumed_product.product_id.id, False):
                     consumed_products[consumed_product.product_id.id] = 0
                 consumed_products[consumed_product.product_id.id] += consumed_product.product_qty
             
             for produced_product in production.move_created_ids2:
+                if produced_product.scraped:
+                    continue
                 produced_qty += produced_product.product_qty
 
             for raw_product in production.move_lines:                
@@ -621,14 +640,17 @@ class mrp_production(osv.osv):
                 if rest_qty > production.product_qty:
                    rest_qty = production.product_qty            
                 if rest_qty > 0:
-                    stock_mov_obj.consume_moves(cr, uid, [raw_product.id], rest_qty, production.location_src_id.id, context=context)
+                    stock_mov_obj.action_consume(cr, uid, [raw_product.id], rest_qty, production.location_src_id.id, context=context)
 
         if production_mode == 'consume_produce':
+            # To produce remaining qty of final product
             vals = {'state':'confirmed'}
             final_product_todo = [x.id for x in production.move_created_ids]
             stock_mov_obj.write(cr, uid, final_product_todo, vals)
             produced_products = {}
             for produced_product in production.move_created_ids2:
+                if produced_product.scraped:
+                    continue
                 if not produced_products.get(produced_product.product_id.id, False):
                     produced_products[produced_product.product_id.id] = 0
                 produced_products[produced_product.product_id.id] += produced_product.product_qty
@@ -639,7 +661,7 @@ class mrp_production(osv.osv):
                 if rest_qty <= production_qty:
                    production_qty = rest_qty 
                 if rest_qty > 0 :
-                    stock_mov_obj.consume_moves(cr, uid, [produce_product.id], production_qty, production.location_dest_id.id, context=context)            
+                    stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, production.location_dest_id.id, context=context)            
         
         
         for raw_product in production.move_lines2: 
@@ -657,6 +679,7 @@ class mrp_production(osv.osv):
 
     def _costs_generate(self, cr, uid, production):
         amount = 0.0
+        analytic_line_obj = self.pool.get('account.analytic.line')
         for wc_line in production.workcenter_lines:
             wc = wc_line.workcenter_id
             if wc.costs_journal_id and wc.costs_general_account_id:
@@ -664,7 +687,7 @@ class mrp_production(osv.osv):
                 account = wc.costs_hour_account_id.id
                 if value and account:
                     amount += value
-                    self.pool.get('account.analytic.line').create(cr, uid, {
+                    analytic_line_obj.create(cr, uid, {
                         'name': wc_line.name+' (H)',
                         'amount': value,
                         'account_id': account,
@@ -677,7 +700,7 @@ class mrp_production(osv.osv):
                 account = wc.costs_cycle_account_id.id
                 if value and account:
                     amount += value
-                    self.pool.get('account.analytic.line').create(cr, uid, {
+                    analytic_line_obj.create(cr, uid, {
                         'name': wc_line.name+' (C)',
                         'amount': value,
                         'account_id': account,
@@ -706,6 +729,10 @@ class mrp_production(osv.osv):
     def action_confirm(self, cr, uid, ids):
         picking_id=False
         proc_ids = []
+        seq_obj = self.pool.get('ir.sequence')
+        pick_obj = self.pool.get('stock.picking')
+        move_obj = self.pool.get('stock.move')
+        proc_obj = self.pool.get('mrp.procurement')
         for production in self.browse(cr, uid, ids):
             if not production.product_lines:
                 self.action_compute(cr, uid, [production.id])
@@ -719,7 +746,9 @@ class mrp_production(osv.osv):
                     pick_type = 'out'
                 address_id = routing_loc.address_id and routing_loc.address_id.id or False
                 routing_loc = routing_loc.id
-            picking_id = self.pool.get('stock.picking').create(cr, uid, {
+            pick_name = seq_obj.get(cr, uid, 'stock.picking.'+pick_type)
+            picking_id = pick_obj.create(cr, uid, {
+                'name': pick_name,
                 'origin': (production.origin or '').split(':')[0] +':'+production.name,
                 'type': pick_type,
                 'move_type': 'one',
@@ -744,7 +773,7 @@ class mrp_production(osv.osv):
                 'state': 'waiting',
                 'company_id': production.company_id.id,
             }
-            res_final_id = self.pool.get('stock.move').create(cr, uid, data)
+            res_final_id = move_obj.create(cr, uid, data)
 
             self.write(cr, uid, [production.id], {'move_created_ids': [(6, 0, [res_final_id])]})
             moves = []
@@ -752,7 +781,7 @@ class mrp_production(osv.osv):
                 move_id=False
                 newdate = production.date_planned
                 if line.product_id.type in ('product', 'consu'):
-                    res_dest_id = self.pool.get('stock.move').create(cr, uid, {
+                    res_dest_id = move_obj.create(cr, uid, {
                         'name':'PROD:'+production.name,
                         'date_planned': production.date_planned,
                         'product_id': line.product_id.id,
@@ -767,7 +796,7 @@ class mrp_production(osv.osv):
                         'company_id': production.company_id.id,
                     })
                     moves.append(res_dest_id)
-                    move_id = self.pool.get('stock.move').create(cr, uid, {
+                    move_id = move_obj.create(cr, uid, {
                         'name':'PROD:'+production.name,
                         'picking_id':picking_id,
                         'product_id': line.product_id.id,
@@ -782,7 +811,7 @@ class mrp_production(osv.osv):
                         'state': 'waiting',
                         'company_id': production.company_id.id,
                     })
-                proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                proc_id = proc_obj.create(cr, uid, {
                     'name': (production.origin or '').split(':')[0] + ':' + production.name,
                     'origin': (production.origin or '').split(':')[0] + ':' + production.name,
                     'date_planned': newdate,
@@ -811,15 +840,6 @@ class mrp_production(osv.osv):
 
 mrp_production()
 
-
-class stock_move(osv.osv):
-    _name = 'stock.move'
-    _inherit = 'stock.move'
-    _columns = {
-        'production_id': fields.many2one('mrp.production', 'Production', select=True),
-    }
-stock_move()
-
 class mrp_production_workcenter_line(osv.osv):
     _name = 'mrp.production.workcenter.line'
     _description = 'Work Orders'
@@ -1041,6 +1061,7 @@ class mrp_procurement(osv.osv):
 
     def check_buy(self, cr, uid, ids):
         user = self.pool.get('res.users').browse(cr, uid, uid)
+        partner_obj = self.pool.get('res.partner')
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_id.product_tmpl_id.supply_method<>'buy':
                 return False
@@ -1051,7 +1072,7 @@ class mrp_procurement(osv.osv):
             if user.company_id and user.company_id.partner_id:
                 if partner.id == user.company_id.partner_id.id:
                     return False
-            address_id = self.pool.get('res.partner').address_get(cr, uid, [partner.id], ['delivery'])['delivery']
+            address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
             if not address_id:
                 cr.execute('update mrp_procurement set message=%s where id=%s', (_('No address defined for the supplier'), procurement.id))
                 return False
@@ -1064,6 +1085,7 @@ class mrp_procurement(osv.osv):
         return False
 
     def action_confirm(self, cr, uid, ids, context={}):
+        move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_qty <= 0.00:
                 raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Requisition Order(s), it should not be less than 1!'))
@@ -1072,7 +1094,7 @@ class mrp_procurement(osv.osv):
                     source = procurement.location_id.id
                     if procurement.procure_method=='make_to_order':
                         source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
-                    id = self.pool.get('stock.move').create(cr, uid, {
+                    id = move_obj.create(cr, uid, {
                         'name': 'PROC:'+procurement.name,
                         'location_id': source,
                         'location_dest_id': procurement.location_id.id,
@@ -1087,7 +1109,7 @@ class mrp_procurement(osv.osv):
                 else:
                     # TODO: check this
                     if procurement.procure_method=='make_to_stock' and procurement.move_id.state in ('waiting',):
-                        id = self.pool.get('stock.move').write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
+                        id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
         self.write(cr, uid, ids, {'state':'confirmed','message':''})
         return True
 
@@ -1115,14 +1137,31 @@ class mrp_procurement(osv.osv):
         return True
 
     def action_produce_assign_product(self, cr, uid, ids, context={}):
-        produce_id = False
+        """
+        This is action which call from workflow to assign production order to procuments
+        @return  : True
+        """
+        res = self.make_mo(cr, uid, ids, context=context)
+        res = res.values()
+        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
+
+    def make_mo(self, cr, uid, ids, context={}):
+        """
+        Make Manufecturing(production) order from procurement
+        
+        @return : New created Production Orders procurement wise 
+        """
+        res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        production_obj = self.pool.get('mrp.production')
+        move_obj = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
             loc_id = procurement.location_id.id
             newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - DateTime.RelativeDateTime(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0)
             newdate = newdate - DateTime.RelativeDateTime(days=company.manufacturing_lead)
-            produce_id = self.pool.get('mrp.production').create(cr, uid, {
+            produce_id = production_obj.create(cr, uid, {
                 'origin': procurement.origin,
                 'product_id': procurement.product_id.id,
                 'product_qty': procurement.product_qty,
@@ -1136,32 +1175,52 @@ class mrp_procurement(osv.osv):
                 'move_prod_id': res_id,
                 'company_id': procurement.company_id.id,
             })
+            res[procurement.id] = produce_id
             self.write(cr, uid, [procurement.id], {'state':'running'})
-            bom_result = self.pool.get('mrp.production').action_compute(cr, uid,
+            bom_result = production_obj.action_compute(cr, uid,
                     [produce_id], properties=[x.id for x in procurement.property_ids])
-            wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
-            self.pool.get('stock.move').write(cr, uid, [res_id],
+            move_obj.write(cr, uid, [res_id],
                     {'location_id':procurement.location_id.id})
-        return produce_id
-
+        return res
+    
     def action_po_assign(self, cr, uid, ids, context={}):
-        purchase_id = False
+        """
+        This is action which call from workflow to assign purchase order to procuments
+        @return  : True
+        """
+        res = self.make_po(cr, uid, ids, context=context)
+        res = res.values()
+        return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
+
+    def make_po(self, cr, uid, ids, context={}):
+        """
+        Make purchase order from procurement
+        
+        @return : New created Purchase Orders procurement wise
+        """
+        res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        partner_obj = self.pool.get('res.partner')
+        uom_obj = self.pool.get('product.uom')
+        pricelist_obj = self.pool.get('product.pricelist')
+        prod_obj = self.pool.get('product.product')
+        acc_pos_obj = self.pool.get('account.fiscal.position')
+        po_obj = self.pool.get('purchase.order')
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
             partner = procurement.product_id.seller_ids[0].name
             partner_id = partner.id
-            address_id = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['delivery'])['delivery']
+            address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
 
             uom_id = procurement.product_id.uom_po_id.id
 
-            qty = self.pool.get('product.uom')._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
+            qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
             if procurement.product_id.seller_ids[0].qty:
                 qty=max(qty,procurement.product_id.seller_ids[0].qty)
 
-            price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
+            price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
 
             newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
             newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
@@ -1170,7 +1229,7 @@ class mrp_procurement(osv.osv):
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang':partner.lang, 'partner_id':partner_id})
 
-            product=self.pool.get('product.product').browse(cr,uid,procurement.product_id.id,context=context)
+            product = prod_obj.browse(cr,uid,procurement.product_id.id,context=context)
 
             line = {
                 'name': product.partner_ref,
@@ -1184,11 +1243,11 @@ class mrp_procurement(osv.osv):
             }
 
             taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
-            taxes = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, taxes_ids)
+            taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
             line.update({
                 'taxes_id':[(6,0,taxes)]
             })
-            purchase_id = self.pool.get('purchase.order').create(cr, uid, {
+            purchase_id = po_obj.create(cr, uid, {
                 'origin': procurement.origin,
                 'partner_id': partner_id,
                 'partner_address_id': address_id,
@@ -1198,12 +1257,14 @@ class mrp_procurement(osv.osv):
                 'company_id': procurement.company_id.id,
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
             })
+            res[procurement.id] = purchase_id
             self.write(cr, uid, [procurement.id], {'state':'running', 'purchase_id':purchase_id})
-        return purchase_id
+        return res
 
     def action_cancel(self, cr, uid, ids):
         todo = []
         todo2 = []
+        move_obj = self.pool.get('stock.move')
         for proc in self.browse(cr, uid, ids):
             if proc.close_move:
                 if proc.move_id.state not in ('done','cancel'):
@@ -1212,9 +1273,9 @@ class mrp_procurement(osv.osv):
                 if proc.move_id and proc.move_id.state=='waiting':
                     todo.append(proc.move_id.id)
         if len(todo2):
-            self.pool.get('stock.move').action_cancel(cr, uid, todo2)
+            move_obj.action_cancel(cr, uid, todo2)
         if len(todo):
-            self.pool.get('stock.move').write(cr, uid, todo, {'state':'assigned'})
+            move_obj.write(cr, uid, todo, {'state':'assigned'})
         self.write(cr, uid, ids, {'state':'cancel'})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
@@ -1237,10 +1298,11 @@ class mrp_procurement(osv.osv):
         return res
 
     def action_done(self, cr, uid, ids):
+        move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.move_id:
                 if procurement.close_move and (procurement.move_id.state <> 'done'):
-                    self.pool.get('stock.move').action_done(cr, uid, [procurement.move_id.id])
+                    move_obj.action_done(cr, uid, [procurement.move_id.id])
         res = self.write(cr, uid, ids, {'state':'done', 'date_close':time.strftime('%Y-%m-%d')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
@@ -1257,183 +1319,5 @@ class mrp_procurement(osv.osv):
         self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
                 use_new_cursor=use_new_cursor, context=context)
 mrp_procurement()
-
-
-class stock_warehouse_orderpoint(osv.osv):
-    _name = "stock.warehouse.orderpoint"
-    _description = "Orderpoint minimum rule"
-    _columns = {
-        'name': fields.char('Name', size=32, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
-        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
-        'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
-        'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a requisition to bring the virtual stock to the Max Quantity."),
-        'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a requisition to bring the virtual stock to the Max Quantity."),
-        'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The requisition quantity will by rounded up to this multiple."),
-        'procurement_id': fields.many2one('mrp.procurement', 'Purchase Order'),
-        'company_id': fields.many2one('res.company','Company',required=True),
-    }
-    _defaults = {
-        'active': lambda *a: 1,
-        'logic': lambda *a: 'max',
-        'qty_multiple': lambda *a: 1,
-        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
-        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
-    }
-    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
-        if warehouse_id:
-            w=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id, context)
-            v = {'location_id':w.lot_stock_id.id}
-            return {'value': v}
-        return {}
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
-        if product_id:
-            prod=self.pool.get('product.product').browse(cr,uid,product_id)
-            v = {'product_uom':prod.uom_id.id}
-            return {'value': v}
-        return {}
-    def copy(self, cr, uid, id, default=None,context={}):
-        if not default:
-            default = {}
-        default.update({
-            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
-        })
-        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-stock_warehouse_orderpoint()
-
-
-class StockMove(osv.osv):
-    _inherit = 'stock.move'
-    _columns = {
-        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
-    }
-    def copy(self, cr, uid, id, default=None, context=None):
-        default = default or {}
-        default['procurements'] = []
-        return super(StockMove, self).copy(cr, uid, id, default, context)
-
-    def _action_explode(self, cr, uid, move, context={}):
-        if move.product_id.supply_method=='produce' and move.product_id.procure_method=='make_to_order':
-            bis = self.pool.get('mrp.bom').search(cr, uid, [
-                ('product_id','=',move.product_id.id),
-                ('bom_id','=',False),
-                ('type','=','phantom')])
-            if bis:
-                factor = move.product_qty
-                bom_point = self.pool.get('mrp.bom').browse(cr, uid, bis[0])
-                res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor, [])
-                dest = move.product_id.product_tmpl_id.property_stock_production.id
-                state = 'confirmed'
-                if move.state=='assigned':
-                    state='assigned'
-                for line in res[0]:                    
-                    valdef = {
-                        'picking_id': move.picking_id.id,
-                        'product_id': line['product_id'],
-                        'product_uom': line['product_uom'],
-                        'product_qty': line['product_qty'],
-                        'product_uos': line['product_uos'],
-                        'product_uos_qty': line['product_uos_qty'],
-                        'move_dest_id': move.id,
-                        'state': state,
-                        'name': line['name'],
-                        'location_dest_id': dest,
-                        'move_history_ids': [(6,0,[move.id])],
-                        'move_history_ids2': [(6,0,[])],
-                        'procurements': [],
-                    }
-                    mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef)
-                    prodobj = self.pool.get('product.product').browse(cr, uid, line['product_id'], context=context)
-                    proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
-                        'name': (move.picking_id.origin or ''),
-                        'origin': (move.picking_id.origin or ''),
-                        'date_planned': move.date_planned,
-                        'product_id': line['product_id'],
-                        'product_qty': line['product_qty'],
-                        'product_uom': line['product_uom'],
-                        'product_uos_qty': line['product_uos'] and line['product_uos_qty'] or False,
-                        'product_uos':  line['product_uos'],
-                        'location_id': move.location_id.id,
-                        'procure_method': prodobj.procure_method,
-                        'move_id': mid,
-                        'company_id': line['company_id'],
-                    })
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
-                self.pool.get('stock.move').write(cr, uid, [move.id], {
-                    'location_id': move.location_dest_id.id,
-                    'auto_validate': True,
-                    'picking_id': False,
-                    'location_id': dest,
-                    'state': 'waiting'
-                })
-                for m in self.pool.get('mrp.procurement').search(cr, uid, [('move_id','=',move.id)], context):
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
-        return True
-    
-    
-    def consume_moves(self, cr, uid, ids, product_qty, location_id=False, location_dest_id=False, consume=True, context=None):
-        res = []
-        production_obj = self.pool.get('mrp.production')
-        for move in self.browse(cr, uid, ids):
-            new_moves = super(StockMove, self).consume_moves(cr, uid, [move.id], product_qty, location_id, location_dest_id, consume, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for new_move in new_moves:
-                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
-                res.append(new_move)
-        return res  
-
-StockMove()
-
-
-class StockPicking(osv.osv):
-    _inherit = 'stock.picking'
-
-    def test_finnished(self, cursor, user, ids):
-        wf_service = netsvc.LocalService("workflow")
-        res = super(StockPicking, self).test_finnished(cursor, user, ids)
-        for picking in self.browse(cursor, user, ids):
-            for move in picking.move_lines:
-                if move.state == 'done' and move.procurements:
-                    for procurement in move.procurements:
-                        wf_service.trg_validate(user, 'mrp.procurement',
-                                procurement.id, 'button_check', cursor)
-        return res
-
-    #
-    # Explode picking by replacing phantom BoMs
-    #
-    def action_explode(self, cr, uid, picks, *args):
-        for move in self.pool.get('stock.move').browse(cr, uid, picks):
-            self.pool.get('stock.move')._action_explode(cr, uid, move)
-        return picks
-
-StockPicking()
-
-
-class spilt_in_production_lot(osv.osv_memory):
-    _inherit = "stock.move.split"
-    def split(self, cr, uid, ids, move_ids, context=None):
-        production_obj = self.pool.get('mrp.production')
-        move_obj = self.pool.get('stock.move')  
-        res = []      
-        for move in move_obj.browse(cr, uid, move_ids, context=context):
-            new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context)
-            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            for new_move in new_moves:
-                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})                
-        return res
-spilt_in_production_lot()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index f0c1cfa5483..8962eb6e1c8 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -165,6 +165,7 @@
 
         <record id="mrp_bom_0" model="mrp.bom">
             <field name="name">Regular processor config</field>
+            <field name="sequence">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_2"/>
@@ -174,6 +175,7 @@
 
         <record id="mrp_bom_1" model="mrp.bom">
             <field name="name">Assembly Basic+ PC</field>
+            <field name="sequence">5</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
@@ -181,18 +183,21 @@
         </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="name">Assembly Medium PC</field>
+            <field name="sequence">8</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','PC3')]"/>
         </record>
         <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">Assembly Customizable PC</field>
+            <field name="sequence">11</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','PC4')]"/>
         </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">HDD on demand</field>
+            <field name="sequence">14</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -200,6 +205,7 @@
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">RAM on demand</field>
+            <field name="sequence">18</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -207,6 +213,7 @@
         </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">HDD on demand</field>
+            <field name="sequence">21</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -214,6 +221,7 @@
         </record>
         <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">HDD on demand</field>
+            <field name="sequence">25</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -221,6 +229,7 @@
         </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">HDD Seagate</field>
+            <field name="sequence">26</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -228,6 +237,7 @@
         </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
+            <field name="sequence">29</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
@@ -236,12 +246,14 @@
         </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">Complete PC with peripherals</field>
+            <field name="sequence">33</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','PC0')]"/>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="name">RAM on demand</field>
+            <field name="sequence">36</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
@@ -250,6 +262,7 @@
 
         <record id="mrp_bom_13" model="mrp.bom">
             <field name="name">High Speed Processor + main board on demand</field>
+            <field name="sequence">38</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
@@ -258,6 +271,7 @@
         <record id="mrp_bom_kit" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="name">Kit Mouse</field>
+            <field name="sequence">40</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -266,6 +280,7 @@
         </record>
         <record id="mrp_bom_clavier" model="mrp.bom">
             <field name="name">Keyboard</field>
+            <field name="sequence">42</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
@@ -273,6 +288,7 @@
         </record>
         <record id="mrp_bom_mouse" model="mrp.bom">
             <field name="name">Mouse</field>
+            <field name="sequence">44</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
@@ -280,6 +296,7 @@
         </record>
         <record id="mrp_bom_16" model="mrp.bom">
             <field name="name">Moon PC</field>
+            <field name="sequence">45</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_10"/>
@@ -287,6 +304,7 @@
         </record>
         <record id="mrp_bom_18" model="mrp.bom">
             <field name="name">Mainboard ASUStek A7N8X</field>
+            <field name="sequence">49</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
@@ -294,6 +312,7 @@
         </record>
         <record id="mrp_bom_19" model="mrp.bom">
             <field name="name">Processor AMD Athlon 2200+</field>
+            <field name="sequence">51</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
@@ -301,6 +320,7 @@
         </record>
         <record id="mrp_bom_1900" model="mrp.bom">
             <field name="name">Regular Case Fan</field>
+            <field name="sequence">54</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
@@ -308,6 +328,7 @@
         </record>
         <record id="mrp_bom_23" model="mrp.bom">
             <field name="name">DDR 256MB PC333</field>
+            <field name="sequence">57</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_11"/>
@@ -315,6 +336,7 @@
         </record>
         <record id="mrp_bom_1901" model="mrp.bom">
             <field name="name">DDR 512MB PC400</field>
+            <field name="sequence">59</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
@@ -322,6 +344,7 @@
         </record>
         <record id="mrp_bom_22" model="mrp.bom">
             <field name="name">DDR 1024MB PC400</field>
+            <field name="sequence">61</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_5"/>
@@ -329,6 +352,7 @@
         </record>
         <record id="mrp_bom_24" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
+            <field name="sequence">64</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_7"/>
@@ -336,6 +360,7 @@
         </record>
         <record id="mrp_bom_25" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
+            <field name="sequence">66</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -344,6 +369,7 @@
         </record>
         <record id="mrp_bom_26" model="mrp.bom">
             <field name="name">RAM on demand</field>
+            <field name="sequence">69</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
@@ -351,6 +377,7 @@
         </record>
         <record id="mrp_bom_27" model="mrp.bom">
             <field name="name">HDD on demand</field>
+            <field name="sequence">73</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
@@ -358,6 +385,7 @@
         </record>
         <record id="mrp_bom_28" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
+            <field name="sequence">76</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -366,6 +394,7 @@
         </record>
         <record id="mrp_bom_29" model="mrp.bom">
             <field name="name">Processor on demand</field>
+            <field name="sequence">79</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -374,6 +403,7 @@
         </record>
         <record id="mrp_bom_30" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
+            <field name="sequence">81</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -382,6 +412,7 @@
         </record>
         <record id="mrp_bom_31" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
+            <field name="sequence">83</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -390,6 +421,7 @@
         </record>
         <record id="mrp_bom_32" model="mrp.bom">
             <field name="name">High speed processor config</field>
+            <field name="sequence">85</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -398,6 +430,7 @@
         </record>
         <record id="mrp_bom_33" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
+            <field name="sequence">87</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -406,6 +439,7 @@
         </record>
         <record id="mrp_bom_34" model="mrp.bom">
             <field name="name">Regular processor config</field>
+            <field name="sequence">89</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -414,6 +448,7 @@
         </record>
         <record id="mrp_bom_35" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
+            <field name="sequence">92</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -422,6 +457,7 @@
         </record>
         <record id="mrp_bom_36" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
+            <field name="sequence">95</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -430,6 +466,7 @@
         </record>
         <record id="mrp_bom_processor" model="mrp.bom">
             <field name="name">processor</field>
+            <field name="sequence">98</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -438,6 +475,7 @@
         </record>
         <record id="mrp_bom_38" model="mrp.bom">
             <field name="name">mainboard</field>
+            <field name="sequence">101</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -446,6 +484,7 @@
         </record>
         <record id="mrp_bom_fan" model="mrp.bom">
             <field name="name">fan</field>
+            <field name="sequence">105</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -454,6 +493,7 @@
         </record>
         <record id="mrp_bom_ram" model="mrp.bom">
             <field name="name">RAM</field>
+            <field name="sequence">108</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -462,6 +502,7 @@
         </record>
         <record id="mrp_bom_41" model="mrp.bom">
             <field name="name">Regular processor config</field>
+            <field name="sequence">111</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -470,6 +511,7 @@
         </record>
         <record id="mrp_bom_42" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
+            <field name="sequence">113</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -478,6 +520,7 @@
         </record>
         <record id="mrp_bom_43" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
+            <field name="sequence">115</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
@@ -487,6 +530,7 @@
 
         <record id="mrp_bom_kit2" model="mrp.bom">
             <field name="code">KIT</field>
+            <field name="sequence">118</field>
             <field name="name">Kit Keyboard + Mouse</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
@@ -496,6 +540,7 @@
         </record>
         <record id="mrp_bom_mouse2" model="mrp.bom">
             <field name="name">Mouse</field>
+            <field name="sequence">121</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
@@ -503,6 +548,7 @@
         </record>
         <record id="mrp_bom_clavier2" model="mrp.bom">
             <field name="name">Keyboard</field>
+            <field name="sequence">123</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9c0b2000b94..15729a8c985 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,10 +5,10 @@
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
-		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
+        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
         <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />
-     	<menuitem name="Master Data"
+        <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
                   sequence="5" />
@@ -242,19 +242,21 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material">
                     <group colspan="4" col="6">
-                      <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                      <field name="name" select="1"/>
-                      <field name="code" select="1"/>
-                      <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+	                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+	                    <field name="name" select="1"/>
+	                    <field name="code" select="1"/>
+	                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <field name="product_uom"/>
-                    <field name="product_qty"/>
-                    <newline/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <field name="product_uos_qty" groups="product.group_uos"/>
                     <field name="routing_id" select="2" groups="base.group_extended"/>
                     <field name="type" groups="base.group_extended"/>
+                    <group colspan="4" col="6">
+	                    <field name="product_uom"/>
+	                   	<field name="product_qty"/>
+	                    <field name="multi_level_bom"/>
+	                </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"/>
@@ -274,6 +276,9 @@
                             <field name="product_efficiency"/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
                         </page>
+                        <page string="Multi-Level BoM" attrs="{'invisible':[('multi_level_bom','=',False)]}">
+                        	<field colspan="4" name="child_ids" nolabel="1" string="BoM Hierarchy"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -286,6 +291,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
+					<field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="product_id"/>
@@ -438,15 +444,7 @@
                     <field name="cycle_total" operator="+"/>
                 </graph>
             </field>
-        </record>
-
-        <wizard
-            string="Change Product Qty."
-            model="mrp.production"
-            name="change_production_qty"
-            id="mrp.wizard_change_production_qty"
-            keyword="client_action_multi"
-            multi="True"/>
+        </record>        
 
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
@@ -462,7 +460,9 @@
                         <field name="product_qty"/>
                         <group colspan="2" col="3">
                         <field name="product_uom"/>
-                        <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production"/>
+                        <button type="action"
+                        	name="%(mrp.action_change_production_qty)d"
+                        	string="Change Qty" states="ready,confirmed" />
                         </group>
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
@@ -484,35 +484,32 @@
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Consume">
                                     <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                    <field name="state" invisible="1" />
-                                    <button
-                                        name="%(stock.move_consume)d"
-                                        string=">" type="action"
-                                        icon="gtk-go-forward" context="{'consume': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="D" type="action"
-                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+				                    <field name="product_qty"  string="Qty"/>
+				                    <field name="product_uom"  string="UOM"/>
+                                    <field name="location_id"  string="Source Loc."/>
+
+                                    <field name="state" invisible="1"/>
+				                    <button name="%(stock.move_consume)d"
+				                    	string="Consume Products" type="action"
+				                    	icon="gtk-go-forward" context="{'consume': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-convert" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />				                    
                                 </tree>
-                                <form string="Products to Consume">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                </form>
                             </field>
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                            			widget="one2many_list" mode="tree,form" height="275">
-                           		<tree string="Consumed Products" editable="bottom">
+                           		<tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
                            			<field name="product_id" readonly="1"/>
-                           			<field name="product_qty" readonly="1"/>
-                           			<field name="product_uom" readonly="1" />
-                           			<field name="state" invisible="1" />
-                           			<field name="location_id" readonly="1"/>
-                           			<field name="prodlot_id" />
+                           			<field name="product_qty" readonly="1" string="Qty"/>
+				                    <field name="product_uom" readonly="1" string="UOM"/>                                    
+                                    <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
+				                    <field name="prodlot_id" />
+                                    <field name="state" invisible="1"/>
+                                    <field name="scraped" invisible="1"/>
                            			<button
                            				name="%(stock.track_line)d"
                            				string="Split in production lots"
@@ -520,15 +517,11 @@
                            				states="done,cancel" />
                            			<button
                            				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
+                           				string="Scrap Products" type="action"
                            				icon="gtk-convert"
-                           				states="done,cancel" />
+                           				states="done,cancel" />                          			
+				                    
                            		</tree>
-                           		<form string="Consumed Products">
-                           			<field name="product_id" />
-                           			<field name="product_qty" />
-                           			<field name="product_uom" />
-                           		</form>
                            	</field>
 
                             <group col="9" colspan="4">
@@ -547,46 +540,37 @@
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                    <field name="state" invisible="1" />
-                                    <button
-                                        name="%(stock.move_consume)d"
-                                        string=">" type="action"
-                                        icon="gtk-go-forward"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="D" type="action"
-                                        icon="gtk-justify-fill" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+				                    <field name="product_qty"  string="Qty"/>
+				                    <field name="product_uom"  string="UOM"/>
+                                    <field name="location_id"  string="Source Loc."/>
+                                    <field name="state" invisible="1"/>
+				                    <button name="%(stock.move_consume)d"
+				                    	string="Consume Products" type="action"
+				                    	icon="gtk-go-forward" context="{'consume': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+				                    <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-convert" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />				                    
                                 </tree>
-                                <form string="Products to Finish">
-                                    <field name="product_id" />
-                                    <field name="product_qty" />
-                                    <field name="product_uom" />
-                                </form>
                             </field>
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                            			widget="one2many_list" mode="tree,form" height="275">
-                           		<tree string="Finished Products" editable="bottom">
+                           		<tree string="Finished Products" editable="bottom" colors="red:scraped==True">
                            			<field name="product_id" readonly="1"/>
-                           			<field name="product_qty" readonly="1"/>
-                           			<field name="product_uom" readonly="1" />
-                           			<field name="state" invisible="1" />
-                           			<field name="location_id" readonly="1"/>
+                           			<field name="product_qty" readonly="1" string="Qty"/>
+				                    <field name="product_uom" readonly="1" string="UOM"/>
+                                    <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
                            			<field name="prodlot_id" />
+                                    <field name="state" invisible="1"/>
+                                    <field name="scraped" invisible="1"/>
                            			<button name="%(stock.track_line)d"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
                            			<button name="%(stock.move_scrap)d"
-                           				string="D" type="action" icon="gtk-go-forward"
+                           				string="Scrap Products" type="action" icon="gtk-convert"
                            				states="done,cancel" />
                            		</tree>
-                           		<form string="Finished Products">
-                           			<field name="product_id" />
-                           			<field name="product_qty" />
-                           			<field name="product_uom" />
-                           		</form>
                            	</field>
                         </page>
                         <page string="Work Orders">
@@ -955,6 +939,7 @@
                 <tree string="Minimum Stock Rules">
                     <field name="name"/>
                     <field name="warehouse_id"/>
+                    <field name="location_id"/>
                     <field name="product_id"/>
                     <field name="product_uom"/>
                     <field name="product_min_qty"/>
@@ -969,11 +954,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Minimum Stock Rules Search">
-                    <field name="name" select="1" />
-                    <field name="warehouse_id" select="1" widget="selection"/>
-                    <field name="location_id" select="1" />
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="product_id" select="1"/>
+                    <group col="10" colspan="4">
+                        <field name="name" select="1" />
+                        <field name="warehouse_id" select="1" widget="selection"/>
+                        <field name="location_id" select="1" />
+                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="product_id" select="1"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="10">
+                        <filter string="Warehouse" icon="terp-stock" domain="[]"  context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 74001494c77..f7bfdcd7395 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -1,35 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/>
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
-        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" type="wizard" sequence="90"/>
-        <!--
-          <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
-        -->
 
-        <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
-        <!--
-             <menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/>
-        -->
-
-        <wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Work Center load"/>
-
-        <wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>
-        <record id="ir_project_cost_structure" model="ir.values">
-            <field eval="'client_print_multi'" name="key2"/>
-            <field eval="'product.product'" name="model"/>
-            <field name="name">Product Cost Structure</field>
-            <field eval="'ir.actions.wizard,%d'%wizard_price" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
-
-        <wizard
-            string="Requisition Request"
-            model="product.product"
-            name="product.product.procurement"
-            keyword="client_action_multi"
-            id="product_procurement_wizard"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
new file mode 100644
index 00000000000..375bd0c9f46
--- /dev/null
+++ b/addons/mrp/product.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class product_product(osv.osv):
+    _inherit = "product.product"    
+
+    def do_change_standard_price(self, cr, uid, ids, datas, context={}):
+        #TODO : TO Check 
+        res = super(product_product, self).do_change_standard_price(cr, uid, ids, datas, context=context)
+        bom_obj = self.pool.get('mrp.bom')
+        product_uom_obj = self.pool.get('product.uom')
+
+        def _compute_price(bom):            
+            price = 0
+            if bom.bom_lines:
+                for sbom in bom.bom_lines:
+                    price += _compute_price(sbom) * sbom.product_qty                    
+            else:
+                
+                no_child_bom = bom_obj.search(cr, uid, [('product_id', '=', bom.product_id.id), ('bom_id', '=', False)])
+                if no_child_bom and bom.id not in no_child_bom:
+                    other_bom = bom_obj.browse(cr, uid, no_child_bom)[0]
+                    if not other_bom.product_id.calculate_price:
+                        price += _compute_price(other_bom) * other_bom.product_qty
+                    else:
+                        price += other_bom.product_id.standard_price
+                else:
+                    price += bom.product_id.standard_price
+
+            if bom.routing_id:
+                for wline in bom.routing_id.workcenter_lines:
+                    wc = wline.workcenter_id
+                    cycle = wline.cycle_nbr
+                    hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) *  (wc.time_efficiency or 1.0)
+                    price += wc.costs_cycle * cycle + wc.costs_hour * hour
+                    price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
+            if bom.bom_lines:
+                self.write(cr, uid, [bom.product_id.id], {'standard_price' : price/bom.product_qty})
+            if bom.product_uom.id != bom.product_id.uom_id.id:
+                price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
+            return price
+
+        
+        bom_ids = bom_obj.search(cr, uid, [('product_id', 'in', ids)])
+        for bom in bom_obj.browse(cr, uid, bom_ids):
+            _compute_price(bom)
+        return res    
+product_product()
diff --git a/addons/mrp/report/__init__.py b/addons/mrp/report/__init__.py
index a053b3998b2..471e3440af3 100644
--- a/addons/mrp/report/__init__.py
+++ b/addons/mrp/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,6 +23,8 @@ import price
 import workcenter_load
 import order
 import bom_structure
+import mrp_report
+import mrp_production_order
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
new file mode 100644
index 00000000000..d2299a19731
--- /dev/null
+++ b/addons/mrp/report/mrp_production_order.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields,osv
+import tools
+
+
+class mrp_production_order(osv.osv):
+    _name = "mrp.production.order"
+    _description = "Production Order Report"
+    _auto = False
+    _columns = {
+        'name': fields.char('Year',size=64,required=False, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+        'reference': fields.char('Reference', size=64, required=True),
+        'origin': fields.char('Source Document', size=64),
+        'nbr': fields.integer('# of Orders', readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','<>','service')]),
+        'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True),
+        'scheduled_date':fields.date('Scheduled Date'),
+        'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True),
+        'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True),
+
+
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'mrp_production_order')
+        cr.execute("""
+            create or replace view mrp_production_order as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.product_id,
+                    count(*) as nbr,
+                    to_date(to_char(c.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as scheduled_date,
+                    c.name as reference,
+                    c.origin,
+                    c.location_src_id,
+                    c.location_dest_id
+                from
+                    mrp_production c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.product_id,to_date(to_char(c.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY'),c.name,c.location_src_id,c.location_dest_id,c.origin
+            )""")
+mrp_production_order()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
new file mode 100644
index 00000000000..abb046bd685
--- /dev/null
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Production Order Report
+	-->
+
+        <record id="view_report_mrp_production_order_tree" model="ir.ui.view">
+            <field name="name">mrp.production.order.tree</field>
+            <field name="model">mrp.production.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+               <tree string="Production">
+					<field name="name" />
+					<field name="month"/>
+					<field name="product_id" />
+					<field name="scheduled_date"/>
+                   	<field name="reference" />
+					<field name="origin"/>
+					<field name="nbr" string="#Production Orders" />
+					<field name="location_src_id"/>
+                   	<field name="location_dest_id" />
+                    <field name="state" invisible="1"/>
+				</tree>
+            </field>
+        </record>
+        <record id="view_report_mrp_production_order_form" model="ir.ui.view">
+            <field name="name">mrp.production.order.form</field>
+            <field name="model">mrp.production.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Production">
+            		<field name="name" />
+					<field name="month"/>
+                   	<field name="product_id"/>
+                   	<field name="scheduled_date"/>
+                   	<field name="reference" />
+					<field name="origin"/>
+                 </form>
+            </field>
+        </record>
+
+        <record id="view_report_mrp_production_order_graph" model="ir.ui.view">
+            <field name="name">mrp.production.order.graph</field>
+            <field name="model">mrp.production.order</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Production" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_mrp_production_order_filter" model="ir.ui.view">
+            <field name="name">mrp.production.order.select</field>
+            <field name="model">mrp.production.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search">
+                  <group col="16" colspan="6">
+                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" default="1" />
+						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
+                        <separator orientation="vertical"/>
+						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
+						<filter string="Scheduled Date" icon="terp-hr" domain="[('scheduled_date',=,time.strftime('%%m/%%d/%%Y'))]"/>
+						<separator orientation="vertical"/>
+						<field name="reference" />
+						<field name="origin"/>
+                   </group>
+
+                   <newline/>
+                  <group expand="1" string="Group By..." colspan="4" col="6">
+                    	<filter string="Source Location" icon="terp-sale" domain="[]" context="{'group_by':'location_src_id'}"/>
+                    	<filter string="Destination Location" icon="terp-sale" domain="[]" context="{'group_by':'location_dest_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+                    	<separator orientation="vertical"/>
+                    	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
+                    	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
+
+
+                   </group>
+               </search>
+            </field>
+        </record>
+        <record id="action_report_mrp_production_order" model="ir.actions.act_window">
+            <field name="name">Production Order</field>
+            <field name="res_model">mrp.production.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="view_id" ref="view_report_mrp_production_order_tree"/>
+            <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
+        </record>
+
+       	<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_report_mrp_production_order_tree"/>
+	        <field name="act_window_id" ref="action_report_mrp_production_order"/>
+	    </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_mrp_production_order_graph">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">graph</field>
+	        <field name="view_id" ref="view_report_mrp_production_order_graph"/>
+	        <field name="act_window_id" ref="action_report_mrp_production_order"/>
+	    </record>
+
+        <menuitem name="Production" action="action_report_mrp_production_order" id="menu_report_mrp_production_orders_tree" parent="next_id_77"/>
+
+  </data>
+</openerp>
+
diff --git a/addons/report_mrp/report_mrp.py b/addons/mrp/report/mrp_report.py
similarity index 100%
rename from addons/report_mrp/report_mrp.py
rename to addons/mrp/report/mrp_report.py
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/mrp/report/mrp_report_view.xml
similarity index 98%
rename from addons/report_mrp/report_mrp_view.xml
rename to addons/mrp/report/mrp_report_view.xml
index c14688d9cbf..5de7c7be34b 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -98,7 +98,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="report_mrp.next_id_77"/>
+        <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="next_id_77"/>
 
 
 
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index a65a51d03f7..248e9e5707e 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -134,9 +134,9 @@ class report_custom(report_int):
 
         # select workcenters
         cr.execute(
-            "SELECT id, name FROM mrp_workcenter " \
-            "WHERE id=ANY(%s)" \
-            "ORDER BY mrp_workcenter.id" ,(ids,))
+            "SELECT mw.id, rs.name FROM mrp_workcenter mw, resource_resource rs " \
+            "WHERE mw.id=ANY(%s) and mw.resource_id=rs.id " \
+            "ORDER BY mw.id" ,(ids,))
         workcenters = cr.dictfetchall()
 
         data = []
@@ -144,13 +144,13 @@ class report_custom(report_int):
             vals = []
             for workcenter in workcenters:
                 cr.execute("SELECT SUM(mrp_production_workcenter_line.hour) AS hours, SUM(mrp_production_workcenter_line.cycle) AS cycles, \
-                                mrp_workcenter.name AS name, mrp_workcenter.id AS id \
-                            FROM mrp_production_workcenter_line, mrp_production, mrp_workcenter \
+                                resource_resource.name AS name, mrp_workcenter.id AS id \
+                            FROM mrp_production_workcenter_line, mrp_production, mrp_workcenter, resource_resource \
                             WHERE (mrp_production_workcenter_line.production_id=mrp_production.id) \
                                 AND (mrp_production_workcenter_line.workcenter_id=mrp_workcenter.id) \
                                 AND (mrp_workcenter.id=%s) \
                                 AND (mrp_production.date_planned BETWEEN %s AND %s) \
-                            GROUP BY mrp_production_workcenter_line.workcenter_id, mrp_workcenter.name, mrp_workcenter.id \
+                            GROUP BY mrp_production_workcenter_line.workcenter_id, resource_resource.name, mrp_workcenter.id \
                             ORDER BY mrp_workcenter.id", (workcenter['id'], dates[date]['start'] + ' 00:00:00', dates[date]['stop'] + ' 23:59:59'))
                 res = cr.dictfetchall()
                 if not res:
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 509d50b46b9..097f81f7529 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -195,9 +195,9 @@ class mrp_procurement(osv.osv):
                     qty = max(op.product_min_qty, op.product_max_qty)-prods
                     reste = qty % op.qty_multiple
                     if reste > 0:
-                        qty += op.qty_multiple - reste
+                        qty += op.qty_multiple - reste                    
                     newdate = DateTime.now() + DateTime.RelativeDateTime(
-                            days=op.product_id.seller_delay)
+                            days=int(op.product_id.seller_delay))
                     if op.product_id.supply_method == 'buy':
                         location_id = op.warehouse_id.lot_input_id
                     elif op.product_id.supply_method == 'produce':
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index cdc658ff7c0..48f27679435 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -32,3 +32,12 @@
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
 "access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0
 "access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0
+"access_mrp_make_procurement","make.procurement","model_make_procurement","mrp.group_mrp_user",1,0,0,0
+"access_mrp_change_production_qty","change.production.qty","model_change_production_qty","mrp.group_mrp_user",1,0,0,0
+"access_mrp_procurement_compute_all","mrp.procurement.compute.all","model_mrp_procurement_compute_all","mrp.group_mrp_user",1,0,0,0
+"access_mrp_procurement_orderpoint_compute","mrp.procurement.orderpoint.compute","model_mrp_procurement_orderpoint_compute","mrp.group_mrp_user",1,0,0,0
+"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
+"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
+"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_product_price","mrp.product_price","model_mrp_product_price","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_workcenter_load","mrp.workcenter.load","model_mrp_workcenter_load","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
new file mode 100644
index 00000000000..4ddfddf6d90
--- /dev/null
+++ b/addons/mrp/stock.py
@@ -0,0 +1,225 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx import DateTime
+from osv import fields
+from osv import osv
+from tools.translate import _
+import ir
+import netsvc
+import time
+
+
+class stock_warehouse_orderpoint(osv.osv):
+    _name = "stock.warehouse.orderpoint"
+    _description = "Orderpoint minimum rule"
+    _columns = {
+        'name': fields.char('Name', size=32, required=True),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
+        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
+        'location_id': fields.many2one('stock.location', 'Location', required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
+        'product_min_qty': fields.float('Min Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a requisition to bring the virtual stock to the Max Quantity."),
+        'product_max_qty': fields.float('Max Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a requisition to bring the virtual stock to the Max Quantity."),
+        'qty_multiple': fields.integer('Qty Multiple', required=True,
+            help="The requisition quantity will by rounded up to this multiple."),
+        'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'),
+        'company_id': fields.many2one('res.company','Company',required=True),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+        'logic': lambda *a: 'max',
+        'qty_multiple': lambda *a: 1,
+        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
+        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
+    }
+    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
+        if warehouse_id:
+            w=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id, context)
+            v = {'location_id':w.lot_stock_id.id}
+            return {'value': v}
+        return {}
+    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        if product_id:
+            prod=self.pool.get('product.product').browse(cr,uid,product_id)
+            v = {'product_uom':prod.uom_id.id}
+            return {'value': v}
+        return {}
+    def copy(self, cr, uid, id, default=None,context={}):
+        if not default:
+            default = {}
+        default.update({
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
+        })
+        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
+stock_warehouse_orderpoint()
+
+class StockMove(osv.osv):
+    _inherit = 'stock.move'
+    _columns = {
+        'production_id': fields.many2one('mrp.production', 'Production', select=True),
+        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
+    }
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default['procurements'] = []
+        return super(StockMove, self).copy(cr, uid, id, default, context)
+
+    def _action_explode(self, cr, uid, move, context={}):
+        if move.product_id.supply_method=='produce' and move.product_id.procure_method=='make_to_order':
+            bis = self.pool.get('mrp.bom').search(cr, uid, [
+                ('product_id','=',move.product_id.id),
+                ('bom_id','=',False),
+                ('type','=','phantom')])
+            if bis:
+                factor = move.product_qty
+                bom_point = self.pool.get('mrp.bom').browse(cr, uid, bis[0])
+                res = self.pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor, [])
+                dest = move.product_id.product_tmpl_id.property_stock_production.id
+                state = 'confirmed'
+                if move.state=='assigned':
+                    state='assigned'
+                for line in res[0]:                    
+                    valdef = {
+                        'picking_id': move.picking_id.id,
+                        'product_id': line['product_id'],
+                        'product_uom': line['product_uom'],
+                        'product_qty': line['product_qty'],
+                        'product_uos': line['product_uos'],
+                        'product_uos_qty': line['product_uos_qty'],
+                        'move_dest_id': move.id,
+                        'state': state,
+                        'name': line['name'],
+                        'location_dest_id': dest,
+                        'move_history_ids': [(6,0,[move.id])],
+                        'move_history_ids2': [(6,0,[])],
+                        'procurements': [],
+                    }
+                    mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef)
+                    prodobj = self.pool.get('product.product').browse(cr, uid, line['product_id'], context=context)
+                    proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                        'name': (move.picking_id.origin or ''),
+                        'origin': (move.picking_id.origin or ''),
+                        'date_planned': move.date_planned,
+                        'product_id': line['product_id'],
+                        'product_qty': line['product_qty'],
+                        'product_uom': line['product_uom'],
+                        'product_uos_qty': line['product_uos'] and line['product_uos_qty'] or False,
+                        'product_uos':  line['product_uos'],
+                        'location_id': move.location_id.id,
+                        'procure_method': prodobj.procure_method,
+                        'move_id': mid,
+                        'company_id': line['company_id'],
+                    })
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+                self.pool.get('stock.move').write(cr, uid, [move.id], {
+                    'location_id': move.location_dest_id.id,
+                    'auto_validate': True,
+                    'picking_id': False,
+                    'location_id': dest,
+                    'state': 'waiting'
+                })
+                for m in self.pool.get('mrp.procurement').search(cr, uid, [('move_id','=',move.id)], context):
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
+        return True
+    
+    
+    def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None):        
+        res = []
+        production_obj = self.pool.get('mrp.production')
+        wf_service = netsvc.LocalService("workflow")
+        for move in self.browse(cr, uid, ids):
+            new_moves = super(StockMove, self).action_consume(cr, uid, [move.id], product_qty, location_id, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for prod in production_obj.browse(cr, uid, production_ids, context=context):
+                if prod.state == 'confirmed':
+                    production_obj.force_production(cr, uid, [prod.id])
+                wf_service.trg_validate(uid, 'mrp.production', prod.id, 'button_produce', cr)
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+                res.append(new_move)
+        return res
+    
+    def action_scrap(self, cr, uid, ids, product_qty, location_id, context=None):
+        res = []
+        production_obj = self.pool.get('mrp.production')
+        wf_service = netsvc.LocalService("workflow")
+        for move in self.browse(cr, uid, ids):
+            new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for prod_id in production_ids:
+                wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr)
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+                res.append(new_move)
+        return {}
+
+StockMove()
+
+
+class StockPicking(osv.osv):
+    _inherit = 'stock.picking'
+
+    def test_finnished(self, cursor, user, ids):
+        wf_service = netsvc.LocalService("workflow")
+        res = super(StockPicking, self).test_finnished(cursor, user, ids)
+        for picking in self.browse(cursor, user, ids):
+            for move in picking.move_lines:
+                if move.state == 'done' and move.procurements:
+                    for procurement in move.procurements:
+                        wf_service.trg_validate(user, 'mrp.procurement',
+                                procurement.id, 'button_check', cursor)
+        return res
+
+    #
+    # Explode picking by replacing phantom BoMs
+    #
+    def action_explode(self, cr, uid, picks, *args):
+        for move in self.pool.get('stock.move').browse(cr, uid, picks):
+            self.pool.get('stock.move')._action_explode(cr, uid, move)
+        return picks
+
+StockPicking()
+
+
+class spilt_in_production_lot(osv.osv_memory):
+    _inherit = "stock.move.split"
+    def split(self, cr, uid, ids, move_ids, context=None):
+        production_obj = self.pool.get('mrp.production')
+        move_obj = self.pool.get('stock.move')  
+        res = []      
+        for move in move_obj.browse(cr, uid, move_ids, context=context):
+            new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})                
+        return res
+spilt_in_production_lot()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 240f25daa9d..043cdc94465 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -19,14 +19,15 @@
 #
 ##############################################################################
 
-import wizard_orderpoint_procurement
+import mrp_product_produce
+import orderpoint_procurement
 import wizard_procurement
-import wizard_schedulers_all
-import wizard_price
-import wizard_workcenter_load
+import schedulers_all
+import mrp_price
+import mrp_workcenter_load
 import wizard_track_prod
-import wizard_change_production_qty
-import make_procurement
+import change_production_qty
+import make_procurement_product
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
new file mode 100644
index 00000000000..7f1496dd6a1
--- /dev/null
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import time
+import ir
+from osv.osv import except_osv
+from osv import fields, osv
+import netsvc
+from tools.translate import _
+
+class change_production_qty(osv.osv_memory):
+    _name = 'change.production.qty'
+    _description = 'Change Quantity of Products'
+    
+    _columns = {
+        'product_qty': fields.float('Product Qty', 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. 
+        
+        """        
+        res = super(change_production_qty, self).default_get(cr, uid, fields, context=context)        
+        prod_obj = self.pool.get('mrp.production')
+        prod = prod_obj.browse(cr, uid, context.get('active_id'))
+        if 'product_qty' in fields:
+            res.update({'product_qty': prod.product_qty})  
+        return res
+        
+    def change_prod_qty(self, cr, uid, ids, context):
+        """ 
+             Changes the Quantity of Product.
+            
+             @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:  
+        
+        """
+        record_id = context and context.get('active_id',False)
+        assert record_id, _('Active Id is not found')
+        prod_obj = self.pool.get('mrp.production')
+        product_lines_obj = self.pool.get('mrp.production.product.line')
+        bom_obj = self.pool.get('mrp.bom')
+        for wiz_qty in self.browse(cr, uid, ids):
+            prod = prod_obj.browse(cr, uid,record_id)
+            prod_obj.write(cr, uid,prod.id, {'product_qty': wiz_qty.product_qty})
+            prod_obj.action_compute(cr, uid, [prod.id])
+        
+            move_lines_obj = self.pool.get('stock.move')
+            for move in prod.move_lines:
+                bom_point = prod.bom_id
+                bom_id = prod.bom_id.id
+                if not bom_point:
+                    bom_id = bom_obj._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
+                    if not bom_id:
+                        raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
+                    prod_obj.write(cr, uid, [prod.id], {'bom_id': bom_id})
+                    bom_point = bom_obj.browse(cr, uid, [bom_id])[0]
+        
+                if not bom_id:
+                    raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
+        
+                factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
+                res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
+                for r in res[0]:
+                    if r['product_id']== move.product_id.id:
+                        move_lines_obj.write(cr, uid,move.id, {'product_qty' :  r['product_qty']})
+            for m in prod.move_created_ids:
+                move_lines_obj.write(cr, uid,m.id, {'product_qty': wiz_qty.product_qty})
+    
+        return {}
+    
+change_production_qty()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
new file mode 100644
index 00000000000..34520a71721
--- /dev/null
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Change Product Quantity -->
+        
+		<record id="view_change_production_qty_wizard" model="ir.ui.view">
+            <field name="name">Change Product Qty</field>
+            <field name="model">change.production.qty</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Product Qty">
+				    <field name="product_qty"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="change_prod_qty" string="Validate"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_change_production_qty" model="ir.actions.act_window">
+            <field name="name">Change Product Qty</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">change.production.qty</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>            
+        </record>
+       
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
deleted file mode 100644
index 0cf12107181..00000000000
--- a/addons/mrp/wizard/make_procurement.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import netsvc
-
-import time
-
-def _get_default(obj, cr, uid, data, context=None):
-    pool = pooler.get_pool(cr.dbname)
-    product = pool.get('product.product').browse(cr, uid, data['id'], context)
-    return {'product_id': product.id, 'uom_id':product.uom_id.id, 'qty':1.0}
-
-def make_procurement(obj, cr, uid, data, context=None):
-    '''Create procurement'''
-    pool = pooler.get_pool(cr.dbname)
-    wh = pool.get('stock.warehouse').browse(cr, uid, data['form']['warehouse_id'], context)
-    user = pool.get('res.users').browse(cr, uid, uid, context)
-    procure_id = pool.get('mrp.procurement').create(cr, uid, {
-        'name':'INT:'+str(user.login),
-        'date_planned':data['form']['date_planned'],
-        'product_id':data['form']['product_id'],
-        'product_qty':data['form']['qty'],
-        'product_uom':data['form']['uom_id'],
-        'location_id':wh.lot_stock_id.id,
-        'procure_method':'make_to_order',
-    }, context=context)
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
-    return {}
-
-
-class MakeProcurement(wizard.interface):
-    '''Wizard that create a procurement from a product form'''
-
-    done_form = """<?xml version="1.0"?>
-<form string="Make Requisition">
-    <label string="Your procurement request has been sent !"/>
-</form>"""
-    procurement_form = """<?xml version="1.0"?>
-<form string="Internal Requisition Request">
-    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
-    <field name="product_id"/>
-    <field name="warehouse_id"/>
-    <field name="qty"/>
-    <field name="uom_id"/>
-    <field name="date_planned"/>
-</form>"""
-    procurement_fields = {
-        'qty': {'string': 'Quantity', 'type': 'float', 'digits':(16,2), 'required': True},
-        'product_id': {'string': 'product', 'type': 'many2one', 'relation': 'product.product', 'required': True, 'readonly':1},
-        'uom_id': {'string': 'Unit of Measure', 'type': 'many2one', 'relation': 'product.uom', 'required':True},
-        'warehouse_id': {'string': 'Warehouse', 'type': 'many2one', 'relation':'stock.warehouse', 'required':True},
-        'date_planned': {'string': 'Planned Date', 'type': 'date', 'required':True, 'default': lambda *args: time.strftime('%Y-%m-%d')}
-    }
-
-    states = {
-        'init': {
-            'actions': [_get_default],
-            'result': {'type': 'form', 'arch': procurement_form, 'fields': procurement_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('create', 'Ask New Products')
-                ]
-            }
-        },
-        'done': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': done_form, 'fields': {},
-                'state': [
-                    ('end', 'Close'),
-                ]
-            }
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': make_procurement, 'state': 'done'}
-        }
-    }
-
-MakeProcurement('product.product.procurement')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp/wizard/make_procurement_product.py
new file mode 100644
index 00000000000..a549d9f24b2
--- /dev/null
+++ b/addons/mrp/wizard/make_procurement_product.py
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+import time
+
+from osv import fields, osv
+
+class make_procurement(osv.osv_memory):
+    _name = 'make.procurement'
+    _description = 'Make Procurements'
+    
+    def onchange_product_id(self, cr, uid, ids, prod_id):
+        """ 
+             On Change of Product ID getting the value of related UoM.
+        
+             @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 prod_id: Changed ID of Product 
+             
+             @return: A dictionary which gives the UoM of the changed Product 
+        
+        """
+        product = self.pool.get('product.product').browse(cr, uid, prod_id)
+        return {'value': {'uom_id': product.uom_id.id}}
+    
+    _columns = {
+        'qty': fields.float('Quantity', digits=(16,2), required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=1),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
+        'date_planned': fields.date('Planned Date', required=True),
+    }
+    
+    _defaults = {
+            'date_planned': lambda *args: time.strftime('%Y-%m-%d'),
+            'qty': lambda *args: 1.0,
+    }
+    
+    def make_procurement(self, cr, uid, ids, context=None):
+        """ 
+             Creates procurement order for selected product.
+        
+             @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: A dictionary which loads Procurement form view. 
+        
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context).login
+        wh_obj = self.pool.get('stock.warehouse')
+        procurement_obj = self.pool.get('mrp.procurement') 
+        wf_service = netsvc.LocalService("workflow")
+        data_obj = self.pool.get('ir.model.data')
+        
+        for proc in self.browse(cr, uid, ids):
+            wh = wh_obj.browse(cr, uid, proc.warehouse_id.id, context)
+            procure_id = procurement_obj.create(cr, uid, {
+                'name':'INT: '+str(user),
+                'date_planned': proc.date_planned,
+                'product_id': proc.product_id.id,
+                'product_qty': proc.qty,
+                'product_uom': proc.uom_id.id,
+                'location_id': wh.lot_stock_id.id,
+                'procure_method':'make_to_order',
+            })
+            
+            wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
+        
+        
+        id2 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_form_view')
+        
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        
+        return {
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'mrp.procurement',
+                'res_id' : procure_id,
+                'views': [(id3,'form'),(id2,'tree')],
+                'type': 'ir.actions.act_window',
+         }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             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. 
+        
+        """
+        record_id = context and context.get('active_id', False) or False
+
+        res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
+        product_id = self.pool.get('product.product').browse(cr, uid, record_id, context=context).id
+        if 'product_id' in fields:
+            res.update({'product_id':product_id})  
+        return res
+
+make_procurement()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp/wizard/make_procurement_view.xml
new file mode 100644
index 00000000000..08c4b2cabf5
--- /dev/null
+++ b/addons/mrp/wizard/make_procurement_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Make Procurement -->
+        
+		<record id="view_make_procurment_wizard" model="ir.ui.view">
+            <field name="name">Requisition Request</field>
+            <field name="model">make.procurement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Requisition Request">
+				    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
+				    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+				    <field name="qty"/>
+				    <field name="uom_id"/>
+				    <field name="date_planned"/>
+				    <field name="warehouse_id" colspan="4"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="make_procurement" string="Ask New Products"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <act_window name="Requisition Request"		    
+		    res_model="make.procurement"
+		    src_model="product.product"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="act_make_procurement"/>       
+		
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/wizard_workcenter_load.py b/addons/mrp/wizard/mrp_price.py
similarity index 51%
rename from addons/mrp/wizard/wizard_workcenter_load.py
rename to addons/mrp/wizard/mrp_price.py
index 6465622c421..5d3c16cbaa5 100644
--- a/addons/mrp/wizard/wizard_workcenter_load.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -19,34 +19,37 @@
 #
 ##############################################################################
 
-import wizard
+from osv import fields, osv
 
-_time_unit_form = '''<?xml version="1.0"?>
-<form string="Select time unit">
-    <field name="time_unit"/>
-    <newline/>
-    <field name="measure_unit"/>
-</form>'''
-
-_time_unit_fields = {
-    'time_unit': {'string':'Type of period', 'type':'selection', 'selection':[('day', 'Day by day'),('week', 'Per week'),('month', 'Per month')], 'required':True},
-    'measure_unit': {'string':'Amount measuring unit', 'type':'selection', 'selection':[('hours', 'Amount in hours'),('cycles', 'Amount in cycles')], 'required':True},
-}
-
-class wizard_mrp_workcenter(wizard.interface):
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type':'form', 'arch':_time_unit_form, 'fields':_time_unit_fields, 'state':[('end','Cancel'),('report','Print') ]},
-        },
-        'report': {
-            'actions': [],
-            'result': {'type':'print', 'report':'mrp.workcenter.load', 'state':'end'},
-        },
+class mrp_price(osv.osv_memory):
+    _name = 'mrp.product_price'
+    _description = 'Product Price'
+    _columns = {
+        'number': fields.integer('Number of products to produce', required=True),
     }
+    
+    def print_report(self, cr, uid, ids, context=None):
+        """ 
+             To print the report of Product cost structure
+                        
+             @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 : Report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res = self.read(cr, uid, ids, ['number'])
+        res = res and res[0] or {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'product.price',
+                'datas' : datas,               
+       }
 
-wizard_mrp_workcenter('mrp.workcenter.load')
-
+mrp_price()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
new file mode 100644
index 00000000000..e2e294c5739
--- /dev/null
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Product Cost Structure Report -->
+        
+		<record id="view_mrp_product_price_wizard" model="ir.ui.view">
+            <field name="name">Product Cost Structure</field>
+            <field name="model">mrp.product_price</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid ?">
+				    <field name="number"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="print_report" string="Print"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+       <act_window name="Product Cost Structure"
+            res_model="mrp.product_price"
+            src_model="product.product"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_mrp_product_price_wizard"/>
+	</data>
+</openerp>	
diff --git a/addons/mrp/mrp_wizard.py b/addons/mrp/wizard/mrp_product_produce.py
similarity index 74%
rename from addons/mrp/mrp_wizard.py
rename to addons/mrp/wizard/mrp_product_produce.py
index 40d9f2ed1ab..7c77dfdee94 100644
--- a/addons/mrp/mrp_wizard.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -34,6 +34,16 @@ class mrp_product_produce(osv.osv_memory):
     }
 
     def _get_product_qty(self, cr, uid, context):
+        """ 
+             To obtain product quantity
+        
+             @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: quantity 
+        
+        """        
         prod = self.pool.get('mrp.production').browse(cr, uid, 
                                 context['active_id'], context=context)
         done = 0.0
@@ -47,11 +57,22 @@ class mrp_product_produce(osv.osv_memory):
                  }
 
     def do_produce(self, cr, uid, ids, context={}):
+        """ 
+             To check the product type
+        
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary
+             @return:  
+        
+        """               
         prod_obj = self.pool.get('mrp.production')
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
             for move_id in move_ids:
-                prod_obj.do_produce(cr, uid, move_id, 
+                prod_obj.action_produce(cr, uid, move_id, 
                                     data['product_qty'], data['mode'], context=context)
         return {}
 
diff --git a/addons/mrp/mrp_wizard_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
similarity index 100%
rename from addons/mrp/mrp_wizard_view.xml
rename to addons/mrp/wizard/mrp_product_produce_view.xml
diff --git a/addons/mrp/wizard/mrp_workcenter_load.py b/addons/mrp/wizard/mrp_workcenter_load.py
new file mode 100644
index 00000000000..1b5478dcbeb
--- /dev/null
+++ b/addons/mrp/wizard/mrp_workcenter_load.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+class mrp_workcenter_load(osv.osv_memory):
+    _name = 'mrp.workcenter.load'
+    _description = 'Workcenter Load'
+    
+    _columns = {
+        'time_unit': fields.selection([('day', 'Day by day'),('week', 'Per week'),('month', 'Per month')],'Type of period', required=True),
+        'measure_unit': fields.selection([('hours', 'Amount in hours'),('cycles', 'Amount in cycles')],'Amount measuring unit', required=True),
+    }
+
+    def print_report(self, cr, uid, ids, context=None):
+        """ 
+             To print the report of Work Center Load
+                        
+             @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 : Report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res = self.read(cr, uid, ids, ['time_unit','measure_unit'])
+        res = res and res[0] or {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'mrp.workcenter.load',
+                'datas' : datas,               
+       }
+
+mrp_workcenter_load()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
new file mode 100644
index 00000000000..a6b7a4f987d
--- /dev/null
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Work Center Load Report -->
+        
+		<record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
+            <field name="name">Work Center Load</field>
+            <field name="model">mrp.workcenter.load</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Select time unit">
+				    <field name="time_unit"/>
+				    <newline/>
+				    <field name="measure_unit"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="print_report" string="Print"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+				</form>
+			</field>
+		</record>
+		
+		<act_window name="Work Center Load"
+            res_model="mrp.workcenter.load"
+            src_model="mrp.workcenter"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_mrp_workcenter_load_wizard"/>
+	</data>
+</openerp>
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp/wizard/orderpoint_procurement.py
new file mode 100644
index 00000000000..731c3fca440
--- /dev/null
+++ b/addons/mrp/wizard/orderpoint_procurement.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+#
+# Order Point Method:
+#    - Order if the virtual stock of today is bellow the min of the defined order point
+#
+
+import threading
+from osv import fields,osv
+
+class procurement_compute(osv.osv_memory):
+    _name = 'mrp.procurement.orderpoint.compute'
+    _description = 'Automatic Order Point'
+    
+    _columns = {
+           'automatic': fields.boolean('Automatic Orderpoint', help='If the stock of a product is under 0, it will act like an orderpoint'),     
+    }
+
+    _defaults = {
+            'automatic' : lambda *a: False,
+    }
+    
+    def _procure_calculation_orderpoint(self, cr, uid, ids, context):
+        """ 
+             @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 
+        """        
+        proc_obj = self.pool.get('mrp.procurement')
+        for proc in self.browse(cr, uid, ids):
+            proc_obj._procure_orderpoint_confirm(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname, context=context)
+        
+        return {}
+    
+    def procure_calculation(self, cr, uid, ids, context):
+        """ 
+             @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 
+        
+        """
+        threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
+        threaded_calculation.start()
+        return {}
+
+procurement_compute()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/orderpoint_procurement_view.xml b/addons/mrp/wizard/orderpoint_procurement_view.xml
new file mode 100644
index 00000000000..c17bedae84f
--- /dev/null
+++ b/addons/mrp/wizard/orderpoint_procurement_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Compute Stock Minimum Rules Only -->
+        
+		<record id="view_procurement_compute_wizard" model="ir.ui.view">
+            <field name="name">Compute Stock Minimum Rules Only</field>
+            <field name="model">mrp.procurement.orderpoint.compute</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Parameters">
+				    <field name="automatic"/>
+				    <separator colspan="4"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="procure_calculation" string="Compute Stock"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <act_window name="Compute Stock Minimum Rules Only"		    
+		    res_model="mrp.procurement.orderpoint.compute"
+		    src_model="mrp.procurement"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_procurement_compute"/>        
+		
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/schedulers_all.py b/addons/mrp/wizard/schedulers_all.py
new file mode 100644
index 00000000000..62497564905
--- /dev/null
+++ b/addons/mrp/wizard/schedulers_all.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import threading
+
+from osv import osv, fields
+
+class procurement_compute(osv.osv_memory):
+    _name = 'mrp.procurement.compute.all'
+    _description = 'Compute all schedulers'
+    
+    _columns = {
+        'automatic': fields.boolean('Automatic orderpoint',help='Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.'),
+    }
+    
+    _defaults ={
+         'automatic': lambda *a: False,
+    }
+    
+    def _procure_calculation_all(self, cr, uid, ids, context):
+        """ 
+             @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 
+        """
+        proc_obj = self.pool.get('mrp.procurement')
+        for proc in self.browse(cr, uid, ids):
+            proc_obj.run_scheduler(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname,\
+                    context=context)
+        return {}
+    
+    def procure_calculation(self, cr, uid, ids, context):
+        """ 
+             @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 
+        """
+        threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
+        threaded_calculation.start()
+        return {}
+    
+procurement_compute()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/schedulers_all_view.xml b/addons/mrp/wizard/schedulers_all_view.xml
new file mode 100644
index 00000000000..b8b465e03e9
--- /dev/null
+++ b/addons/mrp/wizard/schedulers_all_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Compute Schedulers -->
+        
+		<record id="view_compute_schedulers_wizard" model="ir.ui.view">
+            <field name="name">Compute Schedulers</field>
+            <field name="model">mrp.procurement.compute.all</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scheduler Parameters">
+				    <field name="automatic"/>
+				    <separator colspan="4"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="procure_calculation" string="Compute Schedulers"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+         <act_window name="Compute Schedulers"		    
+		    res_model="mrp.procurement.compute.all"
+		    src_model="mrp.procurement"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_compute_schedulers"/>            
+        
+        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+        <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
+		
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/wizard_change_production_qty.py b/addons/mrp/wizard/wizard_change_production_qty.py
deleted file mode 100644
index a9a8387acdf..00000000000
--- a/addons/mrp/wizard/wizard_change_production_qty.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import ir
-import pooler
-from osv.osv import except_osv
-from osv import fields,osv
-import netsvc
-from tools.translate import _
-
-
-form1 = '''<?xml version="1.0"?>
-<form string="Change Product Qty">
-    <field name="product_qty"/>
-</form>'''
-
-form1_fields={
-                'product_qty': {'string': 'Product Qty', 'type':'float', 'required':True},
-              }
-
-def _get_qty(self,cr,uid, data, state):
-    prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
-    prod = prod_obj.browse(cr, uid,data['ids'])[0]
-    form1_fields['product_qty']['default']=prod.product_qty
-    return {}
-def _get_states(self, cr, uid, data, context):
-    prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
-    prod = prod_obj.browse(cr, uid,data['ids'])[0]
-    if prod.state in  ('cancel', 'done'):
-        raise wizard.except_wizard(_('Warning !'), _('The production is in "%s" state. You can not change the production quantity anymore') % (prod.state).upper() )
-        return 'end'
-    if prod.state in  ('draft'):
-        #raise wizard.except_wizard('Warning !', 'The production is in "%s" state. You can change the production quantity directly...!!!' % (prod.state).upper() )
-        return 'end'
-    else:
-        return 'confirm'
-
-def _change_prod_qty(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    prod_obj = pool.get('mrp.production')
-    prod = prod_obj.browse(cr, uid,data['ids'])[0]
-    prod_obj.write(cr, uid,prod.id, {'product_qty' : data['form']['product_qty']})
-    prod_obj.action_compute(cr, uid, [prod.id])
-
-    move_lines_obj = pool.get('stock.move')
-    for move in prod.move_lines:
-        bom_point = prod.bom_id
-        bom_id = prod.bom_id.id
-        if not bom_point:
-            bom_id = pool.get('mrp.bom')._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id)
-            if not bom_id:
-                raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
-            self.write(cr, uid, [prod.id], {'bom_id': bom_id})
-            bom_point = pool.get('mrp.bom').browse(cr, uid, [bom_id])[0]
-
-        if not bom_id:
-            raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
-
-        factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
-        res = pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
-        for r in res[0]:
-            if r['product_id']== move.product_id.id:
-                move_lines_obj.write(cr, uid,move.id, {'product_qty' :  r['product_qty']})
-
-    product_lines_obj = pool.get('mrp.production.product.line')
-
-    for m in prod.move_created_ids:
-        move_lines_obj.write(cr, uid,m.id, {'product_qty' : data['form']['product_qty']})
-
-    return {}
-
-class change_production_qty(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state' : _get_states}
-        },
-
-        'confirm' : {
-            'actions' : [_get_qty],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state':[('end','Cancel'),('validate','Validate')]}
-        },
-
-        'validate': {
-            'actions': [],
-            'result': {'type':'action', 'action':_change_prod_qty, 'state':'end'}
-        },
-
-        'end' : {
-            'actions' : [],
-            'result': {'type': 'state', 'state': 'end'},
-        },
-    }
-
-change_production_qty('change_production_qty')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/wizard_orderpoint_procurement.py b/addons/mrp/wizard/wizard_orderpoint_procurement.py
deleted file mode 100644
index a4fa57bb9a8..00000000000
--- a/addons/mrp/wizard/wizard_orderpoint_procurement.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-#
-# Order Point Method:
-#    - Order if the virtual stock of today is bellow the min of the defined order point
-#
-
-import wizard
-import threading
-import pooler
-
-parameter_form = '''<?xml version="1.0"?>
-<form string="Parameters" colspan="4">
-    <field name="automatic" />
-</form>'''
-
-parameter_fields = {
-    'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'If the stock of a product is under 0, it will act like an orderpoint', 'default': lambda *a: False},
-}
-
-def _procure_calculation_orderpoint(self, db_name, uid, data, context):
-    db, pool = pooler.get_db_and_pool(db_name)
-    cr = db.cursor()
-    try:
-        proc_obj = pool.get('mrp.procurement')
-        automatic = data['form']['automatic']
-        proc_obj._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
-                use_new_cursor=cr.dbname, context=context)
-    finally:
-        cr.close()
-    return {}
-
-def _procure_calculation(self, cr, uid, data, context):
-    threaded_calculation = threading.Thread(target=_procure_calculation_orderpoint, args=(self, cr.dbname, uid, data, context))
-    threaded_calculation.start()
-    return {}
-
-class procurement_compute(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Stock')]}
-        },
-        'compute': {
-            'actions': [_procure_calculation],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-procurement_compute('mrp.procurement.orderpoint.compute')
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/wizard/wizard_schedulers_all.py b/addons/mrp/wizard/wizard_schedulers_all.py
deleted file mode 100644
index e93e31c0599..00000000000
--- a/addons/mrp/wizard/wizard_schedulers_all.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import threading
-import pooler
-
-parameter_form = '''<?xml version="1.0"?>
-<form string="Scheduler Parameters" colspan="4">
-    <field name="automatic" />
-</form>'''
-
-parameter_fields = {
-    'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'Triggers an automatic procurement for all products that have a virtual stock under 0. You should probably not use this option, we suggest using a MTO configuration on products.', 'default': lambda *a: False},
-}
-
-def _procure_calculation_all(self, db_name, uid, data, context):
-    db, pool = pooler.get_db_and_pool(db_name)
-    cr = db.cursor()
-    proc_obj = pool.get('mrp.procurement')
-    automatic = data['form']['automatic']
-    proc_obj.run_scheduler(cr, uid, automatic=automatic, use_new_cursor=cr.dbname,\
-            context=context)
-    cr.close()
-    return {}
-
-def _procure_calculation(self, cr, uid, data, context):
-    threaded_calculation = threading.Thread(target=_procure_calculation_all, args=(self, cr.dbname, uid, data, context))
-    threaded_calculation.start()
-    return {}
-
-class procurement_compute(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Stock') ]}
-        },
-        'compute': {
-            'actions': [_procure_calculation],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-procurement_compute('mrp.procurement.compute.all')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp_jit/i18n/ar.po b/addons/mrp_jit/i18n/ar.po
index 9fa520492c8..24dfe975828 100644
--- a/addons/mrp_jit/i18n/ar.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/bg.po b/addons/mrp_jit/i18n/bg.po
index 40cf2d5562a..33114a92b52 100644
--- a/addons/mrp_jit/i18n/bg.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/bs.po b/addons/mrp_jit/i18n/bs.po
index 9fa520492c8..24dfe975828 100644
--- a/addons/mrp_jit/i18n/bs.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ca.po b/addons/mrp_jit/i18n/ca.po
index 127d3b20024..5500a0d683f 100644
--- a/addons/mrp_jit/i18n/ca.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/cs.po b/addons/mrp_jit/i18n/cs.po
index 785f240e874..9029c7dfe19 100644
--- a/addons/mrp_jit/i18n/cs.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/da.po b/addons/mrp_jit/i18n/da.po
index 24ac370b605..8c0b1ccd8cb 100644
--- a/addons/mrp_jit/i18n/da.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/de.po b/addons/mrp_jit/i18n/de.po
index 3862afb564f..7ab8c409371 100644
--- a/addons/mrp_jit/i18n/de.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/el.po b/addons/mrp_jit/i18n/el.po
index 39d4cc5bfe7..45592e4d5dd 100644
--- a/addons/mrp_jit/i18n/el.po
+++ b/addons/mrp_jit/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index fb632efcc1f..c988d8b3366 100644
--- a/addons/mrp_jit/i18n/es.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/es_AR.po b/addons/mrp_jit/i18n/es_AR.po
index e67d00c1e14..df51412ca82 100644
--- a/addons/mrp_jit/i18n/es_AR.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/et.po b/addons/mrp_jit/i18n/et.po
index b2777dd745f..945b0469978 100644
--- a/addons/mrp_jit/i18n/et.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/fi.po b/addons/mrp_jit/i18n/fi.po
index 3547cfa23fc..5019ed123bc 100644
--- a/addons/mrp_jit/i18n/fi.po
+++ b/addons/mrp_jit/i18n/fi.po
@@ -14,10 +14,10 @@ msgstr ""
 "MIME-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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
-msgstr "MRP JIT"
+msgstr "Tuotanto JIT"
diff --git a/addons/mrp_jit/i18n/fr.po b/addons/mrp_jit/i18n/fr.po
index 7041ea00549..062398c9d0e 100644
--- a/addons/mrp_jit/i18n/fr.po
+++ b/addons/mrp_jit/i18n/fr.po
@@ -13,10 +13,10 @@ msgstr ""
 "MIME-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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
-msgstr ""
+msgstr "MRP JIT"
diff --git a/addons/mrp_jit/i18n/gl.po b/addons/mrp_jit/i18n/gl.po
index c312d0c9862..c8c32724454 100644
--- a/addons/mrp_jit/i18n/gl.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/hr.po b/addons/mrp_jit/i18n/hr.po
index dece060ad96..f1e26a3f87b 100644
--- a/addons/mrp_jit/i18n/hr.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/hu.po b/addons/mrp_jit/i18n/hu.po
index 9fa520492c8..24dfe975828 100644
--- a/addons/mrp_jit/i18n/hu.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/id.po b/addons/mrp_jit/i18n/id.po
index 059e3e687d4..d2239b08341 100644
--- a/addons/mrp_jit/i18n/id.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/it.po b/addons/mrp_jit/i18n/it.po
index 522cf67c5ee..909627f7d60 100644
--- a/addons/mrp_jit/i18n/it.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ko.po b/addons/mrp_jit/i18n/ko.po
index eb9911f1483..e509c0c0baf 100644
--- a/addons/mrp_jit/i18n/ko.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/lt.po b/addons/mrp_jit/i18n/lt.po
index 17a2a44774c..ba21ef4f756 100644
--- a/addons/mrp_jit/i18n/lt.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ml.po b/addons/mrp_jit/i18n/ml.po
index a12ba75e003..c4d888734de 100644
--- a/addons/mrp_jit/i18n/ml.po
+++ b/addons/mrp_jit/i18n/ml.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/nl.po b/addons/mrp_jit/i18n/nl.po
index e66fc934e07..0907d5645f7 100644
--- a/addons/mrp_jit/i18n/nl.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/nl_BE.po b/addons/mrp_jit/i18n/nl_BE.po
index 4eb3d2ec332..1b0f41bec8e 100644
--- a/addons/mrp_jit/i18n/nl_BE.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/oc.po b/addons/mrp_jit/i18n/oc.po
index 2307a6fca92..478e0afc343 100644
--- a/addons/mrp_jit/i18n/oc.po
+++ b/addons/mrp_jit/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-09-18 13:33+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pl.po b/addons/mrp_jit/i18n/pl.po
index 529ec527a17..b73eec797d9 100644
--- a/addons/mrp_jit/i18n/pl.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pt.po b/addons/mrp_jit/i18n/pt.po
index 09c61b1f5c9..a1e22496612 100644
--- a/addons/mrp_jit/i18n/pt.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pt_BR.po b/addons/mrp_jit/i18n/pt_BR.po
index 360efad0d46..cc75367d3bc 100644
--- a/addons/mrp_jit/i18n/pt_BR.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ro.po b/addons/mrp_jit/i18n/ro.po
index 9fa520492c8..24dfe975828 100644
--- a/addons/mrp_jit/i18n/ro.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ru.po b/addons/mrp_jit/i18n/ru.po
index 9fa520492c8..24dfe975828 100644
--- a/addons/mrp_jit/i18n/ru.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sk.po b/addons/mrp_jit/i18n/sk.po
index 0a922aa88b3..f1b1e653266 100644
--- a/addons/mrp_jit/i18n/sk.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sl.po b/addons/mrp_jit/i18n/sl.po
index 5a91fb8e52a..c2c4ef14228 100644
--- a/addons/mrp_jit/i18n/sl.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sr.po b/addons/mrp_jit/i18n/sr.po
index 24fc5450bba..c8a77caf022 100644
--- a/addons/mrp_jit/i18n/sr.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sv.po b/addons/mrp_jit/i18n/sv.po
index 9fa520492c8..24dfe975828 100644
--- a/addons/mrp_jit/i18n/sv.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/tr.po b/addons/mrp_jit/i18n/tr.po
index c4bf8ecbe3c..25e46e0b5c8 100644
--- a/addons/mrp_jit/i18n/tr.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/uk.po b/addons/mrp_jit/i18n/uk.po
index d1b9798eb88..7c29b592621 100644
--- a/addons/mrp_jit/i18n/uk.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/zh_CN.po b/addons/mrp_jit/i18n/zh_CN.po
index 6fdbedff996..92b4cee0895 100644
--- a/addons/mrp_jit/i18n/zh_CN.po
+++ b/addons/mrp_jit/i18n/zh_CN.po
@@ -4,19 +4,48 @@
 #
 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-03 13:45+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:34+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
 msgstr "精益制造资源计划管理（MRP JIT）"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module allows Just In Time computation of all procurement.\n"
+#~ "\n"
+#~ "    If you install this module, you will not have to run the schedulers "
+#~ "anymore.\n"
+#~ "    Each document is computed in real time. Note that this module can slow "
+#~ "down your\n"
+#~ "    system a little bit.\n"
+#~ "\n"
+#~ "    It may also increase your stock size because products are reserved as "
+#~ "soon\n"
+#~ "    as possible. In that case, you can not use priorities any more on the "
+#~ "different\n"
+#~ "    picking.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块允许JIT(准时生产)计算所有的产品需求.\n"
+#~ "\n"
+#~ "如果你安装这模块,你将不用再运行调度.\n"
+#~ "    每个单据是实际计算的.\n"
+#~ "注意:这将稍稍降低你系统的速度.\n"
+#~ "\n"
+#~ "    它可能也加大你库存的大小因为产品是立即储存的.\n"
+#~ "如果是那样的话你不能使用优先选项\n"
+#~ "不同的包装\n"
+#~ "    "
diff --git a/addons/mrp_jit/i18n/zh_TW.po b/addons/mrp_jit/i18n/zh_TW.po
index 9fa520492c8..24dfe975828 100644
--- a/addons/mrp_jit/i18n/zh_TW.po
+++ b/addons/mrp_jit/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_operations/i18n/ar.po b/addons/mrp_operations/i18n/ar.po
index f7a731cb7e1..cbf9009be56 100644
--- a/addons/mrp_operations/i18n/ar.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/bg.po b/addons/mrp_operations/i18n/bg.po
index 87c49777e27..6f67e3d7203 100644
--- a/addons/mrp_operations/i18n/bg.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/bs.po b/addons/mrp_operations/i18n/bs.po
index 6a779fb5544..125dd2f1834 100644
--- a/addons/mrp_operations/i18n/bs.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/ca.po b/addons/mrp_operations/i18n/ca.po
index ffd86896227..e77b59caf2c 100644
--- a/addons/mrp_operations/i18n/ca.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/cs.po b/addons/mrp_operations/i18n/cs.po
index f7a731cb7e1..cbf9009be56 100644
--- a/addons/mrp_operations/i18n/cs.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index 6b676b3f7b3..68cb1d0e74f 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index 965daf4ae3e..01b682b0ba5 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
index 06c2a937c61..525e18e0e92 100644
--- a/addons/mrp_operations/i18n/es_AR.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/et.po b/addons/mrp_operations/i18n/et.po
index 05ea2dbc831..f92782cd7c4 100644
--- a/addons/mrp_operations/i18n/et.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/fi.po b/addons/mrp_operations/i18n/fi.po
index 048c00b39c8..7fe971b8657 100644
--- a/addons/mrp_operations/i18n/fi.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index a230fba63f1..70450cc0a57 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index f7a731cb7e1..cbf9009be56 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/hu.po b/addons/mrp_operations/i18n/hu.po
index f7a731cb7e1..cbf9009be56 100644
--- a/addons/mrp_operations/i18n/hu.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/id.po b/addons/mrp_operations/i18n/id.po
index 5f6da67eb62..68f1d56e823 100644
--- a/addons/mrp_operations/i18n/id.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/it.po b/addons/mrp_operations/i18n/it.po
index 3f51614cbfc..e436ef5cb97 100644
--- a/addons/mrp_operations/i18n/it.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index 3117cb44cd1..6680d613b66 100644
--- a/addons/mrp_operations/i18n/ko.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/lt.po b/addons/mrp_operations/i18n/lt.po
index f7a731cb7e1..cbf9009be56 100644
--- a/addons/mrp_operations/i18n/lt.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index f1fa1b70e11..c0df9b664b6 100644
--- a/addons/mrp_operations/i18n/nl.po
+++ b/addons/mrp_operations/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/nl_BE.po b/addons/mrp_operations/i18n/nl_BE.po
index afc58ebc307..6585b22152c 100644
--- a/addons/mrp_operations/i18n/nl_BE.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 513893ef6c6..3669860decd 100644
--- a/addons/mrp_operations/i18n/pl.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index 4b66a43d086..0de05bb12d8 100644
--- a/addons/mrp_operations/i18n/pt.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
index 31b4f914aa1..51b7e575f0d 100644
--- a/addons/mrp_operations/i18n/pt_BR.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/ro.po b/addons/mrp_operations/i18n/ro.po
index 92066603059..c75528ac2df 100644
--- a/addons/mrp_operations/i18n/ro.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index d72ad8c3fcc..67b9a08c691 100644
--- a/addons/mrp_operations/i18n/ru.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/sl.po b/addons/mrp_operations/i18n/sl.po
index 154002f2b3a..a948dae45c8 100644
--- a/addons/mrp_operations/i18n/sl.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/sv.po b/addons/mrp_operations/i18n/sv.po
index 59e814c856e..660e72115ab 100644
--- a/addons/mrp_operations/i18n/sv.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/tlh.po b/addons/mrp_operations/i18n/tlh.po
index 26ea41ac22d..75fd4963a92 100644
--- a/addons/mrp_operations/i18n/tlh.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index f2c6b193614..08edf335a2b 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/uk.po b/addons/mrp_operations/i18n/uk.po
index 2f76095ba10..4e867456118 100644
--- a/addons/mrp_operations/i18n/uk.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index f72225eb9f1..7fb67a60ab8 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -4,167 +4,167 @@
 #
 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 13:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 08:34+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr ""
+msgstr "开始运作"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "进展"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Pause"
-msgstr ""
+msgstr "暂停"
 
 #. module: mrp_operations
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Operation is started"
-msgstr ""
+msgstr "运作已开始"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr ""
+msgstr "信息"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Start Cancel Operation"
-msgstr ""
+msgstr "开始取消运作"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "In Production"
-msgstr ""
+msgstr "在生产"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operations Code"
-msgstr ""
+msgstr "运作代码"
 
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operation Process"
-msgstr ""
+msgstr "MRP运作流程"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.production.workcenter.line,state:0
 #: field:mrp_operations.operation.code,start_stop:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Start Done Operation"
-msgstr ""
+msgstr "开始完成运作"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Start"
-msgstr ""
+msgstr "开始"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "生产"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Calendar View"
-msgstr ""
+msgstr "日程表视图"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp_operations
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_operation_action
 msgid "Work Order Events Using Bar Codes"
-msgstr ""
+msgstr "工单事件使用的条码"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Set Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
 #: view:mrp.production.workcenter.line:0
 msgid "Work Orders"
-msgstr ""
+msgstr "工单"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action
 msgid "Start - Stop Codes"
-msgstr ""
+msgstr "开始-结束代码"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "UOM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
 msgid "Production Operation Code"
-msgstr ""
+msgstr "运作代码"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "预定日期"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "From production order, create the workorder"
-msgstr ""
+msgstr "从生产单创建工单"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Workcenter"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
 msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
-msgstr ""
+msgstr "检查这能独立所有生产单的调拨"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action
 msgid "All Work Orders"
-msgstr ""
+msgstr "所有工单"
 
 #. module: mrp_operations
 #: rml:mrp.code.barcode:0
@@ -174,51 +174,51 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr ""
+msgstr "产品到产品"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Workcenters Barcode"
-msgstr ""
+msgstr "工作中心条码"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation is done"
-msgstr ""
+msgstr "运作已经完成"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "计划日期"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr ""
+msgstr "准备生产"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp.production.workcenter.line,state:0
 msgid "Finished"
-msgstr ""
+msgstr "已完成"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
-msgstr ""
+msgstr "自由排序生产"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action_planning
 msgid "Work Orders Planning"
-msgstr ""
+msgstr "工单计划"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -228,165 +228,165 @@ msgstr "生产单"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Production order for any products"
-msgstr ""
+msgstr "生产单的产品"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "子调拨"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
 msgid "Operation Name"
-msgstr ""
+msgstr "运作名称"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
 msgid "mrp_operations.operation"
-msgstr ""
+msgstr "运作"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finnished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: mrp_operations
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr ""
+msgstr "真"
 
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Workcenter Production start end workflow"
-msgstr ""
+msgstr "工作中心的生产流程流程"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is delay between operation start and stop in this workcenter"
-msgstr ""
+msgstr "工作中心从运作开始到结束之间的延迟"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
 msgid "From work order, define the cycles and hour for creating product"
-msgstr ""
+msgstr "从工单定义周期和每小时创造产品"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
 msgid "Working Hours"
-msgstr ""
+msgstr "工作时间"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action
 msgid "Future Work Orders"
-msgstr ""
+msgstr "未来工单"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Prod.State"
-msgstr ""
+msgstr "状态"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
-msgstr ""
+msgstr "订单日期"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Production Work Center"
-msgstr ""
+msgstr "生产工作中心"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Production start Operation"
-msgstr ""
+msgstr "生产开始运作"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Packing Exception"
-msgstr ""
+msgstr "包装异常"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp.production.workcenter.line,date_start_date:0
 #: field:mrp_operations.operation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "运作代码"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr ""
+msgstr "运作"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
 #: field:mrp_operations.operation.code,code:0
 msgid "Code"
-msgstr ""
+msgstr "代码"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr ""
+msgstr "确认工作单"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_confirm_action
 msgid "Work Orders to Do"
-msgstr ""
+msgstr "工单列表"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Cancel Operation"
-msgstr ""
+msgstr "取消操作"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Work start Operation"
-msgstr ""
+msgstr "工作开始操作"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr ""
+msgstr "开始/停止条码"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Resume"
-msgstr ""
+msgstr "重新开始"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Done Operation"
-msgstr ""
+msgstr "完成操作"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: mrp_operations
 #: rml:mrp.code.barcode:0
@@ -396,43 +396,98 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr ""
+msgstr "生产运作"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "等待"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
-msgstr ""
+msgstr "持续时间"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: selection:mrp.production.workcenter.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation is cancelled"
-msgstr ""
+msgstr "运作的日程表"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: selection:mrp.production.workcenter.line,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "已取消"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Start working"
-msgstr ""
+msgstr "开始工作"
+
+#~ msgid ""
+#~ "\n"
+#~ "     This module adds state, date_start,date_stop in production order "
+#~ "operation lines\n"
+#~ "     (in the \"Workcenters\" tab)\n"
+#~ "     State: draft, confirm, done, cancel\n"
+#~ "     When finishing/confirming,cancelling production orders set all state "
+#~ "lines to the according state\n"
+#~ "     Create menus:\n"
+#~ "         Production Management > All Operations\n"
+#~ "         Production Management > All Operations > Operations To Do "
+#~ "(state=\"confirm\")\n"
+#~ "     Which is a view on \"Workcenters\" lines in production order,\n"
+#~ "     editable tree\n"
+#~ "\n"
+#~ "    Add buttons in the form view of production order under workcenter tab:\n"
+#~ "    * start (set state to confirm), set date_start\n"
+#~ "    * done (set state to done), set date_stop\n"
+#~ "    * set to draft (set state to draft)\n"
+#~ "    * cancel set state to cancel\n"
+#~ "\n"
+#~ "    When the production order becomes \"ready to produce\", operations must\n"
+#~ "    become 'confirmed'. When the production order is done, all operations\n"
+#~ "    must become done.\n"
+#~ "\n"
+#~ "    The field delay is the delay(stop date - start date).\n"
+#~ "    So that we can compare the theoretic delay and real delay.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "     这模块在生产单操作明细的中增加了状态,开始日期,结束日期\n"
+#~ "在工作中心标签中    状态:草稿,确认,完成,取消\n"
+#~ "    当完成/确认,取消了生产单设定的所有状态明细根据状态\n"
+#~ "创建菜单:\n"
+#~ "\t\t生产管理>所有操作\n"
+#~ "\t\t生产管理>所有操作>操作要做 (状态=确认)\n"
+#~ "     在生产单视图\"工作中心\"明细\n"
+#~ "     可编辑树\n"
+#~ "\n"
+#~ "\t在生产单下的视图增加工作中心标签增加一个按钮:\n"
+#~ "\t*开始(设为确认状态) 设定开始日期\n"
+#~ "\t*完成(设为完成)设定结束日期\n"
+#~ "   *设为草稿\n"
+#~ "\t*取消 设为取消状态\n"
+#~ "\t\n"
+#~ "\t当生产单变为\"准备生产\",操作必须变为\n"
+#~ "   确认.\n"
+#~ "\t当生产单完成所有操作必须变为完成.\n"
+#~ "\n"
+#~ "\t延迟字段是延迟(结束日期 - 开始日期).\n"
+#~ "   这样我们能比较理论延迟和实际延迟.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
index 5f58cb9084e..6c5ded7acdd 100644
--- a/addons/mrp_operations/i18n/zh_TW.po
+++ b/addons/mrp_operations/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 2f44e257a80..12a796b4f3b 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -37,11 +37,12 @@
     'depends': ['base', 'sale', 'account'],
     'update_xml': [
         'security/ir.model.access.csv',
-        'mrp_repair_sequence.xml',
-        'mrp_repair_wizard.xml',
+        'mrp_repair_sequence.xml',        
+        'wizard/mrp_repair_cancel_view.xml',
+        'wizard/mrp_repair_make_invoice_view.xml',
         'mrp_repair_view.xml',
         'mrp_repair_workflow.xml',
-        'mrp_repair_report.xml'
+        'mrp_repair_report.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/mrp_repair/i18n/ar.po b/addons/mrp_repair/i18n/ar.po
index 759fd42429c..b00991a5ca3 100644
--- a/addons/mrp_repair/i18n/ar.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/bg.po b/addons/mrp_repair/i18n/bg.po
index 152ad8b74b3..6827018015c 100644
--- a/addons/mrp_repair/i18n/bg.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/bs.po b/addons/mrp_repair/i18n/bs.po
index 30805391fb8..a70becb3a19 100644
--- a/addons/mrp_repair/i18n/bs.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ca.po b/addons/mrp_repair/i18n/ca.po
index b24c56ec6b8..e4cda513456 100644
--- a/addons/mrp_repair/i18n/ca.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/cs.po b/addons/mrp_repair/i18n/cs.po
index dd58a3112fa..96016c0e412 100644
--- a/addons/mrp_repair/i18n/cs.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index ca50ec777b6..06e92048212 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index a9b6c3d7160..43480bac5b9 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/es_AR.po b/addons/mrp_repair/i18n/es_AR.po
index 1c34f49be77..4cff1683c37 100644
--- a/addons/mrp_repair/i18n/es_AR.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/et.po b/addons/mrp_repair/i18n/et.po
index b42d6009376..7bcb6bc3fd2 100644
--- a/addons/mrp_repair/i18n/et.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/fi.po b/addons/mrp_repair/i18n/fi.po
index 51ae436b2e5..64a23fb1d03 100644
--- a/addons/mrp_repair/i18n/fi.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index 1527037c0e6..842fa48d2c6 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index 759fd42429c..b00991a5ca3 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/hu.po b/addons/mrp_repair/i18n/hu.po
index 759fd42429c..b00991a5ca3 100644
--- a/addons/mrp_repair/i18n/hu.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/id.po b/addons/mrp_repair/i18n/id.po
index ff39d426174..57c1bb20d3e 100644
--- a/addons/mrp_repair/i18n/id.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index da1f1055146..b0e38411c04 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ko.po b/addons/mrp_repair/i18n/ko.po
index 4102ed5ae79..dcea75f2b14 100644
--- a/addons/mrp_repair/i18n/ko.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/lt.po b/addons/mrp_repair/i18n/lt.po
index 759fd42429c..b00991a5ca3 100644
--- a/addons/mrp_repair/i18n/lt.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/nl.po b/addons/mrp_repair/i18n/nl.po
index e94699f2761..6692277b989 100644
--- a/addons/mrp_repair/i18n/nl.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/nl_BE.po b/addons/mrp_repair/i18n/nl_BE.po
index f40173c69da..317dc449191 100644
--- a/addons/mrp_repair/i18n/nl_BE.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/pl.po b/addons/mrp_repair/i18n/pl.po
index c20dd2de046..1981d90f3f8 100644
--- a/addons/mrp_repair/i18n/pl.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/pt.po b/addons/mrp_repair/i18n/pt.po
index 25161eccf0e..e9e0dc94dc6 100644
--- a/addons/mrp_repair/i18n/pt.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index 302212711dc..e5b4094bcef 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ro.po b/addons/mrp_repair/i18n/ro.po
index 759fd42429c..b00991a5ca3 100644
--- a/addons/mrp_repair/i18n/ro.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ru.po b/addons/mrp_repair/i18n/ru.po
index aa9668f973d..d2297fa5fcb 100644
--- a/addons/mrp_repair/i18n/ru.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/sl.po b/addons/mrp_repair/i18n/sl.po
index c9d5aaee5eb..d7ddf41ff9f 100644
--- a/addons/mrp_repair/i18n/sl.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index c326782f208..5e6d08fc52b 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/tlh.po b/addons/mrp_repair/i18n/tlh.po
index 992ec17c120..c4d0dbb58e0 100644
--- a/addons/mrp_repair/i18n/tlh.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index ca380f82ad8..360da93ec0c 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/uk.po b/addons/mrp_repair/i18n/uk.po
index e79d350b4b2..03e6b4b313f 100644
--- a/addons/mrp_repair/i18n/uk.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index 96430d12eab..c8eabc9a984 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -4,53 +4,53 @@
 #
 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-07 11:08+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:36+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "费用明细"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Ref"
-msgstr "维修单引用"
+msgstr "修理单参考"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
 msgid "Inventory Move"
-msgstr "库存移动"
+msgstr "库存调拨"
 
 #. module: mrp_repair
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在操作定义使用了无效的模块名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Untaxed amount"
-msgstr "未完税金额"
+msgstr "不含税金额"
 
 #. module: mrp_repair
 #: field:mrp.repair,state:0
 msgid "Repair State"
-msgstr "维修状态"
+msgstr "修理状态"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Printing Date"
-msgstr ""
+msgstr "打印日期"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -76,7 +76,7 @@ msgstr "送货地址"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr "制作发票"
+msgstr "创建发票"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_subtotal:0
@@ -87,24 +87,24 @@ msgstr "小计"
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Invoice address :"
-msgstr "发票地址："
+msgstr "发票地址:"
 
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr ""
+msgstr "保修期限"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr "税收"
+msgstr "税"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Net Total :"
-msgstr "总净重："
+msgstr "净合计:"
 
 #. module: mrp_repair
 #: rml:repair.order:0
@@ -114,22 +114,22 @@ msgstr "增值税"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Operations"
-msgstr ""
+msgstr "操作"
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
 msgid "Move"
-msgstr "过帐"
+msgstr "调拨"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
 msgid "Repair Orders"
-msgstr "维修单列表"
+msgstr "修理单"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
 msgid "Quotation / Order"
-msgstr "报价/订单"
+msgstr "报价单/订单"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -145,64 +145,64 @@ msgstr "业务伙伴"
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_quotation_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_quotation
 msgid "Repairs in quotation"
-msgstr "报价状态的维修单列表"
+msgstr "修理报价单"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Confirmed"
-msgstr "已确认"
+msgstr "确认"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Recreate Invoice"
-msgstr "重新创建发票"
+msgstr "再创建发票"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
-msgstr "维修单"
+msgstr "修理单"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Repair Order N° :"
-msgstr "维修单编号："
+msgstr "修理单编号:"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: rml:repair.order:0
 msgid "Lot Number"
-msgstr "批次号"
+msgstr "批号"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Under Repair"
-msgstr ""
+msgstr "不修理"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "费用明细"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees line"
-msgstr ""
+msgstr "修理费用明细"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "收费明细"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "To be Invoiced"
-msgstr "待开票"
+msgstr "要开发票"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Shipping address :"
-msgstr "货运地址："
+msgstr "运输地址:"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -212,28 +212,28 @@ msgstr "开始修理"
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr "数量（计量单位）"
+msgstr "数量(计量单位)"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
 #: field:mrp.repair.line,to_invoice:0
 msgid "To Invoice"
-msgstr ""
+msgstr "开票"
 
 #. module: mrp_repair
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_order
 msgid "Repairs"
-msgstr "维修单列表"
+msgstr "修理"
 
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Packing"
-msgstr "分拣单"
+msgstr "包装"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Total :"
-msgstr "总计："
+msgstr "总价:"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
@@ -243,24 +243,24 @@ msgstr "价格表"
 #. module: mrp_repair
 #: help:mrp.repair,state:0
 msgid "Gives the state of the Repair Order"
-msgstr ""
+msgstr "修理单的状态"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,quotation_notes:0
 msgid "Quotation Notes"
-msgstr ""
+msgstr "报价单备注"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_progress_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_progress
 msgid "Repairs in progress"
-msgstr ""
+msgstr "修理进度"
 
 #. module: mrp_repair
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: mrp_repair
 #: help:mrp.repair,guarantee_limit:0
@@ -269,17 +269,17 @@ msgid ""
 "selected product. If the current date is below the garantee limit, each "
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
-msgstr ""
+msgstr "保证限制是:最后调拨日期 + 选择产品的保证定义.如果当前日期少于保证限制每个操作和费用将被设为‘不要开票’.注意你可以在以后手动修改."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repair Line"
-msgstr "维修单明细"
+msgstr "修理明细"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "N° :"
-msgstr ""
+msgstr "单号:"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_method:0
@@ -289,33 +289,33 @@ msgstr "开票方式"
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr "已维修"
+msgstr "已修理"
 
 #. module: mrp_repair
 #: wizard_field:mrp.repair.make_invoice,init,group:0
 msgid "Group by partner invoice address"
-msgstr "按业务伙伴发票地址分组"
+msgstr "业务伙伴发票地址组"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,invoice_line_id:0
 #: field:mrp.repair.line,invoice_line_id:0
 msgid "Invoice Line"
-msgstr "发票明细"
+msgstr "发票行"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Total amount"
-msgstr "总金额"
+msgstr "金额合计"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "Before Repair"
-msgstr "维修之前"
+msgstr "修理前"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
@@ -337,7 +337,7 @@ msgstr "已开票"
 #. module: mrp_repair
 #: wizard_button:mrp.repair.cancel,display,end:0
 msgid "No"
-msgstr "否"
+msgstr "编号"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.make_invoice,init:0
@@ -349,7 +349,7 @@ msgstr "创建发票"
 #: selection:mrp.repair.line,type:0
 #: rml:repair.order:0
 msgid "Add"
-msgstr "添加"
+msgstr "增加"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
@@ -360,18 +360,18 @@ msgstr "草稿"
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_form
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_form
 msgid "New Repair"
-msgstr "新建维修单"
+msgstr "新的修理"
 
 #. module: mrp_repair
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "未完税金额"
+msgstr "不含税金额"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,state:0
@@ -381,25 +381,25 @@ msgstr "状态"
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Guarantee Limit"
-msgstr ""
+msgstr "保证限制"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
 #: rml:repair.order:0
 msgid "Product to Repair"
-msgstr "要维修的产品"
+msgstr "产品修理"
 
 #. module: mrp_repair
 #: help:mrp.repair,pricelist_id:0
 msgid "The pricelist comes from the selected partner, by default."
-msgstr ""
+msgstr "定义选择业务伙伴的价格表"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.cancel,display:0
 msgid ""
 "This operation  will  cancel the  Repair process, but  will not cancel it's "
 "Invoice. Do you want to continue?"
-msgstr ""
+msgstr "这操作将取消修理处理但不会取消发票继续吗?"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -414,33 +414,33 @@ msgstr "计算"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Confirm Repair"
-msgstr "确认维修单"
+msgstr "确认修理"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Repair Quotation"
-msgstr "维修报价单"
+msgstr "修理报价单"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "End Repair"
-msgstr "结束维修"
+msgstr "结束修理"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repairs Order"
-msgstr "维修单"
+msgstr "修理单"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_ready_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_ready
 msgid "Repairs Ready to Start"
-msgstr "准备开始的维修单列表"
+msgstr "修理准备开始"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -457,7 +457,7 @@ msgstr "完成"
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_2binvoiced_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_2binvoiced
 msgid "Repairs to be invoiced"
-msgstr "待开票的维修单列表"
+msgstr "修理要发票"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -467,7 +467,7 @@ msgstr "发票"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees"
-msgstr ""
+msgstr "费用"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -483,22 +483,22 @@ msgstr "目标库位"
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Operation Line(s)"
-msgstr ""
+msgstr "操作明细"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
 msgid "Repair Operations Lines"
-msgstr ""
+msgstr "修理运算明细"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr "运货库位"
+msgstr "送货地点"
 
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module"
-msgstr ""
+msgstr "产品修理模块"
 
 #. module: mrp_repair
 #: help:mrp.repair,invoice_method:0
@@ -506,7 +506,7 @@ msgid ""
 "This field allow you to change the workflow of the repair order. If value "
 "selected is different from 'No Invoice', it also allow you to select the "
 "pricelist and invoicing address."
-msgstr ""
+msgstr "这字段允许你修改修理单的工作流.如果你选的值不是‘没发票’他也允许你选择价格表和发票地址."
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_unit:0
@@ -518,30 +518,30 @@ msgstr "单价"
 #. module: mrp_repair
 #: wizard_view:mrp.repair.make_invoice,init:0
 msgid "Do you really want to create the invoices ?"
-msgstr "您确定要创建发票吗?"
+msgstr "你真的要创建发票吗?"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
 #: field:mrp.repair.line,name:0
 #: rml:repair.order:0
 msgid "Description"
-msgstr "描述"
+msgstr "说明"
 
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr ""
+msgstr "操作明细"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr "货品"
+msgstr "产品"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoice Corrected"
-msgstr "已更正发票"
+msgstr "发票更正"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -550,7 +550,7 @@ msgid ""
 "repaired. If cheked, it will create a packing with selected product. Note "
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
-msgstr ""
+msgstr "如果你想管理产品修理的送货勾选此项.如果勾选它将为选择的产品创建一包装.请注意如果你有扩展的视图你可以选择库位的信息标签."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
@@ -565,13 +565,13 @@ msgstr "价格"
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr "运送"
+msgstr "送货"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr "内部备注"
+msgstr "内部单据"
 
 #. module: mrp_repair
 #: rml:repair.order:0
@@ -581,12 +581,12 @@ msgstr "税:"
 #. module: mrp_repair
 #: model:ir.actions.wizard,name:mrp_repair.wizard_mrp_repair_make_invoice
 msgid "Make invoices"
-msgstr "创建发票"
+msgstr "建立发票"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Ref"
-msgstr "维修单引用"
+msgstr "修理参考"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -597,12 +597,12 @@ msgstr "计量单位"
 #: selection:mrp.repair.line,type:0
 #: rml:repair.order:0
 msgid "Remove"
-msgstr "移除"
+msgstr "删除"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.cancel,display:0
 msgid "Cancel Repair...??"
-msgstr ""
+msgstr "取消修理?"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
@@ -613,56 +613,75 @@ msgstr "产品计量单位"
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
-msgstr "待开票地址"
+msgstr "发票地址"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "After Repair"
-msgstr ""
+msgstr "修理后"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoicing"
-msgstr ""
+msgstr "发票"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_id:0
 msgid "Source Location"
-msgstr "来源货位"
+msgstr "源库位"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quality"
-msgstr "质量"
+msgstr "高级"
 
 #. module: mrp_repair
 #: model:ir.actions.wizard,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair:0
 msgid "Cancel Repair"
-msgstr ""
+msgstr "取消修理"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "No Invoice"
-msgstr ""
+msgstr "没发票"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "States"
-msgstr "省/州"
+msgstr "状态"
 
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
 msgid ""
 "This field allow you to choose the parner that will be invoiced and delivered"
-msgstr ""
+msgstr "这字段允许你选择将开票和送货的业务伙伴"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Ready to Repair"
-msgstr ""
+msgstr "准备修理"
+
+#~ msgid ""
+#~ "\n"
+#~ "           The aim is to have a complete module to manage all products "
+#~ "repairs. The following topics should be covered by this module:\n"
+#~ "           * Add/remove products in the reparation\n"
+#~ "           * Impact for stocks\n"
+#~ "           * Invoicing (products and/or services)\n"
+#~ "           * Warranty concept\n"
+#~ "           * Repair quotation report\n"
+#~ "           * Notes for the technician and for the final customer           \n"
+#~ msgstr ""
+#~ "\n"
+#~ "           目的是有一个完整模块来管理所有的产品修理.以下的主题将覆盖这模块:\t*增加和删除产品的修理\n"
+#~ "\t*作用于仓库\n"
+#~ "\t*发票(产品或者服务)\n"
+#~ "\t*保修\n"
+#~ "\t*修理报价单\n"
+#~ "\t*记录技术员和最终客户           \n"
diff --git a/addons/mrp_repair/i18n/zh_TW.po b/addons/mrp_repair/i18n/zh_TW.po
index 35f28c34985..b1739e5af10 100644
--- a/addons/mrp_repair/i18n/zh_TW.po
+++ b/addons/mrp_repair/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index fc91fe1f9e6..e456c3770d2 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -95,7 +95,7 @@ class mrp_repair(osv.osv):
             \n* The \'To be Invoiced\' state is used to generate the invoice before or after repairing done. \
             \n* The \'Done\' state is set when repairing is completed.\
             \n* The \'Cancelled\' state is used when user cancel repair order.'),
-        'location_id': fields.many2one('stock.location', 'Current Location', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)]}),
         'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),
         'guarantee_limit': fields.date('Guarantee limit', help="The guarantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the guarantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
@@ -261,12 +261,12 @@ class mrp_repair(osv.osv):
     def action_invoice_create(self, cr, uid, ids, group=False, context=None):
         res={}
         invoices_group = {}
-        for repair in self.browse(cr, uid, ids, context=context):
+        for repair in self.browse(cr, uid, ids, context=context):            
             res[repair.id]=False
             if repair.state in ('draft','cancel') or repair.invoice_id:
                 continue
             if not (repair.partner_id.id and repair.partner_invoice_id.id):
-                raise osv.except_osv(_('No partner !'),_('You have to select a partner in the repair form !'))
+                raise osv.except_osv(_('No partner !'),_('You have to select a Partner Invoice Address in the repair form !'))
             comment=repair.quotation_notes
             if (repair.invoice_method != 'none'):
                 if group and repair.partner_invoice_id.id in invoices_group:
@@ -398,7 +398,9 @@ class mrp_repair(osv.osv):
                 self.pool.get('mrp.repair.line').write(cr, uid, [move.id], {'move_id': move_id})
 
             if repair.deliver_bool:
+                pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
                 picking = self.pool.get('stock.picking').create(cr, uid, {
+                    'name': pick_name,
                     'origin': repair.name,
                     'state': 'draft',
                     'move_type': 'one',
diff --git a/addons/mrp_repair/mrp_repair_wizard.xml b/addons/mrp_repair/mrp_repair_wizard.xml
deleted file mode 100644
index 42383f517cc..00000000000
--- a/addons/mrp_repair/mrp_repair_wizard.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-	    <wizard 
-	            id="action_cancel_repair" 
-	            model="mrp.repair" 
-	            name="mrp.repair.cancel"
-	            string="Cancel Repair"
-	            menu = "False"
-	            multi = "True"
-	            />
-		 <wizard
-				id="wizard_mrp_repair_make_invoice"
-				keyword="client_action_multi"
-				model="mrp.repair"
-				name="mrp.repair.make_invoice"
-				multi="True"
-				string="Make invoices"/>
-					
-    </data>
-</openerp>
-		
\ No newline at end of file
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 6c56c80978b..bb3e61ab4e7 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -397,7 +397,7 @@
     <blockTable colWidths="534.0" style="Table8">
       <tr>
         <td>
-          <para style="P3">[[ format(o.quotation_notes) or '' ]]</para>
+          <para style="P3">[[ format(o.quotation_notes) or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/mrp_repair/security/ir.model.access.csv b/addons/mrp_repair/security/ir.model.access.csv
index 0f12f66a815..c524afce69b 100644
--- a/addons/mrp_repair/security/ir.model.access.csv
+++ b/addons/mrp_repair/security/ir.model.access.csv
@@ -5,3 +5,7 @@
 "access_mrp_repair_line_manager","MRP Repair Line manager","model_mrp_repair_line","stock.group_stock_manager",1,1,1,1
 "access_mrp_repair_fee_user","MRP Repair Fee user","model_mrp_repair_fee","stock.group_stock_user",1,0,0,0
 "access_mrp_repair_fee_manager","MRP Repair Fee manager","model_mrp_repair_fee","stock.group_stock_manager",1,1,1,1
+"access_mrp_repair_cancel_user","mrp.repair.cancel user","model_mrp_repair_cancel","stock.group_stock_user",1,0,0,0
+"access_mrp_repair_cancel_manager","mrp.repair.cancel manager","model_mrp_repair_cancel","stock.group_stock_manager",1,1,1,1
+"access_mrp_repair_make_invoice_user","mrp.repair.make_invoice user","model_mrp_repair_make_invoice","stock.group_stock_user",1,0,0,0
+"access_mrp_repair_make_invoice_manager","mrp.repair.make_invoice manager","model_mrp_repair_make_invoice","stock.group_stock_manager",1,1,1,1
diff --git a/addons/mrp_repair/wizard/__init__.py b/addons/mrp_repair/wizard/__init__.py
index ec3063f01de..4f3075f055c 100644
--- a/addons/mrp_repair/wizard/__init__.py
+++ b/addons/mrp_repair/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wizard_cancel_repair
-import wizard_make_invoice
+import cancel_repair
+import make_invoice
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
new file mode 100644
index 00000000000..91df6fb01ef
--- /dev/null
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+
+class repair_cancel(osv.osv_memory):
+    _name = 'mrp.repair.cancel'
+    _description = 'Cancel Repair'
+
+    def cancel_repair(self, cr, uid, ids, context):
+        """ 
+             Cancels the repair
+        
+             @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:  
+        
+        """
+        record_id = context and context.get('active_id', False) or False
+        assert record_id, _('Active ID is not Found')
+        repair_order_obj = self.pool.get('mrp.repair')
+        repair_line_obj = self.pool.get('mrp.repair.line')
+        repair_order = repair_order_obj.browse(cr, uid, record_id)
+        
+        if repair_order.invoiced or repair_order.invoice_method == 'none':
+            repair_order_obj.action_cancel(cr, uid, [record_id], context=context)            
+        else:
+            raise osv.except_osv(_('Warning!'),_('Repair is not cancelled. It is not invoiced.'))
+        
+        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_id = context and context.get('active_id', False) or False        
+        res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if record_id:
+            repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
+            if not repair_order.invoiced:
+                res['arch'] = """ <form string="Cancel Repair" colspan="4">
+                                <group col="2" colspan="2">
+                                    <label string="Do you want to continue?" colspan="4"/>
+                                    <separator colspan="4"/>
+                                    <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                    <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
+                                </group>
+                            </form>                             
+                        """
+        return res
+
+repair_cancel()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
new file mode 100644
index 00000000000..063040590e6
--- /dev/null
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv, fields 
+
+class make_invoice(osv.osv_memory):
+    _name = 'mrp.repair.make_invoice'
+    _description = 'Make Invoice'
+    
+    _columns = {
+	       'group': fields.boolean('Group by partner invoice address'),
+    }
+
+    def make_invoices(self, cr, uid, ids, context):
+        """ 
+             Generates invoice(s) of selected records.
+        
+             @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: Loads the view of new invoice(s).
+        
+        """
+        inv = self.browse(cr, uid, ids[0])
+        order_obj = self.pool.get('mrp.repair')       
+        newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'], group=inv.group,context=context)    
+            
+        return {
+            'domain': [('id','in', newinv.values())],
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'view_id': False,
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window'
+        }
+
+make_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
new file mode 100644
index 00000000000..4af2a3394b0
--- /dev/null
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Cancel Repair -->
+        
+		<record id="view_cancel_repair" model="ir.ui.view">
+            <field name="name">Cancel Repair</field>
+            <field name="model">mrp.repair.cancel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cancel Repair Order">
+				    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?" colspan="4"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="cancel_repair" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>         
+
+        <record id="action_cancel_repair" model="ir.actions.act_window">
+            <field name="name">Cancel Repair Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair.cancel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record> 
+ 		
+        
+	</data>
+</openerp>	
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
new file mode 100644
index 00000000000..f914d198d06
--- /dev/null
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Make Invoice -->
+        
+		<record id="view_make_invoice" model="ir.ui.view">
+            <field name="name">Make Invoice</field>
+            <field name="model">mrp.repair.make_invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create invoices">
+				    <separator colspan="4" string="Do you really want to create the invoices ?" />  
+				    <field name="group"/>
+				    <newline/>  
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="make_invoices" string="Create Invoice"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <act_window name="Make Invoice"		    
+		    res_model="mrp.repair.make_invoice"
+		    src_model="mrp.repair"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="act_mrp_repair_invoice"/>        
+        
+	</data>
+</openerp>	
diff --git a/addons/mrp_repair/wizard/wizard_cancel_repair.py b/addons/mrp_repair/wizard/wizard_cancel_repair.py
deleted file mode 100644
index d895096ce6f..00000000000
--- a/addons/mrp_repair/wizard/wizard_cancel_repair.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-cancel_form = """<?xml version="1.0"?>
-<form string="Cancel Repair...??">
-    <label colspan="4" string="This operation  will  cancel the  Repair process, but  will not cancel it's Invoice.\nDo you want to continue?" />
-</form>
-"""
-
-cancel_fields = {}
-
-def check_state(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    repair_obj = pool.get('mrp.repair').browse(cr, uid, data['ids'])[0]
-    if repair_obj.invoice_id:
-        return 'display'
-    else:
-        pool.get('mrp.repair').write(cr,uid,data['ids'],{'state':'cancel'})
-        return 'end'
-        
-        
-def _cancel_repair(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    repair_obj = pool.get('mrp.repair').browse(cr, uid, data['ids'])
-    pool.get('mrp.repair').write(cr,uid,data['ids'],{'state':'cancel'})
-    mrp_line_obj = pool.get('mrp.repair.line')
-    for line in repair_obj:
-        mrp_line_obj.write(cr, uid, [l.id for l in line.operations], {'state': 'cancel'})
-    return {}
-
-class repair_cancel(wizard.interface):
-    states = {
-       'init' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state' : check_state}
-        },
-
-        'display' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : cancel_form,
-                    'fields' : cancel_fields,
-                    'state' : [('end', 'No'),('yes', 'Yes') ]}
-        },
-        'yes' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                    'action' : _cancel_repair,
-                    'state' : 'end'}
-        },
-         'end' : {
-            'actions' : [],
-            'result': {'type': 'state', 'state': 'end'},
-        },
-    }
-repair_cancel("mrp.repair.cancel")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp_repair/wizard/wizard_make_invoice.py b/addons/mrp_repair/wizard/wizard_make_invoice.py
deleted file mode 100644
index 71aefadfe4b..00000000000
--- a/addons/mrp_repair/wizard/wizard_make_invoice.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Do you really want to create the invoices ?" />  
-    <field name="group"/>  
-</form>
-"""
-invoice_fields = {	
-	'group': {
-		'string': 'Group by partner invoice address',
-		'type':'boolean'
-	},
-}
-
-ack_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator string="Invoices created" />    
-</form>"""
-
-ack_fields = {}
-
-def _makeInvoices(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('mrp.repair')       
-    newinv = order_obj.action_invoice_create(cr, uid, data['ids'],group=data['form']['group'],context=context)    
-        
-    return {
-        'domain': [('id','in', newinv.values())],
-        'name': 'Invoices',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.invoice',
-        'view_id': False,
-        'context': "{'type':'out_refund'}",
-        'type': 'ir.actions.act_window'
-    }
-    
-
-class make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : invoice_form,
-                    'fields' : invoice_fields,
-                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices') ]}
-        },
-        'invoice' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                    'action' : _makeInvoices,
-                    'state' : 'end'}
-        },
-    }
-make_invoice("mrp.repair.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp_subproduct/i18n/ab.po b/addons/mrp_subproduct/i18n/ab.po
index 1b9a5d586d3..b2bbef5acf5 100644
--- a/addons/mrp_subproduct/i18n/ab.po
+++ b/addons/mrp_subproduct/i18n/ab.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ar.po b/addons/mrp_subproduct/i18n/ar.po
index f8a5e63294e..1878cdd22be 100644
--- a/addons/mrp_subproduct/i18n/ar.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/bg.po b/addons/mrp_subproduct/i18n/bg.po
index 11b58752f8a..877e408fb69 100644
--- a/addons/mrp_subproduct/i18n/bg.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/bs.po b/addons/mrp_subproduct/i18n/bs.po
index 82a5a30067b..bfba9772bc7 100644
--- a/addons/mrp_subproduct/i18n/bs.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ca.po b/addons/mrp_subproduct/i18n/ca.po
index e621b652d13..2925009366a 100644
--- a/addons/mrp_subproduct/i18n/ca.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_subproduct/i18n/cs.po
index 07f59b15b88..eb351e6d476 100644
--- a/addons/mrp_subproduct/i18n/cs.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_subproduct/i18n/de.po
index 4dc23b86984..b6327e82811 100644
--- a/addons/mrp_subproduct/i18n/de.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index ec91ded17b1..2365b64eb9b 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_subproduct/i18n/es_AR.po
index 771de1b3240..ad81695bd35 100644
--- a/addons/mrp_subproduct/i18n/es_AR.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_subproduct/i18n/et.po
index f784eec8271..6afe5de7174 100644
--- a/addons/mrp_subproduct/i18n/et.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/fi.po b/addons/mrp_subproduct/i18n/fi.po
new file mode 100644
index 00000000000..11d49b93a38
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/fi.po
@@ -0,0 +1,89 @@
+# Finnish 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-16 10:41+0000\n"
+"Last-Translator: smii <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_subproduct
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#. module: mrp_subproduct
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Mrp Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Tuotteen määrä"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Ennalta määrätty"
+
+#. module: mrp_subproduct
+#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
+msgid "MRP Sub Product"
+msgstr ""
diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_subproduct/i18n/fr.po
index e12f35f5e7d..eeef23e871a 100644
--- a/addons/mrp_subproduct/i18n/fr.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_subproduct/i18n/hr.po
index 76f842a8fcd..c592058271c 100644
--- a/addons/mrp_subproduct/i18n/hr.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/hu.po b/addons/mrp_subproduct/i18n/hu.po
index f8a5e63294e..1878cdd22be 100644
--- a/addons/mrp_subproduct/i18n/hu.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/id.po b/addons/mrp_subproduct/i18n/id.po
index 496532a19ba..83d672c1606 100644
--- a/addons/mrp_subproduct/i18n/id.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/it.po b/addons/mrp_subproduct/i18n/it.po
index e3576029a91..21938d490a9 100644
--- a/addons/mrp_subproduct/i18n/it.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ko.po b/addons/mrp_subproduct/i18n/ko.po
index 10b21a751d1..5ba261c6651 100644
--- a/addons/mrp_subproduct/i18n/ko.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/lt.po b/addons/mrp_subproduct/i18n/lt.po
index f8a5e63294e..1878cdd22be 100644
--- a/addons/mrp_subproduct/i18n/lt.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/nl.po b/addons/mrp_subproduct/i18n/nl.po
index fb2200e9797..b3a0f86b221 100644
--- a/addons/mrp_subproduct/i18n/nl.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_subproduct/i18n/nl_BE.po
index df0c4584fea..39eac2d0f11 100644
--- a/addons/mrp_subproduct/i18n/nl_BE.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_subproduct/i18n/oc.po
index 2335a817202..48a1a3ac407 100644
--- a/addons/mrp_subproduct/i18n/oc.po
+++ b/addons/mrp_subproduct/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-03-12 13:51+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/pl.po b/addons/mrp_subproduct/i18n/pl.po
index 858e1c50d43..b6005539157 100644
--- a/addons/mrp_subproduct/i18n/pl.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_subproduct/i18n/pt.po
index 983429cb3d4..c2b9f54ccac 100644
--- a/addons/mrp_subproduct/i18n/pt.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_subproduct/i18n/pt_BR.po
index 482fe64fa4a..8caea411f4e 100644
--- a/addons/mrp_subproduct/i18n/pt_BR.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_subproduct/i18n/ro.po
index b103ed66b8a..9bd1ca89c44 100644
--- a/addons/mrp_subproduct/i18n/ro.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ru.po b/addons/mrp_subproduct/i18n/ru.po
index ea7b79facde..d9f6b7f1e0a 100644
--- a/addons/mrp_subproduct/i18n/ru.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_subproduct/i18n/sk.po
index 7a9a8535a96..21f34fd118d 100644
--- a/addons/mrp_subproduct/i18n/sk.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/sl.po b/addons/mrp_subproduct/i18n/sl.po
index dd648f23a0c..0aff8a783f5 100644
--- a/addons/mrp_subproduct/i18n/sl.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/sv.po b/addons/mrp_subproduct/i18n/sv.po
index dc35bc2eb4d..66c77ec37db 100644
--- a/addons/mrp_subproduct/i18n/sv.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/tlh.po b/addons/mrp_subproduct/i18n/tlh.po
index 1750f5eb43f..7498edf862a 100644
--- a/addons/mrp_subproduct/i18n/tlh.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 39f44ed197b..bab7b7e955f 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_subproduct/i18n/uk.po
index d202880200b..58be3216af8 100644
--- a/addons/mrp_subproduct/i18n/uk.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index 49d64bcb602..b12bdda0244 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "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-29 02:59+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
@@ -101,8 +101,8 @@ msgstr "物料需求计划子货品"
 #~ "\n"
 #~ "这模块允许你在一个生产单有几个要生产的产品\n"
 #~ "    你能在物料清单中确认子产品.\n"
-#~ "    没有这模块：\n"
+#~ "    没有这模块:\n"
 #~ "\tA + B + C -> D\n"
-#~ "     有这模块：\n"
+#~ "     有这模块:\n"
 #~ "\tA + B + C -> D + E\n"
 #~ "    "
diff --git a/addons/mrp_subproduct/i18n/zh_TW.po b/addons/mrp_subproduct/i18n/zh_TW.po
index b7d4c6fe422..b2f3a7b1778 100644
--- a/addons/mrp_subproduct/i18n/zh_TW.po
+++ b/addons/mrp_subproduct/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__terp__.py
index b3126b9bf99..e42bec3e2bb 100644
--- a/addons/multi_company/__terp__.py
+++ b/addons/multi_company/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,8 +24,9 @@
     'name': 'Multi Company',
     'version': '1.0',
     'category': 'Custom',
-    'description': """This module add the possibility to easily manage 
-    the default value for each object
+    'description': """
+    Multicompany module is for managing a multicompany environment.
+    This module is the base module for other multicompany modules.
     """,
     'author': 'Tiny,SYLEAM',
     'website': 'http://www.openerp.com/',
diff --git a/addons/multi_company/i18n/ar.po b/addons/multi_company/i18n/ar.po
index 53f5957f7bd..c98bbfb5d5b 100644
--- a/addons/multi_company/i18n/ar.po
+++ b/addons/multi_company/i18n/ar.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: multi_company
diff --git a/addons/multi_company/i18n/bg.po b/addons/multi_company/i18n/bg.po
index 24d49e2077d..df76ea8f415 100644
--- a/addons/multi_company/i18n/bg.po
+++ b/addons/multi_company/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:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/bs.po b/addons/multi_company/i18n/bs.po
index 43065459186..befc608ddfe 100644
--- a/addons/multi_company/i18n/bs.po
+++ b/addons/multi_company/i18n/bs.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: multi_company
diff --git a/addons/multi_company/i18n/ca.po b/addons/multi_company/i18n/ca.po
index b54d0f80784..6485c39dda3 100644
--- a/addons/multi_company/i18n/ca.po
+++ b/addons/multi_company/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: multi_company
diff --git a/addons/multi_company/i18n/cs.po b/addons/multi_company/i18n/cs.po
index 06aa6097b41..1814509163b 100644
--- a/addons/multi_company/i18n/cs.po
+++ b/addons/multi_company/i18n/cs.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: multi_company
diff --git a/addons/multi_company/i18n/de.po b/addons/multi_company/i18n/de.po
index 24770948027..60adc32d95d 100644
--- a/addons/multi_company/i18n/de.po
+++ b/addons/multi_company/i18n/de.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: multi_company
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index f478149dcec..4497a62e37d 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/et.po b/addons/multi_company/i18n/et.po
index 4b127eae951..5d68b2fc547 100644
--- a/addons/multi_company/i18n/et.po
+++ b/addons/multi_company/i18n/et.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: multi_company
diff --git a/addons/multi_company/i18n/fi.po b/addons/multi_company/i18n/fi.po
new file mode 100644
index 00000000000..242368a487a
--- /dev/null
+++ b/addons/multi_company/i18n/fi.po
@@ -0,0 +1,192 @@
+# Finnish 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-12-08 11:46+0000\n"
+"PO-Revision-Date: 2010-03-16 10:12+0000\n"
+"Last-Translator: smii <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: multi_company
+#: help:multi_company.default,object_id:0
+msgid "Object affect by this rules"
+msgstr ""
+
+#. module: multi_company
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#. module: multi_company
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: multi_company
+#: constraint:res.partner:0
+msgid "The VAT doesn't seem to be correct."
+msgstr "ALV ei vaikuta olevan oikea."
+
+#. module: multi_company
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
+
+#. module: multi_company
+#: model:res.company,overdue_msg:multi_company.res_company_odoo
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_in
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_us
+msgid ""
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,object_id:0
+msgid "Object"
+msgstr "Objekti"
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid ""
+"This module add the possibility to easily manage \n"
+"    the default value for each object\n"
+"    "
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr "Pääyritys"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Ehto"
+
+#. module: multi_company
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr ""
+
+#. module: multi_company
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: multi_company
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr ""
+
+#. module: multi_company
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: multi_company
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi company"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.model,name:multi_company.model_multi_company_default
+msgid "multi_company.default"
+msgstr ""
+
+#. module: multi_company
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
+msgid "Default Company per Object"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr "Ilmaus"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,sequence:0
+msgid "Sequence"
+msgstr "Jakso"
+
+#. module: multi_company
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Virhe! Et voi luoda rekursiivisia kategorioita."
+
+#. module: multi_company
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Virheellinen EAN-koodi"
+
+#. module: multi_company
+#: help:multi_company.default,expression:0
+msgid "Expression, must be True to match"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
+msgid "Default company per Object"
+msgstr ""
+
+#. module: multi_company
+#: code:addons/multi_company/multi_company.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (kopio)"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr "Vastaavuus"
diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index efbaef3142c..2f9c722d109 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.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: multi_company
diff --git a/addons/multi_company/i18n/hr.po b/addons/multi_company/i18n/hr.po
index ea2472a7599..2fbfb8fbf19 100644
--- a/addons/multi_company/i18n/hr.po
+++ b/addons/multi_company/i18n/hr.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: multi_company
diff --git a/addons/multi_company/i18n/hu.po b/addons/multi_company/i18n/hu.po
index d0806eccea8..d44f803f2a8 100644
--- a/addons/multi_company/i18n/hu.po
+++ b/addons/multi_company/i18n/hu.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: multi_company
diff --git a/addons/multi_company/i18n/id.po b/addons/multi_company/i18n/id.po
index f12e4b21203..ac1ece82853 100644
--- a/addons/multi_company/i18n/id.po
+++ b/addons/multi_company/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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index f1021595cfb..07f5c0bb8aa 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.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: multi_company
diff --git a/addons/multi_company/i18n/lt.po b/addons/multi_company/i18n/lt.po
index faca5e213d0..3e11fb327a5 100644
--- a/addons/multi_company/i18n/lt.po
+++ b/addons/multi_company/i18n/lt.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: multi_company
diff --git a/addons/multi_company/i18n/nl.po b/addons/multi_company/i18n/nl.po
index a399dd1f484..075ef27b97e 100644
--- a/addons/multi_company/i18n/nl.po
+++ b/addons/multi_company/i18n/nl.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: multi_company
diff --git a/addons/multi_company/i18n/oc.po b/addons/multi_company/i18n/oc.po
index 49f656d7233..dd1369fef46 100644
--- a/addons/multi_company/i18n/oc.po
+++ b/addons/multi_company/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
 "PO-Revision-Date: 2010-03-12 13:42+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/pl.po b/addons/multi_company/i18n/pl.po
index eaa08dc6850..3ebf20dcd29 100644
--- a/addons/multi_company/i18n/pl.po
+++ b/addons/multi_company/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:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/pt.po b/addons/multi_company/i18n/pt.po
index d467d536aab..4174c7c3417 100644
--- a/addons/multi_company/i18n/pt.po
+++ b/addons/multi_company/i18n/pt.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: multi_company
diff --git a/addons/multi_company/i18n/pt_BR.po b/addons/multi_company/i18n/pt_BR.po
index 67629066591..78439ca10f3 100644
--- a/addons/multi_company/i18n/pt_BR.po
+++ b/addons/multi_company/i18n/pt_BR.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: multi_company
diff --git a/addons/multi_company/i18n/ro.po b/addons/multi_company/i18n/ro.po
index 4b3017b8209..bc44dfec3cc 100644
--- a/addons/multi_company/i18n/ro.po
+++ b/addons/multi_company/i18n/ro.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: multi_company
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index 6e82a6973ec..66c14c3c896 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.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: multi_company
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 70366d4408d..55868aabe25 100644
--- a/addons/multi_company/i18n/sl.po
+++ b/addons/multi_company/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:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/sv.po b/addons/multi_company/i18n/sv.po
index b54c734ec7d..7c66f7b2bd0 100644
--- a/addons/multi_company/i18n/sv.po
+++ b/addons/multi_company/i18n/sv.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: multi_company
diff --git a/addons/multi_company/i18n/tr.po b/addons/multi_company/i18n/tr.po
index 8c20a9ccde5..453c5fdb8a1 100644
--- a/addons/multi_company/i18n/tr.po
+++ b/addons/multi_company/i18n/tr.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: multi_company
diff --git a/addons/multi_company/i18n/uk.po b/addons/multi_company/i18n/uk.po
index 140e2d5dca3..9a30ea63378 100644
--- a/addons/multi_company/i18n/uk.po
+++ b/addons/multi_company/i18n/uk.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: multi_company
diff --git a/addons/multi_company/i18n/zh_CN.po b/addons/multi_company/i18n/zh_CN.po
index b154ee4f0f7..4ccb756d28d 100644
--- a/addons/multi_company/i18n/zh_CN.po
+++ b/addons/multi_company/i18n/zh_CN.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: multi_company
diff --git a/addons/multi_company/i18n/zh_TW.po b/addons/multi_company/i18n/zh_TW.po
index 278dfee7beb..7fab8e4b248 100644
--- a/addons/multi_company/i18n/zh_TW.po
+++ b/addons/multi_company/i18n/zh_TW.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: multi_company
diff --git a/addons/olap/__terp__.py b/addons/olap/__terp__.py
index 7583de75182..28c742d1f58 100644
--- a/addons/olap/__terp__.py
+++ b/addons/olap/__terp__.py
@@ -6,7 +6,12 @@
     "depends" : ["base"],
     "category" : "Generic Modules/Olap",
     "description": """
-    Base module to manage Olap schemas. Cube designer.
+    Olap module is used to install BI module in client. Olap provides Online
+    Analytical Process with the mdx query. BI provides Cube Browsing and
+    Cube Designing. After installing Olap Module you will get Cube Browser
+    and Cube Desinger in Reporting Menu. Cube Browser is used to generate
+    the reports with table view (mdx view) of mdx query. and Cube designer
+    is used to make cubes in BI..
     """,
     "init_xml" :  ["data/olap_data.xml"],
     "update_xml" : [
diff --git a/addons/olap/i18n/de.po b/addons/olap/i18n/de.po
new file mode 100644
index 00000000000..a4ab30d7ca8
--- /dev/null
+++ b/addons/olap/i18n/de.po
@@ -0,0 +1,1399 @@
+# German 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:24+0000\n"
+"PO-Revision-Date: 2010-03-20 20:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP                 Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection,      "
+"so that you will be able to work on it, and specify a better structure      "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or      "
+"rename tables and columns to simplify end-users interface. The following "
+"database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
diff --git a/addons/olap/i18n/hr.po b/addons/olap/i18n/hr.po
new file mode 100644
index 00000000000..2cf98aff878
--- /dev/null
+++ b/addons/olap/i18n/hr.po
@@ -0,0 +1,1399 @@
+# Croatian 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:24+0000\n"
+"PO-Revision-Date: 2010-03-23 00:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP                 Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection,      "
+"so that you will be able to work on it, and specify a better structure      "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or      "
+"rename tables and columns to simplify end-users interface. The following "
+"database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
diff --git a/addons/olap/i18n/it.po b/addons/olap/i18n/it.po
index 5078199585f..0e1571e5dbd 100644
--- a/addons/olap/i18n/it.po
+++ b/addons/olap/i18n/it.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: olap
diff --git a/addons/olap/i18n/oc.po b/addons/olap/i18n/oc.po
index fc078de73d8..1e48d0771f8 100644
--- a/addons/olap/i18n/oc.po
+++ b/addons/olap/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 05:24+0000\n"
 "PO-Revision-Date: 2010-03-12 13:48+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/i18n/pl.po b/addons/olap/i18n/pl.po
new file mode 100644
index 00000000000..3a111ebdcf7
--- /dev/null
+++ b/addons/olap/i18n/pl.po
@@ -0,0 +1,1401 @@
+# Polish 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:24+0000\n"
+"PO-Revision-Date: 2010-03-29 19:04+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr "Ukryj"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr "Czas"
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr "Połączenie z bazą danych"
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr "Hasło do bazy danych"
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr "Tabele bazy danych OLAP"
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr "URL połączenia"
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr "Tabela aplikacji OLAP"
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr "Nazwa serwera"
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr "Hasło do logowania."
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr "ID aplikacji"
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr "Ten kreator skonfiguruje URL dla klienta web."
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr "Bazy danych faktów"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr "Przeglądarka kostek"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr "Wymiar OLAP"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr "Kolumny bazy danych OLAP"
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr "Klient WEB BI."
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr " Port stosowany do połączenia"
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr "Klucz podstawowy"
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr "ID tabeli"
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr "Ten kreator automatycznie skonfiguruje klienta web do BI."
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr "Typ bazy danych"
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr "Twoja struktura bazy danych została poprawnie załadowana"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr "Parametry serwera OLAP"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr "Tabele kostki OLAP"
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr "Tekst formatu"
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr "Wykonaj"
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr "Znane aplikacje"
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr "Poziom"
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr "ID kolumny"
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+"Załadujemy całą strukturę bazy danych, abyś mógł pracować na niej i ulepszyć "
+"strukturę według własnych potrzeb."
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr "Aplikacja OLAP"
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr "Nazwa zapytania"
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr "Zapytanie MDX"
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr "Klucz podstawowy"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr "Autokonfiguracja"
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr "Wczytaj strukturę bazy danych"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr "Poziom OLAP"
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr "Nic (0000.00)"
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr "Host bazy danych"
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr "Baza danych faktów OLAP"
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP                 Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection,      "
+"so that you will be able to work on it, and specify a better structure      "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or      "
+"rename tables and columns to simplify end-users interface. The following "
+"database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
diff --git a/addons/olap/i18n/sl.po b/addons/olap/i18n/sl.po
index b3eacacd50c..a4a42b9e467 100644
--- a/addons/olap/i18n/sl.po
+++ b/addons/olap/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: olap
diff --git a/addons/olap/i18n/sv.po b/addons/olap/i18n/sv.po
index 9a4850817fb..a12c2dd119a 100644
--- a/addons/olap/i18n/sv.po
+++ b/addons/olap/i18n/sv.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: olap
diff --git a/addons/olap_crm/__terp__.py b/addons/olap_crm/__terp__.py
index 794b65138b4..940355ab49c 100644
--- a/addons/olap_crm/__terp__.py
+++ b/addons/olap_crm/__terp__.py
@@ -27,7 +27,7 @@
     "depends" : ["olap"],
     "category" : "Generic Modules/Olap",
     "description": """
-    Sale module will load the data in olap tables
+    CRM module will load the data in olap tables
     """,
     "init_xml" :  ['olap_data.xml'],
     "update_xml" :[],
diff --git a/addons/olap_crm/i18n/hr.po b/addons/olap_crm/i18n/hr.po
index 14ffc0d3b2a..caf2d334f7e 100644
--- a/addons/olap_crm/i18n/hr.po
+++ b/addons/olap_crm/i18n/hr.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: olap_crm
diff --git a/addons/olap_crm/i18n/oc.po b/addons/olap_crm/i18n/oc.po
index 3b0826e83e5..7622a3a5860 100644
--- a/addons/olap_crm/i18n/oc.po
+++ b/addons/olap_crm/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 05:29+0000\n"
 "PO-Revision-Date: 2010-03-12 13:38+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_crm/i18n/pt_BR.po b/addons/olap_crm/i18n/pt_BR.po
new file mode 100644
index 00000000000..5f334412dc1
--- /dev/null
+++ b/addons/olap_crm/i18n/pt_BR.po
@@ -0,0 +1,34 @@
+# Brazilian Portuguese 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-03-24 01:24+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+"\n"
+"    Módulo de vendas vai carregar os dados nas tabelas OLAP\n"
+"    "
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr "olap_crm"
diff --git a/addons/olap_crm/i18n/sk.po b/addons/olap_crm/i18n/sk.po
index 842088449b1..bc008d38458 100644
--- a/addons/olap_crm/i18n/sk.po
+++ b/addons/olap_crm/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:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_crm/i18n/sl.po b/addons/olap_crm/i18n/sl.po
index a7f372b18e1..b5d01936cbd 100644
--- a/addons/olap_crm/i18n/sl.po
+++ b/addons/olap_crm/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: olap_crm
diff --git a/addons/olap_extract/i18n/bg.po b/addons/olap_extract/i18n/bg.po
new file mode 100644
index 00000000000..08e26af08ad
--- /dev/null
+++ b/addons/olap_extract/i18n/bg.po
@@ -0,0 +1,59 @@
+# Bulgarian 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-03-29 11:24+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
+"Language-Team: Bulgarian <bg@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr "olap_extract"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr "ОК"
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr "\"Olap\" извличане"
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+"\n"
+"    Извлича структурата на схемата.\n"
+"    "
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr "Име на модула"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr "Отказ"
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr "Име на новия модул"
diff --git a/addons/olap_extract/i18n/de.po b/addons/olap_extract/i18n/de.po
new file mode 100644
index 00000000000..e85b31fdae7
--- /dev/null
+++ b/addons/olap_extract/i18n/de.po
@@ -0,0 +1,56 @@
+# German 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-03-20 20:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr ""
diff --git a/addons/olap_extract/i18n/hr.po b/addons/olap_extract/i18n/hr.po
index 9ae8b1066b6..76f29eee142 100644
--- a/addons/olap_extract/i18n/hr.po
+++ b/addons/olap_extract/i18n/hr.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: olap_extract
diff --git a/addons/olap_extract/i18n/oc.po b/addons/olap_extract/i18n/oc.po
index 550e53ba6f9..499a36efce1 100644
--- a/addons/olap_extract/i18n/oc.po
+++ b/addons/olap_extract/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 05:29+0000\n"
 "PO-Revision-Date: 2010-03-12 13:38+0000\n"
-"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/pt_BR.po b/addons/olap_extract/i18n/pt_BR.po
new file mode 100644
index 00000000000..d4c3fe1173e
--- /dev/null
+++ b/addons/olap_extract/i18n/pt_BR.po
@@ -0,0 +1,59 @@
+# Brazilian Portuguese 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-03-24 01:31+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr "olap_extract"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr "OK"
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr "Extrato OLAP"
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+"\n"
+"    Extrato do esquema de estrutura\n"
+"    "
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr "Nome do Módulo"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr "Novo Nome do Módulo"
diff --git a/addons/olap_extract/i18n/ru.po b/addons/olap_extract/i18n/ru.po
index 4bd1efbacae..5556d61f088 100644
--- a/addons/olap_extract/i18n/ru.po
+++ b/addons/olap_extract/i18n/ru.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: olap_extract
diff --git a/addons/olap_extract/i18n/sl.po b/addons/olap_extract/i18n/sl.po
index b6b35b90b24..3e6bf9c1c16 100644
--- a/addons/olap_extract/i18n/sl.po
+++ b/addons/olap_extract/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: olap_extract
diff --git a/addons/olap_extract/i18n/sv.po b/addons/olap_extract/i18n/sv.po
index 757a0b2ac93..a08c350d0bb 100644
--- a/addons/olap_extract/i18n/sv.po
+++ b/addons/olap_extract/i18n/sv.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: olap_extract
diff --git a/addons/olap_sale/i18n/hr.po b/addons/olap_sale/i18n/hr.po
index 501b4941f44..a4225ec45d5 100644
--- a/addons/olap_sale/i18n/hr.po
+++ b/addons/olap_sale/i18n/hr.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: olap_sale
diff --git a/addons/olap_sale/i18n/pt_BR.po b/addons/olap_sale/i18n/pt_BR.po
new file mode 100644
index 00000000000..52c92d2802b
--- /dev/null
+++ b/addons/olap_sale/i18n/pt_BR.po
@@ -0,0 +1,34 @@
+# Brazilian Portuguese 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-03-24 01:33+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+"\n"
+"    Módulo de vendas vai carregar os dados nas tabelas OLAP\n"
+"    "
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr "olap_sale"
diff --git a/addons/olap_sale/i18n/sk.po b/addons/olap_sale/i18n/sk.po
index e87f6b82c14..421badd8f7f 100644
--- a/addons/olap_sale/i18n/sk.po
+++ b/addons/olap_sale/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:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_sale
diff --git a/addons/olap_sale/i18n/sl.po b/addons/olap_sale/i18n/sl.po
index 3f751cb6058..b3f0f6b9bdf 100644
--- a/addons/olap_sale/i18n/sl.po
+++ b/addons/olap_sale/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: olap_sale
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 794793e3baa..f1d847cf76d 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -36,11 +36,33 @@ Main features :
 
     """,
     'author': 'Tiny',
-    'depends': ['sale', 'delivery','report_mrp'],
+    'depends': ['sale', 'delivery'],
 #    'depends': ['sale', 'purchase', 'account', 'account_tax_include','board','mrp','board_manufacturing','delivery','profile_manufacturing','account','multi_company'],
-    'init_xml': [
-        'security/point_of_sale_security.xml',
+    'init_xml': [],
+
+    'update_xml': [
+      'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
+        'wizard/pos_details.xml',  
+        'wizard/pos_add_product.xml',
+        'wizard/pos_confirm.xml',
+        'wizard/pos_discount.xml',
+        'wizard/pos_get_sale.xml',
+        'wizard/pos_open_statement.xml',
+        'wizard/pos_close_statement.xml',  
+        'wizard/pos_box_entries.xml',
+        'wizard/pos_payment_report_user_view.xml',
+        'wizard/pos_payment_report_date_view.xml',
+        'wizard/pos_box_out.xml', 
+        'wizard/pos_sales_user.xml',
+        'wizard/all_closed_cashbox_of_the_day.xml',  
+        'wizard/pos_sales_user_current_user.xml',
+        'wizard/pos_sale_user_today.xml',      
+        'wizard/pos_receipt_view.xml',  
+        'wizard/pos_payment_report_user.xml',  
+        'wizard/pos_payment_report.xml',
+        'wizard/pos_payment.xml',
+        'wizard/pos_scan_product_view.xml',
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
@@ -51,18 +73,7 @@ Main features :
         'statement_view.xml',
         'statement_report.xml',
         'statement_data.xml',
-        'statement_wizard.xml'
-    ],
-    'update_xml': [
-        'security/point_of_sale_security.xml',
-        'security/ir.model.access.csv',
-        'pos_report.xml',
-        'pos_wizard.xml',
-        'pos_view.xml',
-        'pos_sequence.xml',
-        'posrule_data.xml',
-        'pos_data.xml',
-        'pos_workflow.xml'
+        'statement_wizard.xml',   
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
     'installable': True,
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index b599f0531f9..b71e78afcfd 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -125,14 +125,17 @@ class account_bank_statement(osv.osv):
          }
 
     def create(self, cr, uid, vals, context=None):
-        open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
-        if open_jrnl:
-            raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
-        if 'starting_details_ids' in vals:
-            vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
-            for i in starting_details_ids:
-                if i and i[0] and i[1]:
-                    i[0], i[1] = 0, 0
+        
+        company_id = vals and vals.get('company_id',False)
+        if company_id:
+            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+            if open_jrnl:
+                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
+            if 'starting_details_ids' in vals:
+                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
+                for i in starting_details_ids:
+                    if i and i[0] and i[1]:
+                        i[0], i[1] = 0, 0
         res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
         return res
 
diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po
index 960fb8e9794..a9a5738e625 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index a6ecc4c2d2b..29955e416db 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index d4c83121b73..bd15f1b7e62 100644
--- a/addons/point_of_sale/i18n/bs.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index e92f3bd9458..256f03a79bb 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index 598e57eedaa..1b55794e8e0 100644
--- a/addons/point_of_sale/i18n/cs.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index 9b5a6ce1cfc..63cd1027ff0 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index af5c50a4660..4024ef6bb9b 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index 0f83244c0ac..71b5d4907e0 100644
--- a/addons/point_of_sale/i18n/el.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 91b7731d057..68118434d14 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index 3aa86234fa3..f79817cb174 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index f70a883a94e..9bdd585ac6c 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index 919c82e1d52..d0fe7695c55 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/i18n/fi.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total paid"
-msgstr "Kaikkiaan maksettu"
+msgstr "Yhteensä maksettu"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -32,28 +32,28 @@ msgstr "Tuotteen määrä"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Set to draft"
-msgstr "Aseta luonnosteltavaksi"
+msgstr "Aseta luonnokseksi"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr "position tapahtuma"
+msgstr "Kassapäätteen tapahtuma"
 
 #. module: point_of_sale
 #: wizard_view:pos.discount,init:0
 #: rml:pos.receipt:0
 msgid "Discount :"
-msgstr "Alennus :"
+msgstr "Alennus:"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_nb:0
 msgid "Piece number"
-msgstr "Osanumero"
+msgstr "Kappalenumero"
 
 #. module: point_of_sale
 #: 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: point_of_sale
 #: field:pos.order,name:0
@@ -73,12 +73,12 @@ msgstr "Dokumentti"
 #. module: point_of_sale
 #: wizard_view:pos.add_product,init:0
 msgid "Add product :"
-msgstr "Lisää tuote :"
+msgstr "Lisää tuote:"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Net Total"
-msgstr "Loppunetto"
+msgstr "Yhteensä netto"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree2
@@ -88,7 +88,7 @@ msgstr "Päivän tilaukset"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr "Myynnit (yhteenveto)"
+msgstr "Myynti (yhteenveto)"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -123,7 +123,7 @@ msgstr "Myynnin yksityiskohdat"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Base"
-msgstr "Perus"
+msgstr "Pohja"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
@@ -148,7 +148,7 @@ msgstr "Puh : + 32 (0) 2 231 04 35"
 #. module: point_of_sale
 #: field:pos.order.line,name:0
 msgid "Line Description"
-msgstr "Rivinkuvaus"
+msgstr "Rivin kuvaus"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
@@ -158,7 +158,7 @@ msgstr "Myymälä"
 #. module: point_of_sale
 #: wizard_button:pos.refund_order,init,refund_n_quit:0
 msgid "Ok"
-msgstr "Ok"
+msgstr "OK"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -169,13 +169,13 @@ msgstr "Huomautukset"
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
 msgid "Pos order"
-msgstr "Positiotilaus"
+msgstr "Kassapäätetilaus"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Detail of Sales"
-msgstr "Myyntien kuvaus"
+msgstr "Myynnin tiedot"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -193,7 +193,7 @@ msgstr "Myyntirivi"
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "No. Of Articles"
-msgstr "Kappaleiden määrä"
+msgstr "Tuotteiden määrä"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
@@ -205,7 +205,7 @@ msgstr "Koodi"
 #: field:pos.order,date_validity:0
 #: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
-msgstr "Kelpoisuus päivämäärä"
+msgstr "Voimassaolo pvm."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -227,12 +227,12 @@ msgstr "Hyvitystilaukset"
 #. module: point_of_sale
 #: field:pos.order,last_out_picking:0
 msgid "Last Output Picking"
-msgstr "Viimeisin tulostekeräily"
+msgstr "Viimeisin keräily ulos"
 
 #. module: point_of_sale
 #: wizard_view:pos.config.journal,init:0
 msgid "Select default journals"
-msgstr "Valitse oletuslokit"
+msgstr "Valitse oletuspäiväkirjat"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -258,7 +258,7 @@ msgstr "Vero"
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "Total Transaction"
-msgstr "Yhteenlaskettu kauppa"
+msgstr "Kauppa yhteensä"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -284,12 +284,12 @@ msgstr "Kumppani"
 #. module: point_of_sale
 #: field:pos.order,payments:0
 msgid "Order Payments"
-msgstr "Tilausmaksut"
+msgstr "Tilauksen maksut"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Date :"
-msgstr "Päivämäärä"
+msgstr "Päivämäärä:"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -305,18 +305,18 @@ msgstr "Hyväksy"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr "Positio Tilaukset"
+msgstr "Kassapääte tilaukset"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Disc. (%)"
-msgstr "Alennus (%)"
+msgstr "Ale. (%)"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Sales total"
-msgstr "Yhteenlasketut myynnit"
+msgstr "Myynti yhteensä"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -331,12 +331,12 @@ msgstr "Tila"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Sum of subtotals"
-msgstr "Välisummien summa"
+msgstr "Välisummat yhteensä"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_date:0
 msgid "Payment date"
-msgstr "Maksu päivämäärä"
+msgstr "Maksun päivämäärä"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_name:0
@@ -356,12 +356,12 @@ msgstr "Alennus (%)"
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
 msgid "Point Of Sale"
-msgstr "Myynnin ajankohta"
+msgstr "Kassapääte"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
 msgid "Creation Date"
-msgstr "Luomispäivämäärä"
+msgstr "Luontipäivämäärä"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -376,12 +376,12 @@ msgstr "Raportointi"
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS "
-msgstr "POS "
+msgstr "Kassapääte "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Point of Sale journal configuration."
-msgstr "Myynnin ajankohtalokin konfiguraatio."
+msgstr "Kassapäätteen päiväkirjojen konfiguraatio."
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
@@ -391,17 +391,17 @@ msgstr "Yhteensä:"
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal:0
 msgid "Default journal"
-msgstr "Oletusloki"
+msgstr "Oletuspäiväkirja"
 
 #. module: point_of_sale
 #: field:pos.order,account_receivable:0
 msgid "Default Receivable"
-msgstr "Oletus saatava"
+msgstr "Oletus saatavat"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_sale_get
 msgid "Get From Order"
-msgstr "Hanki tilauksesta"
+msgstr "Ota tilauksesta"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config
@@ -418,12 +418,12 @@ msgstr "Yksikköhinta"
 #. module: point_of_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymäarkkitehtuurille!"
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line_day
 msgid "POS Lines of the day"
-msgstr "Päivän POS -rivit"
+msgstr "Päivän kassapääterivit"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -433,12 +433,12 @@ msgstr "Tulosteiden määrä"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal
 msgid "Default journals"
-msgstr "Oletuslokit"
+msgstr "Oletus päiväkirjat"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Draft Invoice"
-msgstr "Laskun luonnos"
+msgstr "Luonnoslasku"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -458,22 +458,22 @@ msgstr "Lisää tuotteita"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr "Loppumäärä"
+msgstr "Lukumäärä yht."
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line
 msgid "POS Lines"
-msgstr "POS -rivit"
+msgstr "Kassapääterivit"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Sales Order POS"
-msgstr "Myyntitilaus POS"
+msgstr "Myyntitilaus kassapääte"
 
 #. module: point_of_sale
 #: wizard_button:pos.config.journal,init,set_default_journal:0
 msgid "Define default journals"
-msgstr "Määritä oletuslokit"
+msgstr "Määritä oletuspäiväkirjat"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
@@ -483,7 +483,7 @@ msgstr "Määritä oletuslokit"
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
-msgstr "Myynnin ajankohta"
+msgstr "Kassapääte"
 
 #. module: point_of_sale
 #: field:pos.order,salesman_id:0
@@ -499,12 +499,12 @@ msgstr "Laskutettu"
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_rebate:0
 msgid "Default rebate journal"
-msgstr "Oletus hyvitysloki"
+msgstr "Oletus hyvityspäiväkirja"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.wizard_default_journal
 msgid "Wizard default journals"
-msgstr "Oletuslokien ohjattu toiminto"
+msgstr "Ohjattu toiminto oletuspäiväkirjoille"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -535,23 +535,23 @@ msgstr "ALV:"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order lines"
-msgstr "Tilausrivien POS"
+msgstr "Kassapäätteen tilausrivit"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "E-mail :"
-msgstr "Sähköposti :"
+msgstr "Sähköposti:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total invoiced"
-msgstr "Laskutettu kaikkiaan"
+msgstr "Laskutettu yhteensä"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_today
 msgid "Sales of the day"
-msgstr "Päivän myynnit"
+msgstr "Päivän myynti"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -562,7 +562,7 @@ msgstr "tuntematon"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr "Tilausrivi POS"
+msgstr "Kassapääte tilausrivi"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_discount
@@ -577,7 +577,7 @@ msgstr "Käyttäjä"
 #. module: point_of_sale
 #: field:pos.payment,payment_date:0
 msgid "Payment Date"
-msgstr "Maksupäivämäärä"
+msgstr "Maksun päivämäärä"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_name:0
@@ -595,7 +595,7 @@ msgstr "Päivämäärä"
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by user"
-msgstr "Käyttäjäkohtaiset myynnit"
+msgstr "Käyttäjäkohtaiset myynti"
 
 #. module: point_of_sale
 #: wizard_button:pos.add_product,init,add:0
@@ -617,7 +617,7 @@ msgstr "Jakso:"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree
 msgid "All the sales"
-msgstr "Kaikki myynnit"
+msgstr "Kaikki myynti"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -638,7 +638,7 @@ msgstr "Yhteenveto"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Create _Invoice"
-msgstr "Luo _lasku"
+msgstr "Luo lasku"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,quantity:0
@@ -662,12 +662,12 @@ msgstr "Maksutapa"
 #. module: point_of_sale
 #: wizard_button:pos.payment,ask_pay,add_pay:0
 msgid "Ma_ke payment"
-msgstr "Tee maksu"
+msgstr "Suorita maksu"
 
 #. module: point_of_sale
 #: wizard_button:pos.discount,init,apply_discount:0
 msgid "Apply Discount"
-msgstr "Käytä alennusta"
+msgstr "Laske alennus"
 
 #. module: point_of_sale
 #: field:pos.order,pricelist_id:0
@@ -687,7 +687,7 @@ msgstr "Kuitti"
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
 msgid "Refund order :"
-msgstr "Hyvitystilaus :"
+msgstr "Hyvitystilaus:"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -697,12 +697,12 @@ msgstr "Tapahtuman numero"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Net Total:"
-msgstr "Netto:"
+msgstr "Yhteensä netto:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other"
-msgstr "Muu"
+msgstr "Muuta"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
@@ -750,7 +750,7 @@ msgstr "Tilauksen viite"
 #. module: point_of_sale
 #: wizard_view:pos.payment,ask_pay:0
 msgid "Add payment :"
-msgstr "Lisää maksu :"
+msgstr "Lisää maksu:"
 
 #. module: point_of_sale
 #: constraint:ir.model:0
@@ -761,13 +761,13 @@ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment
 msgid "Pos Payment"
-msgstr "Maksu Pos"
+msgstr "Kassapääte maksu"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total discount"
-msgstr "Loppualennus"
+msgstr "Alennus yhteensä"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
@@ -782,7 +782,7 @@ msgstr "Hyvitä "
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale"
-msgstr "Myynnin ajankohdan rivit"
+msgstr "Kassapäätteen rivit"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -793,7 +793,7 @@ msgstr "Verot:"
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr "Loppumäärä"
+msgstr "Summa yhteensä"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,product:0
@@ -814,7 +814,7 @@ msgstr "Laskutus"
 #: field:pos.payment,journal_id:0
 #: field:report.transaction.pos,journal_id:0
 msgid "Journal"
-msgstr "Loki"
+msgstr "Päiväkirja"
 
 #. module: point_of_sale
 #: wizard_field:pos.scan_product,init,gencod:0
@@ -829,12 +829,12 @@ msgstr "Peruutettu lasku"
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr "POS"
+msgstr "Kassapääte"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr "POS rivit"
+msgstr "Kassapääte rivit"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -844,12 +844,12 @@ msgstr "Puh.:"
 #. module: point_of_sale
 #: field:pos.payment,payment_nb:0
 msgid "Piece Number"
-msgstr "Osa -numero"
+msgstr "Kappale numero"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_gift:0
 msgid "Default gift journal"
-msgstr "Oletus lahjaloki"
+msgstr "Oletus lahjapäiväkirja"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_payment
@@ -870,12 +870,12 @@ msgstr "Myyntitilaus"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month
 msgid "Sales of the month"
-msgstr "Kuukauden myynnit"
+msgstr "Kuukauden myynti"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "D_iscount"
-msgstr "A_lennus"
+msgstr "Alennus"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -904,7 +904,7 @@ msgstr "Kuvaus"
 #. module: point_of_sale
 #: field:pos.order,account_move:0
 msgid "Account Entry"
-msgstr "Tilitapahtuma"
+msgstr "Tilimerkintä"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_id:0
@@ -918,7 +918,7 @@ msgstr "Maksuehto"
 #: wizard_field:pos.payment,ask_pay,amount:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr "Määrä"
+msgstr "Summa"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -934,13 +934,13 @@ msgstr "Tämä myyjä tekee tilausta."
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr "Verotustavat"
+msgstr "Verotustapa"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Print Date:"
-msgstr "Tulosta päivämäärä:"
+msgstr "Tulostettu:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index c65a17ab086..d8e65c7e133 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 4fe33bc7f08..90ee1f881f1 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index 960fb8e9794..a9a5738e625 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index ffc6a0a1e0d..eac5cdd5db9 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index df513c89073..f0f6aff03c2 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index 82b4428d6f9..980d0699064 100644
--- a/addons/point_of_sale/i18n/ko.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 848733cbd71..a41fc61bed5 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index 53613233854..f02fc8ac4af 100644
--- a/addons/point_of_sale/i18n/mn.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index a85cb9b5791..bfb81ef1ec7 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index c1484577cef..c7a55945229 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index 72a49891d64..d6956bdd6e9 100644
--- a/addons/point_of_sale/i18n/pl.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index 44648dd225d..c49db5fcb91 100644
--- a/addons/point_of_sale/i18n/pt.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 25b38536626..313bd2a7e8a 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index 9ecfdbd8040..6029749d869 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index 0238d3de549..98fec529fd4 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index d97f352414b..25c2845d02e 100644
--- a/addons/point_of_sale/i18n/sl.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 624d2734cba..a0d9e3cf80f 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index b685ab4531a..6d05e5ac543 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index 7418992d38f..009f8111b9a 100644
--- a/addons/point_of_sale/i18n/tlh.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 1c9a46097e6..1f01a49ebd6 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index 9ced52e0eed..f940699a655 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 5b8f754901a..f17d7720f4e 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -4,29 +4,29 @@
 #
 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-07 08:31+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 09:09+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total paid"
-msgstr "总付"
+msgstr "付款合计"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Qty of product"
-msgstr "商品数量"
+msgstr "产品数量"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -36,68 +36,68 @@ msgstr "设为草稿"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr "销售点交易情况"
+msgstr "POS交易"
 
 #. module: point_of_sale
 #: wizard_view:pos.discount,init:0
 #: rml:pos.receipt:0
 msgid "Discount :"
-msgstr "折扣："
+msgstr "折扣:"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_nb:0
 msgid "Piece number"
-msgstr "件号"
+msgstr "领料/提货号"
 
 #. module: point_of_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
 msgid "Order Description"
-msgstr "订单说明"
+msgstr "说明"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_scan_product
 msgid "Scan Product"
-msgstr "扫描商品"
+msgstr "扫描产品"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Document"
-msgstr "单据"
+msgstr "文档"
 
 #. module: point_of_sale
 #: wizard_view:pos.add_product,init:0
 msgid "Add product :"
-msgstr "添加商品："
+msgstr "增加业务伙伴:"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Net Total"
-msgstr "净总计"
+msgstr "净合计"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree2
 msgid "Orders of the day"
-msgstr "该日订单"
+msgstr "单据日期"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr "销售（概要）"
+msgstr "销售(参考)"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
 msgid "This is the logged in user (not necessarily the salesman)."
-msgstr ""
+msgstr "这是登录用户不一定是销售员"
 
 #. module: point_of_sale
 #: wizard_view:pos.sale.get,init:0
 msgid "Select an Open Sale Order"
-msgstr "选择一个打开的销售订单"
+msgstr "选择待处理的销售单"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
@@ -122,12 +122,12 @@ msgstr "销售详情"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Base"
-msgstr "基本信息"
+msgstr "基础"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
 msgid "Scan product"
-msgstr "扫描商品"
+msgstr "扫描产品"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
@@ -137,22 +137,22 @@ msgstr "小计"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Partner Ref."
-msgstr "业务伙伴引用"
+msgstr "业务伙伴参考"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+msgstr "电话:"
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
 msgid "Line Description"
-msgstr "销售单细目说明"
+msgstr "说明"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
 msgid "Shop"
-msgstr "销售点"
+msgstr "商店"
 
 #. module: point_of_sale
 #: wizard_button:pos.refund_order,init,refund_n_quit:0
@@ -168,7 +168,7 @@ msgstr "备注"
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
 msgid "Pos order"
-msgstr ""
+msgstr "POS单"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -192,7 +192,7 @@ msgstr "销售明细"
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "No. Of Articles"
-msgstr ""
+msgstr "条款号"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
@@ -204,13 +204,13 @@ msgstr "代码"
 #: field:pos.order,date_validity:0
 #: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
-msgstr "生效时间"
+msgstr "有效期"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
-msgstr ""
+msgstr "领料/提货"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -221,17 +221,17 @@ msgstr "增值税"
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_refund
 msgid "Refund Orders"
-msgstr "退款单"
+msgstr "退货单"
 
 #. module: point_of_sale
 #: field:pos.order,last_out_picking:0
 msgid "Last Output Picking"
-msgstr ""
+msgstr "最近输出的领料/提货"
 
 #. module: point_of_sale
 #: wizard_view:pos.config.journal,init:0
 msgid "Select default journals"
-msgstr "选择默认帐目"
+msgstr "默认分类帐"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -242,12 +242,12 @@ msgstr "数量"
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Logged in User"
-msgstr ""
+msgstr "登录用户"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 msgid "VAT(%)"
-msgstr "增值税（%）"
+msgstr "增值税(%)"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -257,7 +257,7 @@ msgstr "税"
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "Total Transaction"
-msgstr "总交易数"
+msgstr "交易数合计"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -268,7 +268,7 @@ msgstr "折扣"
 #: rml:pos.invoice:0
 #: rml:pos.receipt:0
 msgid "Fax :"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
@@ -283,39 +283,39 @@ msgstr "业务伙伴"
 #. module: point_of_sale
 #: field:pos.order,payments:0
 msgid "Order Payments"
-msgstr "订单支付方式"
+msgstr "单据付款"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Date :"
-msgstr "日期："
+msgstr "日期:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Ma_ke Payment"
-msgstr "支付(_K)"
+msgstr "付款"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_confirm
 #: wizard_button:pos.sale.get,init,set:0
 msgid "Confirm"
-msgstr "确认"
+msgstr "确定"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr "销售点订单"
+msgstr "POS单"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Disc. (%)"
-msgstr "折扣（％）"
+msgstr "折扣(%)"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Sales total"
-msgstr "销售总计"
+msgstr "销售合计"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -330,17 +330,17 @@ msgstr "状态"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Sum of subtotals"
-msgstr "小计总和"
+msgstr "合计小计"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_date:0
 msgid "Payment date"
-msgstr "支付时间"
+msgstr "付款日期"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_name:0
 msgid "Payment name"
-msgstr "支付方式名称"
+msgstr "付款名称"
 
 #. module: point_of_sale
 #: field:pos.order,lines:0
@@ -350,12 +350,12 @@ msgstr "订单明细"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Disc.(%)"
-msgstr "折扣（％）"
+msgstr "折扣(%)"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
 msgid "Point Of Sale"
-msgstr "销售点"
+msgstr "POS"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
@@ -365,42 +365,42 @@ msgstr "创建日期"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "形式发票"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS "
-msgstr "销售点 "
+msgstr "POS "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Point of Sale journal configuration."
-msgstr "销售点帐目设置"
+msgstr "POS分类帐设置"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal:0
 msgid "Default journal"
-msgstr "默认帐目"
+msgstr "默认分类帐"
 
 #. module: point_of_sale
 #: field:pos.order,account_receivable:0
 msgid "Default Receivable"
-msgstr ""
+msgstr "默认应收款"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_sale_get
 msgid "Get From Order"
-msgstr "从订单获取"
+msgstr "从单据获得"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config
@@ -417,22 +417,22 @@ msgstr "单价"
 #. module: point_of_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line_day
 msgid "POS Lines of the day"
-msgstr "该日销售明细"
+msgstr "今天POS明细"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
 msgid "Number of Print"
-msgstr ""
+msgstr "打印数"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal
 msgid "Default journals"
-msgstr "默认帐目"
+msgstr "默认分类帐"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -442,37 +442,37 @@ msgstr "发票草稿"
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
 msgid "Discount (%)"
-msgstr "折扣（％）"
+msgstr "折扣(%)"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "财务状况备注:"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_add_product
 msgid "Add products"
-msgstr "添加商品"
+msgstr "增加产品"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr "合计数量"
+msgstr "总数量"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line
 msgid "POS Lines"
-msgstr "销售单明细"
+msgstr "POS明细"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Sales Order POS"
-msgstr ""
+msgstr "POS销售单"
 
 #. module: point_of_sale
 #: wizard_button:pos.config.journal,init,set_default_journal:0
 msgid "Define default journals"
-msgstr ""
+msgstr "定义默认分类帐"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
@@ -482,7 +482,7 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
-msgstr "销售点"
+msgstr "POS"
 
 #. module: point_of_sale
 #: field:pos.order,salesman_id:0
@@ -498,23 +498,23 @@ msgstr "已开票"
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_rebate:0
 msgid "Default rebate journal"
-msgstr ""
+msgstr "默认回扣分类帐"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.wizard_default_journal
 msgid "Wizard default journals"
-msgstr ""
+msgstr "向导默认分类帐"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total of the day"
-msgstr "该日销售总计"
+msgstr "今天合计"
 
 #. module: point_of_sale
 #: wizard_button:pos.scan_product,init,add:0
 msgid "Add"
-msgstr "添加"
+msgstr "增加"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
@@ -524,33 +524,33 @@ msgstr "草稿"
 #. module: point_of_sale
 #: selection:pos.order,state:0
 msgid "Paid"
-msgstr "已付"
+msgstr "付款"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "VAT :"
-msgstr "增值税："
+msgstr "增值税:"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order lines"
-msgstr "销售点订单明细"
+msgstr "POS单明细"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "E-mail :"
-msgstr "电子邮件："
+msgstr "电子邮件:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total invoiced"
-msgstr "总开票额"
+msgstr "已开票合计"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_today
 msgid "Sales of the day"
-msgstr "该日销售情况"
+msgstr "今天销售"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -561,7 +561,7 @@ msgstr "未知"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr "销售点订单明细"
+msgstr "POS单明细"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_discount
@@ -576,68 +576,68 @@ msgstr "用户"
 #. module: point_of_sale
 #: field:pos.payment,payment_date:0
 msgid "Payment Date"
-msgstr "支付日期"
+msgstr "付款日期"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_name:0
 msgid "Payment Name"
-msgstr ""
+msgstr "付款名称"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
-msgstr "时间"
+msgstr "日期"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by user"
-msgstr ""
+msgstr "销售用户"
 
 #. module: point_of_sale
 #: wizard_button:pos.add_product,init,add:0
 #: view:pos.order:0
 msgid "_Add product"
-msgstr "添加商品（_A）"
+msgstr "增加产品"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid ":"
-msgstr ""
+msgstr "："
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Period:"
-msgstr "时期："
+msgstr "周期:"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree
 msgid "All the sales"
-msgstr ""
+msgstr "所有销售"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Compute"
-msgstr "计算"
+msgstr "公司"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Total:"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Summary"
-msgstr "概要"
+msgstr "摘要"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Create _Invoice"
-msgstr "创建发票（_I）"
+msgstr "创建发票"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,quantity:0
@@ -650,18 +650,18 @@ msgstr "数量"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Refund"
-msgstr "退款"
+msgstr "退货"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Mode of payment"
-msgstr "付款模式"
+msgstr "付款方式"
 
 #. module: point_of_sale
 #: wizard_button:pos.payment,ask_pay,add_pay:0
 msgid "Ma_ke payment"
-msgstr "付款（_K）"
+msgstr "付款"
 
 #. module: point_of_sale
 #: wizard_button:pos.discount,init,apply_discount:0
@@ -681,22 +681,22 @@ msgstr "折扣百分比"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
 msgid "Receipt"
-msgstr ""
+msgstr "收入"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
 msgid "Refund order :"
-msgstr "退款单："
+msgstr "退货单:"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
-msgstr ""
+msgstr "交易数"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Net Total:"
-msgstr "总净重："
+msgstr "净合计:"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -706,7 +706,7 @@ msgstr "其它"
 #. module: point_of_sale
 #: selection:pos.order,state:0
 msgid "Done"
-msgstr "已完成"
+msgstr "完成"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
@@ -738,73 +738,73 @@ msgstr "关闭"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order lines"
-msgstr "订单明细"
+msgstr "单据明细"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
 #: field:pos.payment,order_id:0
 msgid "Order Ref"
-msgstr "相关订单"
+msgstr "单据参考"
 
 #. module: point_of_sale
 #: wizard_view:pos.payment,ask_pay:0
 msgid "Add payment :"
-msgstr "添加支付方式："
+msgstr "增加付款:"
 
 #. module: point_of_sale
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment
 msgid "Pos Payment"
-msgstr ""
+msgstr "POS付款"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total discount"
-msgstr ""
+msgstr "折扣合计"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "创建发票"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
 msgid "Refund "
-msgstr ""
+msgstr "退货 "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "POS明细"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "税:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr ""
+msgstr "金额合计"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,product:0
 #: rml:pos.details:0
 #: field:pos.order.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Invoicing"
-msgstr ""
+msgstr "发票"
 
 #. module: point_of_sale
 #: field:pos.config.journal,journal_id:0
@@ -813,83 +813,83 @@ msgstr ""
 #: field:pos.payment,journal_id:0
 #: field:report.transaction.pos,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "分类帐"
 
 #. module: point_of_sale
 #: wizard_field:pos.scan_product,init,gencod:0
 msgid "Barcode"
-msgstr ""
+msgstr "条码"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "取消发票"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr ""
+msgstr "销售单明细"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "电话:"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_nb:0
 msgid "Piece Number"
-msgstr ""
+msgstr "领料/提货号"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_gift:0
 msgid "Default gift journal"
-msgstr ""
+msgstr "默认赠品分类帐"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree3
 msgid "All orders"
-msgstr ""
+msgstr "所有单据"
 
 #. module: point_of_sale
 #: wizard_field:pos.sale.get,init,picking_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "销售单"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month
 msgid "Sales of the month"
-msgstr ""
+msgstr "月销售"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "D_iscount"
-msgstr ""
+msgstr "折扣"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "订单日期"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Payments"
-msgstr ""
+msgstr "付款"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "供应商退货"
 
 #. module: point_of_sale
 #: field:pos.config.journal,name:0
@@ -898,18 +898,18 @@ msgstr ""
 #: field:pos.payment,name:0
 #: rml:pos.receipt:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
 msgid "Account Entry"
-msgstr ""
+msgstr "凭证"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_id:0
 #: field:pos.payment,payment_id:0
 msgid "Payment Term"
-msgstr ""
+msgstr "付款条件"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -917,51 +917,51 @@ msgstr ""
 #: wizard_field:pos.payment,ask_pay,amount:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Actions"
-msgstr ""
+msgstr "生效"
 
 #. module: point_of_sale
 #: help:pos.order,salesman_id:0
 msgid "This is the salesman actually making the order."
-msgstr ""
+msgstr "这是销售员实际产生的订单"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr ""
+msgstr "税收模式"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Print Date:"
-msgstr ""
+msgstr "打印日期:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Company:"
-msgstr ""
+msgstr "公司:"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Print Date"
-msgstr ""
+msgstr "打印日期"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "OPERATION N° :"
-msgstr ""
+msgstr "操作员:"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 #: field:pos.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -969,4 +969,28 @@ msgstr ""
 #: rml:pos.lines:0
 #: rml:pos.receipt:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
+
+#~ msgid ""
+#~ "\n"
+#~ "Main features :\n"
+#~ " - Fast encoding of the sale.\n"
+#~ " - Allow to choose one payment mode (the quick way) or to split the payment "
+#~ "between several payment mode.\n"
+#~ " - Computation of the amount of money to return.\n"
+#~ " - Create and confirm picking list automatically.\n"
+#~ " - Allow the user to create invoice automatically.\n"
+#~ " - Allow to refund former sales.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "主要特征:\n"
+#~ "    - 销售快速编码\n"
+#~ "    - 允许选择一个付款方式(快速方式)或在几个付款方式中分开付款\n"
+#~ "    - 计算金额\n"
+#~ "    - 自动创建和确认领料/提货单\n"
+#~ "    - 允许用户自动创建发票\n"
+#~ "    - 允许销售退款\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index 506ca418705..70322d3b49b 100644
--- a/addons/point_of_sale/i18n/zh_HK.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index 123e58f8375..fa9547755ad 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 4b3f73f34d8..03784511f14 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -64,7 +64,7 @@ class pos_company_discount(osv.osv):
         'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
         'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
         'account_receivable': fields.many2one('account.account',
-            'Default Receivable', required=True, states={'draft': [('readonly', False)]}),
+            'Default Receivable', states={'draft': [('readonly', False)]}),
      }
 
 pos_company_discount()
@@ -158,28 +158,8 @@ class pos_order(osv.osv):
                         if val<o.date_created:
                             val=o.date_created
             if val:
-             #   cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
-             #   cr.commit()
                 res[order.id]=val
         return res
- #       tax_obj = self.pool.get('account.tax')
- #       pay_obj = self.pool.get('pos.payment')
- #       for order in self.browse(cr, uid, ids):
- #           val = 0.0
- #           tot =0.0
- #           for pay in order.payments:
- #               tot+= pay.amount
- #           if order.amount_total==tot:
- #               res[order.id]=time.strftime('%Y-%m-%d')
- #           for line in order.lines:
-
- #               val = reduce(lambda x, y: x+round(y['amount'], 2),
- #                       tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
- #                           line.price_unit * \
- #                           (1-(line.discount or 0.0)/100.0), line.qty),
- #                           val)
-
- #           res[order.id] = val
 
     def _amount_tax(self, cr, uid, ids, field_name, arg, context):
         res = {}
@@ -565,7 +545,6 @@ class pos_order(osv.osv):
                 val=val and val[0] or None
                 if val:
                     cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
-                    cr.commit()
         return True
 
 
@@ -1381,7 +1360,7 @@ class report_sales_by_margin_pos(osv.osv):
 #        'pos_name': fields.char('POS Order', size=64, readonly=True),
         'product_name':fields.char('Product Name', size=64, readonly=True),
         'date_order': fields.date('Order Date',required=True, select=True),
-        'amount': fields.float('Total', readonly=True, select=True),
+     #   'amount': fields.float('Total', readonly=True, select=True),
         'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
         'qty': fields.float('Qty', readonly=True, select=True),
         'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
@@ -1430,7 +1409,7 @@ class report_sales_by_margin_pos_month(osv.osv):
 #        'pos_name': fields.char('POS Order', size=64, readonly=True),
         'product_name':fields.char('Product Name', size=64, readonly=True),
         'date_order': fields.date('Order Date',required=True, select=True),
-        'amount': fields.float('Total', readonly=True, select=True),
+        #'amount': fields.float('Total', readonly=True, select=True),
         'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
         'qty': fields.float('Qty', readonly=True, select=True),
         'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index baaac139ce4..828af84636a 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -43,7 +43,7 @@
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-                                <button name="%(pos_discount)d" string="D_iscount" type="action" states="draft"/>
+                                <button name="%(action_pos_discount)d" string="D_iscount" type="action" states="draft"/>
                                 <button name="dummy_button" string="Compute" type="object" />
                             </group>
 
@@ -68,8 +68,8 @@
                                 <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
                                 -->
 
-                                <button name="%(pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance"/>
-                                <button name="%(o_rec)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
+                                <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
+                                <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
 
 
                                 <!--
@@ -663,7 +663,7 @@ invoiced
                     <page string="Other">
                       <field  name="company_discount" colspan="4"/>
                       <field  name="max_diff" colspan="4"/>
-                      <field  name="account_receivable" colspan="4"/>
+                      <field  name="account_receivable" required="1" colspan="4"/>
                     </page>
                 </notebook>
         	</field>
@@ -830,31 +830,31 @@ invoiced
 					action="action_product_output"
 					id="products_for_output_operations"/>
 
-        <wizard
+<!--        <wizard
             string="Refloat Box entries"
             model="account.bank.statement"
             name="pos.entry"
             menu="False"
-            id="pos_entries"/>
+            id="pos_entries"/>-->
+            
         <menuitem name="Register Management" parent="menu_point_root"
             id="menu_point_config" sequence="3"/>
         <menuitem
             name="Input Operations" parent="menu_point_config"
             string="Refloat"
-            action="pos_entries"
-            type="wizard"
-            id="menu_wizard_enter_jrnl" sequence="2" />
-        <wizard
+            action="action_box_entries"
+            id="menu_wizard_enter_jrnl" sequence="3" />
+            
+    <!--    <wizard
             string="Enter negative operations"
             model="account.bank.statement"
             name="pos.out"
             menu="False"
-            id="pos_entries2"/>
+            id="pos_entries2"/>-->
         <menuitem
             name="Output Operations" parent="menu_point_config"
             string="Refloat"
-            action="pos_entries2"
-            type="wizard"
+            action="action_box_out"
             id="menu_wizard_enter_jrnl2" sequence="3" />
 
 <!--        <menuitem name="Sales Waiting Validation" parent="menu_point_config" id="menu_point_ofsale_date_payment"-->
@@ -981,22 +981,29 @@ invoiced
 <!--		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
 				id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user"
-				id="menu_pos_sales_user" parent="menu_trans_pos_tree" type="wizard" sequence="3" groups="base.group_extended" />
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
+				id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
 
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today"
-				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" type="wizard" sequence="2" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
+				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
+ 
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
+				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
+				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_date"
-				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" type="wizard" sequence="5" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
+				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree"  sequence="5" groups="base.group_extended"/>
 
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_user"
-				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" type="wizard" sequence="6" groups="base.group_extended"/>
-		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today_current_user"
-				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" type="wizard" sequence="7"/>
-    	<menuitem icon="STOCK_PRINT" action="wizard_pos_details"
-				id="menu_pos_details" parent="menu_cashboxes_by_day" type="wizard" />
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
+				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="action_report_pos_sales_user_today_current_user"
+				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day"  sequence="7"/>
+
+    	
+    	<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
+				id="menu_pos_details" parent="menu_cashboxes_by_day"  />
 
 
     </data>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 325350d031b..2e09b5cc9df 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -9,17 +9,13 @@
         string="Return Goods"/>
 
 
-		<wizard string="Receipt" model="pos.order"
-				name="ord.receipt" id="o_rec"
-         keyword="client_print_multi"
-         menu="False"
-         />
+
 
 <!--		<wizard string="Box Entries" model="account.bank.statement"
 				name="pos.entry" id="pos_entry" menu="False"/>-->
 
-		<wizard string="Payment" model="pos.order"
-				name="pos.payment" id="pos_payment" menu="False"/>
+<!--		<wizard string="Payment" model="pos.order"
+				name="pos.payment" id="pos_payment" menu="False"/>-->
 
 			<!--<wizard string="Create Invoices" model="pos.order"
 				name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
@@ -30,64 +26,49 @@
 			<!--<wizard string="Cancel" model="pos.order"
 				name="pos.cancel" id="pos_cancel" multi="True"/>-->
 
-		<wizard
-        string="Confirm"
-        model="pos.order"
-				name="pos.confirm"
-        id="pos_confirm"
-			  multi="True"
-			  menu="True"
-        />
-
+<!--
 		<wizard string="Discount" model="pos.order"
-				name="pos.discount" id="pos_discount" menu="False"/>
+				name="pos.discount" id="pos_discount" menu="False"/>-->
 
 <!--		<wizard id="wizard_pos_payment_report" menu="False"
 				model="pos.order" name="pos.payment.report" string="All paid lines for the current User"/-->
-
+<!--
 		<wizard id="wizard_pos_sales_user" menu="False"
-				model="pos.order" name="pos.sales.user" string="Sales Report"/>
-
-		<wizard id="wizard_pos_sales_user_today" menu="False"
-				model="pos.order" name="pos.sales.user.today" string="Sales by Users"/>
+				model="pos.order" name="pos.sales.user" string="Sales Report"/>-->
 
+<!--
 		<wizard id="wizard_pos_payment_report_date" menu="False"
 				model="pos.order" name="pos.payment.report.date" string="Sales lines Report"/>
 
 		<wizard id="wizard_pos_payment_report_user" menu="False"
 				model="pos.order" name="pos.payment.report.user" string="Sales lines by Users"/>
-
+-->
+  
 		<wizard id="wizard_pos_sales_user_today_current_user" menu="False"
 				model="pos.order" name="pos.sales.user.today.current.user" string="Sales for Current User"/>
 
-		<wizard id="wizard_pos_details" menu="False"
-				model="pos.order" name="pos.details" string="Sales Details"/>
+<!--		<wizard id="wizard_pos_details" menu="False"
+				model="pos.order" name="pos.details" string="Sales Details"/>-->
 
 <!--		<wizard string="Get From Order" model="pos.order"
 				name="pos.sale.get" id="pos_sale_get"/>
 
 		<wizard string="Scan Product" model="pos.order"
 				name="pos.scan_product" id="pos_scan_product"/-->
-  		<wizard
+<!--  		<wizard
         	id="close_statement"
         	model="account.bank.statement"
-        	menu="False"
+        	menu="True"
         	name="statement.close"
-        	string="Close Statements"/>
-  		<wizard
-        	id="open_statement"
-        	model="account.bank.statement"
-        	menu="False"
-        	name="statement.open"
-        	string="Open Statements"/>
+        	string="Close Statements"/>-->
 
 
-       <wizard
+       <!--wizard
         	id="wizard_all_closed_cashbox_of_the_day"
         	model="account.bank.statement"
         	menu="False"
         	name="all.closed.cashbox.of.the.day"
-        	string="All Cashboxes Of the day"/>
+        	string="All Cashboxes Of the day"/-->
 
 
 	</data>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 854acfde3a9..f3c21da2dcb 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -138,4 +138,6 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         res = self.cr.dictfetchall()
         return res[0]['net_total'] or 0.0
 
-report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/statement/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
+
+report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
+
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
index 1578f0e6958..82723a43125 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ b/addons/point_of_sale/report/pos_payment_report_date.py
@@ -43,7 +43,7 @@ class pos_payment_report_date(report_sxw.rml_parse):
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
                          "and po.state in ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id in %s " \
-                         ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+                         ,(dt1,dt2,tuple(form['user_id'])))
         data=self.cr.dictfetchall()
         return data
 
@@ -55,7 +55,7 @@ class pos_payment_report_date(report_sxw.rml_parse):
                          "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
                          "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
                          "and po.state in ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id in %s " \
-                         ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+                         ,(dt1,dt2,tuple(form['user_id'])))
         res=self.cr.fetchone()[0]
         return res
 
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index cde5162425e..9af9377d64c 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -35,7 +35,7 @@ class pos_payment_report_user(report_sxw.rml_parse):
 
     def __pos_payment_user__(self,form):
         data={}
-        ids = form['user_id'][0][-1]
+        ids = form['user_id']
         idss = map(str, ids)
         sql = "select pt.name,pol.qty,pol.discount,pol.price_unit, " \
                          "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index ecf1aa8c52a..1d5e70241c7 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -104,7 +104,9 @@
         <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
         <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
         <para style="terp_default_Centre_9">Vendeur : [[ o.user_id1.name ]]</para>
-        <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
+
+        <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
+
         <para style="P4">
             <font color="white"> </font>
         </para>
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index d863efd40f3..0eb0dba773a 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -71,7 +71,7 @@
     <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
     <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
     <para style="terp_default_Centre_9">Salesman : [[ o.user_id.name ]]</para>
-    <para style="terp_default_Centre_9">Sale Date : [[ o.date_order ]]</para>
+    <para style="terp_default_Centre_9">Sale Date : [[ str(o.date_order) ]]</para>
 	  <para style="P5">Purchase Voucher : [[o.name]]</para>
     <para style="P4">
       <font color="white"> </font>
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index 034587a8ae4..b1b7272a030 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -42,7 +42,7 @@ class pos_sales_user(report_sxw.rml_parse):
                         "from pos_order as po,res_users as ru,res_company as rc " \
                         "where po.date_order >= %s and po.date_order <= %s " \
                         "and po.company_id=rc.id and po.user_id=ru.id and po.user_id in %s " \
-                            ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+                            ,(dt1,dt2,tuple(form['user_id'])))
 
         data = self.cr.dictfetchall()
         return data
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
index 4e06a936116..a5caf899069 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.py
+++ b/addons/point_of_sale/report/pos_sales_user_today.py
@@ -36,7 +36,7 @@ class pos_sales_user_today(report_sxw.rml_parse):
 
     def _get_data(self,form):
         data={}
-        ids = form['user_id'][0][-1]
+        ids = form['user_id']
         idss = map(str, ids)
 
         self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index efbe26893f1..a36d631968a 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -19,3 +19,22 @@
 "access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","point_of_sale.group_pos_user",1,0,0,0
 "access_singer_statement","singer.statement","model_singer_statement","point_of_sale.group_pos_user",1,0,0,0
+"access_add_product","pos.add.product ","model_pos_add_product","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_confirm","pos.confirm","model_pos_confirm","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_discount","pos.discount","model_pos_discount","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_get_sale","pos.get.sale","model_pos_get_sale","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_close_statement","pos.open.statement","model_pos_open_statement","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_open_statement","pos.close.statement","model_pos_close_statement","point_of_sale.group_pos_user",1,0,0,0
+"acess_pos_box_entries ","pos.box.entries ","model_pos_box_entries","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_box_out","pos.box.out","model_pos_box_out","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user","pos.sale.user","model_pos_sale_user","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user","pos.sales.user.today","model_pos_sales_user_today","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sales_user_today_current_user","pos.sales.user.today.current_user","model_pos_sales_user_today_current_user","point_of_sale.group_pos_user",1,0,0,0
+"access_all_closed_cashbox_of_the_day","all.closed.cashbox.of.the.day","model_all_closed_cashbox_of_the_day","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_receipt","pos.receipt ","model_pos_receipt","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report_user","pos.payment.report.user","model_pos_payment_report_user","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report_date ","pos.payment.report.date ","model_pos_payment_report_date","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_make_payment","pos.make.payment","model_pos_make_payment","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_scan_product","pos.scan.product","model_pos_scan_product","point_of_sale.group_pos_user",1,0,0,0
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 641cb8e52cf..947348a990d 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -33,7 +33,7 @@
 			<field eval="1" name="global"/>
 		</record>
 		<record id="point_of_sale.res_groups_posuser0" model="res.groups">
- 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_new'),ref('report_mrp.next_id_77'),ref('report_mrp.menu_report_workcenter_load'),ref('report_mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+ 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_new'),ref('mrp.next_id_77'),ref('mrp.menu_report_workcenter_load'),ref('mrp.menu_report_in_out_picking'),ref('base.menu_sales'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
 			<field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
 			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
 		</record>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index 256d0644583..719729a5d45 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -9,7 +9,7 @@
 			name="pos.user.product"
 			auto="False"
 			multi="True"
-			rml="statement/report/pos_users_product.rml"
+			rml="point_of_sale/report/pos_users_product.rml"
 			 />
 
 		<report
@@ -19,19 +19,9 @@
 			name="account.statement"
 			auto="False"
 			multi="True"
-			rml="statement/report/account_statement.rml"
+			rml="point_of_sale/report/account_statement.rml"
 			 />
 
-		<report
-			id="all_closed_cashbox_of_the_day"
-			string="All Cloded CashBOx"
-			model="account.bank.statement"
-			name="all.closed.cashbox.of.the.day"
-			auto="False"
-			multi="True"
-			menu = 'False'
-			rml="statement/report/all_closed_cashbox_of_the_day.rml"
-			 />
 		<report
 			id="pos_users_product_re"
 			string="User's Product"
@@ -39,7 +29,7 @@
 			name="pos.user.product"
 			auto="False"
 			multi="True"
-			rml="statement/report/pos_users_product.rml"
+			rml="point_of_sale/report/pos_users_product.rml"
 			 />
 
 		<report
@@ -49,18 +39,18 @@
 			name="account.statement"
 			auto="False"
 			multi="True"
-			rml="statement/report/account_statement.rml"
+			rml="point_of_sale/report/account_statement.rml"
 			 />
 
 		<report
 			id="all_closed_cashbox_of_the_day"
-			string="All Cloded CashBOx"
+			string="All Closed CashBOx"
 			model="account.bank.statement"
 			name="all.closed.cashbox.of.the.day"
 			auto="False"
 			multi="True"
 			menu = 'False'
-			rml="statement/report/all_closed_cashbox_of_the_day.rml"
+			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
 			 />
 
 	</data>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index e7e7119583d..7f241e5bfa8 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -417,23 +417,27 @@
 		<menuitem name="Cashboxes to Close" parent="menu_pos_bank_statment_tree"
 		 		action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>
 
+	
 		<menuitem
-            name="Open Statements" parent="point_of_sale.menu_point_config"
-            string="Open Statements"
-            action="open_statement"
-            type="wizard"
-            id="menu_open_statement" sequence="3" />
+            name="Open Registers" parent="point_of_sale.menu_point_config"
+            string="Open Register"
+            action="action_pos_open_statement"
+            id="menu_open_statement" sequence="1" />
+
        <menuitem icon="STOCK_PRINT"
-       			 action="wizard_all_closed_cashbox_of_the_day"
+       			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
+
 				 parent="menu_statement_tree_all"
-				 type="wizard"/>
+				/>
+
 
 		<menuitem
-            name="Close Statements" parent="point_of_sale.menu_point_config"
-            string="Close Statements"
-            action="close_statement"
-            type="wizard"
-            id="menu_close_statement" sequence="3" />
+            name="Close Register" parent="point_of_sale.menu_point_config"
+            string="Close Register"
+            action="action_pos_close_statement"
+            id="menu_close_statement" sequence="2" />
+
+            
 	</data>
 </openerp>
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
index f3bffb15ce1..c4f4ddf9072 100644
--- a/addons/point_of_sale/statement_wizard.xml
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -1,9 +1,9 @@
 <openerp>
 	<data>
-  		<wizard
+<!--  		<wizard
         	id="close_statement"
         	model="account.bank.statement"
-        	menu="False"
+        	menu="True"
         	name="statement.close"
         	string="Close Statements"/>
 		<menuitem
@@ -12,31 +12,25 @@
             action="close_statement"
             type="wizard"
             id="menu_close_statement" sequence="4" />
-  		<wizard
-        	id="open_statement"
-        	model="account.bank.statement"
-        	menu="False"
-        	name="statement.open"
-        	string="Open Register"/>
 
-		<menuitem
-            name="Open Register" parent="point_of_sale.menu_point_config"
-            string="Open Register"
-            action="open_statement"
-            type="wizard"
-            id="menu_open_statement" sequence="1" />
+-->
 
-       <wizard
-        	id="wizard_all_closed_cashbox_of_the_day"
+
+
+     <!--  <wizard
+        	id="action_report_all_closed_cashbox_of_the_day2"
         	model="account.bank.statement"
         	menu="False"
         	name="all.closed.cashbox.of.the.day"
-        	string="All Cashboxes Of the day"/>
+        	string="All Cashboxes Of the day"/>-->
+
 
        <menuitem icon="STOCK_PRINT"
-       			 action="wizard_all_closed_cashbox_of_the_day"
+       			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
+
 				 parent="menu_point_report_register"
-				 type="wizard"/>
+				/>
+
     </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 1ff9c124861..ba62c1f78f9 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -20,24 +20,27 @@
 #
 ##############################################################################
 
-import wizard_pos_payment
-import wizard_default_journal
-import wizard_refund_order
-import wizard_add_product
-import wizard_confirm
-import wizard_discount
-import wizard_get_sale
-import wizard_scan_product
-import wizard_receipt
 import wizard_return
-import wizard_pos_payment_report
-import wizard_pos_sales_user
-import wizard_pos_sales_user_today
-import wizard_pos_payment_report_date
-import wizard_pos_payment_report_user
-import wizard_pos_sales_user_current_user
-import wizard_pos_details
-import wizard_open_statement
-import wizard_all_closed_cashbox_of_the_day
+
+import pos_add_product
+import pos_confirm
+import pos_discount
+import pos_get_sale
+import pos_open_statement
+import pos_close_statement
+import pos_box_entries
+import pos_box_out
+import pos_details
+import pos_sales_user
+import pos_sales_user_today
+import pos_sales_user_current_user
+import all_closed_cashbox_of_the_day
+import pos_receipt
+import pos_payment_report_user
+import pos_payment_report_date
+import pos_payment_report
+import pos_payment
+import pos_scan_product
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
similarity index 52%
rename from addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py
rename to addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
index bdb7f72cb93..0968c6c71d4 100644
--- a/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
@@ -20,21 +20,41 @@
 #
 ##############################################################################
 
-import pooler
 import netsvc
-import wizard
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
 import time
 
+class all_closed_cashbox_of_the_day(osv.osv_memory):
+    _name = 'all.closed.cashbox.of.the.day'
+    _description = 'All closed cashbox of the day'
 
-class wizard_all_closed_cashbox_of_the_day(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'print', 'report':'all.closed.cashbox.of.the.day', 'state':'end'}
-             },
+    _columns = {
+                
     }
+    
+    def print_report(self, cr, uid, ids, context=None):
 
-wizard_all_closed_cashbox_of_the_day('all.closed.cashbox.of.the.day')
+        """ 
+             To get the date and print the report 
+                       
+             @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 : retrun report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res =  {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'all.closed.cashbox.of.the.day',
+                'datas' : datas,               
+       }
+
+all_closed_cashbox_of_the_day()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml
new file mode 100644
index 00000000000..e78ef5c6d6a
--- /dev/null
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_all_closed_cashbox_of_the_day" model="ir.ui.view">
+            <field name="name">all closed cashbox of the day</field>
+            <field name="model">all.closed.cashbox.of.the.day</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="All Cashboxes Of the day :">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />				  
+                </form>
+            </field>
+        </record>
+
+ 
+       
+  		<record id="action_report_all_closed_cashbox_of_the_day" model="ir.actions.act_window">
+            <field name="name">All Cashboxes Of the day</field>
+            <field name="res_model">all.closed.cashbox.of.the.day</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           	<field name="target">new</field>
+        </record>	
+		
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
new file mode 100644
index 00000000000..34769be78e9
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+
+class add_product(osv.osv_memory):
+    _name = 'pos.add.product'
+    _description = 'Add Product'
+
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'quantity': fields.float('Quantity ', required=True),
+    }
+    _defaults = {
+        'quantity': lambda *a: 1,
+    }
+
+    def select_product(self, cr, uid, ids, context):
+        """
+             To get the product and quantity and add in order .
+             @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 : Return the add product form again for adding more product
+        """
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('active_id', False)
+        assert record_id, _('Active ID is not found')
+        if record_id:
+            order_obj = self.pool.get('pos.order')
+            order_obj.add_product(cr, uid, record_id, this.product_id.id, this.quantity, context=context)
+
+        return {
+            'name': _('Add Product'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.add.product',
+            'view_id': False,
+            'target': 'new',
+            'views': False,
+            'type': 'ir.actions.act_window',
+        }
+
+add_product()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_add_product.xml b/addons/point_of_sale/wizard/pos_add_product.xml
new file mode 100644
index 00000000000..5d380624f0d
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_add_product.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Add  Product -->
+        
+		<record id="view_add_product" model="ir.ui.view">
+            <field name="name">Add  Product</field>
+            <field name="model">pos.add.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add product :">
+				    <group col="2" colspan="4">
+				    	<field name="product_id"/>
+				    	<field name="quantity"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="select_product" string="Contiue"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_add_product" model="ir.actions.act_window">
+            <field name="name">Add  Product</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.add.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>            
+        </record>
+        
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
new file mode 100644
index 00000000000..fe57e6642f2
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+from tools.translate import _
+
+
+def get_journal(self, cr, uid, context):
+    """
+             Make the selection list of Cash Journal  .
+             @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 :Return the list of journal
+    """
+
+    obj = self.pool.get('account.journal')
+    user = self.pool.get('res.users').browse(cr, uid, uid)
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+
+class pos_box_entries(osv.osv_memory):
+    _name = 'pos.box.entries'
+    _description = 'Pos Box Entries'
+
+
+
+    def _get_income_product(self, cr, uid, context):
+
+        """
+             Make the selection list of purchasing  products.
+             @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 :Return of operation of product
+        """
+        obj = self.pool.get('product.product')
+        ids = obj.search(cr, uid, [('income_pdt', '=', True)])
+        res = obj.read(cr, uid, ids, ['id', 'name'], context)
+        res = [(r['id'], r['name']) for r in res]
+        res.insert(0, ('', ''))
+
+        return res
+
+
+    _columns = {
+                'name': fields.char('Name', size=32, required=True),
+                'journal_id': fields.selection(get_journal, "Journal", required=True),
+                'product_id': fields.selection(_get_income_product, "Operation", required=True),
+                'amount': fields.float('Amount', digits=(16, 2)),
+                'ref': fields.char('Ref', size=32),
+    }
+    _defaults = {
+                 'journal_id': lambda *a: 1,
+                 'product_id': lambda *a: 1,
+                }
+
+    def get_in(self, cr, uid, ids, context):
+        """
+             Create the entry of statement in journal.
+             @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 :Return of operation of product
+        """
+        statement_obj = self.pool.get('account.bank.statement')
+        product_obj = self.pool.get('product.template')
+        res_obj = self.pool.get('res.users')
+        product_obj = self.pool.get('product.product')
+        bank_statement = self.pool.get('account.bank.statement.line')
+        for data in  self.read(cr, uid, ids):
+            args = {}
+            curr_company = res_obj.browse(cr, uid, uid).company_id.id
+            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')])
+            if not statement_id:
+                raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
+
+            acc_id = product_obj.browse(cr, uid, data['product_id']).property_account_income
+            if not acc_id:
+                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name))
+            if statement_id:
+                statement_id = statement_id[0]
+            if not statement_id:
+                statement_id = statement_obj.create(cr, uid, {'date': time.strftime('%Y-%m-%d 00:00:00'),
+                                                            'journal_id': data['journal_id'],
+                                                            'company_id': curr_company,
+                                                            'user_id': uid,
+                                                           })
+
+            args['statement_id'] = statement_id
+            args['journal_id'] = data['journal_id']
+            if acc_id:
+                args['account_id'] = acc_id.id
+            args['amount'] = data['amount'] or 0.0
+            args['ref'] = "%s" % (data['ref'] or '')
+            args['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id']).name, data['name'].decode('utf8'))
+            address_u = res_obj.browse(cr, uid, uid).address_id
+            if address_u:
+                partner_id = address_u.partner_id and address_u.partner_id.id or None
+                args['partner_id'] = partner_id
+            statement_line_id = bank_statement.create(cr, uid, args)
+
+            return {}
+
+pos_box_entries()
+
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
new file mode 100644
index 00000000000..e0f0a21402f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Box Entries -->
+        
+		<record id="view_box_entries" model="ir.ui.view">
+            <field name="name">Box Entries</field>
+            <field name="model">pos.box.entries</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Entrée de caisse">
+				    	<separator string="Please fill these fields for entries to the box:" colspan="4"/>
+				    	<field name="name"/>
+				    	<field name="journal_id"/>
+				    	<field name="product_id"/>
+				    	<field name="amount"/>
+				    	<field name="ref"/>
+				    	<group colspan="4" col="2">
+				 		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="get_in" string="Make Entries in the CashBox"
+                			colspan="1" type="object" icon="gtk-ok" />
+                			</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_box_entries" model="ir.actions.act_window">
+         	<field name="name">Box Entries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.box.entries</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>            
+        </record>
+        
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
new file mode 100644
index 00000000000..ea5768e5099
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+from tools.translate import _
+from mx import DateTime
+import pos_box_entries
+
+
+class pos_box_out(osv.osv_memory):
+    _name = 'pos.box.out'
+    _description = 'Pos Box Out'
+
+    def _get_expense_product(self, cr, uid, context):
+
+        """
+             Make the selection list of expense product.
+             @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 :Return of operation of product
+        """
+        obj = self.pool.get('product.product')
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        ids = obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)])
+        res = obj.read(cr, uid, ids, ['id', 'name'], context)
+        res = [(r['id'], r['name']) for r in res]
+        res.insert(0, ('', ''))
+        return res
+
+    _columns = {
+                'name': fields.char('Name', size=32, required=True),
+                'journal_id': fields.selection(pos_box_entries.get_journal, "Journal", required=True),
+                'product_id': fields.selection(_get_expense_product, "Operation", required=True),
+                'amount': fields.float('Amount', digits=(16, 2)),
+                'ref': fields.char('Ref', size=32),
+    }
+    _defaults = {
+                 'journal_id': lambda *a: 1,
+                 'product_id': lambda *a: 1,
+                }
+    def get_out(self, cr, uid, ids, context):
+
+        """
+             Create the entries in the CashBox   .
+             @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 :Return of operation of product
+        """
+        args = {}
+        statement_obj = self.pool.get('account.bank.statement')
+        statement_line_obj = self.pool.get('account.bank.statement.line')
+        product_obj = self.pool.get('product.template')
+        productp_obj = self.pool.get('product.product')
+        res_obj = self.pool.get('res.users')
+        for data in  self.read(cr, uid, ids):
+            curr_company = res_obj.browse(cr, uid, uid).company_id.id
+            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')])
+            monday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday, 0))).strftime('%Y-%m-%d')
+            sunday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday, 0))).strftime('%Y-%m-%d')
+            done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)])
+            stat_done = statement_obj.browse(cr, uid, done_statmt)
+            address_u = res_obj.browse(cr, uid, uid).address_id
+            am = 0.0
+
+            amount_check = productp_obj.browse(cr, uid, data['product_id']).am_out or False
+            for st in stat_done:
+                for s in st.line_ids:
+                    if address_u and s.partner_id == address_u.partner_id and s.am_out:
+                        am += s.amount
+            if (-data['amount'] or 0.0) + am < -(res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) and amount_check:
+                val = (res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) + am
+                raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
+
+            acc_id = product_obj.browse(cr, uid, data['product_id']).property_account_income
+            if not acc_id:
+                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name))
+            if not statement_id:
+                raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
+            if statement_id:
+                statement_id = statement_id[0]
+            if not statement_id:
+                statement_id = statement_obj.create(cr, uid, {'date': time.strftime('%Y-%m-%d 00:00:00'),
+                                                'journal_id': data['journal_id'],
+                                                'company_id': curr_company,
+                                                'user_id': uid,
+                                                })
+            args['statement_id'] = statement_id
+            args['journal_id'] = data['journal_id']
+            if acc_id:
+                args['account_id'] = acc_id.id
+            amount = data['amount'] or 0.0
+            if data['amount'] > 0:
+                amount = -data['amount']
+            args['amount'] = amount
+            if productp_obj.browse(cr, uid, data['product_id']).am_out:
+                args['am_out'] = True
+            args['ref'] = data['ref'] or ''
+            args['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id']).name, data['name'].decode('utf8'))
+            address_u = res_obj.browse(cr, uid, uid).address_id
+            if address_u:
+                partner_id = address_u.partner_id and address_u.partner_id.id or None
+                args['partner_id'] = partner_id
+            statement_line_id = statement_line_obj.create(cr, uid, args)
+        return {}
+
+pos_box_out()
+
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
new file mode 100644
index 00000000000..c634b4cf997
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Box Entries -->
+        
+		<record id="view_pos_box_out" model="ir.ui.view">
+            <field name="name">Box Out</field>
+            <field name="model">pos.box.out</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sortie de caisse">
+				    	<separator string="Please fill these fields for entries to the box:" colspan="4"/>
+				    	<field name="name"/>
+				    	<field name="journal_id"/>
+				    	<field name="product_id"/>
+				    	<field name="amount"/>
+				    	<field name="ref"/>
+				    	<group colspan="4" col="2">
+				 		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="get_out" string="Make Entries in the CashBox"
+                			colspan="1" type="object" icon="gtk-ok" />
+                			</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_box_out" model="ir.actions.act_window">
+         	<field name="name">Box Out</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.box.out</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>            
+        </record>
+        
+	</data>
+</openerp>	        
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
new file mode 100644
index 00000000000..7f2323683a0
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from tools.translate import _
+
+
+class pos_close_statement(osv.osv_memory):
+    _name = 'pos.close.statement'
+    _description = 'Close Statements'
+
+    def close_statement(self, cr, uid, ids, context):
+        """
+             Close the statements
+             @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 : Blank Dictionary
+        """
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        statement_obj = self.pool.get('account.bank.statement')
+        journal_obj = self.pool.get('account.journal')
+        journal_lst = journal_obj.search(cr, uid, [('company_id', '=', company_id), ('auto_cash', '=', True), ('check_dtls', '=', False)])
+        journal_ids = journal_obj.browse(cr, uid, journal_lst)
+        for journal in journal_ids:
+            ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
+            statement_obj.button_confirm(cr, uid, ids)
+        return {}
+
+pos_close_statement()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
new file mode 100644
index 00000000000..fed3518b706
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Point of Sale Confirm -->
+        
+		<record id="view_pos_close_statement" model="ir.ui.view">
+            <field name="name">Close Statements</field>
+            <field name="model">pos.close.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Close Statements">
+				     	<label string="Are you sure you want to close the statements ?" colspan="2"/>
+				     	<newline/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="close_statement" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+
+		<act_window name="Close Statements"
+				res_model="pos.close.statement"
+				src_model="account.bank.statement"
+				view_mode="form"
+				target="new"
+				key2="client_action_multi"    
+			id="act_pos_open_statement"/>
+   	
+   	
+        <record id="action_pos_close_statement" model="ir.actions.act_window">
+            <field name="name">Close Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.close.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
new file mode 100644
index 00000000000..de293eaebc7
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import osv
+from tools.translate import _
+
+
+class pos_confirm(osv.osv_memory):
+    _name = 'pos.confirm'
+    _description = 'Point of Sale Confirm'
+
+    def action_confirm(self, cr, uid, ids, context):
+        """
+             Confirm the order and close the sales.
+             @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 :Blank dictionary
+        """
+
+        record_id = context and context.get('active_id', False)
+        if record_id:
+            if isinstance(record_id, (int, long)):
+                record_id = [record_id]
+            if record_id:
+                order_obj = self.pool.get('pos.order')
+
+                for order_id in order_obj.browse(cr, uid, record_id, context=context):
+                    if  order_id.state == 'paid':
+                        order_obj.write(cr, uid, [order_id.id], {'journal_entry': True})
+                        order_obj.create_account_move(cr, uid, [order_id.id], context=context)
+
+                wf_service = netsvc.LocalService("workflow")
+                for i in record_id:
+                    wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
+        return {}
+
+pos_confirm()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
new file mode 100644
index 00000000000..384d75f768f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Point of Sale Confirm -->
+        
+		<record id="view_pos_confirm" model="ir.ui.view">
+            <field name="name">Sale Confirm</field>
+            <field name="model">pos.confirm</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Open Statements">
+				     	<label string="Are you sure you want to close your sales ?" colspan="2"/>
+				     	<newline/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="action_confirm" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_pos_confirm" model="ir.actions.act_window">
+            <field name="name">Sale Confirm</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.confirm</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+       <record model="ir.values" id="values_pos_confirm">
+            <field name="model_id" ref="point_of_sale.model_pos_order" />
+            <field name="object" eval="1" />
+            <field name="name">Sale Confirm</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_pos_confirm'))"/>
+            <field name="key">action</field>
+            <field name="model">pos.order</field>
+        </record>        
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
new file mode 100644
index 00000000000..22d29b469fa
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+import time
+
+
+class pos_details(osv.osv_memory):
+    _name = 'pos.details'
+    _description = 'Sales Details'
+
+    _columns = {
+        'date_start': fields.date('Date Start', required=True),
+        'date_end': fields.date('Date End', required=True)
+    }
+    _defaults = {
+        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+        'date_end': lambda *a: time.strftime('%Y-%m-%d'),
+    }
+
+    def print_report(self, cr, uid, ids, context={}):
+        """
+         To get the date and print the report
+         @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 : retrun report
+        """
+
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['date_start', 'date_end'], context)
+        res = res and res[0] or {}
+        datas['form'] = res
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'pos.details',
+            'datas': datas,
+       }
+
+pos_details()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
new file mode 100644
index 00000000000..7d6dd346c12
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_details" model="ir.ui.view">
+            <field name="name">POS Details</field>
+            <field name="model">pos.details</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS Details :">
+				    <group col="2" colspan="4">
+				    	<field name="date_start"/>
+				    	<field name="date_end"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_report_pos_details" model="ir.actions.act_window">
+            <field name="name">Sale Details</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.details</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+<!--    <act_window name="POS Details"
+            res_model="pos.details"
+            src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   -->
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
new file mode 100644
index 00000000000..f85a9d233ce
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+
+class pos_discount(osv.osv_memory):
+    _name = 'pos.discount'
+    _description = 'Add Discount'
+
+    _columns = {
+        'discount': fields.float('Discount ', required=True),
+        'discount_notes': fields.char('Discount Notes', size= 128, required=True),
+    }
+    _defaults = {
+        'discount': lambda *a: 5,
+    }
+
+    def apply_discount(self, cr, uid, ids, context):
+        """
+         To give the discount of  product and check the.
+
+         @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 : nothing
+        """
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('active_id', False)
+        if isinstance(record_id, (int, long)):
+            record_id = [record_id]
+
+        order_ref = self.pool.get('pos.order')
+        order_line_ref = self.pool.get('pos.order.line')
+
+        for order in order_ref.browse(cr, uid, record_id, context=context):
+
+            for line in order.lines:
+                company_discount = order.company_id.company_discount
+                applied_discount = this.discount
+
+                if applied_discount == 0.00:
+                    notice = 'No Discount'
+                elif company_discount >= applied_discount:
+                    notice = 'Minimum Discount'
+                else:
+                    notice = this.discount_notes
+
+                res_new = {
+                }
+
+                if this.discount <= company_discount:
+                    res_new = {
+                        'discount': this.discount,
+                        'notice': notice,
+                        'price_ded': line.price_unit * line.qty * (this.discount or 0) * 0.01 or 0.0
+                    }
+                else:
+                    res_new = {
+                        'discount': this.discount,
+                        'notice': notice,
+                        'price_ded': line.price_unit * line.qty * (this.discount or 0) * 0.01 or 0.0
+                    }
+
+                order_line_ref.write(cr, uid, [line.id], res_new, context=context)
+        return {}
+
+#    def check_discount(self, cr, uid, record_id, discount, context):
+#        """
+#         Check the discount of define by company  .
+#         @param self: The object pointer.
+#         @param cr: A database cursor
+#         @param uid: ID of the user currently logged in
+#         @param record_id:Current Order id
+#         @param discount:Select Discount
+#         @param context: A standard dictionary
+#         @return : retrun  to apply and used the company discount base on condition
+#        """
+
+#        order_ref = self.pool.get('pos.order')
+#
+#        for order in order_ref.browse(cr, uid, record_id, context=context):
+#            company_disc = order.company_id.company_discount
+#            for line in order.lines :
+#                prod_disc = discount
+#                if prod_disc <= company_disc :
+#                   return 'apply_discount'
+#                else :
+#                    return 'disc_discount'
+
+pos_discount()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
new file mode 100644
index 00000000000..a0a7c534a95
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Add  Product -->
+        
+		<record id="view_pos_discount" model="ir.ui.view">
+            <field name="name">Apply Discount</field>
+            <field name="model">pos.discount</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Apply Discount">
+				    <group col="2" colspan="4">
+				    	<field name="discount"/>
+				    	<field name="discount_notes"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="apply_discount" string="Apply Discount"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_pos_discount" model="ir.actions.act_window">
+            <field name="name">Apply Discount</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.discount</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_get_sale.py b/addons/point_of_sale/wizard/pos_get_sale.py
new file mode 100644
index 00000000000..918705440c8
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_get_sale.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+
+class pos_get_sale(osv.osv_memory):
+    _name = 'pos.get.sale'
+    _description = 'Get From Sale'
+
+    _columns = {
+        'picking_id': fields.many2one('stock.picking', 'Sale Order', domain=[('state', 'in', ('assigned', 'confirmed')), ('type', '=', 'out')], context="{'contact_display':'partner'}", required=True),
+    }
+
+    def sale_complete(self, cr, uid, ids, context):
+        """
+             Select the picking order and add the in Point of sale order
+             @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 : nothing
+        """
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('active_id', False)
+
+        proxy_pos = self.pool.get('pos.order')
+        proxy_pick = self.pool.get('stock.picking')
+        proxy_order_line = self.pool.get('pos.order.line')
+
+        if record_id:
+            order = proxy_pos.browse(cr, uid, record_id, context)
+
+            if order.state in ('paid', 'invoiced'):
+                raise osv.except_osv(_('UserError '), _("You can't modify this order. It has already been paid"))
+
+            for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context):
+                proxy_pos.write(cr, uid, record_id, {
+                    'last_out_picking': this.picking_id.id,
+                    'partner_id': pick.address_id and pick.address_id.partner_id.id
+                })
+
+            order = proxy_pick.write(cr, uid, [this.picking_id.id], {
+                'invoice_state': 'none',
+                'pos_order': record_id
+            })
+
+            for line in pick.move_lines:
+                proxy_order_line.create(cr, uid, {
+                    'name': line.sale_line_id.name,
+                    'order_id': record_id,
+                    'qty': line.product_qty,
+                    'product_id': line.product_id.id,
+                    'price_unit': line.sale_line_id.price_unit,
+                    'discount': line.sale_line_id.discount,
+                })
+
+        return {}
+
+pos_get_sale()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_get_sale.xml b/addons/point_of_sale/wizard/pos_get_sale.xml
new file mode 100644
index 00000000000..9a28da548d2
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_get_sale.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Select an Open Sale Order -->
+        
+		<record id="view_pos_get_sale" model="ir.ui.view">
+            <field name="name">Open Sale Order</field>
+            <field name="model">pos.get.sale</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select an Open Sale Order">
+				    <field name="picking_id"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="sale_complete" string="Confirm"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+        <record id="action_pos_get_sale" model="ir.actions.act_window">
+            <field name="name">Select an Open Sale Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.get.sale</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+	</data>
+</openerp>	
+        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
new file mode 100644
index 00000000000..6605f3e46e8
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from tools.translate import _
+import time
+
+
+class pos_open_statement(osv.osv_memory):
+    _name = 'pos.open.statement'
+    _description = 'Open Statements'
+
+    def open_statement(self, cr, uid, ids, context):
+        """
+             Open the statements
+             @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 : Blank Directory
+        """
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        statement_obj = self.pool.get('account.bank.statement')
+        singer_obj = self.pool.get('singer.statement')
+        journal_obj = self.pool.get('account.journal')
+        journal_lst = journal_obj.search(cr, uid, [('company_id', '=', company_id), ('auto_cash', '=', True)])
+        journal_ids = journal_obj.browse(cr, uid, journal_lst)
+        for journal in journal_ids:
+            ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)])
+            if len(ids):
+                raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s". \n Please close the cashbox related to. ' % (journal.name)))
+            sql = """ Select id from account_bank_statement
+                                    where journal_id=%d
+                                    and company_id =%d
+                                    order by id desc limit 1""" % (journal.id, company_id)
+            cr.execute(sql)
+            st_id = cr.fetchone()
+            number = ''
+            sequence_obj = self.pool.get('ir.sequence')
+            if journal.statement_sequence_id:
+                number = sequence_obj.get_id(cr, uid, journal.id)
+            else:
+                number = sequence_obj.get(cr, uid,
+                                'account.bank.statement')
+
+    #        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
+    #                                                  'company_id':company_id,
+    #                                                  'user_id':uid,
+    #                                                  'state':'open',
+    #                                                  'name':number
+    #                                                  })
+            period = statement_obj._get_period(cr, uid, context) or None
+            cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id, company_id, uid, number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
+            cr.commit()
+            cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id, company_id, uid, number))
+            statement_id = cr.fetchone()[0]
+            if st_id:
+                statemt_id = statement_obj.browse(cr, uid, st_id[0])
+                if statemt_id and statemt_id.ending_details_ids:
+                    statement_obj.write(cr, uid, [statement_id], {
+                        'balance_start': statemt_id.balance_end,
+                        'state': 'open',
+                    })
+                    if statemt_id.ending_details_ids:
+                        for i in statemt_id.ending_details_ids:
+                            c = singer_obj.create(cr, uid, {
+                                'pieces': i.pieces,
+                                'number': i.number,
+                                'starting_id': statement_id,
+                            })
+            cr.commit()
+        return {}
+
+pos_open_statement()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
new file mode 100644
index 00000000000..9b80a7ec60d
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--  Point of Sale Confirm -->
+        
+		<record id="view_pos_open_statement" model="ir.ui.view">
+            <field name="name">Open Statements</field>
+            <field name="model">pos.open.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Open Statements">
+				     	<label string="Are you sure you want to open the statements ?" colspan="2"/>
+				     	<newline/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="open_statement" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+		<act_window name="Open Statements"
+				res_model="pos.open.statement"
+				src_model="account.bank.statement"
+				view_mode="form"
+				target="new"
+				key2="client_action_multi"    
+			id="act_pos_open_statement"/>
+
+        <record id="action_pos_open_statement" model="ir.actions.act_window">
+            <field name="name">Open Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.open.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
new file mode 100644
index 00000000000..3ad2d27f6d2
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -0,0 +1,201 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import osv, fields
+from tools.translate import _
+import pos_box_entries
+import time
+
+
+class pos_make_payment(osv.osv_memory):
+    _name = 'pos.make.payment'
+    _description = 'Point of Sale Payment'
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+         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.
+        """
+        if context is None:
+            context = {}
+
+        res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
+        record_id = context and context.get('active_id', False)
+        j_obj = self.pool.get('account.journal')
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
+        if journal:
+            journal = journal[0]
+        else:
+            journal = None
+
+        order_obj=self.pool.get('pos.order')
+        order = order_obj.browse(cr, uid, record_id, context)
+        #get amount to pay
+        amount = order.amount_total - order.amount_paid
+
+        if amount <= 0.0:
+            context.update({'flag': True})
+            order_obj.action_paid(cr, uid, [record_id], context)
+        elif order.amount_paid > 0.0:
+            order_obj.write(cr, uid, [record_id], {'state': 'advance'})
+
+        invoice_wanted_checked = False
+
+        current_date = time.strftime('%Y-%m-%d')
+
+        if 'journal' in fields:
+            res.update({'journal': journal})
+        if 'amount' in fields:
+            res.update({'amount': amount})
+        if 'invoice_wanted' in fields:
+            res.update({'invoice_wanted': invoice_wanted_checked})
+        if 'payment_date' in fields:
+            res.update({'payment_date': current_date})
+        if 'payment_name'  in fields:
+            res.update({'payment_name': 'Payment'})
+        return res
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False
+        order = self.pool.get('pos.order').browse(cr, uid, record_id)
+        if not order.lines:
+            raise osv.except_osv('Error!', 'No Order Lines ')
+        True
+
+    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_id = context and context.get('record_id', False) or False
+        res = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
+
+        if record_id:
+            order = self.pool.get('pos.order').browse(cr, uid, record_id)
+            amount = order.amount_total - order.amount_paid
+            if amount == 0.0:
+                res['arch'] = """ <form string="Make Payment" colspan="4">
+                                <group col="2" colspan="2">
+                                    <label string="Do you want to print the Receipt?" colspan="4"/>
+                                    <separator colspan="4"/>
+                                    <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                    <button name="print_report" string="Print Receipt" type="object" icon="gtk-print"/>
+                                </group>
+                            </form>
+                        """
+        return res
+
+    def check(self, cr, uid, ids, context=None):
+
+        """Check the order:
+        if the order is not paid: continue payment,
+        if the order is paid print invoice (if wanted) or ticket.
+        """
+        record_id = context and context.get('active_id', False)
+        order_obj = self.pool.get('pos.order')
+        jrnl_obj = self.pool.get('account.journal')
+        order = order_obj.browse(cr, uid, record_id, context)
+        amount = order.amount_total - order.amount_paid
+        data = self.read(cr, uid, ids)[0]
+
+        # Todo need to check ...
+        if amount != 0.0:
+            invoice_wanted = data['invoice_wanted']
+            order_obj.write(cr, uid, [record_id], {'invoice_wanted': invoice_wanted})
+            order_obj.add_payment(cr, uid, record_id, data, context=context)
+
+        if amount <= 0.0:
+            context.update({'flag': True})
+            order_obj.action_paid(cr, uid, [record_id], context)
+        if order_obj.test_paid(cr, uid, [record_id]):
+            if order.partner_id and order.invoice_wanted:
+                return self.create_invoice(cr, uid, ids, context)
+            else:
+                order_obj.write(cr, uid, [record_id],{'state':'paid'})                            
+                return self.print_report(cr, uid, ids, context)  
+        if order.amount_paid > 0.0:
+            self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
+            return self.print_report(cr, uid, ids, context)            
+        return {}
+
+    def create_invoice(self, cr, uid, ids, context):
+        wf_service = netsvc.LocalService("workflow")
+        record_ids = context and context.get('active_ids', False)
+        for i in record_ids:
+            wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+        datas = {'ids': context.get('active_ids', [])}
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'pos.invoice',
+            'datas': datas,
+        }
+
+    def print_report(self, cr, uid, ids, context=None):
+        """
+             @summary: To get the date and print the report
+             @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 : retrun report
+        """
+        if context is None:
+            context = {}
+
+        datas = {'ids': context.get('active_ids', [])}
+        res = {}
+        datas['form'] = res
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'pos.receipt',
+            'datas': datas,
+       }
+
+    _columns = {
+        'journal': fields.selection(pos_box_entries.get_journal, "Journal", required=True),
+        'product_id': fields.many2one('product.product', "Acompte"),
+        'amount': fields.float('Amount', digits=(16, 2), required= True),
+        'payment_name': fields.char('Payment name', size=32, required=True),
+        'payment_date': fields.date('Payment date', required=True),
+        'is_acc': fields.boolean('Accompte'),
+        'invoice_wanted': fields.boolean('Invoice'),
+        'num_sale': fields.char('Num.File', size=32),
+    }
+
+pos_make_payment()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
new file mode 100644
index 00000000000..6608f837a63
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+
+"""        
+        <!--  Select an Open Sale Order -->
+        
+		<record id="view_pos_payment" model="ir.ui.view">
+            <field name="name">Add payment :</field>
+            <field name="model">pos.make.payment</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Add payment :">
+				<group colspan="4" >
+				    <field name="amount" />
+				    <field name="journal"/>
+				    <field name="payment_date" />
+				    <field name="payment_name" />
+				    <field name="invoice_wanted" />
+				    <field name="num_sale" />
+				    <field name="is_acc" />
+				    <group attrs="{'readonly':[('is_acc','=',False)]}" colspan="4" col="2">
+				    	<field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"/>
+				    </group>
+				    <newline/>
+				    <group col="2" colspan="4">
+	            		<button icon='gtk-cancel' special="cancel"  string="Cancel" />
+						<button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-ok"/>
+					</group>	
+				 </group>
+				</form>
+            </field>
+        </record>
+        <record id="action_pos_payment" model="ir.actions.act_window">
+            <field name="name">Add payment</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.make.payment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+	</data>
+</openerp>	
+        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py b/addons/point_of_sale/wizard/pos_payment_report.py
similarity index 59%
rename from addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py
rename to addons/point_of_sale/wizard/pos_payment_report.py
index a76c0c97b59..f76b7a36548 100644
--- a/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py
+++ b/addons/point_of_sale/wizard/pos_payment_report.py
@@ -20,21 +20,33 @@
 #
 ##############################################################################
 
-import pooler
-import netsvc
-import wizard
-import time
+
+from osv import osv
+from tools.translate import _
 
 
-class wizard_pos_sales_user_today_current_user(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'print', 'report':'pos.sales.user.today.current.user', 'state':'end'}
-             },
-    }
+class pos_payment_report(osv.osv_memory):
+    _name = 'pos.payment.report'
+    _description = 'Payment Report'
 
-wizard_pos_sales_user_today_current_user('pos.sales.user.today.current.user')
+    def print_report(self, cr, uid, ids, context={}):
+        """
+         To get the date and print the report
+         @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 : retrun report
+        """
+
+        datas = {'ids': context.get('active_ids', [])}
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'pos.payment.report',
+            'datas': datas,
+       }
+
+pos_payment_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
new file mode 100644
index 00000000000..0d925eb2ba9
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_payment_report" model="ir.ui.view">
+            <field name="name">Payment Report</field>
+            <field name="model">pos.payment.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment Report">
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_pos_payment_report" model="ir.actions.act_window">
+            <field name="name">Payment Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.payment.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
new file mode 100644
index 00000000000..c2e60a07045
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_date.py
@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import time
+
+
+class pos_payment_report_date(osv.osv_memory):
+    '''
+    Open ERP Model
+    '''
+    _name = 'pos.payment.report.date'
+    _description = 'POS Payment Report according to date'
+    def print_report(self, cr, uid, ids, context=None):
+
+        """
+             To get the date and print the report
+             @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 : retrun report
+        """
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'])
+        res = res and res[0] or {}
+        datas['form'] = res
+
+        return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'pos.payment.report.date',
+                'datas': datas,
+        }
+
+    _columns = {
+            'date_start': fields.date('Start Date', required=True),
+            'date_end': fields.date('End Date', required=True),
+            'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
+    }
+    _defaults = {
+            'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+            'date_end': lambda *a: time.strftime('%Y-%m-%d'),
+    }
+
+pos_payment_report_date()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date_view.xml b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
new file mode 100644
index 00000000000..4c05c8ac514
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_date_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<record id="pos_payment_report_date_form" model="ir.ui.view">
+			<field name="name">pos.payment.report.date.form</field>
+		    <field name="model">pos.payment.report.date</field>
+		    <field name="type">form</field>
+		    <field name="arch" type="xml">
+		    <form string="Sale by Date and User">
+			     <group col="2" colspan="4">
+					<field name="date_start"/>
+	                <field name="date_end"/>
+	                <field name="user_id"/>
+					<button icon='gtk-cancel' special="cancel"
+	                    string="Close" />
+				<button name="print_report" string="Print Report"
+	                    colspan="1" type="object" icon="gtk-print" />
+			     </group>               
+		    </form>
+		    </field>
+		</record>
+
+        <record id="action_report_pos_payment_repport_date" model="ir.actions.act_window">
+            <field name="name">Sales lines Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.payment.report.date</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+		</data>
+</openerp>              
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
similarity index 50%
rename from addons/point_of_sale/wizard/wizard_pos_sales_user_today.py
rename to addons/point_of_sale/wizard/pos_payment_report_user.py
index 58d990ef4bc..c8f32ff8cb0 100644
--- a/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -20,47 +20,40 @@
 #
 ##############################################################################
 
-from osv import fields
 from osv import osv
-import time
-import ir
-from mx import DateTime
-import datetime
-import pooler
-from tools import config
-import wizard
-import netsvc
+from osv import fields
 
 
-sale_pos_res_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="user_id" />
+class pos_payment_report_user(osv.osv_memory):
+    '''
+    Open ERP Model
+    '''
+    _name = 'pos.payment.report.user'
+    _description = 'Sales lines by Users'
+    def print_report(self, cr, uid, ids, context=None):
 
-</form>
-"""
+        """
+             To get the date and print the report
+             @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 : retrun report
+        """
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['user_id'])
+        res = res and res[0] or {}
+        datas['form'] = res
 
-sale_pos_res_field= {
-   
-    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+        return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'pos.payment.report.user',
+                'datas': datas,
+        }
 
-}
-
-
-class wizard_pos_sales_user_today(wizard.interface):
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : sale_pos_res_form,
-                    'fields' : sale_pos_res_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.sales.user.today',
-                    'state' : 'end'}
-        },
+    _columns = {
+                'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
     }
-wizard_pos_sales_user_today('pos.sales.user.today')
+
+pos_payment_report_user()
+
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
new file mode 100644
index 00000000000..bccfe92a847
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_payment_report" model="ir.ui.view">
+            <field name="name">Pyament Report</field>
+            <field name="model">pos.payment.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pyament Report ">
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_report_pos_payment" model="ir.actions.act_window">
+            <field name="name">Pyament Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.payment.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+<!--    <act_window name="POS Details"
+            res_model="pos.details"
+            src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   -->
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
new file mode 100644
index 00000000000..9d6e925ebd7
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<record id="pos_payment_report_user_form" model="ir.ui.view">
+		    <field name="name">pos.payment.report.user.form</field>
+		    <field name="model">pos.payment.report.user</field>
+		    <field name="type">form</field>
+		    <field name="arch" type="xml">
+				<form string="Sale by User">
+				 	<group col="2" colspan="4">
+					<field name="user_id"/>
+					<button icon='gtk-cancel' special="cancel" string="Close" />
+					<button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
+ 					</group >				
+				</form>
+		    </field>
+		</record>
+        <record id="action_report_pos_payment_report_user" model="ir.actions.act_window">
+            <field name="name">Sales lines by Users</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.payment.report.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+		</data>	        
+</openerp>              
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
new file mode 100644
index 00000000000..63c2b3abdcb
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -0,0 +1,63 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from tools.translate import _
+
+
+class pos_receipt(osv.osv_memory):
+    _name = 'pos.receipt'
+    _description = 'Point of sale receipt'
+
+    _columns = {
+
+    }
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        order_lst = self. pool.get('pos.order').browse(cr, uid, context['active_id'])
+        for order in order_lst:
+            if order.state_2 in ('to_verify'):
+                raise osv.except_osv(_('Error!', 'Can not print the receipt because of discount and/or payment '))
+        True
+
+    def print_report(self, cr, uid, ids, context=None):
+
+        """
+              To get the date and print the report
+             @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 : retrun report
+        """
+        datas = {'ids': context.get('active_ids', [])}
+        res = {}
+        datas['form'] = res
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'pos.receipt',
+            'datas': datas,
+       }
+
+pos_receipt()
+
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
new file mode 100644
index 00000000000..44b07502f3e
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <!--   Pos Receipt -->
+
+		<record id="view_pos_receipt" model="ir.ui.view">
+		      <field name="name">Receipt</field>
+		      <field name="model">pos.receipt</field>
+		      <field name="type">form</field>
+		      <field name="arch" type="xml">
+		        <form string="Receipt :">
+		          <button icon='gtk-cancel' special="cancel"
+		                  string="Close" />
+		          <button name="print_report" string="Print Report"
+		                  colspan="1" type="object" icon="gtk-print" />
+		        </form>
+		      </field>
+    	</record>
+
+
+      <record id="action_report_pos_receipt" model="ir.actions.act_window">
+            <field name="name">Receipt</field>
+            <field name="res_model">pos.receipt</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+             <field name="target">new</field>
+        </record>
+
+</data>
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_sale_user_today.xml b/addons/point_of_sale/wizard/pos_sale_user_today.xml
new file mode 100644
index 00000000000..78f01a4650f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sale_user_today.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_sales_user_today" model="ir.ui.view">
+            <field name="name">Sales User Today</field>
+            <field name="model">pos.sales.user.today</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales User Today">
+				    <group col="2" colspan="4">
+				    	<field name="user_id"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+        <record id="action_pos_sales_user_today" model="ir.actions.act_window">
+            <field name="name">Sale by Users</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.sales.user.today</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+       
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_sales_user.py b/addons/point_of_sale/wizard/pos_sales_user.py
new file mode 100644
index 00000000000..7698bb9798f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+
+class pos_sale_user(osv.osv_memory):
+    _name = 'pos.sale.user'
+    _description = 'Sale by User'
+
+    _columns = {
+        'date_start': fields.date('Date Start', required=True),
+        'date_end': fields.date('Date End', required=True),
+        'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesman'),
+    }
+
+    def print_report(self, cr, uid, ids, context={}):
+        """
+         To get the date and print the report
+         @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 : return report
+        """
+
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context)
+        res = res and res[0] or {}
+        datas['form'] = res
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'pos.sales.user',
+            'datas': datas,
+       }
+
+pos_sale_user()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
new file mode 100644
index 00000000000..0fc46f81aac
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   pos.details -->
+        
+		<record id="view_pos_sale_user" model="ir.ui.view">
+            <field name="name">Sale By User</field>
+            <field name="model">pos.sale.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS Details :">
+				    <group col="2" colspan="4">
+				    	<field name="date_start"/>
+				    	<field name="date_end"/>
+				    	<field name="user_id"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_report_pos_sale_user" model="ir.actions.act_window">
+            <field name="name">Sale by User</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.sale.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+<!--    <act_window name="POS Details"
+            res_model="pos.details"
+            src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   -->
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/report_analytic_line/__terp__.py b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
similarity index 52%
rename from addons/report_analytic_line/__terp__.py
rename to addons/point_of_sale/wizard/pos_sales_user_current_user.py
index 28519d4cbe3..ac603ad36d1 100644
--- a/addons/report_analytic_line/__terp__.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,29 +15,43 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
+from osv import osv
+from tools.translate import _
 
-{
-    'name': 'Analytic lines - Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """A report on analytic lines, costs by products, months and accounts.
-    
 
-     ATTENTION:
-        This Module is merged into report_analytic module. so It will be removed in future""",
+class pos_sales_user_today_current_user(osv.osv_memory):
+    _name = 'pos.sales.user.today.current_user'
+    _description = 'Sales Details'
+
+    _columns = {
+    }
+
+    def print_report(self, cr, uid, ids, context={}):
+        """
+         To get the date and print the report
+         @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 : retrun report
+        """
+
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, [], context)
+        res = res and res[0] or {}
+        datas['form'] = res
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'pos.sales.user.today.current.user',
+            'datas': datas,
+       }
+
+pos_sales_user_today_current_user()
 
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['account', 'hr_timesheet_invoice'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0075179053853',
-}
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_sales_user_current_user.xml b/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
new file mode 100644
index 00000000000..5625b70770f
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+        <!--   Sales for Current User -->
+        
+		<record id="view_pos_sales_user_today_current_user" model="ir.ui.view">
+            <field name="name">Sales for Current User</field>
+            <field name="model">pos.sales.user.today.current_user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales for Current User">
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="print_report" string="Print Report"
+                			colspan="1" type="object" icon="gtk-print" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_report_pos_sales_user_today_current_user" model="ir.actions.act_window">
+            <field name="name">Sales for Current User</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.sales.user.today.current_user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+<!--    <act_window name="POS Details"
+            res_model="pos.details"
+            src_model="pos.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_report_pos_details"/>   -->
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
new file mode 100644
index 00000000000..7025275c3cd
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+
+class pos_sales_user_today(osv.osv_memory):
+    _name = 'pos.sales.user.today'
+    _description = 'Sales User Today'
+
+    _columns = {
+       'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesman'),
+    }
+
+    def print_report(self, cr, uid, ids, context={}):
+        """
+         To get the date and print the report
+         @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 : retrun report
+        """
+
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['user_id'], context)
+        res = res and res[0] or {}
+        datas['form'] = res
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'pos.sales.user.today',
+            'datas': datas,
+       }
+
+pos_sales_user_today()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_catalog_flagey.py b/addons/point_of_sale/wizard/pos_scan_product.py
similarity index 55%
rename from addons/auction/wizard/auction_catalog_flagey.py
rename to addons/point_of_sale/wizard/pos_scan_product.py
index fd73e7dadc4..e9e01b66675 100644
--- a/addons/auction/wizard/auction_catalog_flagey.py
+++ b/addons/point_of_sale/wizard/pos_scan_product.py
@@ -19,31 +19,29 @@
 #
 ##############################################################################
 
-import wizard
-import netsvc
-import pooler
+from osv import osv,fields
+from tools.translate import _
 
-def _wo_check(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    current_auction=pool.get('auction.dates').browse(cr,uid,data['id'])
-    v_lots=pool.get('auction.lots').search(cr,uid,[('auction_id','=',current_auction.id)])
-    v_ids=pool.get('auction.lots').browse(cr,uid,v_lots)
-    for ab in v_ids:
-        if not ab.auction_id :
-            raise wizard.except_wizard('Error!','No Lots belong to this Auction Date')
-    return 'report'
-
-class wizard_report(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result' : {'type': 'choice', 'next_state': _wo_check }
-        },
-        'report': {
-            'actions': [],
-            'result': {'type':'print', 'report':'auction.cat_flagy', 'state':'end'}
-        }
+class pos_scan_product(osv.osv_memory):
+    _name = 'pos.scan.product'
+    _description = 'Scan product'
+    _columns = {
+        'gencod': fields.char('Barcode',size=13,required= True)
     }
-wizard_report('auction.catalog.flagey')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    def scan(self, cr, uid, ids, context):
+        """ 
+         To get the gencod and scan product         
+         @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 : retrun gencod
+        """
+                
+        data=self.read(cr, uid, ids)[0]
+        record_id = context and context.get('active_id',False)
+        result =self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
+        return {'gencod': False}
 
+pos_scan_product()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_scan_product_view.xml b/addons/point_of_sale/wizard/pos_scan_product_view.xml
new file mode 100644
index 00000000000..3957c6c0415
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_scan_product_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+		<record id="view_pos_scan_product" model="ir.ui.view">
+            <field name="name">Scan product</field>
+            <field name="model">pos.scan.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scan product">
+				    <group col="2" colspan="4">
+				    	<label string="Scan Barcode" colspan="4"/>
+						<field name="gencod" colspan="4" nolabel="1"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="scan" string="Add"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_pos_scan_product" model="ir.actions.act_window">
+            <field name="name">Scan product</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.scan.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            
+        </record>
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_add_product.py b/addons/point_of_sale/wizard/wizard_add_product.py
deleted file mode 100644
index 0daa0bdf0db..00000000000
--- a/addons/point_of_sale/wizard/wizard_add_product.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-
-
-_form = """<?xml version="1.0"?>
-<form string="Add product :">
-<field name="product"/>
-<field name="quantity"/>
-</form>
-"""
-_fields = {
-    'product': {
-        'string': 'Product',
-        'type': 'many2one',
-        'relation': 'product.product',
-        'required': True,
-        'default': False
-    },
-
-    'quantity': {
-        'string': 'Quantity',
-        'type': 'integer',
-        'required': True,
-        'default': 1},
-    }
-
-
-def _add(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
-                            data['form']['quantity'], context=context)
-
-    return {}
-
-
-def _pre_init(self, cr, uid, data, context):
-    return {'product': False, 'quantity': 1}
-
-
-class add_product(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [_pre_init],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields': _fields,
-                'state': [('end', 'Cancel'), ('add', '_Add product', 'gtk-ok', True)
-                ]
-            }
-        },
-        'add': {
-            'actions': [_add],
-            'result': {
-                'type': 'state',
-                'state': 'init',
-            }
-        },
-    }
-
-add_product('pos.add_product')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_confirm.py b/addons/point_of_sale/wizard/wizard_confirm.py
deleted file mode 100644
index b819c840ae5..00000000000
--- a/addons/point_of_sale/wizard/wizard_confirm.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import wizard
-import netsvc
-import pooler
-import time
-
-_form = """<?xml version="1.0"?>
-<form string="Open Statements">
-     <label string="Are you sure you want to close your sales ?" colspan="2"/>
-</form>
-"""
-_fields = {}
-
-def _confirm(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    company_id=pool.get('res.users').browse(cr,uid,uid).company_id
-    order_obj = pool.get('pos.order')
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        if  order_id.state =='paid':
-            order_obj.write(cr,uid,[order_id.id],{'journal_entry':True})
-            order_obj.create_account_move(cr, uid, [order_id.id], context=context)
-
-    wf_service = netsvc.LocalService("workflow")
-    for i in data['ids']:
-        wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
-    return {}
-
-def _get_state(self, cr, uid, data, context):
-    action = 'invoice'
-    return action
-class pos_confirm(wizard.interface):
-
- states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields': _fields,
-                'state': (('end', 'No','gtk-cancel'),
-                          ('open', 'Yes', 'gtk-ok', True)
-                         )
-            }
-        },
-        'open': {
-            'actions': [_confirm],
-            'result': {
-                       'type': 'state',
-                       'state':'end'}
-        },
-    }
-
-pos_confirm('pos.confirm')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_default_journal.py b/addons/point_of_sale/wizard/wizard_default_journal.py
deleted file mode 100644
index bfe59251f45..00000000000
--- a/addons/point_of_sale/wizard/wizard_default_journal.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-
-
-def _get_default_journal_selection(self, cr, uid, context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('account.journal')
-    ids = obj.search(cr, uid, [('type', '=', 'cash')])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
-    return res
-
-default_journal_form = '''<?xml version="1.0"?>
-<form string="Select default journals">
-    <field name="default_journal" />
-    <newline />
-    <field name="default_journal_rebate" />
-    <newline />
-    <field name="default_journal_gift" />
-    <newline />
-</form>'''
-
-default_journal_fields = {
-    'default_journal': {'string': 'Default journal', 'type': 'selection',
-        'selection': _get_default_journal_selection,
-    },
-    'default_journal_rebate': {'string': 'Default rebate journal', 'type': 'selection',
-        'selection': _get_default_journal_selection,
-    },
-    'default_journal_gift': {'string': 'Default gift journal', 'type': 'selection',
-        'selection': _get_default_journal_selection,
-    },
-}
-
-
-class wizard_default_journal(wizard.interface):
-
-    def _set_default_journal(self, cr, uid, data, context):
-
-        def _update_default_journal_config(journal_type, journal_code, journal_descr, journal_codes, data):
-            default_journal_id = data.get('form', {}).get(journal_type) or None
-            dico = dict(name=journal_descr, code=journal_code, journal_id=default_journal_id)
-            if default_journal_id:
-                if journal_code in journal_codes:
-                    ids = [obj.id for obj in objs if obj.code == journal_code]
-                    pos_config_journal.write(cr, uid, ids, dico, context)
-                else:
-                    pos_config_journal.create(cr, uid, dico, context)
-            else:
-                ids = [obj.id for obj in objs if obj.code == journal_code]
-                pos_config_journal.write(cr, uid, ids, dico, context)
-
-        pool = pooler.get_pool(cr.dbname)
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal_codes = [str(obj.code) for obj in objs]
-
-        _update_default_journal_config('default_journal', 'DEFAULT', 'Default journal', journal_codes, data)
-        _update_default_journal_config('default_journal_rebate', 'REBATE', 'Default rebate journal', journal_codes, data)
-        _update_default_journal_config('default_journal_gift', 'GIFT', 'Default gift journal', journal_codes, data)
-
-        return {}
-
-    def _get_defaults(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal_codes = {}
-        for obj in objs:
-            journal_codes[obj.code] = int(obj.journal_id.id)
-
-        form = data['form']
-        form['default_journal'] = journal_codes.get('DEFAULT') or False
-        form['default_journal_rebate'] = journal_codes.get('REBATE') or False
-        form['default_journal_gift'] = journal_codes.get('GIFT') or False
-
-        return form
-
-    states = {
-        'init': {
-            'actions': [_get_defaults],
-            'result': {
-                'type': 'form',
-                'arch': default_journal_form,
-                'fields': default_journal_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('set_default_journal', 'Define default journals')
-                ]
-            }
-        },
-        'set_default_journal': {
-            'actions': [_set_default_journal],
-            'result': {
-                'type': 'state',
-                'state': "end",
-            }
-        },
-    }
-
-wizard_default_journal('pos.config.journal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/wizard_discount.py b/addons/point_of_sale/wizard/wizard_discount.py
deleted file mode 100644
index 035c387793c..00000000000
--- a/addons/point_of_sale/wizard/wizard_discount.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-
-_form = """<?xml version="1.0"?>
-<form string="Discount :">
-    <field name="discount"/>
-</form>
-"""
-disc_form = """<?xml version="1.0"?>
-
-<form string="Discount Notes :">
-    <label colspan="2" string="Reason For Giving Discount" align="0.0"/>
-    <newline/>
-    <field name="note" nolabel="1"/>
-</form>
-"""
-
-
-_fields = {
-    'discount': {
-        'string': 'Discount percentage',
-        'type': 'float',
-        'required': True,
-        'default': lambda *args: 5
-    },
-}
-
-disc_fields = {
-    'note': {
-        'string': 'Discount Notes',
-        'type': 'char',
-        'size': 128,
-        'required': True
-    },
-}
-
-class discount_wizard(wizard.interface):
-
-    def apply_discount(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        order_ref = pool.get('pos.order')
-        order_line_ref = pool.get('pos.order.line')
-        for order in order_ref.browse(cr, uid, data['ids'], context=context):
-            for line in order.lines :
-                company_discount = order.company_id.company_discount
-                applied_discount =data['form']['discount']
-                if applied_discount == 0.00:
-                    notice = 'No Discount'
-                elif company_discount >=  applied_discount:
-                    notice = 'Minimum Discount'
-                else:
-                    notice = data['form']['note']
-                if self.check_discount(cr, uid, data, context) == 'apply_discount':
-                    order_line_ref.write(cr, uid, [line.id],
-                            {'discount': data['form']['discount'],
-                            'price_ded':line.price_unit*line.qty*(data['form']['discount'] or 0)*0.01 or 0.0,
-                            'notice':notice
-                            },
-                            context=context,)
-                else :
-                    order_line_ref.write(cr, uid, [line.id],
-                            {'discount': data['form']['discount'],
-                            'notice': notice,
-                            'price_ded':line.price_unit*line.qty*(data['form']['discount'] or 0)*0.01 or 0.0 
-                            },
-                            context=context,)
-        return {}
-
-    def check_discount(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        order_ref = pool.get('pos.order')
-        for order in order_ref.browse(cr, uid, data['ids'], context=context):
-            company_disc = order.company_id.company_discount
-            for line in order.lines :
-                prod_disc = data['form']['discount']
-                if prod_disc <= company_disc :
-                   return 'apply_discount'
-                else :
-                    return 'disc_discount'
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields': _fields,
-                'state': (('end', 'Cancel'),
-                          ('check_disc', 'Apply Discount', 'gtk-ok', True)
-                         )
-            }
-        },
-
-        'check_disc': {
-            'actions': [],
-            'result': {'type':'choice','next_state':check_discount}
-        },
-
-        'disc_discount': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': disc_form,
-                'fields':disc_fields,
-                'state': (('end', 'Cancel'),
-                          ('apply_discount', 'Apply Discount', 'gtk-ok', True)
-                         )
-            }
-        },
-        'apply_discount': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': apply_discount,
-                'state': "end",
-            }
-        },
-    }
-
-discount_wizard('pos.discount')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_get_sale.py b/addons/point_of_sale/wizard/wizard_get_sale.py
deleted file mode 100644
index de686c11d49..00000000000
--- a/addons/point_of_sale/wizard/wizard_get_sale.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-from tools.translate import _
-
-picking_form = """<?xml version="1.0"?>
-<form string="Select an Open Sale Order">
-    <field name="picking_id" domain="[('state','in',('assigned','confirmed')), ('type', '=', 'out')]" context="{'contact_display':'partner'}"/>
-</form>
-"""
-
-picking_fields = {
-    'picking_id': {'string': 'Sale Order', 'type': 'many2one', 'relation': 'stock.picking', 'required': True}
-}
-
-
-def _sale_complete(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-
-    if order.state in ('paid', 'invoiced'):
-        raise wizard.except_wizard(_('UserError'), _("You can't modify this order. It has already been paid"))
-
-    pick = pool.get('stock.picking').browse(cr, uid, data['form']['picking_id'], context)
-
-    pool.get('pos.order').write(cr, uid, data['id'], {
-        'last_out_picking': data['form']['picking_id'],
-        'partner_id': pick.address_id and pick.address_id.partner_id.id
-    })
-
-    order = pool.get('stock.picking').write(cr, uid, [data['form']['picking_id']], {
-        'invoice_state': 'none',
-        'pos_order': data['id']
-    })
-
-    for line in pick.move_lines:
-        pool.get('pos.order.line').create(cr, uid, {
-            'name': line.sale_line_id.name,
-            'order_id': data['id'],
-            'qty': line.product_qty,
-            'product_id': line.product_id.id,
-            'price_unit': line.sale_line_id.price_unit,
-            'discount': line.sale_line_id.discount,
-        })
-
-    return {}
-
-
-class pos_sale_get(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': picking_form,
-                'fields': picking_fields,
-                'state': (('end', 'Cancel'),
-                          ('set', 'Confirm', 'gtk-ok', True)
-                         )
-            }
-        },
-        'set': {
-            'actions': [_sale_complete],
-            'result': {
-                'type': 'state',
-                'state': "end",
-            }
-        },
-    }
-
-pos_sale_get('pos.sale.get')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_open_statement.py b/addons/point_of_sale/wizard/wizard_open_statement.py
deleted file mode 100644
index 09205a97b08..00000000000
--- a/addons/point_of_sale/wizard/wizard_open_statement.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-from tools.translate import _
-import time
-
-statement_form = """<?xml version="1.0"?>
-<form string="Open Statements">
-     <label string="Are you sure you want to open the statements ?" colspan="2"/>
-</form>
-"""
-statement_form_close = """<?xml version="1.0"?>
-<form string="Close Statements">
-     <label string="Are you sure you want to close the statements ?" colspan="2"/>
-</form>
-"""
-
-statement_fields = {}
-
-def _close_statement(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
-    statement_obj = pool.get('account.bank.statement')
-    singer_obj = pool.get('singer.statement')
-    journal_obj=pool.get('account.journal')
-    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True),('check_dtls','=',False)])
-    journal_ids=journal_obj.browse(cr,uid, journal_lst)
-    for journal in journal_ids:
-        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
-        statement_obj.button_confirm(cr,uid,ids)
-    return {}
-def _open_statement(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
-    statement_obj = pool.get('account.bank.statement')
-    singer_obj = pool.get('singer.statement')
-    journal_obj=pool.get('account.journal')
-    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True)])
-    journal_ids=journal_obj.browse(cr,uid, journal_lst)
-    for journal in journal_ids:
-        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
-        if len(ids):
-            raise wizard.except_wizard(_('Message'),_('You can not open a Cashbox for "%s". \n Please close the cashbox related to. '%(journal.name) ))
-        sql = """ Select id from account_bank_statement
-                                where journal_id=%d
-                                and company_id =%d
-                                order by id desc limit 1"""%(journal.id,company_id)
-        singer_ids=None
-        cr.execute(sql)
-        st_id = cr.fetchone()
-        number=''
-        if journal.statement_sequence_id:
-            number = pool.get('ir.sequence').get_id(cr, uid, journal.id)
-        else:
-            number = pool.get('ir.sequence').get(cr, uid,
-                            'account.bank.statement')
-
-#        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
-#                                                  'company_id':company_id,
-#                                                  'user_id':uid,
-#                                                  'state':'open',
-#                                                  'name':number
-#                                                  })
-        period=statement_obj._get_period(cr,uid,context) or None
-        cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id,company_id,uid,number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
-        cr.commit()
-        cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id,company_id,uid,number))
-        statement_id=cr.fetchone()[0]
-        if st_id:
-            statemt_id=statement_obj.browse(cr,uid,st_id[0])
-            if statemt_id and statemt_id.ending_details_ids:
-                statement_obj.write(cr, uid,[statement_id], {'balance_start':statemt_id.balance_end,
-                                                            'state':'open'})
-                if statemt_id.ending_details_ids:
-                    for i in statemt_id.ending_details_ids:
-                        c=singer_obj.create(cr,uid, { 'pieces':i.pieces,
-                                                    'number':i.number,
-                                                    'starting_id':statement_id,
-                            })
-        cr.commit()
-    return {}
-
-class statement_open(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': statement_form,
-                'fields': statement_fields,
-                'state': (('end', 'No','gtk-cancel'),
-                          ('open', 'Yes', 'gtk-ok', True)
-                         )
-            }
-        },
-        'open': {
-            'actions': [_open_statement],
-            'result': {
-                       'type': 'state',
-#                       'action' :_open_statement,
-                       'state':'end'}
-        },
-    }
-statement_open('statement.open')
-class statement_close(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': statement_form_close,
-                'fields': statement_fields,
-                'state': (('end', 'No','gtk-cancel'),
-                          ('open', 'Yes', 'gtk-ok', True)
-                         )
-            }
-        },
-        'open': {
-            'actions': [_close_statement],
-            'result': {
-                       'type': 'state',
-                       'state':'end'}
-        },
-    }
-statement_close('statement.close')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/wizard_pos_details.py b/addons/point_of_sale/wizard/wizard_pos_details.py
deleted file mode 100644
index 80a0593c08e..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_details.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields
-from osv import osv
-import time
-import ir
-from mx import DateTime
-import datetime
-import pooler
-from tools import config
-import wizard
-import netsvc
-
-
-pos_details_res_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="date_start" />
-     <field name="date_end" />
-</form>
-"""
-
-pos_details_res_field= {
-    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-
-
-}
-
-
-class wizard_pos_details(wizard.interface):
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : pos_details_res_form,
-                    'fields' : pos_details_res_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.details',
-                    'state' : 'end'}
-        },
-    }
-wizard_pos_details('pos.details')
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment.py b/addons/point_of_sale/wizard/wizard_pos_payment.py
deleted file mode 100644
index 580b0b308dd..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_payment.py
+++ /dev/null
@@ -1,233 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import netsvc
-import wizard
-import time
-from decimal import Decimal
-from tools.translate import _
-
-
-def _get_journal(self, cr, uid, context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('account.journal')
-    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
-    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    return res
-
-
-payment_form = """<?xml version="1.0"?>
-<form string="Add payment :">
-<group colspan="4" label="Payment">
-    <field name="amount" />
-    <field name="journal"/>
-    <field name="payment_date" />
-    <field name="payment_name" />
-    <field name="invoice_wanted" />
-    <field name="num_sale" />
-    <field name="is_acc" />
-    <group attrs="{'readonly':[('is_acc','=',False)]}" colspan="4" cols="2">
-    <field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"/>
-    </group>
-    </group>
-</form>
-"""
-
-payment_fields = {
-    'amount': {'string': 'Amount', 'type': 'float', 'required': True},
-    'is_acc': {'string': 'Accompte', 'type': 'boolean'},
-    'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
-    'journal': {'string': 'Journal',
-                'type': 'selection',
-                'selection': _get_journal,
-                'required': True,
-               },
-    'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
-    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
-    'num_sale': {'string': 'Num.File', 'type': 'char', 'size': '32'},
-    'product_id': {'string':'Acompte','type': 'many2one', 'relation': 'product.product'},
-    }
-
-
-def _pre_init(self, cr, uid, data, context):
-    def _get_journal(pool, order):
-        j_obj = pool.get('account.journal')
-        c = pool.get('res.users').browse(cr,uid,uid).company_id.id
-        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
-        if journal:
-            journal = journal[0]
-        else:
-            journal = None
-        return journal
-
-    wf_service = netsvc.LocalService("workflow")
-   # wf_service.trg_validate(uid, 'pos.order', data['id'], 'start_payment', cr)
-
-    pool = pooler.get_pool(cr.dbname)
-    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-    #get amount to pay
-    #amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
-    amount = order.amount_total - order.amount_paid
-
-    if amount<=0:
-        context.update({'flag':True})
-        pool.get('pos.order').action_paid(cr,uid,data['ids'],context)
-    elif order.amount_paid > 0:
-        pool.get('pos.order').write(cr, uid, data['id'],{'state':'advance'})
-
-
-    # get journal:
-    journal = _get_journal(pool, order)
-
-    # check if an invoice is wanted:
-    #invoice_wanted_checked = not not order.partner_id # not not -> boolean
-    invoice_wanted_checked = False
-
-    # select the current date
-    current_date = time.strftime('%Y-%m-%d')
-
-    return {'journal': journal, 'amount': amount, 'invoice_wanted': invoice_wanted_checked, 'payment_date': current_date}
-
-
-def _add_pay(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    jrnl_obj = pool.get('account.journal')
-    result = data['form']
-    invoice_wanted = data['form']['invoice_wanted']
-    jrnl_used=False
-    if data['form'] and data['form'].get('journal',False):
-        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
-
-    # add 'invoice_wanted' in 'pos.order'
-    order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
-
-    order_obj.add_payment(cr, uid, data['id'], result, context=context)
-    return {}
-
-
-def _check(self, cr, uid, data, context):
-    """Check the order:
-    if the order is not paid: continue payment,
-    if the order is paid print invoice (if wanted) or ticket.
-    """
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-    amount = order.amount_total - order.amount_paid
-    if amount<=0:
-        context.update({'flag':True})
-        pool.get('pos.order').action_paid(cr,uid,data['ids'],context)
-
-    action = 'ask_pay'
-    if order_obj.test_paid(cr, uid, [data['id']]):
-        if order.partner_id:
-            if order.invoice_wanted:
-                action = 'invoice'
-            else:
-                action = 'paid'
-        elif order.date_payment:
-            action = 'receipt'
-        else:
-            action = 'paid'
-    return action
-
-
-def create_invoice(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService("workflow")
-    for i in data['ids']:
-        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
-    return {}
-
-def _trigger_wkf(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'pos.order', data['id'], 'payment', cr)
-    return {}
-
-
-
-class pos_payment(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'choice',
-                'next_state': _check,
-            }
-        },
-        'ask_pay': {
-            'actions': [_pre_init],
-            'result': {
-                'type': 'form',
-                'arch': payment_form,
-                'fields': payment_fields,
-                'state': (('end', 'Cancel'), ('finish', 'Finish'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True))
-            }
-        },
-        'add_pay': {
-            'actions': [_add_pay],
-            'result': {
-                'type': 'state',
-                'state': "init",
-            }
-        },
-        'invoice': {
-            'actions': [create_invoice],
-            'result': {
-                'type': 'print',
-                'report': 'pos.invoice',
-                'state': 'finish'
-            }
-        },
-        'receipt': {
-            'actions': [],
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'finish'
-            }
-        },
-        'paid': {
-            'actions': [],
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'finish'
-            }
-        },
-        'finish': {
-            'actions': [_trigger_wkf],
-            'result': {
-                'type': 'state',
-                'state': 'end'
-            }
-        },
-
-    }
-
-pos_payment('pos.payment')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report.py b/addons/point_of_sale/wizard/wizard_pos_payment_report.py
deleted file mode 100644
index 1f6ed1afda5..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_payment_report.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import netsvc
-import wizard
-import time
-
-
-class wizard_pos_payment_report(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'print', 'report':'pos.payment.report', 'state':'end'}
-             },
-    }
-
-wizard_pos_payment_report('pos.payment.report')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py b/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
deleted file mode 100644
index 570b6de9ad7..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import netsvc
-import wizard
-import time
-
-pos_payment_report_date_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="date_start" />
-     <field name="date_end"/>
-     <field name="user_id"/>
-</form>
-"""
-
-pos_payment_report_date_field= {
-
-    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
-}
-
-
-class wizard_pos_payment_report_date(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : pos_payment_report_date_form,
-                    'fields' : pos_payment_report_date_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.payment.report.date',
-                    'state' : 'end'}
-        },
-    }
-
-wizard_pos_payment_report_date('pos.payment.report.date')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py b/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py
deleted file mode 100644
index aaad1d328c5..00000000000
--- a/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields
-from osv import osv
-import time
-import ir
-from mx import DateTime
-import datetime
-import pooler
-from tools import config
-import wizard
-import netsvc
-
-
-pos_payment_report_user_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="user_id" />
-
-</form>
-"""
-
-pos_payment_report_user_field= {
-
-    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
-
-}
-
-
-class wizard_pos_payment_report_user(wizard.interface):
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : pos_payment_report_user_form,
-                    'fields' : pos_payment_report_user_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.payment.report.user',
-                    'state' : 'end'}
-        },
-    }
-wizard_pos_payment_report_user('pos.payment.report.user')
diff --git a/addons/point_of_sale/wizard/wizard_receipt.py b/addons/point_of_sale/wizard/wizard_receipt.py
deleted file mode 100644
index 64e8a2e5685..00000000000
--- a/addons/point_of_sale/wizard/wizard_receipt.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-#import time
-#import netsvc
-#from tools.misc import UpdateableStr
-#import pooler
-import wizard
-import pooler
-from tools.translate import _
-
-def _check(self,cr,uid,data,*a):
-    pool = pooler.get_pool(cr.dbname)
-    order_lst = pool.get('pos.order').browse(cr,uid,data['ids'])
-    for order in order_lst:
-        if order.state_2 in ('to_verify'):
-            raise wizard.except_wizard('Error!', 'Can not print the receipt because of discount and/or payment ')
-    return data
-
-class print_order_receipt(wizard.interface):
-        states = {
-          'init': {
-              'actions': [_check],
-              'result': {'type':'print', 'report':'pos.receipt', 'state':'end'}
-          }
-      }
-
-print_order_receipt('ord.receipt')
-
diff --git a/addons/point_of_sale/wizard/wizard_refund_order.py b/addons/point_of_sale/wizard/wizard_refund_order.py
deleted file mode 100644
index 188e7b47690..00000000000
--- a/addons/point_of_sale/wizard/wizard_refund_order.py
+++ /dev/null
@@ -1,232 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import time
-import netsvc
-from tools.misc import UpdateableStr
-import wizard
-import pooler
-from mx import DateTime
-from tools.translate import _
-
-
-entry_form = '''<?xml version="1.0"?>
-<form string="%s">
-<separator string="Please fill these fields for entries to the box:" colspan="4"/>
-<newline/>
-<field name="name"/>
-<field name="ref"/>
-<field name="journal_id"/>
-<field name="amount"/>
-<field name="product_id"/>
-</form>
-'''
-
-def _get_journal(self,cr,uid,context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('account.journal')
-    user = pool.get('res.users').browse(cr, uid, uid)
-    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
-    return res
-
-def _get_pdt(self,cr,uid,context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('product.product')
-    ids = obj.search(cr, uid, [('income_pdt', '=', True)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
-    return res
-
-def _get_pdt_exp(self,cr,uid,context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('product.product')
-    company_id = pool.get('res.users').browse(cr, uid, uid).company_id.id
-    ids = obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
-    return res
-
-entry_fields = {
-    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
-    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt , 'required':True},
-    'amount': {'string': 'Amount', 'type': 'float'},
-    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
-    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
-
-}
-
-out_fields = {
-    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
-    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt_exp , 'required':True},
-    'amount': {'string': 'Amount', 'type': 'float'},
-    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
-    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
-}
-
-def _get_out(self, cr, uid, data, context):
-    args = {}
-    pool = pooler.get_pool(cr.dbname)
-    statement_obj= pool.get('account.bank.statement')
-    product_obj= pool.get('product.template')
-    productp_obj= pool.get('product.product')
-    res_obj = pool.get('res.users')
-    curr_company = res_obj.browse(cr,uid,uid).company_id.id
-    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
-    monday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday,0))).strftime('%Y-%m-%d')
-    sunday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday,0))).strftime('%Y-%m-%d')
-    done_statmt = statement_obj.search(cr,uid, [('date','>=',monday+' 00:00:00'),('date','<=',sunday+' 23:59:59'),('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid)])
-    stat_done = statement_obj.browse(cr,uid, done_statmt)
-    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
-    am = 0.0
-    amount_check = productp_obj.browse(cr,uid,data['form']['product_id']).am_out or False
-    for st in stat_done:
-        for s in st.line_ids:
-            if address_u and s.partner_id==address_u.partner_id and s.am_out:
-                am+=s.amount
-    if (-data['form']['amount'] or 0.0)+ am <-(res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0) and amount_check:
-        val = (res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0)+ am
-        raise wizard.except_wizard(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
-
-    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
-    if not acc_id:
-        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
-    if not statement_id:
-        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
-    if statement_id:
-        statement_id = statement_id[0]
-    if not statement_id:
-        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
-                                        'journal_id':data['form']['journal_id'],
-                                        'company_id':curr_company,
-                                        'user_id':uid,
-                                        })
-    args['statement_id']= statement_id
-    args['journal_id']= data['form']['journal_id']
-    if acc_id:
-        args['account_id']= acc_id.id
-    amount= data['form']['amount'] or 0.0
-    if data['form']['amount'] > 0:
-        amount= -data['form']['amount']
-    args['amount'] = amount
-    if productp_obj.browse(cr,uid,data['form']['product_id']).am_out:
-        args['am_out'] = True
-    args['ref'] = data['form']['ref'] or ''
-    args['name'] = "%s: %s "%(product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
-    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
-    if address_u:
-        partner_id = address_u.partner_id and address_u.partner_id.id or None
-        args['partner_id'] = partner_id
-    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
-    return {}
-
-def _get_in(self, cr, uid, data, context):
-    args = {}
-    pool = pooler.get_pool(cr.dbname)
-    statement_obj = pool.get('account.bank.statement')
-    product_obj = pool.get('product.template')
-    res_obj = pool.get('res.users')
-    curr_company = res_obj.browse(cr,uid,uid).company_id.id
-    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
-    if not statement_id:
-        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
-
-    product = pool.get('product.product').browse(cr, uid, data['form']['product_id'])
-    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
-    if not acc_id:
-        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
-    if statement_id:
-        statement_id = statement_id[0]
-    if not statement_id:
-        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
-                                                    'journal_id':data['form']['journal_id'],
-                                                    'company_id':curr_company,
-                                                    'user_id':uid,
-                                                   })
-
-    args['statement_id'] = statement_id
-    args['journal_id'] =  data['form']['journal_id']
-    if acc_id:
-        args['account_id'] =  acc_id.id
-    args['amount'] = data['form']['amount'] or 0.0
-    args['ref'] = "%s" %(data['form']['ref'] or '')
-    args['name'] = "%s: %s "% (product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
-    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
-    if address_u:
-        partner_id = address_u.partner_id and address_u.partner_id.id or None
-        args['partner_id'] = partner_id
-    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
-
-    return {}
-
-class box_entries(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': entry_form % u'Entrée de caisse',
-                'fields': entry_fields,
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make entries in the Cashbox', 'gtk-ok')]
-            }
-        },
-        'next': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _get_in,
-                'state': 'end'
-            }
-        },
-    }
-
-box_entries('pos.entry')
-
-class box_out(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': entry_form % u'Sortie de caisse',
-                'fields': out_fields,
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make Entries in the CashBox', 'gtk-ok')]
-            }
-        },
-        'next': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _get_out,
-                'state': 'end'
-            }
-        },
-    }
-
-box_out('pos.out')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/wizard/wizard_scan_product.py b/addons/point_of_sale/wizard/wizard_scan_product.py
deleted file mode 100644
index 40a8a5b1246..00000000000
--- a/addons/point_of_sale/wizard/wizard_scan_product.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    Copyright (c) 2008 Sylëam Info Services. (http://www.syleam.fr) All Rights Reserved.
-#
-#    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 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-from osv import osv
-
-form_gencod = """<?xml version="1.0"?>
-<form string="Scan product">
-<label string="Scan Barcode" colspan="4"/>
-<field name="gencod" colspan="4" nolabel="1"/>
-</form>
-"""
-
-fields_gencod = {
-    'gencod': {'string': 'Barcode',
-               'type': 'char',
-               'size': 13,
-               'required': True}
-}
-
-
-def _scan(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    result = pool.get('pos.order.line')._scan_product(cr, uid, data['form']['gencod'], 1, data['id'])
-    return {'gencod': False}
-
-def _pre_init(self, cr, uid, data, context):
-    return {'gencod': False}
-
-class pos_scan_product(wizard.interface):
-    states = {
-        'init' : {'actions' : [_pre_init],
-                'result' : {
-                    'type': 'form',
-                    'arch': form_gencod,
-                    'fields': fields_gencod,
-                    'state': [('end','Cancel','gtk-cancel'),
-                              ('add', 'Add', 'gtk-ok', True)],
-            }
-        },
-        'add' : {'actions' : [_scan],
-                'result' : {
-                    'type': 'state',
-                    'state': 'init',
-                }
-        }
-    }
-
-pos_scan_product('pos.scan_product')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user.py b/addons/pos_sales_user.py
similarity index 100%
rename from addons/point_of_sale/wizard/wizard_pos_sales_user.py
rename to addons/pos_sales_user.py
diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py
index 88c15e59059..d8c039ef276 100644
--- a/addons/process/__terp__.py
+++ b/addons/process/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,13 @@
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
-This module allows you to manage your process for the end-users.
+     This module shows the basic processes involved
+     in the selected modules and in the sequence these
+     occur
+
+     Note: This applies to the modules containing modulename_process_xml
+     for e.g product/process/product_process_xml
+
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/process/i18n/ar.po b/addons/process/i18n/ar.po
index 4e0b3b0553d..1aa8de6b2c2 100644
--- a/addons/process/i18n/ar.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/bg.po b/addons/process/i18n/bg.po
index e3231e017d9..a3a24aa135e 100644
--- a/addons/process/i18n/bg.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/bs.po b/addons/process/i18n/bs.po
index f836aae0db9..ed49c5c2f0d 100644
--- a/addons/process/i18n/bs.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/ca.po b/addons/process/i18n/ca.po
index 3d3c5005a0c..21c81594916 100644
--- a/addons/process/i18n/ca.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/cs.po b/addons/process/i18n/cs.po
index a3fc480863c..6f6bfc03516 100644
--- a/addons/process/i18n/cs.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index 35df1b8dd6a..3f81d1e78bc 100644
--- a/addons/process/i18n/de.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/el.po b/addons/process/i18n/el.po
index fc69dbe38a5..3520bc8a608 100644
--- a/addons/process/i18n/el.po
+++ b/addons/process/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index 4ad1359904f..25b6dda24f9 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/es_AR.po b/addons/process/i18n/es_AR.po
index 1fff3488776..b4c6919283a 100644
--- a/addons/process/i18n/es_AR.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/et.po b/addons/process/i18n/et.po
index 50e3bce6518..e4c378c9d5e 100644
--- a/addons/process/i18n/et.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/fi.po b/addons/process/i18n/fi.po
new file mode 100644
index 00000000000..5aac4c095b8
--- /dev/null
+++ b/addons/process/i18n/fi.po
@@ -0,0 +1,304 @@
+# Finnish 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-22 07:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Node"
+msgstr "Prosessisolmu"
+
+#. module: process
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#. module: process
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: view:process.transition:0
+msgid "Roles from Workflow"
+msgstr "Roolit työnkulusta"
+
+#. module: process
+#: field:process.node,menu_id:0
+msgid "Related Menu"
+msgstr "Liittyvä valikko"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: field:process.transition,action_ids:0
+msgid "Buttons"
+msgstr "Painikkeet"
+
+#. module: process
+#: selection:process.node,kind:0
+msgid "State"
+msgstr "Tila"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: view:process.transition:0
+msgid "Details"
+msgstr "Tiedot"
+
+#. module: process
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr "Ohjeen URL"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_node_form
+#: model:ir.model,name:process.model_process_node
+#: model:ir.ui.menu,name:process.menu_process_node_form
+#: view:process.node:0
+#: view:process.process:0
+msgid "Process Nodes"
+msgstr "Prosessisolmut"
+
+#. module: process
+#: view:process.process:0
+#: field:process.process,node_ids:0
+msgid "Nodes"
+msgstr "Solmut"
+
+#. module: process
+#: view:process.node:0
+#: field:process.node,condition_ids:0
+#: view:process.process:0
+msgid "Conditions"
+msgstr "Ehdot"
+
+#. module: process
+#: field:process.condition,node_id:0
+msgid "Node"
+msgstr "Solmu"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Workflow Trigger"
+msgstr "Työnkulun liipaisin"
+
+#. module: process
+#: field:process.transition,note:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition_action
+msgid "Process Transitions Actions"
+msgstr "Prosessin siirtymien toiminnot"
+
+#. module: process
+#: field:process.condition,model_id:0
+#: field:process.node,model_id:0
+#: field:process.process,model_id:0
+msgid "Object"
+msgstr "Objekti"
+
+#. module: process
+#: field:process.transition,source_node_id:0
+msgid "Source Node"
+msgstr "Lähdesolmu"
+
+#. module: process
+#: field:process.transition,transition_ids:0
+msgid "Workflow Transitions"
+msgstr "Työnkulun siirtymät"
+
+#. module: process
+#: field:process.transition.action,action:0
+msgid "Action ID"
+msgstr "Toiminnon tunnus"
+
+#. module: process
+#: view:process.transition:0
+msgid "Process Transition"
+msgstr "Prosessin siirtymä"
+
+#. module: process
+#: model:ir.model,name:process.model_process_condition
+#: view:process.node:0
+#: view:process.process:0
+msgid "Condition"
+msgstr "Ehto"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Dummy"
+msgstr "Tyhjä"
+
+#. module: process
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#. module: process
+#: field:process.condition,name:0
+#: field:process.node,name:0
+#: field:process.process,name:0
+#: field:process.transition,name:0
+#: field:process.transition.action,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: process
+#: field:process.transition,role_ids:0
+msgid "Roles"
+msgstr "Työtehtävät"
+
+#. module: process
+#: field:process.node,transition_in:0
+msgid "Starting Transitions"
+msgstr "Aloittavat siirtymät"
+
+#. module: process
+#: field:process.node,note:0
+#: field:process.process,note:0
+#: view:process.transition:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: field:process.transition.action,transition_id:0
+msgid "Transition"
+msgstr "Siirtymä"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: view:process.transition:0
+msgid "Roles Required"
+msgstr "Vaaditut työtehtävät"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Extra Information"
+msgstr "Lisätiedot"
+
+#. module: process
+#: selection:process.node,kind:0
+#: field:process.node,subflow_id:0
+msgid "Subflow"
+msgstr "Alikulku"
+
+#. module: process
+#: field:process.process,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Action"
+msgstr "Toiminto"
+
+#. module: process
+#: field:process.node,flow_start:0
+msgid "Starting Flow"
+msgstr "Aloittava kulku"
+
+#. module: process
+#: field:process.condition,model_states:0
+msgid "Expression"
+msgstr "Lauseke"
+
+#. module: process
+#: field:process.transition.action,state:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: process
+#: field:process.node,transition_out:0
+msgid "Ending Transitions"
+msgstr "Lopettavat siirtymät"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_form
+#: model:ir.model,name:process.model_process_process
+#: model:ir.ui.menu,name:process.menu_process_form
+#: field:process.node,process_id:0
+#: view:process.process:0
+msgid "Process"
+msgstr "Prosessi"
+
+#. module: process
+#: model:ir.module.module,shortdesc:process.module_meta_information
+msgid "Enterprise Process"
+msgstr "Yrityksen prosessi"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+#: view:process.transition:0
+msgid "Actions"
+msgstr "Toiminnot"
+
+#. module: process
+#: field:process.node,model_states:0
+msgid "States Expression"
+msgstr "Tilojen lauseke"
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_transition_form
+#: model:ir.model,name:process.model_process_transition
+#: model:ir.ui.menu,name:process.menu_process_transition_form
+msgid "Process Transitions"
+msgstr "Prosessin siirtymät"
+
+#. module: process
+#: field:process.transition,target_node_id:0
+msgid "Target Node"
+msgstr "Kohdesolmu"
+
+#. module: process
+#: field:process.node,kind:0
+msgid "Kind of Node"
+msgstr "Solmun tyyppi"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Outgoing Transitions"
+msgstr "Lähtevät siirtymät"
+
+#. module: process
+#: model:ir.ui.menu,name:process.menu_process
+msgid "Enterprise Processes"
+msgstr "Yrityksen prosessit"
+
+#. module: process
+#: view:process.node:0
+#: view:process.process:0
+msgid "Transitions"
+msgstr "Siirtymät"
+
+#. module: process
+#: selection:process.transition.action,state:0
+msgid "Object Method"
+msgstr "Objektimenetelmä"
diff --git a/addons/process/i18n/fr.po b/addons/process/i18n/fr.po
index 3d4de59cbcc..c6d87668b19 100644
--- a/addons/process/i18n/fr.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/hi.po b/addons/process/i18n/hi.po
index f55eafebed4..5a80f2f2c18 100644
--- a/addons/process/i18n/hi.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index 56b85055356..c2a3779243a 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* process
-#
+# * process
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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 16:30+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 00:55+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: process
 #: view:process.node:0
@@ -27,47 +28,48 @@ msgstr ""
 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: process
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 #: view:process.transition:0
 msgid "Roles from Workflow"
-msgstr ""
+msgstr "Uloge iz Hodograma"
 
 #. module: process
 #: field:process.node,menu_id:0
 msgid "Related Menu"
-msgstr ""
+msgstr "Povezani izbornik"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 #: field:process.transition,action_ids:0
 msgid "Buttons"
-msgstr ""
+msgstr "Tipke"
 
 #. module: process
 #: selection:process.node,kind:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 #: view:process.transition:0
 msgid "Details"
-msgstr ""
+msgstr "Detalji"
 
 #. module: process
 #: field:process.node,help_url:0
 msgid "Help URL"
-msgstr ""
+msgstr "Help URL"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_node_form
@@ -76,84 +78,84 @@ msgstr ""
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr ""
+msgstr "Procesna čvorišta"
 
 #. module: process
 #: view:process.process:0
 #: field:process.process,node_ids:0
 msgid "Nodes"
-msgstr ""
+msgstr "Čvorišta"
 
 #. module: process
 #: view:process.node:0
 #: field:process.node,condition_ids:0
 #: view:process.process:0
 msgid "Conditions"
-msgstr ""
+msgstr "Uvjeti"
 
 #. module: process
 #: field:process.condition,node_id:0
 msgid "Node"
-msgstr ""
+msgstr "Čvorište"
 
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Workflow Trigger"
-msgstr ""
+msgstr "Okidač Hodograma"
 
 #. module: process
 #: field:process.transition,note:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr ""
+msgstr "Radnje Procesnih Prijelaza"
 
 #. module: process
 #: field:process.condition,model_id:0
 #: field:process.node,model_id:0
 #: field:process.process,model_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objekt"
 
 #. module: process
 #: field:process.transition,source_node_id:0
 msgid "Source Node"
-msgstr ""
+msgstr "Čvorište izvor"
 
 #. module: process
 #: field:process.transition,transition_ids:0
 msgid "Workflow Transitions"
-msgstr ""
+msgstr "Prijelazi Hodograma"
 
 #. module: process
 #: field:process.transition.action,action:0
 msgid "Action ID"
-msgstr ""
+msgstr "ID Radnje"
 
 #. module: process
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr ""
+msgstr "Prijelaz Procesa"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
 #: view:process.node:0
 #: view:process.process:0
 msgid "Condition"
-msgstr ""
+msgstr "Uvjet"
 
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Dummy"
-msgstr ""
+msgstr "Dummy"
 
 #. module: process
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: process
 #: field:process.condition,name:0
@@ -162,80 +164,80 @@ msgstr ""
 #: field:process.transition,name:0
 #: field:process.transition.action,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: process
 #: field:process.transition,role_ids:0
 msgid "Roles"
-msgstr ""
+msgstr "Uloge"
 
 #. module: process
 #: field:process.node,transition_in:0
 msgid "Starting Transitions"
-msgstr ""
+msgstr "Početni prijelazi"
 
 #. module: process
 #: field:process.node,note:0
 #: field:process.process,note:0
 #: view:process.transition:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 #: field:process.transition.action,transition_id:0
 msgid "Transition"
-msgstr ""
+msgstr "Prijelaz"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 #: view:process.transition:0
 msgid "Roles Required"
-msgstr ""
+msgstr "Potrebne Uloge"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Dodatne Informacije"
 
 #. module: process
 #: selection:process.node,kind:0
 #: field:process.node,subflow_id:0
 msgid "Subflow"
-msgstr ""
+msgstr "Podtok"
 
 #. module: process
 #: field:process.process,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Action"
-msgstr ""
+msgstr "Radnja"
 
 #. module: process
 #: field:process.node,flow_start:0
 msgid "Starting Flow"
-msgstr ""
+msgstr "Početni tok"
 
 #. module: process
 #: field:process.condition,model_states:0
 msgid "Expression"
-msgstr ""
+msgstr "Izraz"
 
 #. module: process
 #: field:process.transition.action,state:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: process
 #: field:process.node,transition_out:0
 msgid "Ending Transitions"
-msgstr ""
+msgstr "Završni prijelazi"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_form
@@ -244,60 +246,60 @@ msgstr ""
 #: field:process.node,process_id:0
 #: view:process.process:0
 msgid "Process"
-msgstr ""
+msgstr "Proces"
 
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
 msgid "Enterprise Process"
-msgstr ""
+msgstr "Proces poduzeća"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 #: view:process.transition:0
 msgid "Actions"
-msgstr ""
+msgstr "Radnje"
 
 #. module: process
 #: field:process.node,model_states:0
 msgid "States Expression"
-msgstr ""
+msgstr "Izraz Stanja"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_transition_form
 #: model:ir.model,name:process.model_process_transition
 #: model:ir.ui.menu,name:process.menu_process_transition_form
 msgid "Process Transitions"
-msgstr ""
+msgstr "Prijelazi Procesa"
 
 #. module: process
 #: field:process.transition,target_node_id:0
 msgid "Target Node"
-msgstr ""
+msgstr "Ciljno čvorište"
 
 #. module: process
 #: field:process.node,kind:0
 msgid "Kind of Node"
-msgstr ""
+msgstr "Čvorište neke vrste"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Izlazni prijelazi"
 
 #. module: process
 #: model:ir.ui.menu,name:process.menu_process
 msgid "Enterprise Processes"
-msgstr ""
+msgstr "Procesi poduzeća"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Transitions"
-msgstr ""
+msgstr "Prijelazi"
 
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Object Method"
-msgstr ""
+msgstr "Object Method"
diff --git a/addons/process/i18n/hu.po b/addons/process/i18n/hu.po
index a3fc480863c..6f6bfc03516 100644
--- a/addons/process/i18n/hu.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/id.po b/addons/process/i18n/id.po
index 59eca5b59fd..d4fe4ac85f4 100644
--- a/addons/process/i18n/id.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/it.po b/addons/process/i18n/it.po
index 652a3e7bfcc..4a650d994e9 100644
--- a/addons/process/i18n/it.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/ko.po b/addons/process/i18n/ko.po
index 41253f3945a..47020298722 100644
--- a/addons/process/i18n/ko.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/lt.po b/addons/process/i18n/lt.po
index 85ba4552d57..1b4fb507ea1 100644
--- a/addons/process/i18n/lt.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/nl.po b/addons/process/i18n/nl.po
index ed6e79148ac..85594095f03 100644
--- a/addons/process/i18n/nl.po
+++ b/addons/process/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/nl_BE.po b/addons/process/i18n/nl_BE.po
index e5969fb5806..61d27ba9be9 100644
--- a/addons/process/i18n/nl_BE.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/pl.po b/addons/process/i18n/pl.po
index aa3136ee122..7afd90bc7ab 100644
--- a/addons/process/i18n/pl.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/pt.po b/addons/process/i18n/pt.po
index 06f2df855ed..173e825136c 100644
--- a/addons/process/i18n/pt.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index d41421e76c1..3b0cb83b3d8 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/ro.po b/addons/process/i18n/ro.po
index 6bdb7af5066..fdbabf20a1f 100644
--- a/addons/process/i18n/ro.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po
index 9b5cbc3c26d..e285b93a5f3 100644
--- a/addons/process/i18n/ru.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/sl.po b/addons/process/i18n/sl.po
index f825ebeb45f..7329d4cfa65 100644
--- a/addons/process/i18n/sl.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/sr.po b/addons/process/i18n/sr.po
index 8b03e841e6e..9deceb517f9 100644
--- a/addons/process/i18n/sr.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index 846add53e73..16e2d5ff0ba 100644
--- a/addons/process/i18n/sv.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/tlh.po b/addons/process/i18n/tlh.po
index 7a8de3ec065..76717d7c4b5 100644
--- a/addons/process/i18n/tlh.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index 87ad0440184..eaf18b536f6 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/uk.po b/addons/process/i18n/uk.po
index 21ce8fa8e15..f9b50f11d20 100644
--- a/addons/process/i18n/uk.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index f979d155fdb..3eca5c3ce55 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -4,41 +4,41 @@
 #
 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-29 03:11+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr "流程节点"
+msgstr "处理节点"
 
 #. module: process
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: process
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 #: view:process.transition:0
 msgid "Roles from Workflow"
-msgstr "工作流程的角色"
+msgstr "工作流角色"
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -67,7 +67,7 @@ msgstr "详情"
 #. module: process
 #: field:process.node,help_url:0
 msgid "Help URL"
-msgstr "帮助 URL"
+msgstr "帮助URL"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_node_form
@@ -76,7 +76,7 @@ msgstr "帮助 URL"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr "流程节点"
+msgstr "处理节点"
 
 #. module: process
 #: view:process.process:0
@@ -99,7 +99,7 @@ msgstr "节点"
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Workflow Trigger"
-msgstr "工作流触发器"
+msgstr "触发工作流"
 
 #. module: process
 #: field:process.transition,note:0
@@ -109,7 +109,7 @@ msgstr "说明"
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr "流程转换动作"
+msgstr "处理转换生效"
 
 #. module: process
 #: field:process.condition,model_id:0
@@ -121,7 +121,7 @@ msgstr "对象"
 #. module: process
 #: field:process.transition,source_node_id:0
 msgid "Source Node"
-msgstr "来源节点"
+msgstr "源节点"
 
 #. module: process
 #: field:process.transition,transition_ids:0
@@ -131,12 +131,12 @@ msgstr "工作流转换"
 #. module: process
 #: field:process.transition.action,action:0
 msgid "Action ID"
-msgstr "动作标识符"
+msgstr "动作ID"
 
 #. module: process
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr "流程转换"
+msgstr "处理转换"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
@@ -148,12 +148,12 @@ msgstr "条件"
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Dummy"
-msgstr "伪动作"
+msgstr "哑元"
 
 #. module: process
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: process
 #: field:process.condition,name:0
@@ -167,19 +167,19 @@ msgstr "名称"
 #. module: process
 #: field:process.transition,role_ids:0
 msgid "Roles"
-msgstr "用户角色"
+msgstr "角色"
 
 #. module: process
 #: field:process.node,transition_in:0
 msgid "Starting Transitions"
-msgstr "起始转换"
+msgstr "开始转换"
 
 #. module: process
 #: field:process.node,note:0
 #: field:process.process,note:0
 #: view:process.transition:0
 msgid "Notes"
-msgstr "备注"
+msgstr "节点"
 
 #. module: process
 #: view:process.node:0
@@ -193,7 +193,7 @@ msgstr "转换"
 #: view:process.process:0
 #: view:process.transition:0
 msgid "Roles Required"
-msgstr "需要的用户角色"
+msgstr "角色要求"
 
 #. module: process
 #: view:process.node:0
@@ -205,12 +205,12 @@ msgstr "额外信息"
 #: selection:process.node,kind:0
 #: field:process.node,subflow_id:0
 msgid "Subflow"
-msgstr "子流"
+msgstr "子工作流"
 
 #. module: process
 #: field:process.process,active:0
 msgid "Active"
-msgstr "启用"
+msgstr "生效"
 
 #. module: process
 #: selection:process.transition.action,state:0
@@ -220,12 +220,12 @@ msgstr "动作"
 #. module: process
 #: field:process.node,flow_start:0
 msgid "Starting Flow"
-msgstr "起始流"
+msgstr "开始流程"
 
 #. module: process
 #: field:process.condition,model_states:0
 msgid "Expression"
-msgstr "表达式"
+msgstr "表达"
 
 #. module: process
 #: field:process.transition.action,state:0
@@ -235,7 +235,7 @@ msgstr "类型"
 #. module: process
 #: field:process.node,transition_out:0
 msgid "Ending Transitions"
-msgstr "终止转换"
+msgstr "结束转换"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_form
@@ -244,7 +244,7 @@ msgstr "终止转换"
 #: field:process.node,process_id:0
 #: view:process.process:0
 msgid "Process"
-msgstr "流程"
+msgstr "处理"
 
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
@@ -268,7 +268,7 @@ msgstr "状态表达式"
 #: model:ir.model,name:process.model_process_transition
 #: model:ir.ui.menu,name:process.menu_process_transition_form
 msgid "Process Transitions"
-msgstr "流程转换"
+msgstr "处理转换"
 
 #. module: process
 #: field:process.transition,target_node_id:0
@@ -278,7 +278,7 @@ msgstr "目标节点"
 #. module: process
 #: field:process.node,kind:0
 msgid "Kind of Node"
-msgstr "节点种类"
+msgstr "分类节点"
 
 #. module: process
 #: view:process.node:0
@@ -301,3 +301,12 @@ msgstr "转换"
 #: selection:process.transition.action,state:0
 msgid "Object Method"
 msgstr "对象方法"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to manage your process for the end-users.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块允许你管理你的最终用户处理\n"
+#~ "    "
diff --git a/addons/process/i18n/zh_TW.po b/addons/process/i18n/zh_TW.po
index 4e0b3b0553d..1aa8de6b2c2 100644
--- a/addons/process/i18n/zh_TW.po
+++ b/addons/process/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/product/company.py b/addons/product/company.py
index f23d010b600..0f248dba309 100644
--- a/addons/product/company.py
+++ b/addons/product/company.py
@@ -36,16 +36,6 @@ class res_company(osv.osv):
             help="The price type field in the selected price type will be used, instead of the default one, \
                   for valuation of product in the current company"),
     }
-    
-    def _check_currency(self, cr, uid, ids):
-        for rec in self.browse(cr, uid, ids):
-            if rec.currency_id.id <> rec.property_valuation_price_type.currency_id.id:
-                return False
-        return True
-        
-    _constraints = [
-        (_check_currency, 'Error! You can not chooes a pricetype in a different currency than your company (Not supported now).', ['property_valuation_price_type'])
-    ]
 
 res_company()
 
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index 0be860cd3b7..eaccdca6bbb 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index a97902da97c..8985d92dba3 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index 4feb4f244e5..9b4bb51cbdb 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index eb5add69766..7ff6a6a508e 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 770168d632f..27ed7231bd5 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 0b9089b8dd5..002d81eb277 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index 865108c3da1..bdd7ad411a1 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 6eecd987a70..579f639f154 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,13 +7,13 @@ 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-11-17 11:12+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-21 19:25+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -990,6 +990,10 @@ msgid ""
 "management. For example, in food industries, you will manage a stock of ham "
 "but invoice in Kg. Keep empty to use the default UOM."
 msgstr ""
+"Usado por compañías que manejan dos unidades de medida: facturación y "
+"administración de inventarios. Por ejemplo, en las industrias alimentaria, "
+"se administra el almacén de jamón pero se factura en Kg. Dejar sin llenar "
+"para usar UOM por defecto."
 
 #. module: product
 #: view:product.product:0
@@ -1437,6 +1441,9 @@ msgid ""
 "products with infinite stock, or for use when you have no inventory "
 "management in the system."
 msgstr ""
+"Cambiará la forma en que las compras son procesadas. Los Consumibles son "
+"productos almacenables y con infinita capacidad de almacenamiento, o para "
+"usarse cuando no hay administración de inventarios en el sistema."
 
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index 4b90b6aefcb..64384d70c0f 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.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:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index da83f4082ae..b3ad90387c6 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index c5812946a89..86cd602e93e 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -232,7 +232,7 @@ msgstr "Saapuvat"
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr "Valmistetaan varastoon"
+msgstr "Valmista varastoon"
 
 #. module: product
 #: view:product.product:0
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index de574f2ad94..b7d7e8f505d 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index 464763f73e7..61e7bbc6c5a 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 314de2b9225..f1bae0481c9 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index cb1c2eab207..3d4cd3e7617 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index a9563091940..908147e0a58 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index aef302433fd..e5984ec230f 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index d0c67a0b681..885f1cbcb93 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index ce2878d90c1..0bfc9fa0ddb 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 35f9b4ccf56..2bee909db7e 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index d63a657bf85..4d3a6459d1a 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index b1099930e33..95fed43a9da 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index a4ec6d20c62..a2c755a1d43 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index b1a8eeb60a8..5233d991484 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index 5cd2be6e211..2ec7a6ad0a9 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 2d5ccd8e9f5..075e7e1678b 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 9603cb67211..0ebcffd1993 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index dfeda387f0a..71cc242638e 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index a263076896e..09456fdc6f8 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 52125e3d02d..e9a6feee054 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index d0bb08373d1..0704dd19925 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index d023fcdd436..1b3f1750dd2 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index 729659b5c77..39e8854a4f5 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 48adf03071b..23c0fd0dcaa 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 34adb11ee54..d22434673c5 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 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: 2010-01-07 13:36+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -24,14 +24,14 @@ msgstr "最大利润"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr "基本价格"
+msgstr "基础价格"
 
 #. module: product
 #: help:product.template,standard_price:0
 msgid ""
 "The cost of the product for accounting stock valuation. It can serves as a "
 "base price for supplier price."
-msgstr "产品成本为会计存货估价。它也可以作为供应商基本价格。"
+msgstr "产品成本的会计库存价值.它能作为供应商价格的一个基础价格."
 
 #. module: product
 #: selection:product.template,type:0
@@ -43,7 +43,7 @@ msgstr "服务"
 msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
-msgstr "确定该产品在采购订单明细的货品选择表中是否可见"
+msgstr "如果产品列表中能看见这产品确定它"
 
 #. module: product
 #: help:product.supplierinfo,name:0
@@ -58,14 +58,14 @@ msgstr "DDR 512MB PC400"
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
 msgid "Onsite Senior Intervention"
-msgstr "高级现场维护"
+msgstr "现场高级调试"
 
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid ""
 "The minimal quantity to purchase for this supplier, expressed in the default "
 "unit of measure."
-msgstr "从该供应商采购的最小数量，使用默认计量单位表示。"
+msgstr "供应商最少采购数量使用默认单位"
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -77,7 +77,7 @@ msgstr "净重"
 msgid ""
 "Quantities of products that are planned to arrive in selected locations or "
 "all internal if none have been selected."
-msgstr "所选存货点或全部内部存货点（如未选存货点）的计划到货数量。"
+msgstr "产品在选定库位计划接收数量或如果没有选定库位全部内部库位"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -85,7 +85,7 @@ msgid ""
 "Futur stock for this product according to the selected location or all "
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
-msgstr "该产品在所选存货点或全部内部存货点（如未选存货点）的未来库存。计算公式：实际库存+接收-发出"
+msgstr "产品在选定库位或者没选定在内部的未来库存.计算公式:实际库存 + 接收 - 发出"
 
 #. module: product
 #: field:product.packaging,width:0
@@ -97,7 +97,7 @@ msgstr "宽度"
 msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
-msgstr "如果此规则只能应用于一种产品模板，则在此设置该产品模板。如果可应用于所有产品，则置空。"
+msgstr "设置一模板如果这规则只适合一产品产品模板.留空为适用所有产品"
 
 #. module: product
 #: field:product.template,procure_method:0
@@ -107,17 +107,17 @@ msgstr "获得方式"
 #. module: product
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在操作定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: product
 #: model:process.process,name:product.process_process_productprocess0
 msgid "Product Process"
-msgstr "产品流程"
+msgstr "产品工艺"
 
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr "产品表单中的关联字段"
+msgstr "产品的相关字段"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -127,7 +127,7 @@ msgstr "标准价"
 #. module: product
 #: help:product.packaging,height:0
 msgid "The height of the package"
-msgstr "包装高度"
+msgstr "包装的高度"
 
 #. module: product
 #: view:product.pricelist:0
@@ -142,7 +142,7 @@ msgstr "可销售"
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr "键盘＋鼠标套装"
+msgstr "键盘+鼠标套件"
 
 #. module: product
 #: field:product.price.type,name:0
@@ -162,7 +162,7 @@ msgstr "公司"
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr "可租赁产品"
+msgstr "租借产品"
 
 #. module: product
 #: field:product.product,lst_price:0
@@ -178,7 +178,7 @@ msgstr "价格类型"
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr "库存商品"
+msgstr "可库存产品"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -190,7 +190,7 @@ msgstr "服务"
 msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
-msgstr "计算客户价格的基础价格。也可称为目录价格。"
+msgstr "计算客户价格的基础价格.有时候它被称为目录价格"
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
@@ -205,12 +205,12 @@ msgstr "AMD Athlon XP 2200+ 处理器"
 #. module: product
 #: help:product.price.type,name:0
 msgid "Name of this kind of price."
-msgstr "价格种类名称"
+msgstr "价格类型名称"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr "该价格表版本的生效时间"
+msgstr "有效的价格表版本开始日期"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -231,24 +231,24 @@ msgstr "重量"
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
 msgid "Silent fan"
-msgstr "静音风扇"
+msgstr "无声风扇"
 
 #. module: product
 #: help:product.template,supply_method:0
 msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Purchase will trigger purchase orders when requested."
-msgstr "生产将根据货品类型创建生产定单或任务。采购将在请求时触发采购订单。"
+msgstr "生产将根据产品类型创建生产单或任务.采购将在有需要时触发采购订单请求."
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
 msgid "You can see the list of suppliers for that product."
-msgstr "您能看到该货品的供应商名单"
+msgstr "你能在产品中看到供应商"
 
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layer on a palet or box"
-msgstr "托板或箱子的层数"
+msgstr "小包或箱子层数"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
@@ -259,7 +259,7 @@ msgstr "销售价格表"
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr "基础价格表"
+msgstr "其它价格表"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -276,10 +276,7 @@ msgid ""
 "Sets the price so that it is a multiple of this value.\n"
 "Rounding is applied after the discount and before the surcharge.\n"
 "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
-msgstr ""
-"设置价格，为该数值的倍数。\n"
-"舍入适用打折之后，附加费之前。\n"
-"如想定以9.99为尾的价格，设舍入为10，附加费为-0.01。"
+msgstr "设定价格以便它有多个价格,折扣后使用四舍五入和之前的附加费,以价格9.99为例四舍五入为10附加费为-0.001."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -300,14 +297,14 @@ msgstr "固定的"
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr "度量单位分类"
+msgstr "计量单位类型"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
 msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
-msgstr "设置一个产品如果该规则只适用于一个产品，为所有产品留空"
+msgstr "设置产品类别如果这规则只适合产品.留空为为全部产品"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -345,7 +342,7 @@ msgstr "层数"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr "错误！您不能创建递归分类。"
+msgstr "错误!你不能创建递归的分类"
 
 #. module: product
 #: field:product.template,uom_id:0
@@ -355,7 +352,7 @@ msgstr "默认计量单位"
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr "制造周期"
+msgstr "生产提前期"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
@@ -366,7 +363,7 @@ msgstr "供应商价格表"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr "托盘尺寸"
+msgstr "托板尺寸"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -386,7 +383,7 @@ msgstr "业务伙伴"
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr "客户交货期"
+msgstr "客户交货提前期"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
@@ -399,7 +396,7 @@ msgid ""
 "Standard Price: the cost price is fixed and recomputed periodically (usually "
 "at the end of the year), Average Price: the cost price is recomputed at each "
 "reception of products."
-msgstr "标准价：成本价格定期不变，周期底重新计算（通常在年底)。平均价：成本价在每次到新货时重新计算。"
+msgstr "标准价:这价格是固定的和重新定价(通常在今年年底).平均价:这价格是在每个产品上重新计算."
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -419,12 +416,12 @@ msgstr "平均价"
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Create new Product"
-msgstr "新建产品"
+msgstr "创建新产品"
 
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr "价格表明细明确的规则名"
+msgstr "价格表明细详尽的规则名"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -449,12 +446,12 @@ msgstr "生产中"
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr "下级分类"
+msgstr "子类"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
 msgid "Accessories"
-msgstr "电脑外设"
+msgstr "配件"
 
 #. module: product
 #: field:product.supplierinfo,sequence:0
@@ -464,13 +461,13 @@ msgstr "优先级"
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr "根据需求硬盘型号"
+msgstr "硬盘要求"
 
 #. module: product
 #: field:product.uom,factor_inv:0
 #: field:product.uom,factor_inv_data:0
 msgid "Factor"
-msgstr "因数"
+msgstr "系数"
 
 #. module: product
 #: wizard_button:product.price_list,init,price:0
@@ -519,12 +516,12 @@ msgstr "业务伙伴产品名称"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr "杂项"
+msgstr "各种各样的"
 
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
-msgstr "该规则计算价格的模式"
+msgstr "计算价格公式的模式"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -537,12 +534,12 @@ msgstr "计量单位"
 #. module: product
 #: field:product.product,partner_ref:0
 msgid "Customer ref"
-msgstr "客户参考号"
+msgstr "客户参考"
 
 #. module: product
 #: field:product.supplierinfo,qty:0
 msgid "Minimal Quantity"
-msgstr "最小数量"
+msgstr "最少数量"
 
 #. module: product
 #: model:product.category,name:product.product_category_pc
@@ -555,12 +552,12 @@ msgid ""
 "This is the average delay in days between the purchase order confirmation "
 "and the reception of goods for this product and for the default supplier. It "
 "is used by the scheduler to order requests based on reordering delays."
-msgstr "在供应商确认采购订单到交付完成货品之间的平均时间。调度程序使用该时间根据在订购延误生成订购请求。"
+msgstr "默认供应商在供应商确认采购订单到接收完成产品之间的平均延迟.用于计划调度订单请求时所根据的重新排序延误."
 
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr "供应商供货期"
+msgstr "供应商交货提前期"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -570,7 +567,7 @@ msgstr "默认的公共价格表版本"
 #. module: product
 #: field:product.pricelist.type,key:0
 msgid "Key"
-msgstr "关键词"
+msgstr "关键字"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -587,7 +584,7 @@ msgstr "规则匹配测试"
 msgid ""
 "This pricelist will be used, instead of the default one,                     "
 "for sales to the current partner"
-msgstr "该价格表将替代当前业务伙伴默认的销售价格表。"
+msgstr "当前业务伙伴的销售价格表.不是默认值."
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist
@@ -598,17 +595,17 @@ msgstr "价格表"
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr "可消费品"
+msgstr "消耗品"
 
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr "该字段的货币值表达为"
+msgstr "货币字段的表达式"
 
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr "单位为千克的毛重。"
+msgstr "毛重使用公斤"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -618,19 +615,19 @@ msgstr "盒"
 #. module: product
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: product
 #: help:product.template,sale_ok:0
 msgid ""
 "Determine if the product can be visible in the list of product within a "
 "selection from a sale order line."
-msgstr "确定该产品在销售订单明细的货品选择表中是否可见。"
+msgstr "如果在选择销售订单明细的产品列表中能看见这产品确定它"
 
 #. module: product
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: product
 #: field:product.category,parent_id:0
@@ -647,14 +644,14 @@ msgstr "开发中"
 msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
-msgstr "用于在编码里根据不同背景来选择特定的价格。请勿改变"
+msgstr "用代码来选择特定的价格.保持不改变"
 
 #. module: product
 #: help:product.product,outgoing_qty:0
 msgid ""
 "Quantities of products that are planned to leave in selected locations or "
 "all internal if none have been selected."
-msgstr "选定货位中计划离开的或如无选定货位内部所有的产品数量"
+msgstr "产品在选定库位的计划接收数量或如果没有选择库位全部内部库位"
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -667,19 +664,19 @@ msgid ""
 "'Make to Stock': When needed, take from the stock or wait until re-"
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
-msgstr "'备货型生产'：当需要时，从存货取货或等到重新供应。 '订货型生产'：当需要时，根据采购请求购买或生产。"
+msgstr "按库存:在库存取得或等待重新供应.按单:采购或生产这产品需求请求"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr "采购"
+msgstr "产品需求"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_product_category_action
 msgid "Products by Category"
-msgstr "分类的产品"
+msgstr "产品分类"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -692,9 +689,7 @@ msgid ""
 "When a version is duplicated it is set to non active, so that the dates do "
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
-msgstr ""
-"当复制版本时复本会被设定为未激活的。这样复本和原版的日期不会重叠。\"\r\n"
-"\"您应该改日期并激活价格表。"
+msgstr "当一个版本重复时它是设为不生效.这样在旧版本日期是不重复的"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -719,12 +714,12 @@ msgstr "货架"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr "计量单位分类"
+msgstr "计量单位类型"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr "装箱"
+msgstr "包"
 
 #. module: product
 #: field:product.product,ean13:0
@@ -741,12 +736,12 @@ msgstr "销售说明"
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr "销售计量单位"
+msgstr "销售单位"
 
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr "计量类型"
+msgstr "单位类型"
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
@@ -756,14 +751,14 @@ msgstr "重量"
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor on demand"
-msgstr "根据需求处理器型号"
+msgstr "处理器要求"
 
 #. module: product
 #: help:product.supplierinfo,product_name:0
 msgid ""
 "Name of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
-msgstr "业务伙伴货品名称将用在询价上。留空为使用内部名称。"
+msgstr "业务伙伴该产品名称将用在询价上.留空为使用内部名称"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -773,12 +768,12 @@ msgstr "供应方式"
 #. module: product
 #: model:product.category,name:product.product_category_11
 msgid "IT components kits"
-msgstr "电脑配件包"
+msgstr "IT成套零部件"
 
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr "计量单位分类"
+msgstr "计量单位类型"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -811,7 +806,7 @@ msgstr "货币"
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr "一般的处理器配置"
+msgstr "通常处理器配置"
 
 #. module: product
 #: view:product.product:0
@@ -822,7 +817,7 @@ msgstr "说明"
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Suppliers of Product"
-msgstr "货品供应商"
+msgstr "产品供应商"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -832,24 +827,24 @@ msgstr "开始日期"
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr "销售属性"
+msgstr "销售 属性"
 
 #. module: product
 #: help:product.product,qty_available:0
 msgid ""
 "Current quantities of products in selected locations or all internal if none "
 "have been selected."
-msgstr "选定货位的或如无选定货位内部所有的现有货品数量。"
+msgstr "在选定库位当前产品的数量或如果没选择表示所有的内部库位"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
 msgid "Basic PC"
-msgstr "基本电脑"
+msgstr "基础PC"
 
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr "行"
+msgstr "列"
 
 #. module: product
 #: field:product.template,categ_id:0
@@ -860,7 +855,7 @@ msgstr "分类"
 #: help:product.pricelist.item,min_quantity:0
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
-msgstr "该规则只适用于业务伙伴采购/销售超过此数量"
+msgstr "该规则只适用于业务伙伴采购/销售超过一定的数量"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
@@ -875,14 +870,14 @@ msgstr "实际库存"
 #. module: product
 #: view:product.category:0
 msgid "Product Categories"
-msgstr "产品分类"
+msgstr "产品类型"
 
 #. module: product
 #: help:product.uom,category_id:0
 msgid ""
 "Unit of Measure of a category can be converted between each others in the "
 "same category."
-msgstr "属于同分类的计量单位能互相转化"
+msgstr "类别单位能转化的同一类别"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
@@ -897,18 +892,18 @@ msgstr "可销售"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr "带外设的完整电脑"
+msgstr "完整的电脑外设"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr "ASUStek A7V8X-X 主板"
+msgstr "主板 ASUStek A7V8X-X"
 
 #. module: product
 #: field:product.uom,factor:0
@@ -947,7 +942,7 @@ msgstr "处理发票和库存管理两个计量单位的公司使用。例如，
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr "需求单与地点"
+msgstr "产品需求&库位"
 
 #. module: product
 #: view:product.product:0
@@ -981,32 +976,32 @@ msgstr "价格舍入"
 #. module: product
 #: model:product.price.type,name:product.list_price
 msgid "Public Price"
-msgstr "对外价格"
+msgstr "标价"
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr "最大价格利润"
+msgstr "最大毛利"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr "电脑配件"
+msgstr "IT零部件"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
-msgstr "物流单位空包装的重量"
+msgstr "空包装的最大重量"
 
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr "运输单位编码"
+msgstr "运输单位代码"
 
 #. module: product
 #: field:product.template,uom_po_id:0
@@ -1021,17 +1016,17 @@ msgstr "产品价格类型"
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr "产品经理"
+msgstr "产品主管"
 
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr "产品变体附加差价"
+msgstr "额外价格变量"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr "普通 80mm 风扇"
+msgstr "通常80mm风扇"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
@@ -1045,12 +1040,12 @@ msgstr "产品供应商信息"
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
-msgstr "变体价格差额"
+msgstr "变价幅度"
 
 #. module: product
 #: wizard_view:product.price_list,init:0
@@ -1060,12 +1055,12 @@ msgstr "价格表"
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
 msgid "Medium PC"
-msgstr "中等配置电脑"
+msgstr "多媒体PC"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
 msgid "pricelist.partnerinfo"
-msgstr "pricelist.partnerinfo"
+msgstr "业务伙伴信息"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
@@ -1084,33 +1079,33 @@ msgstr "采购说明"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr "副计量单位"
+msgstr "第二计量单位"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr "戴尔电脑"
+msgstr "DELL"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr "存储地点"
+msgstr "存储库位"
 
 #. module: product
 #: help:product.packaging,length:0
 msgid "The length of the package"
-msgstr "包装长度"
+msgstr "包装的长度"
 
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr "最小价格差额"
+msgstr "最小毛利"
 
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr "包装的欧洲商品编号(EAN)"
+msgstr "包装的EAN编码"
 
 #. module: product
 #: field:product.template,weight:0
@@ -1122,13 +1117,13 @@ msgstr "毛重"
 msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the packing order and is mainly used if you use the EDI module."
-msgstr "给出相同货品的不同包装方式。这不会影响挑选程序，主要用于您可选择地使用的EDI模块。"
+msgstr "给出相同产品的不同包装方式.如果你使用EDI模块这并不影响包装单和主要使用"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr "产品类别"
+msgstr "产品类型"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1144,7 +1139,7 @@ msgstr "价格表类型"
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr "告诉用户是否可以使用产品。"
+msgstr "产品在企业的状态"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
@@ -1154,28 +1149,26 @@ msgstr "业务伙伴产品代码"
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr "电脑相关"
+msgstr "电脑原材料"
 
 #. module: product
 #: field:product.packaging,code:0
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: product
 #: help:product.uom,factor_inv:0
 msgid ""
 "The coefficient for the formula:\n"
 "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
-msgstr ""
-"该公式的系数为：\n"
-"系数（基本单位）＝1（这单位）。因子＝1/比率。"
+msgstr "该公式的系数为:系数(基础单位)=1(这单位)×因子=1/比率"
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr "序号"
+msgstr "序列"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
@@ -1190,7 +1183,7 @@ msgstr "可变的"
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr "所有库存操作的默认计量单位。"
+msgstr "所有库存操作的默认计量单位"
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -1203,14 +1196,14 @@ msgstr "产品模板"
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr "发货单位"
+msgstr "运输单位"
 
 #. module: product
 #: help:product.uom,rounding:0
 msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for products "
 "that can not be split."
-msgstr "计算数量将是该数值的倍数。对不能拆分的货品请使用1.0。"
+msgstr "这计算数量将是一个倍数值.产品使用1.0不能拆分."
 
 #. module: product
 #: field:product.packaging,height:0
@@ -1220,7 +1213,7 @@ msgstr "高度"
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
 msgid "Customizable PC"
-msgstr "定制电脑"
+msgstr "自选配置PC"
 
 #. module: product
 #: help:product.pricelist.version,date_end:0
@@ -1243,7 +1236,7 @@ msgstr "产品类型"
 #: model:product.category,name:product.product_category_7
 #: model:product.template,name:product.product_product_1_product_template
 msgid "Onsite Intervention"
-msgstr "现场维护"
+msgstr "现场调试"
 
 #. module: product
 #: model:product.category,name:product.cat0
@@ -1258,7 +1251,7 @@ msgstr "取消"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by palet or box."
-msgstr "可按箱或托板装的货品总数。"
+msgstr "产品总数你可以输入箱子或小包"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
@@ -1274,12 +1267,12 @@ msgstr "价格表"
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr "对外价格表"
+msgstr "标价价格表"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr "根据要求内存容量"
+msgstr "内存要求"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1295,7 +1288,7 @@ msgstr "希捷 7200.8 120GB 硬盘"
 #. module: product
 #: wizard_field:product.price_list,init,qty2:0
 msgid "Quantity-2"
-msgstr "数量二"
+msgstr "数量2"
 
 #. module: product
 #: view:product.product:0
@@ -1306,57 +1299,57 @@ msgstr "信息"
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr "编码"
+msgstr "代码"
 
 #. module: product
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty4:0
 msgid "Quantity-4"
-msgstr "数量四"
+msgstr "数量4"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty5:0
 msgid "Quantity-5"
-msgstr "数量五"
+msgstr "数量5"
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Other Info"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr "延期"
+msgstr "延迟"
 
 #. module: product
 #: field:product.pricelist.version,items_id:0
 msgid "Price List Items"
-msgstr "价格表项"
+msgstr "价格表明细"
 
 #. module: product
 #: help:product.supplierinfo,product_code:0
 msgid ""
 "Code of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
-msgstr "该业务伙伴的货品编码，将用在询价上。留空为使用内部编码"
+msgstr "业务伙伴的该产品的代码将用在询价上.留空为使用内部代码"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "Obsolete"
-msgstr "过期"
+msgstr "荒废"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pallet"
-msgstr "托盘"
+msgstr "托板"
 
 #. module: product
 #: field:pricelist.partnerinfo,price:0
@@ -1366,12 +1359,12 @@ msgstr "单价"
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr "保证期（月）"
+msgstr "保证期(月)"
 
 #. module: product
 #: field:product.packaging,ul_qty:0
 msgid "Package by layer"
-msgstr "分层包装"
+msgstr "包装层"
 
 #. module: product
 #: help:product.template,type:0
@@ -1384,7 +1377,7 @@ msgstr "将会改变需求计划的处理方式。消耗品是拥有无限库存
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Product suppliers, with their product name, price, etc."
-msgstr "产品供应商，包含产品名称、价格等。"
+msgstr "产品供应商.产品名称、价格."
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -1419,7 +1412,7 @@ msgstr "说明"
 #. module: product
 #: field:product.packaging,ean:0
 msgid "EAN"
-msgstr "条码"
+msgstr ""
 
 #. module: product
 #: view:product.product:0
@@ -1438,7 +1431,7 @@ msgid ""
 "This is the average time between the confirmation of the customer order and "
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
-msgstr "在确认销售订单到交付完成产品之间的平均时间。是您承诺客户的时间。"
+msgstr "这是确认客户订单和交付的平均时间.是承诺客户的时间."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -1448,7 +1441,7 @@ msgstr "产品计量单位分类"
 #. module: product
 #: wizard_field:product.price_list,init,qty3:0
 msgid "Quantity-3"
-msgstr "数量三"
+msgstr "数量3"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -1468,12 +1461,12 @@ msgstr "订货型生产"
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr "其他费用"
+msgstr "价格附加费"
 
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "您不能同时具有两个重叠的价格表版本。"
+msgstr "你不能有两个价格表版本它是重复的！"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1483,7 +1476,7 @@ msgstr "舍入方法"
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr "变动"
+msgstr "系列型号"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1493,12 +1486,12 @@ msgstr "价格计算"
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr "ASUStek A7N8X 主板"
+msgstr "主板 ASUStek A7N8X"
 
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr "箱"
+msgstr "盒"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
@@ -1514,7 +1507,7 @@ msgstr "产品分类"
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr "物流单位"
+msgstr "逻辑单位"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1526,16 +1519,14 @@ msgstr "物流单位"
 #: field:product.uom,name:0
 #: field:product.uom.categ,name:0
 msgid "Name"
-msgstr "名称"
+msgstr "完整的分类名称"
 
 #. module: product
 #: help:product.template,uos_coeff:0
 msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uom = uos * coeff"
-msgstr ""
-"计量单位到销售单位的转换系数\n"
-" 计量单位＝销售单位x系数"
+msgstr "计量单位到销售单位的转换系数 计量单位=销售单位×系数"
 
 #. module: product
 #: field:product.template,purchase_ok:0
@@ -1555,7 +1546,7 @@ msgstr "高速处理器配置"
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr "基础+PC(按订单组装)"
+msgstr "基础PC组装订单"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -1566,18 +1557,18 @@ msgstr "成本计算方法"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr "托盘化"
+msgstr "托板化"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Prices & Suppliers"
-msgstr "价格与供应商"
+msgstr "价格&供应商"
 
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full of products palet or box."
-msgstr "满箱或托盘重量"
+msgstr "全部产品小包或箱子的重量"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1587,26 +1578,24 @@ msgstr "生命周期终止"
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
 msgid "Products & Pricelists"
-msgstr "产品与价格列表"
+msgstr "产品&价格表"
 
 #. module: product
 #: help:product.uom,factor:0
 msgid ""
 "The coefficient for the formula:\n"
 "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
-msgstr ""
-"该公式的系数为：\n"
-"1（基本单位）=系数（这单位）。比率=1/因子"
+msgstr "该公式的系数为:1(基础单位)=系数(这单位)×比率=1/因子"
 
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr "以千克为单位的净重。"
+msgstr "净重使用KG"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
 msgid "ATX Mid-size Tower"
-msgstr "ATX 中型塔式机箱"
+msgstr "ATX中型塔式机箱"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
@@ -1623,7 +1612,7 @@ msgstr "价格表版本"
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr "空的包装重量"
+msgstr "空包装重量"
 
 #. module: product
 #: field:product.template,list_price:0
@@ -1637,12 +1626,12 @@ msgid ""
 "and, if it is a multi-level bill of material, it's only for the level of "
 "this product. Different delays will be summed for all levels and purchase "
 "orders."
-msgstr "生产该产品的平均时间。它只用于生产订单，并且如果是多层的材料单，则只用于该产品所在层次。不同的延迟将会被综合到所有层次以及采购订单。"
+msgstr "产品生产的平均时间生产单才有的.如果它是一个多层物料清单在各层和采购订单在不同称和采购单的延迟汇总"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty1:0
 msgid "Quantity-1"
-msgstr "数量一"
+msgstr "数量1"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1652,7 +1641,7 @@ msgstr "长度"
 #. module: product
 #: model:product.category,name:product.cat2
 msgid "Private"
-msgstr "私人"
+msgstr "私有"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -1660,19 +1649,19 @@ msgid ""
 "Delay in days between the confirmation of the purchase order and the "
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
-msgstr "在确认采购订单到在仓库接收货品之间的平均天数。调度程序使用该时间为自动计算采购计划。"
+msgstr "延迟天数是确认采购订单到仓库接收产品之间的延迟天数.用于采购订单计划自动计算计划调度."
 
 #. module: product
 #: help:product.template,uom_po_id:0
 msgid ""
 "Default Unit of Measure used for purchase orders. It must in the same "
 "category than the default unit of measure."
-msgstr "采购订单采用的计量单位。它必须与默认计量单位属于同一类型。"
+msgstr "采购订单的默认计量单位它必须是与默认计量单位类型同级"
 
 #. module: product
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的(EAN)条码"
+msgstr "错误:无效EAN编码"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
@@ -1684,7 +1673,7 @@ msgstr "最小数量"
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his childs. Keep empty for all products"
-msgstr "如果该规则只适用于一类货品及其子类货品请设置货品分类。为所有货品留空。"
+msgstr "设置产品类别如果这规则只适合产品分类和它的子项.留空为为全部"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1694,7 +1683,7 @@ msgstr "产品标签"
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr "体积（立方米）"
+msgstr "这体积是m3"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
@@ -1710,3 +1699,70 @@ msgstr "千克"
 #: field:product.pricelist.item,price_discount:0
 msgid "Price Discount"
 msgstr "降价"
+
+#~ msgid "Price List Name:"
+#~ msgstr "价格表名称:"
+
+#~ msgid "Currency :"
+#~ msgstr "货币:"
+
+#~ msgid ""
+#~ "Used by companies that manages two unit of measure: invoicing and stock "
+#~ "management. For example, in food industries, you will manage a stock of ham "
+#~ "but invoice in Kg. Keep empty to use the default UOM."
+#~ msgstr "公司管理使用两个计量单位:发票和库存管理.例如:食品工业的仓库的火腿发票要公斤.留空为使用默认计量单位"
+
+#~ msgid "Product Pricelist"
+#~ msgstr "产品价格表"
+
+#~ msgid "Printing Date :"
+#~ msgstr "打印日期:"
+
+#~ msgid ""
+#~ "Will change the way procurements are processed. Consumables are stockable "
+#~ "products with infinite stock, or for use when you have no stock management "
+#~ "in the system."
+#~ msgstr "将改变产品需求处理.消耗品是可库存的产品并有无限的库存.或使用时没用库存管理系统来管理"
+
+#~ msgid "units"
+#~ msgstr "单位"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module for managing products and pricelists in Open "
+#~ "ERP.\n"
+#~ "\n"
+#~ "    Products support variants, different pricing methods, suppliers\n"
+#~ "    information, make to stock/order, different unit of measures,\n"
+#~ "    packaging and properties.\n"
+#~ "\n"
+#~ "    Pricelists support:\n"
+#~ "    * Multiple-level of discount (by product, category, quantities)\n"
+#~ "    * Compute price based on different criteria:\n"
+#~ "        * Other pricelist,\n"
+#~ "        * Cost price,\n"
+#~ "        * List price,\n"
+#~ "        * Supplier price, ...\n"
+#~ "    Pricelists preferences by product and/or partners.\n"
+#~ "\n"
+#~ "    Print product labels with barcode.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这基础模块管理系统的产品和价格表.\n"
+#~ "\n"
+#~ "产品支持系列型号不同的\n"
+#~ "计价方式,供应商信息,按库存/按单生产,不同的单位,\n"
+#~ "包装和属性.\n"
+#~ "\n"
+#~ "价格表支持:\n"
+#~ "- 多层折扣(按产品,分类,数量)\n"
+#~ "- 计算价格根据不同的准则\n"
+#~ "\t- 其它价格表\n"
+#~ "\t- 成本价\n"
+#~ "\t- 标价\n"
+#~ "\t- 供应商价格..\n"
+#~ "价格表参数根据产品或业务伙伴\n"
+#~ "\n"
+#~ "打印产品标签和条码\n"
+#~ "    "
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index 73246b4bdc5..f9bb54d08fd 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 8045cc6cf22..1dbf110cd64 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -104,6 +104,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="currency_id"/>
+                    <field name="active" />
                 </tree>
             </field>
         </record>
diff --git a/addons/product/product.py b/addons/product/product.py
index 87b0622ae9e..d51d0733e81 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -82,9 +82,9 @@ class product_uom(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
             help="Unit of Measure of a category can be converted between each others in the same category."),
-        'factor': fields.float('Rate', digits=(12, 6), required=True,
+        'factor': fields.float('Ratio', digits=(12, 6), required=True,
             help='The coefficient for the formula:\n' \
-                    '1 (base unit) = coeff (this unit). Rate = 1 / Factor.'),
+                    '1 (base unit) = coeff (this unit). Ratio = 1 / Factor.'),
         'factor_inv': fields.function(_factor, digits=(12, 6),
             method=True, string='Factor',
             help='The coefficient for the formula:\n' \
@@ -93,6 +93,9 @@ class product_uom(osv.osv):
         'rounding': fields.float('Rounding Precision', digits=(16, 3), required=True,
             help="The computed quantity will be a multiple of this value. Use 1.0 for products that can not be split."),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the unit of measure without removing it."),
+        'uom_factor': fields.selection([('bigger','Bigger than the Default'),
+                                        ('smaller','Smaller than the Default'),
+                                        ('','')],'UoM Factor'),
     }
 
     _defaults = {
@@ -100,6 +103,7 @@ class product_uom(osv.osv):
         'factor_inv': lambda *a: 1.0,
         'active': lambda *a: 1,
         'rounding': lambda *a: 0.01,
+        'uom_factor': lambda *a: 'smaller',
     }
 
     _sql_constraints = [
@@ -204,7 +208,13 @@ class product_category(osv.osv):
         'parent_id': fields.many2one('product.category','Parent Category', select=True),
         'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
+        'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'),
     }
+    
+    _defaults = {
+        'type' : lambda *a : 'normal',
+    }
+    
     _order = "sequence"
     def _check_recursion(self, cr, uid, ids):
         level = 100
@@ -252,7 +262,7 @@ class product_template(osv.osv):
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the requisition request."),
         'rental': fields.boolean('Can be Rent'),
-        'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
+        'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]"),
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
         'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Account'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price."),
         'volume': fields.float('Volume', help="The volume in m3."),
@@ -441,7 +451,7 @@ class product_product(osv.osv):
         'default_code' : fields.char('Code', size=64),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
-        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=False),
         'ean13': fields.char('EAN13', size=13),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')),
@@ -523,7 +533,6 @@ class product_product(osv.osv):
     def price_get(self, cr, uid, ids, ptype='list_price', context={}):
         res = {}
         product_uom_obj = self.pool.get('product.uom')
-
         for product in self.browse(cr, uid, ids, context=context):
             res[product.id] = product[ptype] or 0.0
             if ptype == 'list_price':
@@ -533,6 +542,16 @@ class product_product(osv.osv):
                 uom = product.uos_id or product.uom_id
                 res[product.id] = product_uom_obj._compute_price(cr, uid,
                         uom.id, res[product.id], context['uom'])
+            # Convert from price_type currency to asked one
+            if 'currency_id' in context:
+                pricetype_obj = self.pool.get('product.price.type')
+                # Take the price_type currency from the product field
+                # This is right cause a field cannot be in more than one currency
+                price_type_id = pricetype_obj.search(cr, uid, [('field','=',ptype)])[0]
+                price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id
+                res[product.id] = self.pool.get('res.currency').compute(cr, uid, price_type_currency_id,
+                    context['currency_id'], res[product.id],context=context)
+                
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 4ed27c81d1d..300a2b0f546 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -21,25 +21,31 @@
             <field name="category_id" ref="product_uom_categ_unit"/>
             <field name="name">PCE</field>
             <field name="factor">1.0</field>
-            <field name="factor_inv">1.0</field>
+            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">KGM</field>
             <field name="factor">1.0</field>
-            <field name="factor_inv">1.0</field>
+            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="uom_hour" model="product.uom">
             <field name="name">Hour</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor">8.0</field>
-            <field name="factor_inv">1.0</field>
+            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="uom_day" model="product.uom">
             <field name="name">Day</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor">1.0</field>
-            <field name="factor_inv">1.0</field>
+            <field name="factor_inv_data">1.0</field>
+        </record>
+        <record id="product_uom_ton" model="product.uom">
+            <field name="category_id" ref="product_uom_categ_kgm"/>
+            <field name="name">TON</field>
+            <field name="factor">1.0</field>
+            <field name="factor_inv_data">1.0</field>
         </record>
 
         <!--
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 68054cec0f1..19761704e88 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -8,6 +8,7 @@
         <record id="cat0" model="product.category">
             <field name="parent_id" ref="null"/>
             <field name="name">All products</field>
+            <field name="type">view</field>
         </record>
         <record id="cat1" model="product.category">
             <field name="parent_id" ref="cat0"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e6c5588f4f7..a01649850c7 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -24,6 +24,10 @@
                    <newline/>
                    <group col='8' colspan='15' expand='1' string='Group by...'>
                        <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
+                       <separator orientation="vertical"/>
+                       <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
+                       <separator orientation="vertical"/>
+                       <filter string='Type' icon="terp-stock" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
                 </search>
             </field>
@@ -41,6 +45,7 @@
                     <field name="categ_id" />
                     <field name="variants" groups="product.group_product_variant"/>
                     <field name="uom_id"/>
+                    <field name="type"/>
                     <field name="qty_available"/>
                     <field name="virtual_available"/>
                     <field name="lst_price"/>
@@ -212,6 +217,7 @@
                     <field name="name" select="1"/>
                     <field name="parent_id"/>
                     <field name="sequence"/>
+                    <field name="type"/>
                     <newline/>
                 </form>
             </field>
@@ -302,9 +308,11 @@
                 <form string="Units of Measure">
                     <field name="name" select="1"/>
                     <field name="category_id" select="1"/>
-                    <field name="factor" select="1"/>
-                    <field name="factor_inv" select="1"/>
+                    <field name="factor" select="1" attrs="{'readonly':[('uom_factor','=','bigger')]}"/>
+                    <field name="factor_inv_data" select="1" string="Factor Data" attrs="{'readonly':[('uom_factor','=','smaller')]}"/>
+                    <field name="factor_inv" invisible="1"/>
                     <field name="rounding"/>
+                    <field name="uom_factor"/>
                     <field name="active"/>
                 </form>
             </field>
@@ -344,8 +352,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packaging">
-                    <field name="name"/>
-                    <field name="type"/>
+                    <field name="name" select="1" />
+                    <field name="type" select="1" />
                 </form>
             </field>
         </record>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 9dca54aad1a..4d71b0d480a 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -17,7 +17,7 @@
     </record>
     <record id="product_comp_rule" model="ir.rule">
         <field name="rule_group" ref="product_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__terp__.py
index b0e81f341a7..9272287371a 100644
--- a/addons/product_margin/__terp__.py
+++ b/addons/product_margin/__terp__.py
@@ -31,7 +31,7 @@ the report has several options to help you get the data you need.
 """,
     'author': 'Tiny',
     'depends': ['base', 'product', 'account'],
-    'update_xml': ['product_margin_view.xml'],
+    'update_xml': ['wizard/product_margin_view.xml','product_margin_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/product_margin/i18n/ar.po b/addons/product_margin/i18n/ar.po
index 51643c9915d..561c3b1aae4 100644
--- a/addons/product_margin/i18n/ar.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/bg.po b/addons/product_margin/i18n/bg.po
index 26b2167af53..bd6c4e424dc 100644
--- a/addons/product_margin/i18n/bg.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/bs.po b/addons/product_margin/i18n/bs.po
index 501ce6e81ec..af1e64a7f11 100644
--- a/addons/product_margin/i18n/bs.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/ca.po b/addons/product_margin/i18n/ca.po
index 8b6be3e2924..e530b73759d 100644
--- a/addons/product_margin/i18n/ca.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/cs.po b/addons/product_margin/i18n/cs.po
index 9029bc0cf52..daff401f7a2 100644
--- a/addons/product_margin/i18n/cs.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/de.po b/addons/product_margin/i18n/de.po
index 18fe7b0bd3d..87634f5922c 100644
--- a/addons/product_margin/i18n/de.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/el.po b/addons/product_margin/i18n/el.po
index 42a494314ac..170d1b0bf53 100644
--- a/addons/product_margin/i18n/el.po
+++ b/addons/product_margin/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index 6210f50119d..ce04338d710 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/es_AR.po b/addons/product_margin/i18n/es_AR.po
index bdd863859bd..f1bbc4affb3 100644
--- a/addons/product_margin/i18n/es_AR.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/et.po b/addons/product_margin/i18n/et.po
index d651250cd21..5eb675ebf09 100644
--- a/addons/product_margin/i18n/et.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/fi.po b/addons/product_margin/i18n/fi.po
index 146597165f0..0ce193ec256 100644
--- a/addons/product_margin/i18n/fi.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index aaecd225018..720405eb9fa 100644
--- a/addons/product_margin/i18n/fr.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/hr.po b/addons/product_margin/i18n/hr.po
index 51643c9915d..561c3b1aae4 100644
--- a/addons/product_margin/i18n/hr.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/hu.po b/addons/product_margin/i18n/hu.po
index 51643c9915d..561c3b1aae4 100644
--- a/addons/product_margin/i18n/hu.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/id.po b/addons/product_margin/i18n/id.po
index 1a1441f8377..f5e7a0033ab 100644
--- a/addons/product_margin/i18n/id.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/it.po b/addons/product_margin/i18n/it.po
index e16304a086a..8cf01c5fe82 100644
--- a/addons/product_margin/i18n/it.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/ko.po b/addons/product_margin/i18n/ko.po
index a62a5aca85c..d75aaa59bbb 100644
--- a/addons/product_margin/i18n/ko.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/lt.po b/addons/product_margin/i18n/lt.po
index 51643c9915d..561c3b1aae4 100644
--- a/addons/product_margin/i18n/lt.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/nl.po b/addons/product_margin/i18n/nl.po
index ce22da60f84..b01166b3c55 100644
--- a/addons/product_margin/i18n/nl.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/nl_BE.po b/addons/product_margin/i18n/nl_BE.po
index eb72809736c..d39856ebef1 100644
--- a/addons/product_margin/i18n/nl_BE.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/pl.po b/addons/product_margin/i18n/pl.po
index 848953cefe2..89ac30ab3b3 100644
--- a/addons/product_margin/i18n/pl.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/pt.po b/addons/product_margin/i18n/pt.po
index 744dff2cefb..b5f60bb0fae 100644
--- a/addons/product_margin/i18n/pt.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index fde35efa82e..a5a789e71e6 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/ro.po b/addons/product_margin/i18n/ro.po
index 51643c9915d..561c3b1aae4 100644
--- a/addons/product_margin/i18n/ro.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po
index 6ca95dcd939..6f0e628e1f2 100644
--- a/addons/product_margin/i18n/ru.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/sl.po b/addons/product_margin/i18n/sl.po
index a776602835f..5a2e2877896 100644
--- a/addons/product_margin/i18n/sl.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 4b64862207f..4a44e03ecb6 100644
--- a/addons/product_margin/i18n/sv.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/tlh.po b/addons/product_margin/i18n/tlh.po
index 5992ee2b5a2..4427e02a2ab 100644
--- a/addons/product_margin/i18n/tlh.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index ce596549402..6873953567e 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/uk.po b/addons/product_margin/i18n/uk.po
index 6ec303d54af..9fd807dc620 100644
--- a/addons/product_margin/i18n/uk.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/i18n/zh_CN.po b/addons/product_margin/i18n/zh_CN.po
index 04963313286..c80ec7a88df 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/i18n/zh_CN.po
@@ -4,59 +4,59 @@
 #
 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-29 03:26+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:13+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
 #: field:product.product,expected_margin_rate:0
 msgid "Expected Margin (%)"
-msgstr "预期毛利（%）"
+msgstr "预计利润(%)"
 
 #. module: product_margin
 #: wizard_field:product.margins,init,from_date:0
 msgid "From"
-msgstr "来自"
+msgstr "从"
 
 #. module: product_margin
 #: help:product.product,sale_expected:0
 msgid ""
 "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
-msgstr "销售目录价格乘以客户发票数量总和"
+msgstr "客户发票(销售价×数量)合计"
 
 #. module: product_margin
 #: wizard_field:product.margins,init,to_date:0
 msgid "To"
-msgstr "至"
+msgstr "到"
 
 #. module: product_margin
 #: field:product.product,date_to:0
 msgid "To Date"
-msgstr "截止日期"
+msgstr "日期到"
 
 #. module: product_margin
 #: field:product.product,date_from:0
 msgid "From Date"
-msgstr "起始日期"
+msgstr "日期从"
 
 #. module: product_margin
 #: selection:product.margins,init,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Draft, Open and Paid"
-msgstr "草稿、未结和已付"
+msgstr "草稿、待处理和支付"
 
 #. module: product_margin
 #: model:ir.ui.menu,name:product_margin.menu_product_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
@@ -67,34 +67,34 @@ msgstr "平均单价"
 #. module: product_margin
 #: model:ir.module.module,shortdesc:product_margin.module_meta_information
 msgid "Margins in Product"
-msgstr "产品毛利"
+msgstr "产品利润"
 
 #. module: product_margin
 #: help:product.product,total_cost:0
 msgid ""
 "Sum of Multification of Invoice price and quantity of Supplier Invoices "
-msgstr "供应商发票价格乘以数量总和 "
+msgstr "供应商发票(发票价×数量)合计 "
 
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr "目录价格"
+msgstr "价目表"
 
 #. module: product_margin
 #: selection:product.margins,init,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Paid"
-msgstr "已付款"
+msgstr "支付"
 
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Excepted Sale - Turn Over"
-msgstr "预计销售—营业额"
+msgstr "额外销售-营业额"
 
 #. module: product_margin
 #: field:product.product,sale_expected:0
 msgid "Expected Sale"
-msgstr "预计销售"
+msgstr "预销售"
 
 #. module: product_margin
 #: view:product.product:0
@@ -109,7 +109,7 @@ msgstr "供应商发票数量合计"
 #. module: product_margin
 #: help:product.product,normal_cost:0
 msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
-msgstr "供应商发票数量乘以成本价格总和"
+msgstr "供应商发票  (成本价×数量)合计"
 
 #. module: product_margin
 #: view:product.product:0
@@ -121,7 +121,7 @@ msgstr "营业额"
 #: field:product.product,purchase_num_invoiced:0
 #: field:product.product,sale_num_invoiced:0
 msgid "# Invoiced"
-msgstr "# 已开票"
+msgstr "已开票"
 
 #. module: product_margin
 #: view:product.product:0
@@ -132,43 +132,43 @@ msgstr "总成本"
 #. module: product_margin
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: product_margin
 #: help:product.product,expected_margin:0
 msgid "Excepted Sale - Normal Cost"
-msgstr "预计销售-标准成本"
+msgstr "额外销售-普通成本"
 
 #. module: product_margin
 #: field:product.product,expected_margin:0
 msgid "Expected Margin"
-msgstr "预计毛利"
+msgstr "预计利润"
 
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnorder - Total Cost"
-msgstr "营业额—总成本"
+msgstr "总成本"
 
 #. module: product_margin
 #: view:product.product:0
 msgid "#Purchased"
-msgstr "#采购"
+msgstr "采购"
 
 #. module: product_margin
 #: help:product.product,turnover:0
 msgid ""
 "Sum of Multification of Invoice price and quantity of Customer Invoices"
-msgstr "客户发票价格乘以数量总和"
+msgstr "客户发票(发票价×数量)合计"
 
 #. module: product_margin
 #: help:product.product,expected_margin_rate:0
 msgid "Expected margin * 100 / Expected Sale"
-msgstr "预计毛利率×100/预销售"
+msgstr "预计利润率×100/预销售"
 
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
 msgid "Avg. Price in Customer Invoices)"
-msgstr "客户发票中的均价"
+msgstr "客户发票价格"
 
 #. module: product_margin
 #: wizard_view:product.margins,init:0
@@ -184,7 +184,7 @@ msgstr "发票状态"
 #. module: product_margin
 #: help:product.product,purchase_gap:0
 msgid "Normal Cost - Total Cost"
-msgstr "标准成本-总成本"
+msgstr "普通成本-总成本"
 
 #. module: product_margin
 #: view:product.product:0
@@ -195,7 +195,7 @@ msgstr "销售差距"
 #. module: product_margin
 #: field:product.product,normal_cost:0
 msgid "Normal Cost"
-msgstr "标准成本"
+msgstr "普通成本"
 
 #. module: product_margin
 #: view:product.product:0
@@ -205,17 +205,17 @@ msgstr "采购"
 #. module: product_margin
 #: help:product.product,purchase_avg_price:0
 msgid "Avg. Price in Supplier Invoices "
-msgstr "供应商发票的平均价格 "
+msgstr "供应商发票价格 "
 
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
-msgstr "总毛利"
+msgstr "总利润"
 
 #. module: product_margin
 #: help:product.product,total_margin_rate:0
 msgid "Total margin * 100 / Turnover"
-msgstr "总毛利×100/营业额"
+msgstr "总利润×100/营业额"
 
 #. module: product_margin
 #: view:product.product:0
@@ -226,7 +226,7 @@ msgstr "分析标准"
 #: selection:product.margins,init,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Open and Paid"
-msgstr "未结和支付"
+msgstr "待处理和支付"
 
 #. module: product_margin
 #: view:product.product:0
@@ -238,7 +238,7 @@ msgstr "销售"
 #: model:ir.ui.menu,name:product_margin.menu_action_product_margin
 #: view:product.product:0
 msgid "Product Margins"
-msgstr "产品毛利"
+msgstr "产品利润"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
@@ -248,12 +248,12 @@ msgstr "采购缺口"
 #. module: product_margin
 #: field:product.product,total_margin_rate:0
 msgid "Total Margin (%)"
-msgstr "总毛利率(%)"
+msgstr "总利润率(%)"
 
 #. module: product_margin
 #: wizard_button:product.margins,init,open:0
 msgid "Open Margins"
-msgstr "未结毛利"
+msgstr "待处理利润"
 
 #. module: product_margin
 #: wizard_button:product.margins,init,end:0
@@ -263,7 +263,7 @@ msgstr "取消"
 #. module: product_margin
 #: view:product.product:0
 msgid "Margins"
-msgstr "毛利"
+msgstr "利润"
 
 #. module: product_margin
 #: help:product.product,sale_num_invoiced:0
@@ -273,4 +273,14 @@ msgstr "客户发票数量合计"
 #. module: product_margin
 #: wizard_view:product.margins,init:0
 msgid "View Stock of Products"
-msgstr "查看货品库存"
+msgstr "查看库存产品"
+
+#~ msgid ""
+#~ "\n"
+#~ "Adds a reporting menu in products that computes sales, purchases, margins\n"
+#~ "and others interesting indicators based on invoices. The wizard to launch\n"
+#~ "the report has several options to help you get the data you need.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "在计算产m品销售,采购,利润和其它基于发票利益指标上增加一个报表菜单.\n"
+#~ "这向导启动几种选择报表来帮助你获得你需要的资料\n"
diff --git a/addons/product_margin/i18n/zh_TW.po b/addons/product_margin/i18n/zh_TW.po
index 82a41683a89..defc1d75a78 100644
--- a/addons/product_margin/i18n/zh_TW.po
+++ b/addons/product_margin/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: product_margin
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 03dfbdf2280..36ed9a70a33 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-
-    <wizard id="action_open_margin" menu="False" model="product.product" name="product.margins" string="Product Margins"/>
-
-<!--    <menuitem id="menu_product_reporting"-->
-<!--        name="Reporting" parent ="product.menu_main_product"-->
-<!--        groups="product.group_product_manager"/>-->
-<!---->
-<!--    <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />-->
-
+            
     <record model="ir.ui.view" id="view_product_margin_graph">
             <field name="name">product.margin.graph</field>
             <field name="model">product.product</field>
diff --git a/addons/product_margin/wizard/__init__.py b/addons/product_margin/wizard/__init__.py
index 4e2ecc2e39a..e1f1680bccb 100644
--- a/addons/product_margin/wizard/__init__.py
+++ b/addons/product_margin/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wizard_product_margin
+import product_margin
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
new file mode 100644
index 00000000000..1907c6695c2
--- /dev/null
+++ b/addons/product_margin/wizard/product_margin.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from osv import osv
+from osv import fields
+
+import netsvc
+import time
+from tools.translate import _
+class product_margin(osv.osv_memory):
+    '''
+    Product Margin
+    '''
+    _name = 'product.margin'
+    _description = 'Product Margin'
+
+    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: the ID or list of IDs if we want more than one
+
+            @return:
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
+        view_res3 = cr.fetchone()[0]
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
+        view_res2 = cr.fetchone()[0]
+        cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
+        view_res = cr.fetchone()[0]
+
+        #get the current product.margin object to obtain the values from it
+        product_margin_obj = self.browse(cr,uid,ids)[0]
+
+        return {
+            'name': _('Product Margins'),
+            'context':{'date_from':product_margin_obj.from_date,'date_to':product_margin_obj.to_date,'invoice_state' : product_margin_obj.invoice_state},
+            'view_type': 'form',
+            "view_mode": 'tree,form,graph',
+            'res_model':'product.product',
+            'type': 'ir.actions.act_window',
+            'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')],
+            'view_id': False,
+            'search_view_id': id['res_id']
+        }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+           
+
+            @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 if we want more than one
+
+            @return:
+        """
+        return {'type':'ir.actions.act_window_close'}
+
+    _columns = {
+        #TODO : import time required to get currect date
+        'from_date': fields.date('From'),
+        #TODO : import time required to get currect date
+        'to_date': fields.date('To'),
+        'invoice_state':fields.selection([
+           ('paid','Paid'),
+           ('open_paid','Open and Paid'),
+           ('draft_open_paid','Draft, Open and Paid'),
+        ],'Invoice State', select=True, required=True),
+    }
+    _defaults = {
+        'from_date':  lambda *a:time.strftime('%Y-01-01'),
+        'to_date': lambda *a:time.strftime('%Y-01-01'),
+        'invoice_state': lambda *a:"open_paid",
+    }
+product_margin()
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
new file mode 100644
index 00000000000..66869e120a5
--- /dev/null
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+        <data>
+	     	<record id="product_margin_form_view" model="ir.ui.view">
+	            <field name="name">product.margin.form</field>
+	            <field name="model">product.margin</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Properties categories">
+	                    <separator colspan="4" string="General Information"/>
+						<field name="from_date" />
+						<field name="to_date" />
+						<field name="invoice_state" />
+						<group col="4" colspan="2">
+						    	<button special="cancel" string="Cancel" type="object"/>
+						    	<button name="action_open_window" string="Open Margins" type="object"/>
+						</group>
+	                </form>
+	            </field>
+	        </record>
+<!--  		        
+			<act_window name="Test Wizard"
+					res_model="product.margin"
+					src_model="product.product"
+					view_mode="form"
+					target="new"
+					key2="client_action_multi"    
+					id="product_margin_act_window"/>	       
+       
+    -->
+
+        </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
deleted file mode 100644
index 625cfd4c1df..00000000000
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-from tools.translate import _
-
-def _action_open_window(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname) 
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
-    id = mod_obj.read(cr, uid, result, ['res_id'])    
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
-    view_res3 = cr.fetchone()[0]
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
-    view_res2 = cr.fetchone()[0]
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
-    view_res = cr.fetchone()[0]
-    return {
-        'name': _('Product Margins'),
-        'context':{'date_from':data['form']['from_date'],'date_to':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
-        'view_type': 'form',
-        "view_mode": 'tree,form,graph',
-        'res_model':'product.product',
-        'type': 'ir.actions.act_window',
-        'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')],
-        'view_id': False,
-        'search_view_id': id['res_id'] 
-    }
-
-
-class product_margins(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Stock of Products">
-        <separator string="Select " colspan="4"/>
-        <field name="from_date"/>
-        <field name="to_date"/>
-        <field name="invoice_state"/>
-    </form>'''
-    form1_fields = {
-             'from_date': {
-                'string': 'From',
-                'type': 'date',
-                'default': lambda *a:time.strftime('%Y-01-01'),
-
-        },
-             'to_date': {
-                'string': 'To',
-                'type': 'date',
-                'default': lambda *a:time.strftime('%Y-12-31'),
-
-        },
-         'invoice_state': {
-                'string': 'Invoice State',
-                'type': 'selection',
-                'selection': [('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid'),],
-                'required': True,
-                'default': lambda *a:"open_paid",
-        },
-    }
-
-    states = {
-      'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Margins','gtk-ok')]}
-        },
-    'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-product_margins('product.margins')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_accounting/i18n/ar.po b/addons/profile_accounting/i18n/ar.po
index 84b69651dbb..b2db90ddd73 100644
--- a/addons/profile_accounting/i18n/ar.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/bg.po b/addons/profile_accounting/i18n/bg.po
index 72d84513878..49b530ba60f 100644
--- a/addons/profile_accounting/i18n/bg.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/bs.po b/addons/profile_accounting/i18n/bs.po
index 264065c017f..39a08c846c6 100644
--- a/addons/profile_accounting/i18n/bs.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/ca.po b/addons/profile_accounting/i18n/ca.po
index d17c7ab4ca3..cab03fea221 100644
--- a/addons/profile_accounting/i18n/ca.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/cs.po b/addons/profile_accounting/i18n/cs.po
index 84b69651dbb..b2db90ddd73 100644
--- a/addons/profile_accounting/i18n/cs.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/de.po b/addons/profile_accounting/i18n/de.po
index 88e2c497602..77750dc7099 100644
--- a/addons/profile_accounting/i18n/de.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/el.po b/addons/profile_accounting/i18n/el.po
index b7d04715f85..40c2fa4ab33 100644
--- a/addons/profile_accounting/i18n/el.po
+++ b/addons/profile_accounting/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/profile_accounting/i18n/es.po b/addons/profile_accounting/i18n/es.po
index ed100a6472f..74370e73a99 100644
--- a/addons/profile_accounting/i18n/es.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/es_AR.po b/addons/profile_accounting/i18n/es_AR.po
index 4fb88444706..160e59fa1b6 100644
--- a/addons/profile_accounting/i18n/es_AR.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/et.po b/addons/profile_accounting/i18n/et.po
index ea33300f29c..e876a2ff6b8 100644
--- a/addons/profile_accounting/i18n/et.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/fr.po b/addons/profile_accounting/i18n/fr.po
index c9b04a62813..fcae7dd5b36 100644
--- a/addons/profile_accounting/i18n/fr.po
+++ b/addons/profile_accounting/i18n/fr.po
@@ -8,13 +8,12 @@ msgstr ""
 "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:01+0000\n"
-"Last-Translator: Christian Draux - reseaucerta.org "
-"<christian.draux@reseaucerta.org>\n"
+"Last-Translator: Christian Draux - reseaucerta.org <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/hr.po b/addons/profile_accounting/i18n/hr.po
index 84b69651dbb..b2db90ddd73 100644
--- a/addons/profile_accounting/i18n/hr.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/hu.po b/addons/profile_accounting/i18n/hu.po
index 84b69651dbb..b2db90ddd73 100644
--- a/addons/profile_accounting/i18n/hu.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/id.po b/addons/profile_accounting/i18n/id.po
index 780bb426517..b4da4a4dda7 100644
--- a/addons/profile_accounting/i18n/id.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/it.po b/addons/profile_accounting/i18n/it.po
index 957f31289fd..c4aec433529 100644
--- a/addons/profile_accounting/i18n/it.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/ko.po b/addons/profile_accounting/i18n/ko.po
index ae2e212ab6c..fb98a8cd94f 100644
--- a/addons/profile_accounting/i18n/ko.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/lt.po b/addons/profile_accounting/i18n/lt.po
index 84b69651dbb..b2db90ddd73 100644
--- a/addons/profile_accounting/i18n/lt.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/nl.po b/addons/profile_accounting/i18n/nl.po
index 49f417fadc5..390bae6c716 100644
--- a/addons/profile_accounting/i18n/nl.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/nl_BE.po b/addons/profile_accounting/i18n/nl_BE.po
index 72de1a20497..5bf8a40ba53 100644
--- a/addons/profile_accounting/i18n/nl_BE.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/pl.po b/addons/profile_accounting/i18n/pl.po
index 9f5824630ba..6c9051a1f1c 100644
--- a/addons/profile_accounting/i18n/pl.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/pt.po b/addons/profile_accounting/i18n/pt.po
index 59a9931adab..f285b92882e 100644
--- a/addons/profile_accounting/i18n/pt.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/pt_BR.po b/addons/profile_accounting/i18n/pt_BR.po
index 91172ebd600..62759eb5b61 100644
--- a/addons/profile_accounting/i18n/pt_BR.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/ro.po b/addons/profile_accounting/i18n/ro.po
index ac6618f4ae2..1439286d58e 100644
--- a/addons/profile_accounting/i18n/ro.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/ru.po b/addons/profile_accounting/i18n/ru.po
index 9022644e231..188cdf454b0 100644
--- a/addons/profile_accounting/i18n/ru.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/sl.po b/addons/profile_accounting/i18n/sl.po
index 0a2ef8c3dc8..207ff870535 100644
--- a/addons/profile_accounting/i18n/sl.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/sv.po b/addons/profile_accounting/i18n/sv.po
index 2291ddf9eed..76e58167586 100644
--- a/addons/profile_accounting/i18n/sv.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/tlh.po b/addons/profile_accounting/i18n/tlh.po
index 0d810c6590f..99be6cb146a 100644
--- a/addons/profile_accounting/i18n/tlh.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/tr.po b/addons/profile_accounting/i18n/tr.po
index 440764f13fd..a3fa628d724 100644
--- a/addons/profile_accounting/i18n/tr.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/uk.po b/addons/profile_accounting/i18n/uk.po
index 667b28c1eec..81763911f45 100644
--- a/addons/profile_accounting/i18n/uk.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/zh_CN.po b/addons/profile_accounting/i18n/zh_CN.po
index d81a8a2894e..dc4dabd3b92 100644
--- a/addons/profile_accounting/i18n/zh_CN.po
+++ b/addons/profile_accounting/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: 2009-12-03 13:28+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 09:13+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
@@ -22,13 +22,13 @@ msgid ""
 "Install more modules. A few modules are proposed according to the Account "
 "Profile you selected. You will be able to install them based on our "
 "requirements."
-msgstr ""
+msgstr "根据你选择的会计配置.有几个模块是被推荐的根据这你将完成安装."
 
 #. module: profile_accounting
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
@@ -42,14 +42,12 @@ msgid ""
 "automatically index, search and preview all kind of documents (internal "
 "documents, printed reports, calendar system). It opens an FTP access for the "
 "users to easily browse association's document."
-msgstr ""
-"Open ERP的单据管理系统，运行你保存、浏览、自动索引、搜索和预览所有单据（包括内部单据、打印报表、日历系统）。It opens an FTP "
-"access for the users to easily browse association's document."
+msgstr "系统文档管理允许你储存,浏览,自动建立索引,查找和预览各种文档."
 
 #. module: profile_accounting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
@@ -64,42 +62,42 @@ msgstr "供应商付款管理"
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_asset:0
 msgid "Asset Management"
-msgstr "固定资产管理"
+msgstr "资产管理"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "多个辅助核算方案"
 
 #. module: profile_accounting
 #: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
 msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
+msgstr "会计配置:安装额外的模块"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
 msgid "Invoice on Analytic Entries"
-msgstr ""
+msgstr "辅助核算凭证的发票"
 
 #. module: profile_accounting
 #: model:ir.module.module,description:profile_accounting.module_meta_information
 msgid "Profile for Accounting"
-msgstr ""
+msgstr "会计配置"
 
 #. module: profile_accounting
 #: help:profile.accounting.config.install_modules_wizard,account_budget:0
 msgid "Helps you to manage financial and analytic budgets."
-msgstr "帮助您管理财务预算"
+msgstr "帮助你管理财务和核算预算"
 
 #. module: profile_accounting
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构"
+msgstr "无效XML视图结构!"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_budget:0
@@ -114,17 +112,17 @@ msgstr "安装"
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Install Extra Module"
-msgstr ""
+msgstr "安装额外的模块"
 
 #. module: profile_accounting
 #: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
 msgid "Accounting only profile"
-msgstr ""
+msgstr "会计配置"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
 msgid "Analytic Accounting"
-msgstr "分析科目"
+msgstr "核算会计"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,board_document:0
@@ -140,3 +138,6 @@ msgstr "profile.accounting.config.install_modules_wizard"
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Cancel"
 msgstr "取消"
+
+#~ msgid "Accounting Management"
+#~ msgstr "会计管理"
diff --git a/addons/profile_accounting/i18n/zh_TW.po b/addons/profile_accounting/i18n/zh_TW.po
index 14319a61563..6048e8a7aef 100644
--- a/addons/profile_accounting/i18n/zh_TW.po
+++ b/addons/profile_accounting/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_association/i18n/ar.po b/addons/profile_association/i18n/ar.po
index 1118002e76d..e12d83034e0 100644
--- a/addons/profile_association/i18n/ar.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/bg.po b/addons/profile_association/i18n/bg.po
index 21206c9a6d1..785b0a3a805 100644
--- a/addons/profile_association/i18n/bg.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/bs.po b/addons/profile_association/i18n/bs.po
index c7bddfc0fef..b6a4ac6afed 100644
--- a/addons/profile_association/i18n/bs.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/ca.po b/addons/profile_association/i18n/ca.po
index 3cc91515f10..cf7ae2c4c5f 100644
--- a/addons/profile_association/i18n/ca.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/cs.po b/addons/profile_association/i18n/cs.po
index d72415d6214..9dbfa982704 100644
--- a/addons/profile_association/i18n/cs.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/de.po b/addons/profile_association/i18n/de.po
index f59d74662fb..3d9125aca15 100644
--- a/addons/profile_association/i18n/de.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/es.po b/addons/profile_association/i18n/es.po
index 9aae41daa52..484da70b8b5 100644
--- a/addons/profile_association/i18n/es.po
+++ b/addons/profile_association/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/es_AR.po b/addons/profile_association/i18n/es_AR.po
index fb9bcd3eda7..7434e47513a 100644
--- a/addons/profile_association/i18n/es_AR.po
+++ b/addons/profile_association/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/et.po b/addons/profile_association/i18n/et.po
index 6c4c62e345d..83ea27f5853 100644
--- a/addons/profile_association/i18n/et.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/fr.po b/addons/profile_association/i18n/fr.po
index c3e1fd9ce9d..419cd1b7396 100644
--- a/addons/profile_association/i18n/fr.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/hr.po b/addons/profile_association/i18n/hr.po
index 1118002e76d..e12d83034e0 100644
--- a/addons/profile_association/i18n/hr.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/hu.po b/addons/profile_association/i18n/hu.po
index 1118002e76d..e12d83034e0 100644
--- a/addons/profile_association/i18n/hu.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/id.po b/addons/profile_association/i18n/id.po
index 15b79fe7283..d7abfbaa342 100644
--- a/addons/profile_association/i18n/id.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/it.po b/addons/profile_association/i18n/it.po
index fe31c902c8f..d4f718aed83 100644
--- a/addons/profile_association/i18n/it.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/ko.po b/addons/profile_association/i18n/ko.po
index 5af23805f50..196bc37e73b 100644
--- a/addons/profile_association/i18n/ko.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/lt.po b/addons/profile_association/i18n/lt.po
index 1118002e76d..e12d83034e0 100644
--- a/addons/profile_association/i18n/lt.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/nl.po b/addons/profile_association/i18n/nl.po
index 3d10eedec8e..7346bc3d547 100644
--- a/addons/profile_association/i18n/nl.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/nl_BE.po b/addons/profile_association/i18n/nl_BE.po
index 8c779a17801..207beb0a04d 100644
--- a/addons/profile_association/i18n/nl_BE.po
+++ b/addons/profile_association/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/pl.po b/addons/profile_association/i18n/pl.po
index fc0c10ad7a6..15921979a34 100644
--- a/addons/profile_association/i18n/pl.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/pt.po b/addons/profile_association/i18n/pt.po
index 793651a4a0d..15d9eafac99 100644
--- a/addons/profile_association/i18n/pt.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/pt_BR.po b/addons/profile_association/i18n/pt_BR.po
index 7877a1c5ff8..8a157089629 100644
--- a/addons/profile_association/i18n/pt_BR.po
+++ b/addons/profile_association/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/ro.po b/addons/profile_association/i18n/ro.po
index 1118002e76d..e12d83034e0 100644
--- a/addons/profile_association/i18n/ro.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/ru.po b/addons/profile_association/i18n/ru.po
index 2cc058dfca1..198532bbdd2 100644
--- a/addons/profile_association/i18n/ru.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/sl.po b/addons/profile_association/i18n/sl.po
index 9221db30447..0729fe03527 100644
--- a/addons/profile_association/i18n/sl.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/sv.po b/addons/profile_association/i18n/sv.po
index 5eed2b83d33..17bce349399 100644
--- a/addons/profile_association/i18n/sv.po
+++ b/addons/profile_association/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/tlh.po b/addons/profile_association/i18n/tlh.po
index df232a7e7ef..cd60128f2b8 100644
--- a/addons/profile_association/i18n/tlh.po
+++ b/addons/profile_association/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/tr.po b/addons/profile_association/i18n/tr.po
index 1f3d2f16127..3a9d7dca69e 100644
--- a/addons/profile_association/i18n/tr.po
+++ b/addons/profile_association/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/uk.po b/addons/profile_association/i18n/uk.po
index 42fe369f840..c8a65c941ec 100644
--- a/addons/profile_association/i18n/uk.po
+++ b/addons/profile_association/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/zh_CN.po b/addons/profile_association/i18n/zh_CN.po
index 8313003b126..5c1605ad648 100644
--- a/addons/profile_association/i18n/zh_CN.po
+++ b/addons/profile_association/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/zh_TW.po b/addons/profile_association/i18n/zh_TW.po
index 7987364ea89..9db74c21153 100644
--- a/addons/profile_association/i18n/zh_TW.po
+++ b/addons/profile_association/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_auction/i18n/ar.po b/addons/profile_auction/i18n/ar.po
index 32d3738cb2f..fba3fd23722 100644
--- a/addons/profile_auction/i18n/ar.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/bg.po b/addons/profile_auction/i18n/bg.po
index 4fbb129764c..98a4f4c9613 100644
--- a/addons/profile_auction/i18n/bg.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/bs.po b/addons/profile_auction/i18n/bs.po
index dd95dcb2d36..76fe2276754 100644
--- a/addons/profile_auction/i18n/bs.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/ca.po b/addons/profile_auction/i18n/ca.po
index dda7c67371f..e153b646c4d 100644
--- a/addons/profile_auction/i18n/ca.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/cs.po b/addons/profile_auction/i18n/cs.po
index 3405d961a1e..9f6447a48cb 100644
--- a/addons/profile_auction/i18n/cs.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/csb.po b/addons/profile_auction/i18n/csb.po
index 6b06b615e86..f3577430480 100644
--- a/addons/profile_auction/i18n/csb.po
+++ b/addons/profile_auction/i18n/csb.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: profile_auction
diff --git a/addons/profile_auction/i18n/de.po b/addons/profile_auction/i18n/de.po
index b9fb498622e..d904e5a50d1 100644
--- a/addons/profile_auction/i18n/de.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/es.po b/addons/profile_auction/i18n/es.po
index b09d8829ea8..c11294d7d57 100644
--- a/addons/profile_auction/i18n/es.po
+++ b/addons/profile_auction/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: profile_auction
diff --git a/addons/profile_auction/i18n/es_AR.po b/addons/profile_auction/i18n/es_AR.po
index bf32a12e2b9..8d7ab7fb68d 100644
--- a/addons/profile_auction/i18n/es_AR.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/et.po b/addons/profile_auction/i18n/et.po
index 4c95ea6c22f..76ab425b753 100644
--- a/addons/profile_auction/i18n/et.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/fr.po b/addons/profile_auction/i18n/fr.po
index 73c0b3293f9..4cf21740d54 100644
--- a/addons/profile_auction/i18n/fr.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/gl.po b/addons/profile_auction/i18n/gl.po
index 56776956051..c1ae5704fec 100644
--- a/addons/profile_auction/i18n/gl.po
+++ b/addons/profile_auction/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/hr.po b/addons/profile_auction/i18n/hr.po
index 679de01c196..020226933b6 100644
--- a/addons/profile_auction/i18n/hr.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/hu.po b/addons/profile_auction/i18n/hu.po
index 32d3738cb2f..fba3fd23722 100644
--- a/addons/profile_auction/i18n/hu.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/id.po b/addons/profile_auction/i18n/id.po
index e50c4016090..ebeeb530e2b 100644
--- a/addons/profile_auction/i18n/id.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/it.po b/addons/profile_auction/i18n/it.po
index 19e797729eb..d910797f5c4 100644
--- a/addons/profile_auction/i18n/it.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/ko.po b/addons/profile_auction/i18n/ko.po
index 3c0f9af2170..a4b48b2a22c 100644
--- a/addons/profile_auction/i18n/ko.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/lt.po b/addons/profile_auction/i18n/lt.po
index 05dbebf0af6..ee6a21b3569 100644
--- a/addons/profile_auction/i18n/lt.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/nl.po b/addons/profile_auction/i18n/nl.po
index 6d088410f1f..158416fbd13 100644
--- a/addons/profile_auction/i18n/nl.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/nl_BE.po b/addons/profile_auction/i18n/nl_BE.po
index 40fce17e951..b0bbded828b 100644
--- a/addons/profile_auction/i18n/nl_BE.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/pl.po b/addons/profile_auction/i18n/pl.po
index 54d6dd1b7b1..3979ce7eb4d 100644
--- a/addons/profile_auction/i18n/pl.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/pt.po b/addons/profile_auction/i18n/pt.po
index 3b1e472d9c3..d12e8632373 100644
--- a/addons/profile_auction/i18n/pt.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/pt_BR.po b/addons/profile_auction/i18n/pt_BR.po
index 71d6657006a..8de62596408 100644
--- a/addons/profile_auction/i18n/pt_BR.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/ro.po b/addons/profile_auction/i18n/ro.po
index 0401c6cc1f3..43df4988be8 100644
--- a/addons/profile_auction/i18n/ro.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/ru.po b/addons/profile_auction/i18n/ru.po
index 32d3738cb2f..fba3fd23722 100644
--- a/addons/profile_auction/i18n/ru.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/sk.po b/addons/profile_auction/i18n/sk.po
index 7349db9180c..6cad22a3a4f 100644
--- a/addons/profile_auction/i18n/sk.po
+++ b/addons/profile_auction/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: profile_auction
diff --git a/addons/profile_auction/i18n/sl.po b/addons/profile_auction/i18n/sl.po
index 3f4bf997fac..09c61d3a88d 100644
--- a/addons/profile_auction/i18n/sl.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/sv.po b/addons/profile_auction/i18n/sv.po
index 05dbebf0af6..ee6a21b3569 100644
--- a/addons/profile_auction/i18n/sv.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/tr.po b/addons/profile_auction/i18n/tr.po
index eb8a9b28e27..08ca9ca8ca0 100644
--- a/addons/profile_auction/i18n/tr.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/uk.po b/addons/profile_auction/i18n/uk.po
index fd281e2fefa..30269d2d307 100644
--- a/addons/profile_auction/i18n/uk.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/zh_CN.po b/addons/profile_auction/i18n/zh_CN.po
index eea1d450b03..93e0b52a8c4 100644
--- a/addons/profile_auction/i18n/zh_CN.po
+++ b/addons/profile_auction/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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: profile_auction
diff --git a/addons/profile_auction/i18n/zh_TW.po b/addons/profile_auction/i18n/zh_TW.po
index 32d3738cb2f..fba3fd23722 100644
--- a/addons/profile_auction/i18n/zh_TW.po
+++ b/addons/profile_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 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_crm/i18n/ar.po b/addons/profile_crm/i18n/ar.po
index 12d34ad274f..0fc2f23f749 100644
--- a/addons/profile_crm/i18n/ar.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/bg.po b/addons/profile_crm/i18n/bg.po
index 62116994343..856109c296c 100644
--- a/addons/profile_crm/i18n/bg.po
+++ b/addons/profile_crm/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/bs.po b/addons/profile_crm/i18n/bs.po
index 12d34ad274f..0fc2f23f749 100644
--- a/addons/profile_crm/i18n/bs.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/ca.po b/addons/profile_crm/i18n/ca.po
index 511614fb8e2..fcdd1d54f4c 100644
--- a/addons/profile_crm/i18n/ca.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/cs.po b/addons/profile_crm/i18n/cs.po
index e93b14cd7ac..576f5e59628 100644
--- a/addons/profile_crm/i18n/cs.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/da.po b/addons/profile_crm/i18n/da.po
index cdac862ee26..c7f9cebf507 100644
--- a/addons/profile_crm/i18n/da.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/de.po b/addons/profile_crm/i18n/de.po
index 3746cb8efe5..ee21788105b 100644
--- a/addons/profile_crm/i18n/de.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/el.po b/addons/profile_crm/i18n/el.po
index 0eb4e40e192..4b8aae66a29 100644
--- a/addons/profile_crm/i18n/el.po
+++ b/addons/profile_crm/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/profile_crm/i18n/es.po b/addons/profile_crm/i18n/es.po
index 209f4bae6be..2460dacb684 100644
--- a/addons/profile_crm/i18n/es.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/es_AR.po b/addons/profile_crm/i18n/es_AR.po
index 31777e846c6..c5a1f1c87c6 100644
--- a/addons/profile_crm/i18n/es_AR.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/et.po b/addons/profile_crm/i18n/et.po
index f076de36f99..c56e7d548df 100644
--- a/addons/profile_crm/i18n/et.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/fr.po b/addons/profile_crm/i18n/fr.po
index 933383f257a..9a6252dbeea 100644
--- a/addons/profile_crm/i18n/fr.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/gl.po b/addons/profile_crm/i18n/gl.po
index 0f2e86d655f..2fd3cc49400 100644
--- a/addons/profile_crm/i18n/gl.po
+++ b/addons/profile_crm/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/hr.po b/addons/profile_crm/i18n/hr.po
index 8ef9fcc9fff..74b3beba236 100644
--- a/addons/profile_crm/i18n/hr.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/hu.po b/addons/profile_crm/i18n/hu.po
index 12d34ad274f..0fc2f23f749 100644
--- a/addons/profile_crm/i18n/hu.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/id.po b/addons/profile_crm/i18n/id.po
index 40ed56de343..56b55cecc8a 100644
--- a/addons/profile_crm/i18n/id.po
+++ b/addons/profile_crm/i18n/id.po
@@ -13,10 +13,10 @@ msgstr ""
 "MIME-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: profile_crm
 #: model:ir.module.module,description:profile_crm.module_meta_information
 msgid "Profile for CRM"
-msgstr ""
+msgstr "Profil untuk CRM"
diff --git a/addons/profile_crm/i18n/it.po b/addons/profile_crm/i18n/it.po
index 20f66c0d3db..bad24bf71e3 100644
--- a/addons/profile_crm/i18n/it.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/ko.po b/addons/profile_crm/i18n/ko.po
index 18740791d41..3aa7317933f 100644
--- a/addons/profile_crm/i18n/ko.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/lt.po b/addons/profile_crm/i18n/lt.po
index 46a70ace276..c0f3a4e56ac 100644
--- a/addons/profile_crm/i18n/lt.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/nl.po b/addons/profile_crm/i18n/nl.po
index 823b5a41a7e..8498cdd9591 100644
--- a/addons/profile_crm/i18n/nl.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/nl_BE.po b/addons/profile_crm/i18n/nl_BE.po
index adea52d3453..5cd51414ec2 100644
--- a/addons/profile_crm/i18n/nl_BE.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/pl.po b/addons/profile_crm/i18n/pl.po
index 7e6e5093755..49f086c2ee7 100644
--- a/addons/profile_crm/i18n/pl.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/pt.po b/addons/profile_crm/i18n/pt.po
index 4cf629b7e78..095dfb42606 100644
--- a/addons/profile_crm/i18n/pt.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/pt_BR.po b/addons/profile_crm/i18n/pt_BR.po
index 9835bcb01a2..b4dbb147fdf 100644
--- a/addons/profile_crm/i18n/pt_BR.po
+++ b/addons/profile_crm/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 12:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-24 01:34+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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: profile_crm
 #: model:ir.module.module,description:profile_crm.module_meta_information
 msgid "Profile for CRM"
-msgstr ""
+msgstr "Perfil para CRM"
diff --git a/addons/profile_crm/i18n/ro.po b/addons/profile_crm/i18n/ro.po
index 81a3c7a6c95..3bc0811c9d4 100644
--- a/addons/profile_crm/i18n/ro.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/ru.po b/addons/profile_crm/i18n/ru.po
index 78cab6b59d2..5762d497e9c 100644
--- a/addons/profile_crm/i18n/ru.po
+++ b/addons/profile_crm/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/sk.po b/addons/profile_crm/i18n/sk.po
index f9d17ed1955..24c3363c424 100644
--- a/addons/profile_crm/i18n/sk.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/sl.po b/addons/profile_crm/i18n/sl.po
index b2446df3bc2..c6d8cecee36 100644
--- a/addons/profile_crm/i18n/sl.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/sv.po b/addons/profile_crm/i18n/sv.po
index fdaa7452d17..f0234a64b57 100644
--- a/addons/profile_crm/i18n/sv.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/tr.po b/addons/profile_crm/i18n/tr.po
index 5cb731e1f52..b6ded646b34 100644
--- a/addons/profile_crm/i18n/tr.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/uk.po b/addons/profile_crm/i18n/uk.po
index 8b7fc28222b..4a42c211630 100644
--- a/addons/profile_crm/i18n/uk.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_crm/i18n/zh_CN.po b/addons/profile_crm/i18n/zh_CN.po
index 31134695e12..d8112acb487 100644
--- a/addons/profile_crm/i18n/zh_CN.po
+++ b/addons/profile_crm/i18n/zh_CN.po
@@ -4,19 +4,22 @@
 #
 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-12-01 15:46+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 09:14+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
 #: model:ir.module.module,description:profile_crm.module_meta_information
 msgid "Profile for CRM"
 msgstr "客户关系管理配置"
+
+#~ msgid "CRM profile"
+#~ msgstr "客户关系管理配置"
diff --git a/addons/profile_crm/i18n/zh_TW.po b/addons/profile_crm/i18n/zh_TW.po
index 12d34ad274f..0fc2f23f749 100644
--- a/addons/profile_crm/i18n/zh_TW.po
+++ b/addons/profile_crm/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: profile_crm
diff --git a/addons/profile_manufacturing/i18n/ar.po b/addons/profile_manufacturing/i18n/ar.po
index 3a107bf524e..9aa363ce74c 100644
--- a/addons/profile_manufacturing/i18n/ar.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/bg.po b/addons/profile_manufacturing/i18n/bg.po
index 55029f7def9..b1e64f54bea 100644
--- a/addons/profile_manufacturing/i18n/bg.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/bs.po b/addons/profile_manufacturing/i18n/bs.po
index 0b18708759e..f351a3eeab9 100644
--- a/addons/profile_manufacturing/i18n/bs.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/ca.po b/addons/profile_manufacturing/i18n/ca.po
index 68cd555b03a..92285dd98eb 100644
--- a/addons/profile_manufacturing/i18n/ca.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/cs.po b/addons/profile_manufacturing/i18n/cs.po
index 3a107bf524e..9aa363ce74c 100644
--- a/addons/profile_manufacturing/i18n/cs.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/de.po b/addons/profile_manufacturing/i18n/de.po
index 915b775882e..7cbda85de1c 100644
--- a/addons/profile_manufacturing/i18n/de.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/el.po b/addons/profile_manufacturing/i18n/el.po
index 0c83fec3e37..c829382ed6e 100644
--- a/addons/profile_manufacturing/i18n/el.po
+++ b/addons/profile_manufacturing/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/profile_manufacturing/i18n/es.po b/addons/profile_manufacturing/i18n/es.po
index c4f77182f0f..39cfc93960b 100644
--- a/addons/profile_manufacturing/i18n/es.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/es_AR.po b/addons/profile_manufacturing/i18n/es_AR.po
index 8d696847d0c..78a2211d18a 100644
--- a/addons/profile_manufacturing/i18n/es_AR.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/et.po b/addons/profile_manufacturing/i18n/et.po
index 0bdc28b32f2..56ddc18ce38 100644
--- a/addons/profile_manufacturing/i18n/et.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/fr.po b/addons/profile_manufacturing/i18n/fr.po
index 5620499b9a2..d5d2a50e198 100644
--- a/addons/profile_manufacturing/i18n/fr.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/hr.po b/addons/profile_manufacturing/i18n/hr.po
index fbfddd490a0..64c68a4f488 100644
--- a/addons/profile_manufacturing/i18n/hr.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/hu.po b/addons/profile_manufacturing/i18n/hu.po
index 3a107bf524e..9aa363ce74c 100644
--- a/addons/profile_manufacturing/i18n/hu.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/id.po b/addons/profile_manufacturing/i18n/id.po
index 65e695c1e06..291385b32d0 100644
--- a/addons/profile_manufacturing/i18n/id.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/it.po b/addons/profile_manufacturing/i18n/it.po
index c0f70179709..5c2f6398cf9 100644
--- a/addons/profile_manufacturing/i18n/it.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/ko.po b/addons/profile_manufacturing/i18n/ko.po
index b2205ae689b..64dbecf42b7 100644
--- a/addons/profile_manufacturing/i18n/ko.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/lt.po b/addons/profile_manufacturing/i18n/lt.po
index 3a107bf524e..9aa363ce74c 100644
--- a/addons/profile_manufacturing/i18n/lt.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/nl.po b/addons/profile_manufacturing/i18n/nl.po
index 2ddc035578a..79a37300dc5 100644
--- a/addons/profile_manufacturing/i18n/nl.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/nl_BE.po b/addons/profile_manufacturing/i18n/nl_BE.po
index 89b2a93f031..06970eb8b5c 100644
--- a/addons/profile_manufacturing/i18n/nl_BE.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/pl.po b/addons/profile_manufacturing/i18n/pl.po
index 3b1a9a969ee..7ff2cc0a98f 100644
--- a/addons/profile_manufacturing/i18n/pl.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/pt.po b/addons/profile_manufacturing/i18n/pt.po
index 75009868795..72eaf661d0d 100644
--- a/addons/profile_manufacturing/i18n/pt.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/pt_BR.po b/addons/profile_manufacturing/i18n/pt_BR.po
index c8e88394063..72e84b25f96 100644
--- a/addons/profile_manufacturing/i18n/pt_BR.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/ro.po b/addons/profile_manufacturing/i18n/ro.po
index 3a107bf524e..9aa363ce74c 100644
--- a/addons/profile_manufacturing/i18n/ro.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/ru.po b/addons/profile_manufacturing/i18n/ru.po
index c63400c516b..3c0e59fb8f8 100644
--- a/addons/profile_manufacturing/i18n/ru.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/sl.po b/addons/profile_manufacturing/i18n/sl.po
index deb2970c366..ceeaedf8d43 100644
--- a/addons/profile_manufacturing/i18n/sl.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/sv.po b/addons/profile_manufacturing/i18n/sv.po
index 55d5e47d2e6..7f288715c92 100644
--- a/addons/profile_manufacturing/i18n/sv.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/tlh.po b/addons/profile_manufacturing/i18n/tlh.po
index 22cdb87b56f..f312947ceb4 100644
--- a/addons/profile_manufacturing/i18n/tlh.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/tr.po b/addons/profile_manufacturing/i18n/tr.po
index 81be05993db..3df91389cdf 100644
--- a/addons/profile_manufacturing/i18n/tr.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/uk.po b/addons/profile_manufacturing/i18n/uk.po
index af24072bd0c..6b677f873bb 100644
--- a/addons/profile_manufacturing/i18n/uk.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/zh_CN.po b/addons/profile_manufacturing/i18n/zh_CN.po
index 776f3b5b820..9fc84dd8cb2 100644
--- a/addons/profile_manufacturing/i18n/zh_CN.po
+++ b/addons/profile_manufacturing/i18n/zh_CN.po
@@ -4,43 +4,43 @@
 #
 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-12-29 07:16+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:14+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
 msgid "Manufacturing Operations"
-msgstr "生产操作"
+msgstr "生产工序"
 
 #. module: profile_manufacturing
 #: model:ir.module.module,description:profile_manufacturing.module_meta_information
 msgid "Profile for manufacturing industries"
-msgstr "生产企业特定类型"
+msgstr "制造业配置"
 
 #. module: profile_manufacturing
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
 msgid "Just in Time Scheduling"
-msgstr "JIT（准时制）规划"
+msgstr "JIT(准时生产)日程表"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
 msgid "Manage by Journals"
-msgstr "按日记账管理"
+msgstr "分类帐管理"
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
@@ -50,7 +50,7 @@ msgstr "关系管理"
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,portal:0
 msgid "This module allows you to manage a Portal system."
-msgstr "该模块使您能够管理一个门户网站系统"
+msgstr "这模块允许你管理一个门户系统"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,board_document:0
@@ -60,8 +60,7 @@ msgid ""
 "documents, printed reports, calendar system). It opens an FTP access for the "
 "users to easily browse association's document."
 msgstr ""
-"Open "
-"ERP文档管理系统使您能够储存、浏览、自动索引、搜索和预览所有种类的文档(内部文档、打印报表、日程表)。用户通过文件传送协议（FTP）访问浏览相关文档。"
+"文档管理系统你可以储存、浏览、自动索引、搜索和预览所有分类的文档(内部文档、打印报表、日程表系统).用户打开一个FTP访问以方便浏览相关文档."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
@@ -69,18 +68,18 @@ msgid ""
 "This module  allows you to manage your sales, invoicing and picking by "
 "journals. You can define journals for trucks, salesman, departments, "
 "invoicing date delivery period, etc."
-msgstr "该模块使您能够按日记账管理销售、发票和分拣。你能定义卡车、业务员、部门、发票日期、交付期限、等日记账。"
+msgstr "这模块允许你管理你的销售、发票和领料/提货分类帐.你能定义跟踪、业务员、部门、发票日期交付期限等分类帐."
 
 #. module: profile_manufacturing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: profile_manufacturing
 #: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "制造业特定类型：安装额外的模块."
+msgstr "生产配置:安装额外的模块"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
@@ -88,7 +87,7 @@ msgid ""
 "The JIT module allows you to not run the scheduler periodically. It's easier "
 "and faster for real time stock computation but, in counter-part, it manages "
 "less efficiently priorities in procurements."
-msgstr "JIT（准时制）模块允许您不定期地运行调度程序。这样实时计算库存更方便并更快速，但是它会降低需求单的优先权管理效率。"
+msgstr "这JIT(准时生产)模块可以让你不运行定期调度.更容易和更快速实时计算库存.在相对部分它控制有效地减少优先产品需求."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
@@ -96,7 +95,7 @@ msgid ""
 "This module allows you to not only manage by production order but also by "
 "work order/operation. You will be able to planify, analyse the cost, check "
 "times, ... on all operations of each manufacturing order"
-msgstr "该模块不仅让您能按生产单管理也让您能按工作单/操作管理。每个生产单的操作都可以规划、分析成本、检查时间等。"
+msgstr "该模块不仅可以让你管理生产单而且能管理工作单/工序.你将在每个生产单运作能规划、分析成本、检查时间."
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,board_document:0
@@ -106,24 +105,24 @@ msgstr "文档管理"
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,portal:0
 msgid "Portal"
-msgstr "门户网站"
+msgstr "门户"
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Stock & Manufacturing"
-msgstr "库存及生产"
+msgstr "库存&生产"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
 msgid ""
 "Allow to manage product repairs. Handle the guarantee limit date and the "
 "invoicing of products and services."
-msgstr "让你能够管理货品修理。处理保证期限和货品、服务发票。"
+msgstr "允许你管理产品修理.处理保证期日期和产品、服务的发票"
 
 #. module: profile_manufacturing
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: profile_manufacturing
 #: model:ir.actions.todo,note:profile_manufacturing.config_install_module
@@ -131,22 +130,22 @@ msgid ""
 "Install more modules. A few modules are proposed according to the "
 "manufacturing profile you selected. You will be able to install them based "
 "on our requirements."
-msgstr "安装更多的模块。根据你选择的制造业特定类型推荐一些模块。你将根据要求安装。"
+msgstr "根据你选择的生产配置所推荐的几个模块.你将据此安装."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
 msgid "This module allows you to add sub poducts in mrp bom."
-msgstr "安装更多的模块。根据你选择的制造业特定类型推荐一些模块。你将根据要求安装。"
+msgstr "这模块允许你在MRP的物料清单中增加子产品."
 
 #. module: profile_manufacturing
 #: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
 msgid "Manufacturing industry profile"
-msgstr "制造业特定类型"
+msgstr "制造业配置"
 
 #. module: profile_manufacturing
 #: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
 msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "profile.manufacturing.config.install_modules_wizard"
+msgstr "生产模块安装设置向导"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
@@ -154,7 +153,7 @@ msgid ""
 "This installs the customer relationship features like: leads and "
 "opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
 "on."
-msgstr "这将安装客户关系的功能：例如线索和商机跟踪、共享日程、职员空缺跟踪、错误跟踪等。"
+msgstr "安装客户关系的功能:例如商机和销售机会跟踪、共享日程、职位跟踪、缺陷跟踪等."
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
@@ -169,12 +168,12 @@ msgstr "客户关系管理和日程表"
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
 msgid "Repair"
-msgstr "修复"
+msgstr "修理"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
 msgid "Display margins on the sale order form."
-msgstr "在销售订单上显示毛利率。"
+msgstr "显示这订单销售利润."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
@@ -183,12 +182,12 @@ msgid ""
 "form for pos operations. You must also check our frontend point of sale for "
 "a perfect ergonomy with touchscreen materials and payment processing "
 "hardware."
-msgstr "该模块使您能够管理销售点（POS ）系统。它提供一个基本的POS经营模式。您应该查看与触摸屏和付款处理硬件相配的销售点前台。"
+msgstr "这模块允许你管理POS系统.它提供一个基本模式为POS的操作.你必须检查POS前台有一个完美的触摸屏和付款处理POS硬件."
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
 msgid "Mrp Sub Product"
-msgstr "物料需求计划子货品"
+msgstr "MRP子产品"
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
@@ -198,12 +197,12 @@ msgstr "销售管理"
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,warning:0
 msgid "Warning"
-msgstr "警示"
+msgstr "警告"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
 msgid "Margins on Sales Order"
-msgstr "毛利在销售订单上"
+msgstr "销售订单管理"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
@@ -213,8 +212,7 @@ msgid ""
 "operations, etc. This module is often used for: localisation of products, "
 "managing a manufacturing chain, a quality control location, product that you "
 "rent, etc."
-msgstr ""
-"使您能够管理不同货位的高级物流。为每一个产品定义不同的货位、不同操作的货位路径等。这模块经常在：货品货位、管理生产链、质量控制、租赁货品、等情况下使用。"
+msgstr "允许你管理不同库位的高级逻辑.你能定义产品不同的库位、不同操作的库位路径等.这模块经常使用在:产品库位、管理一个生产链、质量控制等."
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
@@ -224,9 +222,12 @@ msgstr "取消"
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
 msgid "Point of Sale"
-msgstr "销售点"
+msgstr "POS"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
 msgid "Advanced Locations"
-msgstr "高级货位"
+msgstr "高级库位"
+
+#~ msgid "Able you to set warnings on products and partners."
+#~ msgstr "你可以设定产品和业务伙伴的警告."
diff --git a/addons/profile_manufacturing/i18n/zh_TW.po b/addons/profile_manufacturing/i18n/zh_TW.po
index 6cafe7755b2..6c323918f45 100644
--- a/addons/profile_manufacturing/i18n/zh_TW.po
+++ b/addons/profile_manufacturing/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: profile_manufacturing
diff --git a/addons/profile_service/i18n/ar.po b/addons/profile_service/i18n/ar.po
index d66cb71152f..12107e6d0ae 100644
--- a/addons/profile_service/i18n/ar.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/bg.po b/addons/profile_service/i18n/bg.po
index f62e9188227..676cd85bef4 100644
--- a/addons/profile_service/i18n/bg.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/bs.po b/addons/profile_service/i18n/bs.po
index 94685230b62..657b754acb1 100644
--- a/addons/profile_service/i18n/bs.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/ca.po b/addons/profile_service/i18n/ca.po
index 91d77ef5ced..004080821dc 100644
--- a/addons/profile_service/i18n/ca.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/cs.po b/addons/profile_service/i18n/cs.po
index d66cb71152f..12107e6d0ae 100644
--- a/addons/profile_service/i18n/cs.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/de.po b/addons/profile_service/i18n/de.po
index 4133f36e7f3..4d3d50383a4 100644
--- a/addons/profile_service/i18n/de.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/el.po b/addons/profile_service/i18n/el.po
index 23125402d2e..4cea4ca18b8 100644
--- a/addons/profile_service/i18n/el.po
+++ b/addons/profile_service/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/profile_service/i18n/es.po b/addons/profile_service/i18n/es.po
index c11a7da3463..6cf137504f8 100644
--- a/addons/profile_service/i18n/es.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/es_AR.po b/addons/profile_service/i18n/es_AR.po
index c9e28d545a4..cf155818f65 100644
--- a/addons/profile_service/i18n/es_AR.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/et.po b/addons/profile_service/i18n/et.po
index ab330d8fd1c..f4e982deed8 100644
--- a/addons/profile_service/i18n/et.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/fi.po b/addons/profile_service/i18n/fi.po
index a63292f6538..286b021903b 100644
--- a/addons/profile_service/i18n/fi.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/fr.po b/addons/profile_service/i18n/fr.po
index 381faa7ab89..6b05c282964 100644
--- a/addons/profile_service/i18n/fr.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/hr.po b/addons/profile_service/i18n/hr.po
index d66cb71152f..12107e6d0ae 100644
--- a/addons/profile_service/i18n/hr.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/hu.po b/addons/profile_service/i18n/hu.po
index d66cb71152f..12107e6d0ae 100644
--- a/addons/profile_service/i18n/hu.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/id.po b/addons/profile_service/i18n/id.po
index 9a0885e7c5c..98e11adef65 100644
--- a/addons/profile_service/i18n/id.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/it.po b/addons/profile_service/i18n/it.po
index 9398e9c4cc1..c08c5655b59 100644
--- a/addons/profile_service/i18n/it.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/ko.po b/addons/profile_service/i18n/ko.po
index 4c72d5fe24f..0a281bb194e 100644
--- a/addons/profile_service/i18n/ko.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/lt.po b/addons/profile_service/i18n/lt.po
index d66cb71152f..12107e6d0ae 100644
--- a/addons/profile_service/i18n/lt.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/nl.po b/addons/profile_service/i18n/nl.po
index a023e9a19ec..d3631b28566 100644
--- a/addons/profile_service/i18n/nl.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/pl.po b/addons/profile_service/i18n/pl.po
index 5a036d87d58..6786eb27980 100644
--- a/addons/profile_service/i18n/pl.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/pt.po b/addons/profile_service/i18n/pt.po
index c52f6cedce3..1251cdfe8b1 100644
--- a/addons/profile_service/i18n/pt.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/pt_BR.po b/addons/profile_service/i18n/pt_BR.po
index ad1e6e40645..dfc4245e71f 100644
--- a/addons/profile_service/i18n/pt_BR.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/ro.po b/addons/profile_service/i18n/ro.po
index d66cb71152f..12107e6d0ae 100644
--- a/addons/profile_service/i18n/ro.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/ru.po b/addons/profile_service/i18n/ru.po
index 60290f59657..3bd89d299c6 100644
--- a/addons/profile_service/i18n/ru.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/sl.po b/addons/profile_service/i18n/sl.po
index f21ba617246..ff38d1c30fd 100644
--- a/addons/profile_service/i18n/sl.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/sv.po b/addons/profile_service/i18n/sv.po
index 1fb16256dbf..28d327533db 100644
--- a/addons/profile_service/i18n/sv.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/tlh.po b/addons/profile_service/i18n/tlh.po
index 6c021ac7d21..2ec5090c3ac 100644
--- a/addons/profile_service/i18n/tlh.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/tr.po b/addons/profile_service/i18n/tr.po
index 7abe3c0c454..c6f0290b69d 100644
--- a/addons/profile_service/i18n/tr.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/uk.po b/addons/profile_service/i18n/uk.po
index 0bf22027841..37306b78427 100644
--- a/addons/profile_service/i18n/uk.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/zh_CN.po b/addons/profile_service/i18n/zh_CN.po
index 908d8f13f2c..98e45945743 100644
--- a/addons/profile_service/i18n/zh_CN.po
+++ b/addons/profile_service/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/zh_TW.po b/addons/profile_service/i18n/zh_TW.po
index 0d1e630bfac..86d982db172 100644
--- a/addons/profile_service/i18n/zh_TW.po
+++ b/addons/profile_service/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_tools/__terp__.py b/addons/profile_tools/__terp__.py
index 209be09cfc9..508a68e819f 100644
--- a/addons/profile_tools/__terp__.py
+++ b/addons/profile_tools/__terp__.py
@@ -25,7 +25,9 @@
     "version" : "1.0",
     "depends" : ["base"],
     "author" : "Tiny",
-    "description": """Installer for various interesting tools
+    "category" : "Tools",
+    "description": """Installs tools for lunch,survey,subscription and audittrail
+    module
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index cedeab01b4f..2af0ba122bf 100644
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -40,6 +40,7 @@ works done on tasks, eso. It is able to render planning, order tasks, eso.
         "project_report.xml",
         "process/task_process.xml",
         "project_installer.xml",
+        "report/project_report_view.xml"
     ],
     'demo_xml': [
         'project_demo.xml'
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index 2742131b81b..fbd4d6c5fc7 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 0853e6bc02e..4bae563a832 100644
--- a/addons/project/i18n/bg.po
+++ b/addons/project/i18n/bg.po
@@ -7,13 +7,13 @@ 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: 2008-10-01 22:00+0000\n"
-"Last-Translator: Tsvetin Vasilev <cecipv@yahoo.com>\n"
+"PO-Revision-Date: 2010-03-31 08:41+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -559,7 +559,7 @@ msgstr "Невалиден XML за преглед на архитектурат
 #: model:ir.ui.menu,name:project.menu_main
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Управление на проекти"
+msgstr "Проекти"
 
 #. module: project
 #: field:project.project,effective_hours:0
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index d9d69250247..eaa218e0679 100644
--- a/addons/project/i18n/bs.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 18c33323637..9228bf488d9 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 6af7a39331c..000d287b820 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 442499dd205..4e2285f328c 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index 6e6b37f7b70..2f889f2a569 100644
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index f0349eef757..070eb832fcc 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index 0fc6b986c4e..cbb726b479a 100644
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index b256a6dd930..ba6b5c81e6f 100644
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index fa8ee228224..260c7b9c3ab 100644
--- a/addons/project/i18n/et.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index 1a097712727..00e8a03153e 100644
--- a/addons/project/i18n/fi.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 376acb64378..684bbb06f2b 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index 25c69ea1eab..a2fb953efa2 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project
-#
+# * project
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-11-30 06:24+0000\n"
-"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 19:19+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -29,7 +30,7 @@ msgstr "Zadaci Procesa"
 #. module: project
 #: help:project.task.delegate,init,name:0
 msgid "New title of the task delegated to the user."
-msgstr ""
+msgstr "Novi naziv zadatka delegiran Korisniku"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -59,7 +60,7 @@ msgstr "Pogrešno ime modela u definiciji akcije."
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr ""
+msgstr "Sati za procjenu"
 
 #. module: project
 #: field:project.project,progress_rate:0
@@ -73,6 +74,7 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Ukupno preostalo vrijeme, periodično ga može procjenjivati nositelj zadatka."
 
 #. module: project
 #: field:project.project,child_id:0
@@ -87,7 +89,7 @@ msgstr "Članovi Projekta"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "Zadatak po nostelju"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_my_run
@@ -98,7 +100,7 @@ msgstr "Moji Tekući Projekti"
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr ""
+msgstr "Delegirani Zadaci"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -106,6 +108,8 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Zaglavlje dodano na početku emaila za poruku upozorenja koja se šalje "
+"korisniku kada je zadatak obavljen."
 
 #. module: project
 #: field:project.task,priority:0
@@ -120,7 +124,7 @@ msgstr "Ažuriranje"
 #. module: project
 #: help:project.task.delegate,init,user_id:0
 msgid "User you want to delegate this task to."
-msgstr ""
+msgstr "Korisnik kojem želite delegirati zadatak."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
@@ -135,7 +139,7 @@ msgstr "Postavite u tijeku"
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr ""
+msgstr "Odredite zahtjeve i postavite planirane sate."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
@@ -151,7 +155,7 @@ msgstr "Novi Projekt na Temelju Predloška"
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Projektni zadaci"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -170,6 +174,10 @@ msgid ""
 "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
 "    "
 msgstr ""
+"Modul za upravljanje projektima koji prati projekte na više razina, zadatke, "
+"obavljen posao u okviru zadataka, itd. Može predstaviti planiranje, naručiti "
+"zadatke, itd.\n"
+"    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
@@ -199,6 +207,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task."
 msgstr ""
+"Procijenjeno vrijeme potrebno za procjenu rada korisnika kojemu je zadatak "
+"dodijeljen."
 
 #. module: project
 #: view:project.project:0
@@ -235,13 +245,14 @@ msgstr "Započni Zadatak"
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
 msgid "My Draft Tasks"
-msgstr ""
+msgstr "Moji zadaci u nacrtu."
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Automatske varijable za zaglavlje i podnožje. Koristi potpuno istu notaciju."
 
 #. module: project
 #: selection:project.project,state:0
@@ -253,7 +264,7 @@ msgstr "Poništeno"
 #: view:project.project:0
 #: field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "Zaglavlje maila."
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -268,12 +279,12 @@ msgstr "Zadatak je Završen"
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Delegira zadatke drugom korisniku."
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Izračunato kao zbir rada izvršenog zadatkom."
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -281,21 +292,24 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Obaberete li ovo, korisnik će vidjeti \"popup\" obavjest kada zaključuje "
+"zadatak koji predlaže slanje emaila stranki."
 
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user."
 msgstr ""
+"Ponovo uključite opis zadatka u okviru zadatka koji dodjeljujete korisniku."
 
 #. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
-msgstr "Analitički Račun"
+msgstr "Analitički Konto"
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "izvršio"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -334,20 +348,20 @@ msgstr "Zadatak: %(name)s"
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Postavi kao Projekt"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr "Delegacija"
+msgstr "Delegiranja"
 
 #. module: project
 #: help:project.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
-"Član projekta. Ne koristi se u niti jednom računanja, samo za informacijske "
-"svrhe."
+"Član projekta. Ne koristi se u kalkulacijama, služi samo za informativnu "
+"svrhu."
 
 #. module: project
 #: view:project.project:0
@@ -363,7 +377,7 @@ msgstr "Svi projekti"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "Iz stanja Nacrta, doći će u stanje Otvoreno"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
@@ -374,6 +388,7 @@ msgstr "Delegirani Zadaci"
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
+"Postotak zaključenih zadataka, na osnovi ukupnog broja preuzetih zadataka."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
@@ -393,7 +408,7 @@ msgstr "Matični Projekt"
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Računa se kao: Utrošeno vrijeme + Preostalo vrijeme"
 
 #. module: project
 #: field:project.task,type:0
@@ -433,7 +448,7 @@ msgstr "Preostali Sati"
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 msgid "Project task type"
-msgstr ""
+msgstr "Tip projektnog zadatka"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -445,7 +460,7 @@ msgstr "Planirano Vrijeme"
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "Rad u okviru Zadatka"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
@@ -456,7 +471,7 @@ msgstr "Sati"
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
 #: model:ir.ui.menu,name:project.menu_tasks_yours_pending
 msgid "My Pending Tasks"
-msgstr "Moji Zadaci na Čekanju"
+msgstr "Moji neizvršeni Zadaci"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened
@@ -474,7 +489,7 @@ msgstr "Nedodijeljeni Zadaci"
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Delegirani naslov"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
@@ -486,6 +501,8 @@ msgstr "Moji Projekti"
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
 msgstr ""
+"Procijenjeno vrijeme potrebno za izvršenje zadatka od strane delegiranog "
+"korisnika."
 
 #. module: project
 #: selection:project.project,state:0
@@ -528,7 +545,7 @@ msgstr "Aktiviraj Račun"
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "Skiciraj otvoreni zadatak"
 
 #. module: project
 #: view:project.project:0
@@ -538,18 +555,18 @@ msgstr "Korisnik: %(user_id)s"
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Odgodi u satima"
 
 #. module: project
 #: field:project.project,contact_id:0
 msgid "Contact"
-msgstr "Kontakt"
+msgstr "Kontaktiraj"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "Delegat"
+msgstr "Delegiraj"
 
 #. module: project
 #: constraint:ir.ui.view:0
@@ -589,28 +606,28 @@ msgstr "Novi Zadatak"
 #. module: project
 #: help:project.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Raspored radnih sati za prilagođavanje izvještaja Gantt dijagramom"
 
 #. module: project
 #: view:project.project:0
 msgid "Project's members"
-msgstr "Član Projekta"
+msgstr "Članovi Projekta"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Nakon što je zadatak izvršen, napravi Račun."
 
 #. module: project
 #: help:project.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Računa se kao: Utrošeno vrijeme / Ukupno vrijeme"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr "Moji Zadatci"
+msgstr "Moji Zadaci"
 
 #. module: project
 #: view:project.project:0
@@ -625,12 +642,12 @@ msgstr "Planirano"
 #. module: project
 #: help:project.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
-msgstr "Zbroj ukupnog vremena svih poslova vezanih uz ovaj projekt."
+msgstr "Zbroj ukupnog vremena svih zadataka vezanih uz ovaj projekt."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr ""
+msgstr "Delegirani Zadaci"
 
 #. module: project
 #: view:project.task:0
@@ -655,14 +672,14 @@ msgstr "E-Mails"
 #. module: project
 #: model:process.node,note:project.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Aktiviraj Račune na osnovi Prodajnih narudžbi"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr "Skica"
+msgstr "Nacrt"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -672,7 +689,7 @@ msgstr "Nisko"
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr "Menadžer Projekta"
+msgstr "Voditelj Projekta"
 
 #. module: project
 #: view:project.project:0
@@ -694,6 +711,8 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
 msgstr ""
+"Novo stanje vašeg zadatka. Ono što je u toku, automatski će se otvoriti kada "
+"se zaključi delegirani zadatak."
 
 #. module: project
 #: field:res.company,project_time_mode:0
@@ -719,7 +738,7 @@ msgstr "Ukupno vrijeme"
 #. module: project
 #: field:project.task,active:0
 msgid "Active"
-msgstr "Aktivno"
+msgstr "Aktivan"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
@@ -734,7 +753,7 @@ msgstr "Citat"
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr ""
+msgstr "(re)Izdanje zadatka"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -742,6 +761,9 @@ msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
 msgstr ""
+"računa se kao: Ukupno vrijeme - Procijenjeno vrijeme. Daje razliku između "
+"vremena koje je procijenio Voditelj projekta i realnog vremena potrebnog za "
+"zaključenje zadatka."
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -761,7 +783,7 @@ msgstr "Mjeseci"
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "Kada je zadatak izvršen, doći će u stanje \"Gotovo\""
 
 #. module: project
 #: field:project.task.work,date:0
@@ -775,6 +797,9 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Ovo će postaviti jedinicu mjere koja se koristi u projektima i zadacima. "
+"Koristite li Raspored povezan s Projektima (Project Timesheet Module), ne "
+"zaboravite postaviti jedinice mjerenja."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -794,7 +819,7 @@ msgstr "Hitno"
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegate this task to a user"
-msgstr ""
+msgstr "Delegirajte ovaj zadatak korisniku."
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -804,7 +829,7 @@ msgstr "Delegirano Za"
 #. module: project
 #: field:project.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Datum zaključenja"
 
 #. module: project
 #: field:project.task,user_id:0
@@ -817,11 +842,14 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Procijenjeno vrijeme za izvršenje zadatka, koje obično odredi Voditelj "
+"Projekta kada je zadatak u stanju Nacrta."
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
 msgstr ""
+"Zbroj utrošenih sati za izvršenje svih zadataka vezanih uz ovaj projekt."
 
 #. module: project
 #: help:project.task,project_id:0
@@ -829,6 +857,8 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Vidite li (?) u imenu projekta, znači da nema Analitičkog Konta, vezanog uz "
+"Projekt."
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -844,7 +874,7 @@ msgstr "Mjesečni radovi"
 #: model:ir.actions.report.xml,name:project.report_project_project_gantt
 #: model:ir.actions.report.xml,name:project.report_project_task_gantt
 msgid "Gantt Representation"
-msgstr ""
+msgstr "Predstavljanje Ganttogramom"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -859,7 +889,7 @@ msgstr "Stanje"
 #. module: project
 #: field:project.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "Sižetak Zadatka"
 
 #. module: project
 #: view:project.project:0
@@ -873,6 +903,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Povežite ovaj projekt s Analitičkim Kontom, ako trebate upravljanje "
+"financijama vezano uz projekt. Time ćete uz projekt vezati budžetiranje, "
+"planiranje, analizu prihoda i rashoda, rasporede, itd."
 
 #. module: project
 #: view:project.project:0
@@ -950,7 +983,7 @@ msgstr "Pošaljite mail kupcu"
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr "Upravitelj Upozorenja"
+msgstr "Upozorite Voditelja"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
@@ -960,12 +993,13 @@ msgstr "config.compute.remaining"
 #. module: project
 #: wizard_button:project.task.close,mail_ask,close:0
 msgid "Quiet close"
-msgstr "Tiho zatvaranje"
+msgstr "Tiho zaključenje"
 
 #. module: project
 #: help:project.task.delegate,init,prefix:0
 msgid "New title of your own task to validate the work done."
-msgstr "Novi naslov za svoj zadatak da biste provjerili valjanost posla."
+msgstr ""
+"Novi naslov za vaš vlastiti zadatak u cilju vrednovanja izvršenog rada."
 
 #. module: project
 #: field:project.task,progress:0
@@ -982,7 +1016,7 @@ msgstr "Opis"
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Račun vezan uz zadatak"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_open
@@ -993,12 +1027,12 @@ msgstr "Struktura Projekta"
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Validation Task"
-msgstr "Potvrdni Zadatak"
+msgstr "Zadatak vrednovanja"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Rad"
+msgstr "Izvršeni rad"
 
 #. module: project
 #: selection:project.project,state:0
@@ -1011,11 +1045,12 @@ msgid ""
 "If you have [?] in the name, it means there are no analytic account linked "
 "to project."
 msgstr ""
+"Vidite li (?) u imenu, znači da nema Analitičkog Konta, vezanog uz Projekt."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
 msgid "Delegate Task"
-msgstr ""
+msgstr "Delegiraj Zadatak"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1028,16 +1063,18 @@ msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
+"Označite li ovo polje, Voditelj projekta bit će obaviješten svaki puta kada "
+"netko iz tima dovrši zadatak."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr "Nea Mogućnost"
+msgstr "Novo svojstvo"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "Kodiraj radne sate"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
@@ -1052,7 +1089,7 @@ msgstr "Zadatak Projekta"
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr "Potrošeno Sati"
+msgstr "Utrošeno Sati"
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1069,7 +1106,7 @@ msgstr "Predložak Projekata"
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr "Sekvenca"
+msgstr "Slijed"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1077,6 +1114,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Naslovnik dodan na početku emaila za poruku upozorenja koja se šalje "
+"korisniku kada je zadatak obavljen."
 
 #. module: project
 #: view:project.project:0
@@ -1091,17 +1130,17 @@ msgstr "Izračunaj Preostale Sate"
 #. module: project
 #: wizard_field:project.task.delegate,init,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "Stanje Vrednovanja"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error ! You can not create recursive projects."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne projekte."
 
 #. module: project
 #: field:project.task,date_deadline:0
 msgid "Deadline"
-msgstr "Krajnji Rok"
+msgstr "Rok"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
@@ -1111,28 +1150,28 @@ msgstr "Dodijeli"
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr ""
+msgstr "Sižetak rada"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date_stop)s"
-msgstr ""
+msgstr "Datum zaustavljanja: %(date_stop)s"
 
 #. module: project
 #: field:project.project,date_end:0
 msgid "Expected End"
-msgstr ""
+msgstr "Očekivani kraj"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Delegirajte zadatak drugom korisniku."
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "Podnožje maila"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_open
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 2742131b81b..fbd4d6c5fc7 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index 13b193d8894..3c4cbf3341e 100644
--- a/addons/project/i18n/id.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 252aba53e2b..166d5bfefb3 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 8b5a69eee4f..44f6c1827a1 100644
--- a/addons/project/i18n/ko.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 7c878b32697..04748e4c3d9 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index 54f1ff53e44..f64995e1572 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index efa345bff3d..886248d16d4 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index ad7cc5cbef3..1ff621407ac 100644
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index cb51cd04be4..e69f19b9ea1 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 9a4a0146db4..76893e85eb3 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 09e1bc2258a..7ab868b3a59 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index f96658705c8..a11f0246db7 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 4c35ce4fb64..bf65d5f8234 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index 2ac29467e63..cfd3227343d 100644
--- a/addons/project/i18n/sk.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index fd1d1619bee..7e11d919ae2 100644
--- a/addons/project/i18n/sl.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index b384eb26c01..87abf6eb123 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/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-03-11 15:55+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index e2fcc7f98a1..6159cc2df23 100644
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 72d02412e8c..25e36280bc3 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 4e16fdd68b0..0d6595059ac 100644
--- a/addons/project/i18n/uk.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index d04845039e1..e12d189e37c 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -4,22 +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-31 12:11+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:47+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr "已分配的任务"
+msgstr "指派任务"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
@@ -29,12 +29,12 @@ msgstr "任务流程"
 #. module: project
 #: help:project.task.delegate,init,name:0
 msgid "New title of the task delegated to the user."
-msgstr "已委托给用户任务的新标题"
+msgstr "这用户的任务委派新标题"
 
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr "更改剩余时间"
+msgstr "改变剩余时间"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
@@ -44,17 +44,17 @@ msgstr "关闭任务"
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr "项目任务列表"
+msgstr "项目任务"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr "打开已完成的任务"
+msgstr "打开完成任务"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -64,7 +64,7 @@ msgstr "确认小时数"
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr "进度"
+msgstr "进展"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -72,7 +72,7 @@ msgstr "进度"
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
-msgstr "总剩余时间，可以由任务执行人重新估计。"
+msgstr "总剩余时间.能由任务分派人重新估计"
 
 #. module: project
 #: field:project.project,child_id:0
@@ -82,23 +82,23 @@ msgstr "子项目"
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr "项目成员"
+msgstr "项目管理"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "委托的任务"
+msgstr "委派任务"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_my_run
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_my_run
 msgid "My Running Projects"
-msgstr "我正在进行中的项目"
+msgstr "我运行的项目"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr "已委托的任务列表"
+msgstr "委派任务"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -110,7 +110,7 @@ msgstr "任务关闭时通知客户的消息邮件的头"
 #. module: project
 #: field:project.task,priority:0
 msgid "Importance"
-msgstr "重要度"
+msgstr "重要"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -120,7 +120,7 @@ msgstr "更新"
 #. module: project
 #: help:project.task.delegate,init,user_id:0
 msgid "User you want to delegate this task to."
-msgstr "您想要委托此任务的用户。"
+msgstr "用户想把这任务委托给"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
@@ -135,7 +135,7 @@ msgstr "设为未决"
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr "定义需求并设置计划时间"
+msgstr "确认要求和设置计划时间"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
@@ -146,12 +146,12 @@ msgstr "任务类型"
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "基于此模板新建项目"
+msgstr "新的基于模板的项目"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr "项目包含的任务"
+msgstr "项目任务"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -161,7 +161,7 @@ msgstr "非常紧急"
 #. module: project
 #: wizard_button:project.task.delegate,init,valid:0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -170,15 +170,14 @@ msgid ""
 "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
 "    "
 msgstr ""
-"项目管理模块可以跟踪管理多个层次的项目，任务，\n"
-"以及完成任务所做的工作等。它可以触发创建计划，或订单任务。\n"
+"项目管理跟踪多层次项目,任务,任务工作完成等,它能使用计划,任务预定等\n"
 "    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr "我进行中的任务列表"
+msgstr "我的任务进展"
 
 #. module: project
 #: view:project.project:0
@@ -188,7 +187,7 @@ msgstr "设为模板"
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr "任务草案"
+msgstr "草稿任务"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -201,7 +200,7 @@ msgstr "任务"
 msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task."
-msgstr "验证您向谁委派此任务的估计完成时间"
+msgstr "确认你向谁委派这任务完成的估计时间"
 
 #. module: project
 #: view:project.project:0
@@ -209,7 +208,7 @@ msgstr "验证您向谁委派此任务的估计完成时间"
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr "注释"
+msgstr "备注"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
@@ -232,19 +231,19 @@ msgstr "项目"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr "启动任务"
+msgstr "开始任务"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
 msgid "My Draft Tasks"
-msgstr "我的任务草案列表"
+msgstr "我的任务草稿"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
-msgstr "用于开头和末尾的自动变量。请使用完全相同的标记。"
+msgstr "页眉页脚的自动变量.使用同一个符号."
 
 #. module: project
 #: selection:project.project,state:0
@@ -261,39 +260,39 @@ msgstr "邮件头"
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr "完成的任务"
+msgstr "完成任务"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr "任务已完成"
+msgstr "任务完成"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr "委托任务到其他用户"
+msgstr "委派任务给其它用户"
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr "任务完成的工作时间合计"
+msgstr "计算任务工作时间完成的合计"
 
 #. module: project
 #: help:project.project,warn_customer:0
 msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
-msgstr "如果勾选此处。用户在完成任务时会有一个弹出窗口要求填写发送给客户的email的内容。"
+msgstr "如果勾选此项用户关闭任务时将弹出一个信息这信息会发送给客户"
 
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user."
-msgstr "在用户的任务列表中包括此任务描述"
+msgstr "在这用户任务中包含任务说明"
 
 #. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
-msgstr "项目分类"
+msgstr "辅助核算项目"
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -310,7 +309,7 @@ msgstr "所有任务"
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr "正在计划"
+msgstr "计划"
 
 #. module: project
 #: view:project.task:0
@@ -327,33 +326,33 @@ msgstr "业务伙伴"
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr "计划小时数"
+msgstr "已计划的小时数"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr "任务：%(name)s"
+msgstr "任务:%(名称)"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr "重置为项目"
+msgstr "重设项目"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr "委托"
+msgstr "委派"
 
 #. module: project
 #: help:project.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
-msgstr "项目成员没有被任何统计计算所使用，而是仅仅为了记录信息。"
+msgstr "项目成员不用于任何计算,只是为了信息"
 
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr "我的项目列表"
+msgstr "我的项目"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
@@ -364,27 +363,27 @@ msgstr "所有项目"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr "它将从草案状态转换为打开状态"
+msgstr "从草稿状态它将进入待处理状态"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr "已委托的项目"
+msgstr "委派任务"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "待办任务总数和已关闭任务的百分比"
+msgstr "结束任务和全部要做任务的百分比"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr "新任务描述"
+msgstr "新任务说明"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr "项目的内部说明"
+msgstr "项目内部说明"
 
 #. module: project
 #: field:project.project,parent_id:0
@@ -394,7 +393,7 @@ msgstr "上级项目"
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "计算方法：花费时间－剩余时间"
+msgstr "计算:花费时间 + 剩余时间"
 
 #. module: project
 #: field:project.task,type:0
@@ -411,25 +410,25 @@ msgstr "周"
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr "我的当前任务列表"
+msgstr "我当前的任务"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr "新建项目"
+msgstr "新项目"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Medium"
-msgstr "中"
+msgstr "媒体"
 
 #. module: project
 #: view:config.compute.remaining:0
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "剩余小时数"
+msgstr "剩余的小时数"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
@@ -439,14 +438,14 @@ msgstr "项目任务类型"
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr "计划时间"
+msgstr "已计划时间"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr "任务工作"
+msgstr "工作任务"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
@@ -457,36 +456,36 @@ msgstr "小时"
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
 #: model:ir.ui.menu,name:project.menu_tasks_yours_pending
 msgid "My Pending Tasks"
-msgstr "我的未决任务列表"
+msgstr "我未决的任务"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr "进行中的任务列表"
+msgstr "任务进展"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
 #: model:ir.ui.menu,name:project.menu_action_view_task7
 msgid "Unassigned Tasks"
-msgstr "未分配任务列表"
+msgstr "未指派任务"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr "委托标题"
+msgstr "委派标题"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr "我的项目列表"
+msgstr "我的项目"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
-msgstr "委托用户关闭此任务的估计时间"
+msgstr "关闭这授权用户的任务估计时间"
 
 #. module: project
 #: selection:project.project,state:0
@@ -503,23 +502,23 @@ msgstr "设置"
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
 #: view:project.project:0
 msgid "Projects"
-msgstr "项目列表"
+msgstr "项目"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr "时间"
+msgstr "日期"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr "任务详情"
+msgstr "任务细节"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
@@ -529,7 +528,7 @@ msgstr "触发发票"
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr "进行中的任务草案"
+msgstr "待处理任务草稿"
 
 #. module: project
 #: view:project.project:0
@@ -539,23 +538,23 @@ msgstr "用户：%(user_id)s"
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr "延迟小时数"
+msgstr "延迟时间"
 
 #. module: project
 #: field:project.project,contact_id:0
 msgid "Contact"
-msgstr "联系人"
+msgstr "联系"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "委托"
+msgstr "委派"
 
 #. module: project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -568,7 +567,7 @@ msgstr "项目管理"
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr "花费时间"
+msgstr "花费的时间"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
@@ -585,12 +584,12 @@ msgstr "任务类型"
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr "新建任务"
+msgstr "新任务"
 
 #. module: project
 #: help:project.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "从时间表的工作时间来调整甘特图报表"
+msgstr "时间表工作小时数甘特图"
 
 #. module: project
 #: view:project.project:0
@@ -600,38 +599,38 @@ msgstr "项目成员"
 #. module: project
 #: model:process.transition,note:project.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr "当任务完成时创建相关发票"
+msgstr "任务结束后创建发票"
 
 #. module: project
 #: help:project.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr "计算方式：花费时间 / 总时间"
+msgstr "计算:花费时间/总时间"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr "我的任务列表"
+msgstr "我的任务"
 
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr "状态：%(state)s"
+msgstr "状态: %(state)s"
 
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr "已计划"
+msgstr "计划"
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
-msgstr "与此项目相关任务的总小时数"
+msgstr "项目所有任务的总时间"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr "已委托的任务"
+msgstr "委派任务"
 
 #. module: project
 #: view:project.task:0
@@ -641,7 +640,7 @@ msgstr "信息"
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr "复审"
+msgstr "检查"
 
 #. module: project
 #: view:project.project:0
@@ -651,19 +650,19 @@ msgstr "管理"
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
 msgid "E-Mails"
-msgstr "Email"
+msgstr "电子邮件"
 
 #. module: project
 #: model:process.node,note:project.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr "从销售订单细目触发发票"
+msgstr "销售订单明细触发的发票"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -673,7 +672,7 @@ msgstr "低"
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr "项目经理"
+msgstr "项目管理"
 
 #. module: project
 #: view:project.project:0
@@ -694,7 +693,7 @@ msgstr "状态"
 msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
-msgstr "您任务的新状态。当此委托任务关闭时未决的将被自动重新打开。"
+msgstr "你自己任务的新状态.未决的项目将被自动重新委派任务是关闭的."
 
 #. module: project
 #: field:res.company,project_time_mode:0
@@ -720,12 +719,12 @@ msgstr "总时间"
 #. module: project
 #: field:project.task,active:0
 msgid "Active"
-msgstr "活动的"
+msgstr "有效"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr "错误"
+msgstr "缺陷"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
@@ -735,19 +734,19 @@ msgstr "报价"
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr "任务版本"
+msgstr "任务编辑"
 
 #. module: project
 #: help:project.task,delay_hours:0
 msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
-msgstr "计算方法：总时间 - 估计时间。它提供项目经理时间估计和任务实际关闭时间的差距。"
+msgstr "计算:总时间 - 估计时间.它提供给项目经理时间估计和任务实际的关闭时间之间的差距"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr "打开任务"
+msgstr "待处理任务"
 
 #. module: project
 #: field:project.project,timesheet_id:0
@@ -762,12 +761,12 @@ msgstr "月"
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr "当任务完成将转换为完成状态。"
+msgstr "当任务完成它将进入完成状态"
 
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr "时间"
+msgstr "日期"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -775,84 +774,82 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
-msgstr ""
-"此项设置项目和任务的时间单位。\n"
-"如果您使用时间表链接到项目（project_timesheet 模块），别忘记为员工设置正确的时间单位。"
+msgstr "这将设置项目和任务的计量单位如果你使用链接的时间表不要忘记设置你员工的计量单位"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr "用户的项目"
+msgstr "用户计划"
 
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr "重新激活项目"
+msgstr "重新启动项目"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Urgent"
-msgstr "紧急"
+msgstr "紧急的"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegate this task to a user"
-msgstr "委托此任务给一个用户"
+msgstr "外派这任务给一个用户"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr "委托给"
+msgstr "委派給"
 
 #. module: project
 #: field:project.task,date_close:0
 msgid "Date Closed"
-msgstr "关闭日期"
+msgstr "结束时间"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Assigned to"
-msgstr "分配给"
+msgstr "指派到"
 
 #. module: project
 #: help:project.task,planned_hours:0
 msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
-msgstr "做任务的估计时间，通常是任务在草案状态时由项目经理设置。"
+msgstr "做任务的估计时间.通常由项目经理在任务草稿阶段设定"
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
-msgstr "与此项目有关的所有任务花费的总时间"
+msgstr "项目所有任务的时间合计"
 
 #. module: project
 #: help:project.task,project_id:0
 msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
-msgstr "如果在项目名称中有 [?] 标志, 表示没有分析科目与此项目关联。"
+msgstr "如果你有[?]的名字这意味相关项目没有辅助核算项目"
 
 #. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
-msgstr "与此项目有关的所有任务的计划时间"
+msgstr "项目所有任务的计划时间合计"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
 msgid "Month works"
-msgstr "每月工作"
+msgstr "本月工作"
 
 #. module: project
 #: model:ir.actions.report.xml,name:project.report_project_project_gantt
 #: model:ir.actions.report.xml,name:project.report_project_task_gantt
 msgid "Gantt Representation"
-msgstr "甘特图"
+msgstr "甘特图描述"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "通知业务伙伴"
+msgstr "警告业务伙伴"
 
 #. module: project
 #: field:project.project,state:0
@@ -862,12 +859,12 @@ msgstr "状态"
 #. module: project
 #: field:project.task,name:0
 msgid "Task summary"
-msgstr "任务概述"
+msgstr "任务摘要"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr "开始时间：%(date_start)s"
+msgstr "开始日期:%(date_start)"
 
 #. module: project
 #: help:project.project,category_id:0
@@ -875,7 +872,7 @@ msgid ""
 "Link this project to an analytic account if you need financial management on "
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
-msgstr "如果你需要对此项目实施财务管理请将一个分析科目与之关联。这样我们就能对该项目进行预算，计划，成本，收益等的分析。"
+msgstr "如果你需要项目的财务管理链接到这项目的辅助核算项目行,它能让你在链接的项目的有预算、计划、成本和收益分析、项目的时间表等."
 
 #. module: project
 #: view:project.project:0
@@ -900,12 +897,12 @@ msgstr "取消"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr "创建任务"
+msgstr "创建一个任务"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr "打开"
+msgstr "待处理"
 
 #. module: project
 #: view:project.project:0
@@ -915,18 +912,18 @@ msgstr "标识符：%(task_id)s"
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr "进行中"
+msgstr "进展"
 
 #. module: project
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr "重新激活"
+msgstr "恢复"
 
 #. module: project
 #: field:project.task,parent_id:0
@@ -946,12 +943,12 @@ msgstr "非常低"
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr "发送邮件给客户"
+msgstr "发送邮件到客户"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr "通知项目经理"
+msgstr "警告信息"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
@@ -961,17 +958,17 @@ msgstr "config.compute.remaining"
 #. module: project
 #: wizard_button:project.task.close,mail_ask,close:0
 msgid "Quiet close"
-msgstr "安静地关闭"
+msgstr "安静关闭"
 
 #. module: project
 #: help:project.task.delegate,init,prefix:0
 msgid "New title of your own task to validate the work done."
-msgstr ""
+msgstr "你自己任务的新标题到确认工作完成"
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr "进度（％）"
+msgstr "进度%"
 
 #. module: project
 #: field:project.task,description:0
@@ -1004,19 +1001,19 @@ msgstr "工作完成"
 #. module: project
 #: selection:project.project,state:0
 msgid "Running"
-msgstr "进行中"
+msgstr "运行"
 
 #. module: project
 #: help:project.project,parent_id:0
 msgid ""
 "If you have [?] in the name, it means there are no analytic account linked "
 "to project."
-msgstr "如果在项目名称中有 [?] 标志, 表示没有分析科目与此项目关联。"
+msgstr "如果你有[?]的名字这意味相关项目没有辅助核算项目"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
 msgid "Delegate Task"
-msgstr "委托任务"
+msgstr "委派任务"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1028,22 +1025,22 @@ msgstr "项目任务"
 msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
-msgstr "如果选中此字段，项目经理当他的团队完成每一个任务的时候将收到一个请求。"
+msgstr "如果勾选此项项目经理将收到他团队每个任务完成时间的请求"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr "新特性"
+msgstr "新特征"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr "编码您的工作时间"
+msgstr "你工作小时编码"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr "您的任务标题"
+msgstr "你的任务主题"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
@@ -1053,7 +1050,7 @@ msgstr "项目任务"
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr "花费小时数"
+msgstr "时间花费"
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1070,14 +1067,14 @@ msgstr "项目模板"
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: project
 #: help:project.project,warn_footer:0
 msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
-msgstr "任务关闭时客户通知邮件的开始将添加页脚。"
+msgstr "任务关闭时通知客户的消息邮件的页脚"
 
 #. module: project
 #: view:project.project:0
@@ -1087,7 +1084,7 @@ msgstr "业务伙伴信息"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_compute_remaining
 msgid "Compute Remaining Hours"
-msgstr "计算剩余小时数"
+msgstr "计算剩余时间"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,state:0
@@ -1097,37 +1094,37 @@ msgstr "确认状态"
 #. module: project
 #: constraint:project.project:0
 msgid "Error ! You can not create recursive projects."
-msgstr "错误！您不能创建循环的项目。"
+msgstr "错误!你不能创建递归的项目"
 
 #. module: project
 #: field:project.task,date_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "最后期限"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr "分配给"
+msgstr "指派到"
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr "工作概述"
+msgstr "工作摘要"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date_stop)s"
-msgstr "停止时间：%(date_stop)s"
+msgstr "停止日期:%(date_stop)"
 
 #. module: project
 #: field:project.project,date_end:0
 msgid "Expected End"
-msgstr "预计结束时间"
+msgstr "预期结束"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr "委托您的任务给其他用户"
+msgstr "委派你的任务给其它用户"
 
 #. module: project
 #: view:project.project:0
@@ -1139,4 +1136,4 @@ msgstr "邮件页脚"
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr "正在进行的任务"
+msgstr "运行项目"
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index d6e285169d8..9f7837bdadb 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 02d0bbdd288..b910515c950 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -207,7 +207,7 @@
                     <field name="remaining_hours" widget="float_time"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object"/>
+                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object" default_focus="1"/>
                     </group>
                 </form>
             </field>
@@ -329,11 +329,12 @@
                 <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
                     <field name="sequence" invisible="1"/>
                     <field name="name"/>
-                    <field name="planned_hours" widget="float_time" on_change="onchange_planned(planned_hours, effective_hours)" invisible="not context.get('set_visible',False)"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                     <field name="user_id"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
-                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
+                    <field name="planned_hours" widget="float_time" />
+                    <field name="total_hours" widget="float_time"/>
+                    <field name="remaining_hours" widget="float_time" avg="Remaining Hours" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <field name="date_start" invisible="1"/>
@@ -411,7 +412,6 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
-                             <filter domain="[('project_id','=',False)]" help="Tasks not assigned to a project" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
                             <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
diff --git a/addons/project/report/__init__.py b/addons/project/report/__init__.py
index 2aefd8b3c11..3c104dc54ec 100644
--- a/addons/project/report/__init__.py
+++ b/addons/project/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,9 +15,9 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+import project_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/report_project/report_project.py b/addons/project/report/project_report.py
similarity index 54%
rename from addons/report_project/report_project.py
rename to addons/project/report/project_report.py
index 183163813da..20d65aec356 100644
--- a/addons/report_project/report_project.py
+++ b/addons/project/report/project_report.py
@@ -29,14 +29,23 @@ class report_project_task_user(osv.osv):
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'date_start': fields.datetime('Starting Date'),
+        'date_end': fields.datetime('Ending Date'),
+        'date_deadline': fields.date('Deadline'),
         'project_id':fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
         'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
-        'task_closed': fields.integer('Task Closed', readonly=True),
+        'nbr': fields.integer('#Number of tasks', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+        'state': fields.selection([('draft', 'Draft'),
+                                   ('open', 'In Progress'),
+                                   ('pending', 'Pending'),
+                                   ('cancelled', 'Cancelled'),
+                                   ('done', 'Done')],
+                                'State', readonly=True),
 
     }
     _order = 'name desc, project_id'
@@ -46,70 +55,30 @@ class report_project_task_user(osv.osv):
             create or replace view report_project_task_user as (
                 select
                     min(t.id) as id,
-                    to_char(date_end, 'YYYY') as name,
-                    to_char(date_end, 'MM') as month,
-                    count(distinct t.id) as task_closed,
+                    to_char(date_start, 'YYYY') as name,
+                    to_char(date_start, 'MM') as month,
+                    count(distinct t.id) as nbr,
+                    date_trunc('day',t.date_start) as date_start,
+                    date_trunc('day',t.date_end) as date_end,
+                    date_trunc('day',t.date_deadline) as date_deadline,
                     t.user_id,
                     t.project_id,
+                    t.state,
                     sum(planned_hours) as hours_planned,
                     to_char(avg(date_end::abstime-t.create_date::timestamp), 'DD"d" HH24:MI:SS') as closing_days,
                     sum(w.hours) as hours_effective,
                     ((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
                 from project_task t
                     left join project_task_work w on (t.id=w.task_id)
-                where
-                    t.state='done'
                 group by
-                    to_char(date_end, 'YYYY'),to_char(date_end, 'MM'),t.user_id,project_id
+                    to_char(date_start, 'YYYY'),
+                    to_char(date_start, 'MM'),
+                    t.user_id,t.state,t.date_end,
+                    t.date_deadline,t.date_start,
+                    t.project_id
             )
         """)
 report_project_task_user()
 
-
-class report_project_task(osv.osv):
-    _name = "report.project.task"
-    _description = "Tasks by project"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'project_id':fields.many2one('project.project', 'Project', readonly=True),
-        'hours_planned': fields.float('Planned Hours', readonly=True),
-        'hours_effective': fields.float('Effective Hours', readonly=True),
-        'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
-        'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
-        'task_closed': fields.integer('Task Closed', readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-
-    }
-    _order = 'name desc, project_id'
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'report_project_task')
-        cr.execute("""
-            create or replace view report_project_task as (
-                select
-                    min(t.id) as id,
-                    to_char(date_end, 'YYYY') as name,
-                    to_char(date_end, 'MM') as month,
-                    count(distinct t.id) as task_closed,
-                    t.project_id,
-                    sum(planned_hours) as hours_planned,
-                    to_char(avg(date_end::abstime-t.create_date::timestamp), 'DD"d" HH12:MI:SS') as closing_days,
-                    sum(w.hours) as hours_effective,
-                    ((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
-                from project_task t
-                    left join project_task_work w on (t.id=w.task_id)
-                where
-                    t.state='done'
-                group by
-                    to_char(date_end, 'YYYY'),to_char(date_end, 'MM'),project_id
-            )
-        """)
-report_project_task()
-
-
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
new file mode 100644
index 00000000000..dd271ee97da
--- /dev/null
+++ b/addons/project/report/project_report_view.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	    <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+
+        <record id="view_task_project_user_tree" model="ir.ui.view">
+            <field name="name">report.project.task.user.tree</field>
+            <field name="model">report.project.task.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tasks">
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="user_id"/>
+                    <field name="project_id"/>
+                    <field name="nbr"/>
+                    <field name="date_start" invisible="1"/>
+                    <field name="date_end" invisible="1"/>
+                    <field name="date_deadline" invisible="1"/>
+                    <field name="hours_planned"/>
+                    <field name="hours_effective"/>
+                    <field name="hours_delay"/>
+                    <field name="closing_days"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_task_project_user_search" model="ir.ui.view">
+            <field name="name">report.project.task.user.search</field>
+            <field name="model">report.project.task.user</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            	<search string="Tasks">
+	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
+	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
+	            		<separator orientation="vertical"/>
+	            		<filter string="Start" icon="terp-project" domain="[('date_start','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                 		<filter string="End" icon="terp-project" domain="[('date_end','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                 	    <filter string="Deadline" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                 	    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
+	            		<separator orientation="vertical"/>
+	            		<field name="project_id"/>
+	                    <field name="user_id" widget="selection">
+	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
+                		</field>
+	                    <newline/>
+                		<group expand="1" string="Group By..." colspan="10" col="11">
+                    		<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
+                    		<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
+                 			<separator orientation="vertical"/>
+                 			<filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
+   							<separator orientation="vertical"/>
+                    		<filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
+                    		<filter string="Year" icon="terp-project" context="{'group_by':'name'}"/>
+                		</group>
+            	</search>
+            </field>
+        </record>
+
+       <record id="action_project_task_user_tree" model="ir.actions.act_window">
+            <field name="name">Tasks</field>
+            <field name="res_model">report.project.task.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="view_task_project_user_search"/>
+        </record>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
+
+    </data>
+</openerp>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index b5877b688b7..abedc99cfd6 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -12,4 +12,5 @@
 "access_config_compute_remaining","project.config.compute.remaining","model_config_compute_remaining","project.group_project_user",1,1,1,1
 "access_config_compute_remaining_manager","project.config.compute.remaining.manager","model_config_compute_remaining","project.group_project_manager",1,1,1,1
 "access_project_message","project.message","model_project_message","project.group_project_user",1,0,0,0
-"access_project_installer","project.installer","model_project_installer","project.group_project_user",1,0,0,0
\ No newline at end of file
+"access_project_installer","project.installer","model_project_installer","project.group_project_user",1,0,0,0
+"access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,0,0,0
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 7c34807517a..7fcb2e6fedb 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -23,7 +23,7 @@
     </record>
     <record model="ir.rule" id="project_comp_rule">
         <field name="rule_group" ref="project_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="task_comp_rule_group">
@@ -32,7 +32,7 @@
         <field name="global" eval="True"/>
     </record>
     <record model="ir.rule" id="task_comp_rule">
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         <field name="rule_group" ref="task_comp_rule_group"/>
     </record>
 
diff --git a/addons/project/wizard/close_task.py b/addons/project/wizard/close_task.py
index f577929a8f6..89e4409f643 100644
--- a/addons/project/wizard/close_task.py
+++ b/addons/project/wizard/close_task.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -37,7 +37,8 @@ mail_fields = {
 }
 
 def email_send(cr, uid, ids, to_adr, description, context={}):
-    for task in pooler.get_pool(cr.dbname).get('project.task').browse(cr, uid, ids, context):
+    pool = pooler.get_pool(cr.dbname)
+    for task in pool.get('project.task').browse(cr, uid, ids, context=context):
         project = task.project_id
         subject = "Task '%s' closed" % task.name
         if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
@@ -45,7 +46,6 @@ def email_send(cr, uid, ids, to_adr, description, context={}):
             signature = task.user_id.signature
         else:
             raise wizard.except_wizard(_('Error'), _("Couldn't send mail because your email address is not configured!"))
-
         if to_adr:
             val = {
                 'name': task.name,
@@ -75,8 +75,8 @@ class wizard_close(wizard.interface):
         partner_id = task.partner_id or task.project_id.partner_id
         if partner_id and partner_id.address[0].email:
             email = partner_id.address[0].email
-        return {'description': task.description, 'email':email}
-        
+        return {'description': task.description or task.name, 'email':email}
+
     def _data_send(self, cr, uid, data, context):
         task_obj = pooler.get_pool(cr.dbname).get('project.task')
         if data['form']['email']:
diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index 7f9965367ae..9c81aefca1e 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -133,15 +133,15 @@ class wizard_compute_tasks(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type':'form', 'arch':compute_form, 'fields':compute_fields, 'state':[
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
             ]},
         },
 
 
         'compute': {
             'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
+            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
         }
     }
 wizard_compute_tasks('wizard.compute.tasks')
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 1bb6c538593..0fe662dc3cb 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -96,7 +96,7 @@ class wizard_delegate(wizard.interface):
             'actions': [_ask_auto_complete],
             'result': {'type':'form', 'arch':ask_form, 'fields':ask_fields, 'state':[
                 ('end', 'Cancel'),
-                ('valid', 'Validate')
+                ('valid', 'Validate', '', True)
             ]},
         },
         'valid': {
diff --git a/addons/project_gtd/i18n/ar.po b/addons/project_gtd/i18n/ar.po
index 86419dddb0a..97a2250fbf8 100644
--- a/addons/project_gtd/i18n/ar.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/bg.po b/addons/project_gtd/i18n/bg.po
index ca4100f8980..f449fb4e181 100644
--- a/addons/project_gtd/i18n/bg.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/bs.po b/addons/project_gtd/i18n/bs.po
index a45fa290777..e4260e41ea6 100644
--- a/addons/project_gtd/i18n/bs.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ca.po b/addons/project_gtd/i18n/ca.po
index fbf610b1b65..c86d3e30b71 100644
--- a/addons/project_gtd/i18n/ca.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/cs.po b/addons/project_gtd/i18n/cs.po
index 74281b02a58..7e62010af5f 100644
--- a/addons/project_gtd/i18n/cs.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index d3d76fb8fac..c24fb255d6a 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/el.po b/addons/project_gtd/i18n/el.po
index 00c8e2b6d15..b381e63a01b 100644
--- a/addons/project_gtd/i18n/el.po
+++ b/addons/project_gtd/i18n/el.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index e44d6e038d8..fe128ae393d 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/es_AR.po b/addons/project_gtd/i18n/es_AR.po
index 246ee2b1e6e..a69c7f53969 100644
--- a/addons/project_gtd/i18n/es_AR.po
+++ b/addons/project_gtd/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: project_gtd
diff --git a/addons/project_gtd/i18n/et.po b/addons/project_gtd/i18n/et.po
index f9c5e655a2a..57ee612a752 100644
--- a/addons/project_gtd/i18n/et.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/fi.po b/addons/project_gtd/i18n/fi.po
index 9ed2815028c..da633e3c5dd 100644
--- a/addons/project_gtd/i18n/fi.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/fr.po b/addons/project_gtd/i18n/fr.po
index 975277e048f..3772f5953a2 100644
--- a/addons/project_gtd/i18n/fr.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/hr.po b/addons/project_gtd/i18n/hr.po
index 8ef7fd48dc8..4c5c2ab7cc6 100644
--- a/addons/project_gtd/i18n/hr.po
+++ b/addons/project_gtd/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project_gtd
-#
+# * project_gtd
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-11-17 10:23+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 19:22+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -46,7 +47,7 @@ msgstr "Mjesečno"
 #. module: project_gtd
 #: field:project.gtd.timebox,parent_id:0
 msgid "Parent Timebox"
-msgstr ""
+msgstr "Ishodni Timebox"
 
 #. module: project_gtd
 #: constraint:ir.ui.view:0
@@ -67,7 +68,7 @@ msgstr "Prioritet"
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_inbox
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_myinbox
 msgid "My Inbox"
-msgstr ""
+msgstr "Moj Inbox"
 
 #. module: project_gtd
 #: field:project.gtd.context,project_default_id:0
@@ -77,7 +78,7 @@ msgstr "Zadani Projekt"
 #. module: project_gtd
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context4_id:0
@@ -87,7 +88,7 @@ msgstr "Kontekst 4"
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
 msgid "Set to Timebox"
-msgstr ""
+msgstr "Postavi na Timebox"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
@@ -97,29 +98,29 @@ msgstr "Drugo"
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_task_inbox
 msgid "Inbox Tasks"
-msgstr ""
+msgstr "Zadaci u Inboxu"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 #: field:project.gtd.timebox,name:0
 #: field:project.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "Timebox"
 
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
 msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "Getting Things Done - Modul za upravljanje vremenom"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
 msgid "Timebox Tasks"
-msgstr ""
+msgstr "Zadaci u Timeboxu"
 
 #. module: project_gtd
 #: wizard_view:project.gtd.timebox.fill,init:0
 msgid "Timebox tasks selection"
-msgstr ""
+msgstr "Odabir zadataka u Timeboxu"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,type:0
@@ -134,7 +135,7 @@ msgstr "Efektivni Sati"
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_empty
 msgid "Empty Timebox"
-msgstr ""
+msgstr "Prazan Timebox"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_pending
@@ -144,7 +145,7 @@ msgstr "Moji Neriješeni Zadaci"
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Timebox Definition"
-msgstr ""
+msgstr "Definicija Timeboxa"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,user_id:0
@@ -155,7 +156,7 @@ msgstr "Korisnik"
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_daily
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_daily_inbox
 msgid "My Daily Timebox"
-msgstr ""
+msgstr "Moj dnevni Timebox"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
@@ -180,7 +181,7 @@ msgstr "Kontekst 3"
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,process:0
 msgid "Add to Timebox"
-msgstr ""
+msgstr "Dodaj u Timebox"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context5_id:0
@@ -207,7 +208,7 @@ msgstr "Dnevno"
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_fill
 msgid "Plannify Timebox"
-msgstr ""
+msgstr "Postavi planiranje u Timebox"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_project:0
@@ -219,14 +220,14 @@ msgstr "Projekt"
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree_my
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_my_timeboxes
 msgid "My Timeboxes"
-msgstr ""
+msgstr "Moji Timeboxovi"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
 #: view:project.gtd.timebox:0
 msgid "Timeboxes"
-msgstr ""
+msgstr "Timeboxovi"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -254,7 +255,7 @@ msgstr "Upravljanje Vremenom"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Getting Things Done"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,task1_ids:0
@@ -276,12 +277,12 @@ msgstr "Redoslijed"
 #. module: project_gtd
 #: field:project.gtd.timebox,child_ids:0
 msgid "Child Timeboxes"
-msgstr ""
+msgstr "Ishodni Timeboxovi"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_allinbox
 msgid "All My Timeboxes"
-msgstr ""
+msgstr "Svi moji Timeboxovi"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_deadline:0
@@ -291,7 +292,7 @@ msgstr "Krajnji Rok"
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_id:0
 msgid "Get from Timebox"
-msgstr ""
+msgstr "Uzmi iz Timeboxa"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,end:0
diff --git a/addons/project_gtd/i18n/hu.po b/addons/project_gtd/i18n/hu.po
index 86419dddb0a..97a2250fbf8 100644
--- a/addons/project_gtd/i18n/hu.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/id.po b/addons/project_gtd/i18n/id.po
index 034b365d322..fd66ae1ced5 100644
--- a/addons/project_gtd/i18n/id.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/it.po b/addons/project_gtd/i18n/it.po
index 9272bc71a6e..da3cc189f9e 100644
--- a/addons/project_gtd/i18n/it.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ko.po b/addons/project_gtd/i18n/ko.po
index dbc25606396..eac88f9aa78 100644
--- a/addons/project_gtd/i18n/ko.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/lt.po b/addons/project_gtd/i18n/lt.po
index 86419dddb0a..97a2250fbf8 100644
--- a/addons/project_gtd/i18n/lt.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/nl.po b/addons/project_gtd/i18n/nl.po
index b3491fb48cb..5baf27a745f 100644
--- a/addons/project_gtd/i18n/nl.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/nl_BE.po b/addons/project_gtd/i18n/nl_BE.po
index 5c73ae423d6..a38fe78431e 100644
--- a/addons/project_gtd/i18n/nl_BE.po
+++ b/addons/project_gtd/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: project_gtd
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index fe6caee688c..b5c55c854ea 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/pt.po b/addons/project_gtd/i18n/pt.po
index 722bff11700..8442748224c 100644
--- a/addons/project_gtd/i18n/pt.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index edb66f96648..99dbc341d27 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -7,19 +7,19 @@ 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-01-30 13:25+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-19 01:52+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Visible Columns"
-msgstr ""
+msgstr "Colunas visíveis"
 
 #. module: project_gtd
 #: constraint:ir.model:0
@@ -32,22 +32,22 @@ msgstr ""
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
 msgid "project.gtd.timebox"
-msgstr ""
+msgstr "project.gtd.timebox"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
 msgid "My Deadlines"
-msgstr ""
+msgstr "Meus Prazos Finais"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mensalmente"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,parent_id:0
 msgid "Parent Timebox"
-msgstr ""
+msgstr "Período de tempo pai"
 
 #. module: project_gtd
 #: constraint:ir.ui.view:0
@@ -57,205 +57,205 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,task_ids:0
 msgid "Tasks selection"
-msgstr ""
+msgstr "Seleção de tarefas"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioridade"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_inbox
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_myinbox
 msgid "My Inbox"
-msgstr ""
+msgstr "Minhas tarefas"
 
 #. module: project_gtd
 #: field:project.gtd.context,project_default_id:0
 msgid "Default Project"
-msgstr ""
+msgstr "Projeto Padrão"
 
 #. module: project_gtd
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context4_id:0
 msgid "Context 4"
-msgstr ""
+msgstr "Contexto 4"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
 msgid "Set to Timebox"
-msgstr ""
+msgstr "Definir um período"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_task_inbox
 msgid "Inbox Tasks"
-msgstr ""
+msgstr "Caixa de tarefas"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 #: field:project.gtd.timebox,name:0
 #: field:project.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "Período de tempo"
 
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
 msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "Pegando coisas feitas - Módulo de administração de tempo"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
 msgid "Timebox Tasks"
-msgstr ""
+msgstr "Tarefas do período"
 
 #. module: project_gtd
 #: wizard_view:project.gtd.timebox.fill,init:0
 msgid "Timebox tasks selection"
-msgstr ""
+msgstr "Seleção de tarefas do período"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_effective_hours:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Horas efetivas"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_empty
 msgid "Empty Timebox"
-msgstr ""
+msgstr "Período vazio"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_pending
 msgid "My Pending Tasks"
-msgstr ""
+msgstr "Minhas Tarefas Pendentes"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Timebox Definition"
-msgstr ""
+msgstr "Definição do período"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_daily
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_daily_inbox
 msgid "My Daily Timebox"
-msgstr ""
+msgstr "Meu período diário"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
 msgid "project.gtd.context"
-msgstr ""
+msgstr "project.gtd.context"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context1_id:0
 msgid "Context 1"
-msgstr ""
+msgstr "Contexto 1"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context2_id:0
 msgid "Context 2"
-msgstr ""
+msgstr "Contexto 2"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context3_id:0
 msgid "Context 3"
-msgstr ""
+msgstr "Contexto 3"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,process:0
 msgid "Add to Timebox"
-msgstr ""
+msgstr "Adicionar ao período"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context5_id:0
 msgid "Context 5"
-msgstr ""
+msgstr "Contexto 5"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context6_id:0
 msgid "Context 6"
-msgstr ""
+msgstr "Contexto 6"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
 #: view:project.gtd.timebox:0
 msgid "Contexts"
-msgstr ""
+msgstr "Contextos"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Daily"
-msgstr ""
+msgstr "Diário"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_fill
 msgid "Plannify Timebox"
-msgstr ""
+msgstr "Período planejado"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_project:0
 msgid "Project"
-msgstr ""
+msgstr "Projeto"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_all
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree_my
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_my_timeboxes
 msgid "My Timeboxes"
-msgstr ""
+msgstr "Meus períodos"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
 #: view:project.gtd.timebox:0
 msgid "Timeboxes"
-msgstr ""
+msgstr "Período de tempo"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planejado"
 
 #. module: project_gtd
 #: view:project.gtd.context:0
 #: field:project.gtd.context,name:0
 #: field:project.task,context_id:0
 msgid "Context"
-msgstr ""
+msgstr "Contexto"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Minhas Tarefas Abertas"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time
 #: model:ir.ui.menu,name:project_gtd.menu_open_time
 msgid "Time Management"
-msgstr ""
+msgstr "Administração de tempo"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Pegando coisas feitas(GTD)"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,task1_ids:0
@@ -272,44 +272,44 @@ msgstr "Tarefas"
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequencia"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,child_ids:0
 msgid "Child Timeboxes"
-msgstr ""
+msgstr "Períodos filhos"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_allinbox
 msgid "All My Timeboxes"
-msgstr ""
+msgstr "Todos os meus períodos"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Prazo final"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_id:0
 msgid "Get from Timebox"
-msgstr ""
+msgstr "Pegando do período"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Data de início"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Horas planejadas"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Semanalmente"
diff --git a/addons/project_gtd/i18n/ro.po b/addons/project_gtd/i18n/ro.po
index 86419dddb0a..97a2250fbf8 100644
--- a/addons/project_gtd/i18n/ro.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ru.po b/addons/project_gtd/i18n/ru.po
index 8b901ccd706..9fb06436326 100644
--- a/addons/project_gtd/i18n/ru.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/sl.po b/addons/project_gtd/i18n/sl.po
index 99754986616..72c23d6b35e 100644
--- a/addons/project_gtd/i18n/sl.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po
index efe74477b3f..a7814dcd3a6 100644
--- a/addons/project_gtd/i18n/sv.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/tlh.po b/addons/project_gtd/i18n/tlh.po
index 5ceb99b6dfb..5ca56004437 100644
--- a/addons/project_gtd/i18n/tlh.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 0d2bc26db1a..e7a4376b4d7 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/uk.po b/addons/project_gtd/i18n/uk.po
index 45bcb39e3b4..c3a09dfc834 100644
--- a/addons/project_gtd/i18n/uk.po
+++ b/addons/project_gtd/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: project_gtd
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index 7a30f0c2a06..faa7c008d52 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/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.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-11 03:12+0000\n"
-"Last-Translator: 一念轮回 <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:47+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -25,7 +25,7 @@ msgstr "可见列"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
@@ -35,7 +35,7 @@ msgstr ""
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
 msgid "My Deadlines"
-msgstr "我的截止日期"
+msgstr "我的截止期限"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
@@ -50,17 +50,17 @@ msgstr "上级时间盒"
 #. module: project_gtd
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件!"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,task_ids:0
 msgid "Tasks selection"
-msgstr "选择任务"
+msgstr "任务选择"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_priority:0
 msgid "Priority"
-msgstr "优先级"
+msgstr "优先"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_inbox
@@ -71,54 +71,54 @@ msgstr "我的收件箱"
 #. module: project_gtd
 #: field:project.gtd.context,project_default_id:0
 msgid "Default Project"
-msgstr "默认项目"
+msgstr "默认的项目"
 
 #. module: project_gtd
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在动作定义中无效的模块名"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context4_id:0
 msgid "Context 4"
-msgstr ""
+msgstr "上下文4"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
 msgid "Set to Timebox"
-msgstr ""
+msgstr "设为时间箱"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Other"
-msgstr "其他"
+msgstr "其它"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_task_inbox
 msgid "Inbox Tasks"
-msgstr "收件箱任务列表"
+msgstr "收件箱任务"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 #: field:project.gtd.timebox,name:0
 #: field:project.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "时间箱"
 
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
 msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "GTD - 时间管理模块"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
 msgid "Timebox Tasks"
-msgstr ""
+msgstr "时间箱任务"
 
 #. module: project_gtd
 #: wizard_view:project.gtd.timebox.fill,init:0
 msgid "Timebox tasks selection"
-msgstr ""
+msgstr "时间箱任务选择"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,type:0
@@ -133,17 +133,17 @@ msgstr "有效时间"
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_empty
 msgid "Empty Timebox"
-msgstr ""
+msgstr "空时间箱"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_pending
 msgid "My Pending Tasks"
-msgstr "我的未决任务列表"
+msgstr "我未决的任务"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Timebox Definition"
-msgstr ""
+msgstr "时间箱定义"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,user_id:0
@@ -154,7 +154,7 @@ msgstr "用户"
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_daily
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_daily_inbox
 msgid "My Daily Timebox"
-msgstr ""
+msgstr "我每天的时间箱"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
@@ -164,49 +164,49 @@ msgstr ""
 #. module: project_gtd
 #: field:project.gtd.timebox,context1_id:0
 msgid "Context 1"
-msgstr ""
+msgstr "上下文1"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context2_id:0
 msgid "Context 2"
-msgstr ""
+msgstr "上下文2"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context3_id:0
 msgid "Context 3"
-msgstr ""
+msgstr "上下文3"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,process:0
 msgid "Add to Timebox"
-msgstr ""
+msgstr "加到时间箱"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context5_id:0
 msgid "Context 5"
-msgstr ""
+msgstr "上下文5"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context6_id:0
 msgid "Context 6"
-msgstr ""
+msgstr "上下文6"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
 #: view:project.gtd.timebox:0
 msgid "Contexts"
-msgstr ""
+msgstr "上下文"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Daily"
-msgstr "每日"
+msgstr "每天"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_fill
 msgid "Plannify Timebox"
-msgstr ""
+msgstr "计划中的时间箱"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_project:0
@@ -218,14 +218,14 @@ msgstr "项目"
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree_my
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_my_timeboxes
 msgid "My Timeboxes"
-msgstr ""
+msgstr "我的时间箱"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
 #: view:project.gtd.timebox:0
 msgid "Timeboxes"
-msgstr ""
+msgstr "时间箱"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -237,12 +237,12 @@ msgstr "已计划"
 #: field:project.gtd.context,name:0
 #: field:project.task,context_id:0
 msgid "Context"
-msgstr ""
+msgstr "上下文"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open
 msgid "My Open Tasks"
-msgstr "我进行中的任务列表"
+msgstr "我打开的任务"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time
@@ -253,7 +253,7 @@ msgstr "时间管理"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "GTD"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,task1_ids:0
@@ -270,27 +270,27 @@ msgstr "任务"
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0
 msgid "Sequence"
-msgstr "顺序"
+msgstr "序列"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,child_ids:0
 msgid "Child Timeboxes"
-msgstr ""
+msgstr "子时间箱"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_allinbox
 msgid "All My Timeboxes"
-msgstr ""
+msgstr "所有我的时间箱"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "截止期限"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_id:0
 msgid "Get from Timebox"
-msgstr ""
+msgstr "从时间箱"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,end:0
@@ -300,12 +300,12 @@ msgstr "取消"
 #. module: project_gtd
 #: field:project.gtd.timebox,col_date_start:0
 msgid "Date Start"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_planned_hours:0
 msgid "Planned Hours"
-msgstr "计划小时数"
+msgstr "计划时间"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
diff --git a/addons/project_gtd/i18n/zh_TW.po b/addons/project_gtd/i18n/zh_TW.po
index 8cc43a24956..fb972907511 100644
--- a/addons/project_gtd/i18n/zh_TW.po
+++ b/addons/project_gtd/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: project_gtd
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index 3bbb947c5ba..ca3964d34c5 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -61,7 +61,7 @@ class wiz_timebox_fill(wizard.interface):
                 'arch':_gtd_arch,
                 'fields':_gtd_field,
                 'state':[
-                    ('end','Cancel'),
+                    ('end','Cancel', 'gtk-cancel'),
                     ('process','Add to Timebox')
                 ]
             }
diff --git a/addons/project_issue/__terp__.py b/addons/project_issue/__terp__.py
index 05a94ba809b..03ec9e22285 100644
--- a/addons/project_issue/__terp__.py
+++ b/addons/project_issue/__terp__.py
@@ -30,7 +30,11 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['crm','project'],
+    'depends': [
+        'crm',
+        'project',
+        'hr_timesheet_sheet',
+    ],
     'init_xml': [
         'project_issue_data.xml'
     ],
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 48492f44675..d9a4cffdcf9 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -39,8 +39,6 @@ class project_issue(osv.osv):
     _columns = {
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
         'categ_id': fields.many2one('crm.case.categ','Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
@@ -51,8 +49,13 @@ class project_issue(osv.osv):
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'project_id':fields.many2one('project.project', 'Project'),
-        'duration': fields.float('Duration'),        
-        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]")
+        'duration': fields.float('Duration'),
+        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
+        'assigned_to' : fields.many2one('res.users', 'Assigned to'),
+        'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
+        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
+                                                domain="[('partner_id', '=', partner_id)]",
+                                                required=True),
     }
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
@@ -87,5 +90,23 @@ class project_issue(osv.osv):
     _defaults = {
         'project_id':_get_project,
     }
+
 project_issue()
 
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+    _columns = {
+        'create_date' : fields.datetime('Create Date', readonly=True),
+    }
+
+account_analytic_line()
+
+class hr_analytic_issue(osv.osv):
+    _inherit = 'hr.analytic.timesheet'
+
+    _columns = {
+        'issue_id' : fields.many2one('project.issue', 'Issue'),
+    }
+
+hr_analytic_issue()
+
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 1134e57afce..8794992b440 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<!-- 
-		((((((((((( Demo Cases ))))))))))) 
+	<!--
+		((((((((((( Demo Cases )))))))))))
 	-->
 <!--For Issue Tracking-->
 	<record id="crm_case_buginaccountsmodule0" model="project.issue">
@@ -18,6 +18,7 @@
 		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage1"/>
 		<field name="project_id" ref="project.project_project_22"/>
+		<field name="analytic_account_id" ref="account.analytic_agrolait"/>
 		<field eval="15.0" name="duration"/>
 		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
 		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
@@ -37,6 +38,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field name="analytic_account_id" ref="account.analytic_asustek"/>
 		<field eval="&quot;done&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -53,7 +55,8 @@
 		<field name="type_id" ref="type1"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_2"/>
+		<field name="partner_id" ref="account.analytic_project_1"/>
+		<field name="analytic_account_id" ref="account.analytic_asustek"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -71,6 +74,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_14"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -87,6 +91,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+		<field name="analytic_account_id" ref="account.analytic_desertic_hispafuentes"/>
 		<field eval="&quot;draft&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -104,6 +109,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -121,6 +127,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -138,6 +145,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -147,7 +155,7 @@
 		<field name="project_id" ref="project.project_project_9"/>
 		<field eval="&quot;Constraint Error&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_errorinprogram0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_10"/>
 		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
@@ -155,6 +163,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field eval="1" name="active"/>
 		<field eval="1.3" name="duration"/>
@@ -163,7 +172,7 @@
 		<field name="project_id" ref="project.project_project_22"/>
 		<field eval="&quot;Error in Program&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_patcheserrorinprogram0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_9"/>
 		<field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
@@ -171,6 +180,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_2"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -180,7 +190,7 @@
 		<field name="project_id" ref="project.project_project_9"/>
 		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_newfeaturestobeadded0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
 		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
@@ -188,6 +198,7 @@
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_maxtor"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -197,7 +208,7 @@
 		<field name="project_id" ref="project.project_project_21"/>
 		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_addmenustothemodule0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_1"/>
 		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
@@ -205,6 +216,7 @@
 		<field eval="&quot;1&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_9"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;done&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -215,7 +227,7 @@
 		<field eval="&quot;Add menus to the module&quot;" name="name"/>
 		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
 	</record>
-	
+
 	<record id="crm_case_includeattendancesheetinproject0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_2"/>
 		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
@@ -223,6 +235,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_10"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -233,7 +246,7 @@
 		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
 		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
 	</record>
-	
+
 	<record id="crm_case_createnewobject0" model="project.issue">
 		<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
 		<field name="partner_address_id" ref="base.res_partner_address_6"/>
@@ -243,6 +256,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;draft&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -252,7 +266,7 @@
 		<field name="project_id" ref="project.project_project_22"/>
 		<field eval="&quot;Create new object&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_improvereportsinhrms0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_15"/>
 		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
@@ -260,6 +274,7 @@
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -269,7 +284,7 @@
 		<field name="project_id" ref="project.project_project_22"/>
 		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_improvereportsinpms0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_15"/>
 		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
@@ -277,6 +292,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -286,6 +302,6 @@
 		<field name="project_id" ref="project.project_project_22"/>
 		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
 	</record>
-	
+
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2a82ef783d3..f09643c2590 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,295 +2,307 @@
 <openerp>
     <data>
 
-    # ------------------------------------------------------
-    # Issue Categories
-    # ------------------------------------------------------
+        <record id="project_issue_categ_action" model="ir.actions.act_window">
+            <field name="name">Issue Categories</field>
+            <field name="res_model">crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+            <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
+            <field name="context">{'object_id':'project.issue'}</field>
+        </record>
 
+        <record id="project_issue_stage_act" model="ir.actions.act_window">
+            <field name="name">Issue Stages</field>
+            <field name="res_model">crm.case.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_stage_tree"/>
+            <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
+            <field name="context">{'object_id':'project.issue'}</field>
+        </record>
+        <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
 
-    <record id="project_issue_categ_action" model="ir.actions.act_window">
-        <field name="name">Issue Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
-        <field name="context">{'object_id':'project.issue'}</field>
-    </record>
-    # ------------------------------------------------------
-    # Stage
-    # ------------------------------------------------------
-    <record id="project_issue_stage_act" model="ir.actions.act_window">
-        <field name="name">Issue Stages</field>
-        <field name="res_model">crm.case.stage</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
-        <field name="context">{'object_id':'project.issue'}</field>
-    </record>
-    <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
-
-    <record model="ir.ui.view" id="project_issue_form_view">
-        <field name="name">Project Issue Tracker Form</field>
-        <field name="model">project.issue</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Issue Tracker Form">
-                <group colspan="3" col="4">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="project_id" required="True"/>
-                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                </group>
-                <group colspan="1" col="3">
-                    <field name="task_id"/>
-                    <button string="Convert To Task"
-                        name="%(wizard_project_issue_task_set)d"
-                        icon="gtk-index" type="action"
-                        attrs="{'invisible':[('task_id','!=',False)]}"/>
-                    <newline/>
-                    <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]"/>
-                    <group colspan="1" col="2">
-                        <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
-                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                    </group>
-                </group>
-                <notebook colspan="4">
-                <page string="General">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Communication"/>
-                        <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
-                        <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-                        <field name="email_from"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Status"/>
-                        <field name="type_id"/>
-                        <field name="priority"/>
-                    </group>
-                    <separator string= "Description" colspan="4"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" />
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-                    </group>
-                </page>
-                <page string="History" groups="base.group_extended">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Dates"/>
+        <record model="ir.ui.view" id="project_issue_form_view">
+            <field name="name">Project Issue Tracker Form</field>
+            <field name="model">project.issue</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Issue Tracker Form">
+                    <group colspan="4" col="8">
+                        <field name="name"/>
+                        <field name="user_id"/>
+                        <field name="assigned_to" />
+                        <group colspan="2" col="4">
+                            <field name="stage_id" on_change="onchange_stage_id(stage_id)"  domain="[('object_id.model', '=', 'project.issue')]" widget="selection"/>
+                            <button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
+                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                        </group>
+                        <field name="project_id" required="True"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                         <field name="create_date"/>
-                        <field name="date_closed"/>
+                        <field name="write_date" />
                     </group>
-                    <group col="2" colspan="2">
-                        <separator string="References" colspan="2"/>
-                        <field name="id"/>
-                        <field name="active"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="References" colspan="2"/>
-                        <field name="ref" colspan="4"/>
-                        <field name="ref2" colspan="4"/>
-                    </group>
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date" />
-                            <field name="user_id" />
-                            <field name="canal_id"/>
-                        </form>
-                    </field>
-                </page>
-                <page string="Emails" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="7" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                                <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
+                    <notebook colspan="4">
+                        <page string="General">
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Communication"/>
+                                <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
+                                <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
+                                <field name="email_from"/>
+                                <field name="analytic_account_id" />
                             </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                           <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                           </form>
-                           <tree string="Communication history">
-                               <field name="description"/>
-                               <field name="email"/>
-                               <field name="date"/>
-                           </tree>
-                       </field>
-                       <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                 </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="project_issue_tree_view">
-        <field name="name">Project Issue Tracker Tree</field>
-        <field name="model">project.issue</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Issue Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id"/>
-                <field name="name"/>
-                <field name="partner_id"/>
-                <field name="priority" string="Severity"/>
-                <field name="stage_id" string="Resolution"/>
-                <button icon="gtk-go-back" string=""
-                    name="stage_previous" type="object"
-                    states="open,draft,pending,done,cancel" />
-                <button icon="gtk-go-forward" string=""
-                    name="stage_next" type="object"
-                    states="open,draft,pending,done,cancel" />
-                <field name="type_id" string="Version"/>
-                <field name="user_id"/>
-                <field name="state"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-            </tree>
-        </field>
-    </record>
+                            <group col="3" colspan="2">
+                                <separator colspan="3" string="Status"/>
+                                <field name="type_id" colspan="3"/>
+                                <field name="priority" colspan="3"/>
+                                <field name="task_id" />
+                                <button string="Convert To Task"
+                                    name="%(wizard_project_issue_task_set)d"
+                                    icon="gtk-index" type="action"
+                                    attrs="{'invisible':[('task_id','!=',False)]}" />
+                            </group>
+                            <separator string= "Description" colspan="4"/>
+                            <field name="description" nolabel="1" colspan="4"/>
+                            <separator colspan="4"/>
+                            <group col="8" colspan="4">
+                                <field name="state" />
+                                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                            </group>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Date"/>
+                                <field name="date_closed"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="References" colspan="2"/>
+                                <field name="id"/>
+                                <field name="active"/>
+                            </group>
+                            <field name="log_ids" nolabel="1" colspan="4">
+                                <form string="Actions">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name" colspan="4"/>
+                                    <field name="date" />
+                                    <field name="user_id" />                                    
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Emails" groups="base.group_extended">
+                            <group colspan="4">
+                                <field colspan="4" name="email_cc" string="CC"/>
+                            </group>
+                            <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                                <form string="Communication history">
+                                    <group col="7" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                        <button
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(crm.action_crm_send_mail)d"
+                                   	context="{'mail':'reply', 'model': 'project.issue'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(crm.action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'project.issue'}"
+                           	icon="gtk-go-forward" type="action" />
+                        </page>
+                        <page string="Worklogs">
+                            <separator string="Timesheets" colspan="4" />
+                            <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
+                                <tree editable="top" string="Timesheet">
+                                    <field name="create_date" string="Date" />
+                                    <field name="user_id" readonly="1" />
+                                    <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
+                                    <field name="name"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
 
-    <record id="view_project_issue_filter" model="ir.ui.view">
-        <field name="name">Project Issue Tracker Search</field>
-        <field name="model">project.issue</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Issue Tracker Search">
-               <group col="3" colspan="1">
-                   <filter icon="gtk-home" string="   Today   "
-                       separator="1"
-                       domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                       help="Todays's bugs"
-                   />
-                   <filter icon="gtk-media-rewind"
-                       string="    7 Days    " separator="1"
-                       domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                       help="Bugs during last 7 days"
-                   />
+                                    <field invisible="1" name="journal_id"/>
+                                    <field invisible="1" name="product_id"/>
+                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                    <field invisible="1" name="amount"/>
+                                    <field invisible="1" name="general_account_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="project_issue_tree_view">
+            <field name="name">Project Issue Tracker Tree</field>
+            <field name="model">project.issue</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Issue Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                    <field name="id"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="priority" string="Severity"/>
+                    <field name="stage_id" string="Resolution"/>
+                    <button icon="gtk-go-back" string=""
+                        name="stage_previous" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <button icon="gtk-go-forward" string=""
+                        name="stage_next" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <field name="type_id" string="Version"/>
+                    <field name="user_id"/>
+                    <field name="state"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                </tree>
+            </field>
+        </record>
 
-               </group>
-               <separator orientation="vertical"/>
-               <group col="5" colspan="2">
-                   <field name="name" select='1' string="Subject"/>
-                    <field name="user_id" select="1" widget="selection">
-                    <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
-                    </field>
-                    <field name="state" select="1">
-                       <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" default="1"/>
-                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
-                    </field>
-                    <field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
+        <record id="view_project_issue_filter" model="ir.ui.view">
+            <field name="name">Project Issue Tracker Search</field>
+            <field name="model">project.issue</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Issue Tracker Search">
+                    <group col="3" colspan="1">
+                        <filter icon="gtk-home" string="   Today   "
+                            separator="1"
+                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                            help="Todays's bugs"
+                            />
+                        <filter icon="gtk-media-rewind"
+                            string="    7 Days    " separator="1"
+                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Bugs during last 7 days"
+                            />
+
+                    </group>
+                    <separator orientation="vertical"/>
+                    <group col="5" colspan="2">
+                        <field name="name" select='1' string="Subject"/>
+                        <field name="user_id" select="1" widget="selection">
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
+                        </field>
+                        <field name="state" select="1">
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" default="1"/>
+                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
+                        </field>
+                        <field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
                             <filter icon="terp-crm"
-                               domain="[('project_id','=',context.get('project_id',False))]"
-                               help="My Project"
-                           />
-                    </field>
-               </group>
-            </search>
-         </field>
-    </record>
+                                domain="[('project_id','=',context.get('project_id',False))]"
+                                help="My Project"
+                                />
+                        </field>
+                    </group>
+                </search>
+            </field>
+        </record>
 
-     <record model="ir.ui.view" id="project_issue_calendar_view">
-        <field name="name">Project Issue Tracker Calendar</field>
-        <field name="model">project.issue</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
-        <field name="arch" type="xml">
-            <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_id"/>
-            </calendar>
-        </field>
-    </record>
+        <record model="ir.ui.view" id="project_issue_calendar_view">
+            <field name="name">Project Issue Tracker Calendar</field>
+            <field name="model">project.issue</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                </calendar>
+            </field>
+        </record>
 
-    # ------------------------------------------------------
-    # Feature Requests
-    # ------------------------------------------------------
+        # ------------------------------------------------------
+        # Feature Requests
+        # ------------------------------------------------------
 
-    <record model="ir.ui.view" id="project_feature_tree_view">
-        <field name="name">Project Issue- Feature Tracker Tree</field>
-        <field name="model">project.issue</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Feature Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id"/>
-                <field name="name" string="Feature description"/>
-                <field name="partner_id"/>
-                <field name="priority" string="Severity"/>
-                <field name="stage_id" string="Resolution"/>
-                <button icon="gtk-go-back" string=""
-                    name="stage_previous" type="object"
-                    states="open,draft,pending,done,cancel" />
-                <button icon="gtk-go-forward" string=""
-                    name="stage_next" type="object"
-                    states="open,draft,pending,done,cancel" />
-                <field name="type_id" string="Version"/>
-                <field name="user_id"/>
-                <field name="state"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-            </tree>
-        </field>
-    </record>
+        <record model="ir.ui.view" id="project_feature_tree_view">
+            <field name="name">Project Issue- Feature Tracker Tree</field>
+            <field name="model">project.issue</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Feature Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                    <field name="id"/>
+                    <field name="name" string="Feature description"/>
+                    <field name="partner_id"/>
+                    <field name="priority" string="Severity"/>
+                    <field name="stage_id" string="Resolution"/>
+                    <button icon="gtk-go-back" string=""
+                        name="stage_previous" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <button icon="gtk-go-forward" string=""
+                        name="stage_next" type="object"
+                        states="open,draft,pending,done,cancel" />
+                    <field name="type_id" string="Version"/>
+                    <field name="user_id"/>
+                    <field name="state"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                </tree>
+            </field>
+        </record>
 
-    <record id="view_project_feature_filter" model="ir.ui.view">
-        <field name="name">Project Issue- Feature Tracker Search</field>
-        <field name="model">project.issue</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Feature Tracker Search">
-               <group col="3" colspan="1">
-                   <filter icon="gtk-home" string="   Today   "
-                       separator="1"
-                       domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                       help="Todays's features"
-                   />
-                   <filter icon="gtk-media-rewind"
-                       string="    7 Days    " separator="1"
-                       domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                       help="Features during last 7 days"
-                   />
-               </group>
-               <separator orientation="vertical"/>
-               <group col="5" colspan="2">
-                    <field name="name" select='1' string="Feature description"/>
-                    <field name="user_id" select="1" widget="selection">
-                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" default="1"/>
-                    </field>
-                    <field name="state" select="1">
-                       <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" default="1"/>
-                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
-                    </field>
-                    <field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
+        <record id="view_project_feature_filter" model="ir.ui.view">
+            <field name="name">Project Issue- Feature Tracker Search</field>
+            <field name="model">project.issue</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Feature Tracker Search">
+                    <group col="3" colspan="1">
+                        <filter icon="gtk-home" string="   Today   "
+                            separator="1"
+                            domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                            help="Todays's features"
+                            />
+                        <filter icon="gtk-media-rewind"
+                            string="    7 Days    " separator="1"
+                            domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Features during last 7 days"
+                            />
+                    </group>
+                    <separator orientation="vertical"/>
+                    <group col="5" colspan="2">
+                        <field name="name" select='1' string="Feature description"/>
+                        <field name="user_id" select="1" widget="selection">
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" default="1"/>
+                        </field>
+                        <field name="state" select="1">
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" default="1"/>
+                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
+                        </field>
+                        <field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
                             <filter icon="terp-crm"
-                               domain="[('project_id','=',context.get('project_id',False))]"
-                               help="My Project"
-                           />
-                    </field>
-               </group>
-            </search>
-         </field>
-    </record>
+                                domain="[('project_id','=',context.get('project_id',False))]"
+                                help="My Project"
+                                />
+                        </field>
+                    </group>
+                </search>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 2e3bf4b2d58..ef1e002ae78 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -1,15 +1,21 @@
 from osv import fields,osv
 import tools
+from crm import crm
 
 class project_issue_report(osv.osv):
-    _name = "project.issue.report"    
+    _name = "project.issue.report"
     _auto = False
     _inherit = "crm.case.report"
     _columns = {
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue.report')]"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"),                
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"),
         'nbr': fields.integer('# of Issues', reaadonly=True),
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
+        'company_id' : fields.many2one('res.company', 'Company'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'project_id':fields.many2one('project.project', 'Project'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'project.issue')]"),
+        'date_closed': fields.datetime('Close Date', readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'project_issue_report')
@@ -24,11 +30,19 @@ class project_issue_report(osv.osv):
                     c.section_id,
                     c.categ_id,
                     c.stage_id,
-                    count(*) as nbr,
+                    to_char(c.date_closed, 'YYYY/mm/dd') as date_closed,
+                    u.company_id as company_id,
+                    c.priority as priority,
+                    c.project_id as project_id,
+                    c.type_id as type_id,
+                    count(*) as nbr,                    
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     project_issue c
+                left join
+                    res_users u on (c.id = u.id)
                 group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.stage_id
+                ,c.date_closed,u.company_id,c.priority,c.project_id,c.type_id
             )""")
 
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index dd379c91fe0..72d665cdff0 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<!--
-	Project Bug 
-	-->
+ <!-- Report for project issue -->
         <record id="view_project_issue_report_tree" model="ir.ui.view">
             <field name="name">project.issue.report.tree</field>
             <field name="model">project.issue.report</field>
@@ -12,19 +10,22 @@
 				<tree string="Project Issue">
 	              	<field name="name" />
 					<field name="month"/>
+					<field name="priority" />
+					<field name="stage_id" />
+					<field name="type_id" string="Type"/>
+					<field name="project_id" invisible="1"/>
+					<field name="company_id" invisible="1"/>
                 	<field name="nbr" string="#Project Issue"/>
-                    <field name="amount_revenue"/>
-                    <field name="probability"/>
-                    <field name="amount_revenue_prob" widget="progress"/>
                     <field name="delay_close"/>
                     <field name="state" invisible="1"/>
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="stage_id"  invisible="1"/>
                     <field name="categ_id" invisible="1"/>
+                    <field name="date_closed" invisible="1"/>
                 </tree>
             </field>
-        </record>       
+        </record>
         <record id="view_project_issue_report_graph" model="ir.ui.view">
             <field name="name">project.issue.report.graph</field>
             <field name="model">project.issue.report</field>
@@ -43,22 +44,64 @@
             <field name="inherit_id" ref="crm.view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
-					<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+               <data>
+                <xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Year"]' position='replace'>
+                    	<filter string="This Year" icon="terp-sale" domain="[('name','=',time.strftime('%%Y'))]"/>
+           		</xpath>
+            	<xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Month"]' position='replace'>
+                    	<filter string="This Month" icon="terp-sale" domain="[('month','=',time.strftime('%%m'))]"  />
             	</xpath>
+                <xpath expr='//search[@string="Search"]/group[1]/filter[@string="Lost"]' position='after'>
+                        <separator orientation="vertical"/>
+                    	<filter string="Closed Today" icon="terp-sale" domain="[('date_closed','=',time.strftime('%%Y/%%m/%%d'))]" />
+            	</xpath>
+               	<xpath expr='//search[@string="Search"]/group[1]/field[3]' position='after'>
+						<field name="project_id" widget="selection"/>
+            	</xpath>
+               	<xpath expr='//search[@string="Search"]/group[@string="Group By..."]' position='before'>
+               	       <newline/>
+                		<group expand="1" string="Extended options..." colspan="10" col="12">
+                    		<filter icon="terp-sale"
+                    		string="Highest"
+                    		domain="[('priority','=','1')]"/>
+                    		<filter icon="terp-sale"
+                    		string="High"
+                    		domain="[('priority','=','2')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Normal"
+                    		domain="[('priority','=','3')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Low"
+                    		domain="[('priority','=','4')]"/>
+                    		<filter icon="terp-sale"
+                    		string="Lowest"
+                    		domain="[('priority','=','5')]"/>
+                		</group>
+                		<newline/>
+				</xpath>
+				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Company"]' position='replace'>
+					<filter string="Company" icon="terp-sale" domain="[]" context="{'group_by':'company_id'}"/>
+            	</xpath>
+				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Category"]' position='after'>
+            		<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+            		<separator orientation="vertical"/>
+            		<filter string="Project" icon="terp-sale" domain="[]" context="{'group_by':'project_id'}"/>
+            		<filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
+            	</xpath>
+                </data>
             </field>
         </record>
 
         <record id="action_project_issue_report" model="ir.actions.act_window">
-            <field name="name">Project Issue Report</field>
+            <field name="name">Project Issue</field>
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
   			<field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_project_issue_report_tree"/>
             <field name="search_view_id" ref="view_project_issue_report_filter"/>
         </record>
-        
-                               	
+
+
        	<record model="ir.actions.act_window.view" id="action_project_issue_report_tree">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
@@ -70,9 +113,9 @@
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="view_project_issue_report_graph"/>
 	        <field name="act_window_id" ref="action_project_issue_report"/>
-	    </record>              
+	    </record>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
-        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>        
+        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
         <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report"/>
   </data>
 </openerp>
diff --git a/addons/project_long_term/__terp__.py b/addons/project_long_term/__terp__.py
index 03d8cd8f11f..25529f5b245 100644
--- a/addons/project_long_term/__terp__.py
+++ b/addons/project_long_term/__terp__.py
@@ -18,8 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-
 {
     "name" : "Long Term Project Management",
     "version": "1.1",
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 684fbcc776a..0ac0f902220 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -193,13 +193,15 @@ class project_phase(osv.osv):
         if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
                 dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S')
                 work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
-                vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
+                if work_times:
+                    vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
                 for prv_phase in phase.previous_phase_ids:
                     self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
         if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
                 dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d %H:%M:%S')
                 work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
-                vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
+                if work_times:
+                    vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
                 for next_phase in phase.next_phase_ids:
                     self._check_date_end(cr, uid, next_phase, dt_end, context=context)
         return super(project_phase, self).write(cr, uid, ids, vals, context=context)
@@ -265,21 +267,26 @@ class task(osv.osv):
 
     def onchange_planned(self, cr, uid, ids, project, user_id=False, planned=0.0, effective=0.0, date_start=None, occupation_rate=0.0):
         result = {}
+        resource = False
         resource_obj = self.pool.get('resource.resource')
         project_pool = self.pool.get('project.project')
         resource_calendar = self.pool.get('resource.calendar')
+        if not project:
+            return {'value' : result}
         if date_start:
             hrs = float(planned / float(occupation_rate))
             calendar_id = project_pool.browse(cr, uid, project).resource_calendar_id.id
             dt_start = mx.DateTime.strptime(date_start, '%Y-%m-%d %H:%M:%S')
             resource_id = resource_obj.search(cr, uid, [('user_id','=',user_id)])
             if resource_id:
-                resource = resource_obj.browse(cr, uid, resource_id)[0]
-                hrs = planned / (float(occupation_rate) * resource.time_efficiency)
-                if resource.calendar_id.id:
-                    calendar_id = resource.calendar_id.id
-            work_times = resource_calendar.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource.id or False)
-            result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
+                resource_data = resource_obj.browse(cr, uid, resource_id)[0]
+                resource = resource_data.id
+                hrs = planned / (float(occupation_rate) * resource_data.time_efficiency)
+                if resource_data.calendar_id.id:
+                    calendar_id = resource_data.calendar_id.id
+            work_times = resource_calendar.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource or False)
+            if work_times:
+                result['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
         result['remaining_hours'] = planned - effective
         return {'value' : result}
 
@@ -297,7 +304,7 @@ class task(osv.osv):
             if resource.calendar_id.id:
                 calendar_id = resource.calendar_id and resource.calendar_id.id or False
             hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency)
-       work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, date_end, hours or 0.0, resource_id or False)
+       work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, date_end, hours or 0.0, resource_id and resource_id[0] or False)
        dt_start = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
        self.write(cr, uid, [task.id], {'date_start' : dt_start,'date_end' : date_end.strftime('%Y-%m-%d %H:%M:%S')})
 
@@ -315,7 +322,7 @@ class task(osv.osv):
             if resource.calendar_id.id:
                 calendar_id = resource.calendar_id and resource.calendar_id.id or False
             hours = task.planned_hours / (float(task.occupation_rate) * resource.time_efficiency)
-       work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, date_start, hours or 0.0, resource.id or False)
+       work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, date_start, hours or 0.0, resource_id and resource_id[0] or False)
        dt_end = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
        self.write(cr, uid, [task.id], {'date_start': date_start.strftime('%Y-%m-%d %H:%M:%S'),'date_end' : dt_end}, context=context)
 
@@ -347,15 +354,15 @@ class task(osv.osv):
         if vals.get('date_start', False) and vals['date_start'] < task_rec.date_start:
             dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S')
             work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource.id or False)
-            vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
-            super(task, self).write(cr, uid, ids, vals, context=context)
+            if work_times:
+                vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
             for prv_task in task_rec.parent_ids:
                self._check_date_start(cr, uid, prv_task, dt_start)
         if vals.get('date_end', False) and vals['date_end'] > task_rec.date_end:
             dt_end = mx.DateTime.strptime(vals['date_end'], '%Y-%m-%d %H:%M:%S')
             work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, hrs or 0.0, resource.id or False)
-            vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
-            super(task, self).write(cr, uid, ids, vals, context=context)
+            if work_times:
+                vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
             for next_task in task_rec.child_ids:
                self._check_date_end(cr, uid, next_task, dt_end)
 
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4d1871f977..53eaba2e4a9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -48,7 +48,7 @@
                         <field name="responsible_id"/>
                         <field name="date_start"/>
                         <field name="date_end"/>
-                        <field name="duration"/>
+                        <field name="duration" widget="float_time"/>
                         <field name="product_uom"/>
                     </group>
                     <notebook colspan="4">
@@ -83,10 +83,10 @@
                                 <separator string="Scheduling" colspan="2"/>
                                 <field name="sequence"/>
                             </group>
-                           <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
                            <separator colspan="4" string="Previous Phases"/>
                            <field colspan="4" name="previous_phase_ids" nolabel="1"/>
+                           <separator colspan="4" string="Next Phases"/>
+                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
                         </page>
                         <page string="Task Detail">
                             <separator colspan="4" string="Project's Tasks"/>
@@ -101,7 +101,7 @@
 									<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
 									<field name="effective_hours" invisible="1"/>
 									<field name="state"/>
-									<field name="occupation_rate" invisible="1"/>
+									<field name="occupation_rate"/>
                                   </tree>
                                   <form string="Project's Tasks">
                                   	<notebook colspan="4">
@@ -115,7 +115,7 @@
 		                                  		<separator string="Dates" colspan="2"/>
 		                                  		<field name="date_start"/>
 		                                  		<field name="date_deadline"/>
-		                                  		<field name="occupation_rate" invisible="1"/>
+		                                  		<field name="occupation_rate"/>
 		                                    </group>
 		                                    <group colspan="2" col="2">
 		                                  		<separator string="Planning" colspan="2"/>
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index f7e49f23247..61f3bb42251 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -36,7 +36,7 @@ compute_form = """<?xml version="1.0" ?>
 </form>"""
 
 compute_fields = {
-    'project_id': {'string':'Project', 'type':'many2one', 'relation':'project.project'},
+    'project_id': {'string':'Project', 'type':'many2one', 'relation':'project.project', 'help': 'If you do not specify project then it will take All projects with state=draft, open, pending'},
 
 }
 
@@ -49,7 +49,6 @@ class wizard_compute_phases(wizard.interface):
                    calendar_id -- working calendar of the project
 
        """
-
        pool = pooler.get_pool(cr.dbname)
        phase_obj = pool.get('project.phase')
        resource_obj = pool.get('resource.resource')
@@ -66,7 +65,7 @@ class wizard_compute_phases(wizard.interface):
                 resource = resource_obj.browse(cr, uid, resource_id, context=context)[0]
                 time_efficiency = resource.time_efficiency
                 leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource.id, resource.calendar_id.id)
-            phase_resource_obj = classobj(str(phase.responsible_id.name), (Resource,),
+            phase_resource_obj = classobj((phase.responsible_id.name.encode('utf8')), (Resource,),
                                                {'__doc__': phase.responsible_id.name,
                                                 '__name__': phase.responsible_id.name,
                                                 'vacation': tuple(leaves),
@@ -83,7 +82,7 @@ class wizard_compute_phases(wizard.interface):
                 # If project has working calendar then that
                 # else the default one would be considered
                 if calendar_id:
-                    working_days = wkcal.compute_working_calendar(cr, uid, calendar_id)
+                    working_days = wkcal.compute_working_calendar(cr, uid, calendar_id, context=context)
                     vacation = tuple(wkcal.compute_leaves(cr, uid, calendar_id))
 
                 def phase():
@@ -166,8 +165,8 @@ class wizard_compute_phases(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state':[
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
 
             ]},
         },
diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/compute_tasks_date.py
index 17a2b90b50b..77e7bbd6512 100644
--- a/addons/project_long_term/wizard/compute_tasks_date.py
+++ b/addons/project_long_term/wizard/compute_tasks_date.py
@@ -40,7 +40,7 @@ success_msg = """<?xml version="1.0" ?>
 </form>"""
 
 compute_fields = {
-    'project_id': {'string':'Project', 'type':'many2one', 'relation':'project.project', 'required':'True'},
+    'project_id': {'string':'Project', 'type':'many2one', 'relation':'project.project', 'required':True},
 }
 
 class wizard_compute_tasks(wizard.interface):
@@ -72,13 +72,14 @@ class wizard_compute_tasks(wizard.interface):
             for user in project.members:
                 leaves = []
                 time_efficiency = 1.0
-                resource_id = resource_obj.search(cr, uid, [('user_id', '=', user.id)])
+                resource_id = resource_obj.search(cr, uid, [('user_id', '=', user.id)], context=context)
                 if resource_id:
 #                    resource = resource_obj.browse(cr, uid, resource_id, context=context)[0]
                     resource = resource_obj.read(cr, uid, resource_id, ['calendar_id','time_efficiency'], context=context)[0]
-                    leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id, resource.get('calendar_id')[0])
+                    if resource.get('calendar_id', False):
+                       leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource['calendar_id'] and resource['calendar_id'][0] or False)
                     time_efficiency = resource.get('time_efficiency')
-                resources.append(classobj(str(user.name), (Resource,), {'__doc__': user.name,
+                resources.append(classobj((user.name.encode('utf8')), (Resource,), {'__doc__': user.name,
                                                                         '__name__': user.name,
                                                                         'vacation': tuple(leaves),
                                                                         'efficiency': time_efficiency
@@ -118,7 +119,7 @@ class wizard_compute_tasks(wizard.interface):
                         priorty = priority_dict[each_task.priority]
                     if each_task.user_id:
                        for resource in resources:
-                            if resource.__name__ == each_task.user_id.name:
+                            if resource.__name__ == each_task.user_id.name: # check me!!
                                task = create_tasks(i, hours, priorty, resource)
                     else:
                         task = create_tasks(i, hours, priorty)
@@ -147,8 +148,8 @@ class wizard_compute_tasks(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state': [
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
             ]},
         },
         'compute': {
diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py
index 16a40155fa8..4a170859032 100644
--- a/addons/project_long_term/wizard/schedule_tasks.py
+++ b/addons/project_long_term/wizard/schedule_tasks.py
@@ -49,7 +49,7 @@ class wizard_schedule_task(wizard.interface):
             if resource_cal:
                 cal_id  = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
                 leaves = wkcal.compute_leaves(cr, uid, cal_id, res.id, resource_cal, context=context)
-            resource_objs.append(classobj(str(res.user_id.name), (Resource,),
+            resource_objs.append(classobj(res.user_id.name.encode('utf8'), (Resource,),
                                          {'__doc__': res.user_id.name,
                                           '__name__': res.user_id.name,
                                           'vacation': tuple(leaves),
@@ -139,7 +139,7 @@ class wizard_schedule_task(wizard.interface):
     states = {
         'init': {
             'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
+            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
         }
     }
 wizard_schedule_task('phase.schedule.tasks')
diff --git a/addons/project_long_term/wizard/working_calendar.py b/addons/project_long_term/wizard/working_calendar.py
index f3474d81a58..ba8ec7db150 100644
--- a/addons/project_long_term/wizard/working_calendar.py
+++ b/addons/project_long_term/wizard/working_calendar.py
@@ -56,11 +56,11 @@ def compute_leaves(cr, uid, calendar_id, resource_id=False, resource_calendar=Fa
                                                                       ], context=context)
         leaves = resource_calendar_leaves_obj.read(cr, uid, leave_ids, ['date_from', 'date_to'], context=context)
         for i in range(len(leaves)):
-                dt_start = datetime.datetime.strptime(leaves[i]['date_from'], '%Y-%m-%d %H:%M:%S')
-                dt_end = datetime.datetime.strptime(leaves[i]['date_to'], '%Y-%m-%d %H:%M:%S')
-                no = dt_end - dt_start
-                [leave_list.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
-                leave_list.sort()
+            dt_start = datetime.datetime.strptime(leaves[i]['date_from'], '%Y-%m-%d %H:%M:%S')
+            dt_end = datetime.datetime.strptime(leaves[i]['date_to'], '%Y-%m-%d %H:%M:%S')
+            no = dt_end - dt_start
+            [leave_list.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
+            leave_list.sort()
         return leave_list
 
 def compute_working_calendar(cr, uid, calendar_id, context={}):
diff --git a/addons/project_messages/__terp__.py b/addons/project_messages/__terp__.py
index 54e1c77daeb..134b4cc80c2 100644
--- a/addons/project_messages/__terp__.py
+++ b/addons/project_messages/__terp__.py
@@ -25,8 +25,10 @@
     "version" : "1.0",
     "depends" : ["project"],
     "author" : "Tiny",
-    "description": """Provides the ability to send small messages to other
-    users on the project.
+    "description": """
+    This module provides the functionality to send messages within a project.'
+    A user can send messages individually to other user also he can broadcast
+    it to all the users.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
diff --git a/addons/project_mrp/i18n/ar.po b/addons/project_mrp/i18n/ar.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/ar.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/bg.po b/addons/project_mrp/i18n/bg.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/bg.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/bs.po b/addons/project_mrp/i18n/bs.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/bs.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/ca.po b/addons/project_mrp/i18n/ca.po
index bc0b4b1db06..c2d80687aba 100644
--- a/addons/project_mrp/i18n/ca.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/cs.po b/addons/project_mrp/i18n/cs.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/cs.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index 27edf4af503..50927c17a4a 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/el.po b/addons/project_mrp/i18n/el.po
index 9025edca5c4..079c40e581c 100644
--- a/addons/project_mrp/i18n/el.po
+++ b/addons/project_mrp/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project_mrp/i18n/es.po b/addons/project_mrp/i18n/es.po
index 3ca09901d52..07467611955 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_mrp/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/project_mrp/i18n/es_AR.po
index 9cb3254c61e..3c2db79160c 100644
--- a/addons/project_mrp/i18n/es_AR.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/et.po b/addons/project_mrp/i18n/et.po
index d40b915a70a..8514aeb593f 100644
--- a/addons/project_mrp/i18n/et.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/fr.po b/addons/project_mrp/i18n/fr.po
index c22c5377ab3..c4ffdfaa6ed 100644
--- a/addons/project_mrp/i18n/fr.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index e8da89c36bc..bf078a254c7 100644
--- a/addons/project_mrp/i18n/hr.po
+++ b/addons/project_mrp/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project_mrp
-#
+# * project_mrp
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-12-22 19:46+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 19:22+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -31,12 +32,13 @@ msgstr "Zadatak"
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procure method is Make to order and supply method is produce"
 msgstr ""
-"Ako je metoda nabave Napravi za narudžbu i metoda opskrbe je proizvedi"
+"Ako je metoda nabave da se napravi po narudžbi i metoda opskrbe da se "
+"proizvede"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
-msgstr "Ako je tip proizvoda 'usluga' tada stvara zadatak"
+msgstr "Ako je tip proizvoda 'usluga' tada kreira zadatak"
 
 #. module: project_mrp
 #: field:project.task,procurement_id:0
@@ -46,12 +48,12 @@ msgstr "Nabava"
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
-msgstr "Ako je tip proizvoda 'usluga' tada stvara zadatak"
+msgstr "Ako je tip proizvoda 'usluga' tada kreira zadatak"
 
 #. module: project_mrp
 #: model:ir.module.module,shortdesc:project_mrp.module_meta_information
 msgid "Project Management - MRP and Sale Integration"
-msgstr "Upravljanje projektima - MRP i integracija prodaje"
+msgstr "Upravljanje projektima - MRP i Integracija Prodaje"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
@@ -61,7 +63,7 @@ msgstr "Zadatak nabave"
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
-msgstr "Stvara se zadatak kako bi se osigurala usluga"
+msgstr "Stvara se zadatak kako bi se pružila usluga"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
@@ -71,7 +73,7 @@ msgstr "Zadatak narudžbe"
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
 msgid "Sale Order Task"
-msgstr "Zadatak naloga prodaje"
+msgstr "Zadatak Prodajne Narudžbe"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -81,4 +83,4 @@ msgstr "Kreiraj Zadatak"
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr "U slučaju da prodajete usluge po nalogu"
+msgstr "U slučaju da prodajete usluge prema narudžbi prodaje"
diff --git a/addons/project_mrp/i18n/hu.po b/addons/project_mrp/i18n/hu.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/hu.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/id.po b/addons/project_mrp/i18n/id.po
index 1f4e02b8f21..ccd242d44c2 100644
--- a/addons/project_mrp/i18n/id.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/it.po b/addons/project_mrp/i18n/it.po
index 904dc6472bb..75ed0b18f7a 100644
--- a/addons/project_mrp/i18n/it.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/ko.po b/addons/project_mrp/i18n/ko.po
index 8b072b70b29..2f41a585bc6 100644
--- a/addons/project_mrp/i18n/ko.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/lt.po b/addons/project_mrp/i18n/lt.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/lt.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/nl.po b/addons/project_mrp/i18n/nl.po
index 68c2014d543..67432616919 100644
--- a/addons/project_mrp/i18n/nl.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/project_mrp/i18n/nl_BE.po
index 3fdd2087cf1..97fccfe6e4a 100644
--- a/addons/project_mrp/i18n/nl_BE.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index efc45da19ee..e36c78c1324 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/pt.po b/addons/project_mrp/i18n/pt.po
index e7be768848e..0f9c8e18499 100644
--- a/addons/project_mrp/i18n/pt.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/project_mrp/i18n/pt_BR.po
index 360992c2786..b96f5081446 100644
--- a/addons/project_mrp/i18n/pt_BR.po
+++ b/addons/project_mrp/i18n/pt_BR.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: project_mrp
diff --git a/addons/project_mrp/i18n/ro.po b/addons/project_mrp/i18n/ro.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/ro.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/ru.po b/addons/project_mrp/i18n/ru.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/ru.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/sl.po b/addons/project_mrp/i18n/sl.po
index bdf5409023a..478e24cecaf 100644
--- a/addons/project_mrp/i18n/sl.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/sv.po b/addons/project_mrp/i18n/sv.po
index 5a001e422e3..ce96257b4aa 100644
--- a/addons/project_mrp/i18n/sv.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/tlh.po b/addons/project_mrp/i18n/tlh.po
index e29e98b10af..56b9cfd534b 100644
--- a/addons/project_mrp/i18n/tlh.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index 69bdbbf6292..c167b4bdf7f 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/uk.po b/addons/project_mrp/i18n/uk.po
index e29e98b10af..56b9cfd534b 100644
--- a/addons/project_mrp/i18n/uk.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index 3538540d566..b6ba6b36ff0 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/i18n/zh_CN.po
@@ -7,19 +7,19 @@ 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-12-18 11:07+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:49+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
 msgid "For each product, on type service and on order"
-msgstr ""
+msgstr "订单的每个产品和服务"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -30,54 +30,54 @@ msgstr "任务"
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procure method is Make to order and supply method is produce"
-msgstr ""
+msgstr "如果采购方式是按单和供应方式是生产"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
-msgstr ""
+msgstr "如果采购类型是服务创建这任务"
 
 #. module: project_mrp
 #: field:project.task,procurement_id:0
 msgid "Procurement"
-msgstr "需求单"
+msgstr "获得"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
-msgstr ""
+msgstr "产品类型是服务创建这任务"
 
 #. module: project_mrp
 #: model:ir.module.module,shortdesc:project_mrp.module_meta_information
 msgid "Project Management - MRP and Sale Integration"
-msgstr ""
+msgstr "项目管理 - MRP和销售一体化"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procure Task"
-msgstr ""
+msgstr "获得任务"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
-msgstr ""
+msgstr "创建一提供服务的任务"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
 msgid "Order Task"
-msgstr ""
+msgstr "订单任务"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
 msgid "Sale Order Task"
-msgstr ""
+msgstr "销售订单任务"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
 msgid "Create Task"
-msgstr ""
+msgstr "创建任务"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr ""
+msgstr "在销售订单这事务是销售服务"
diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/project_mrp/i18n/zh_TW.po
index c5b55dfe16f..7a55e912504 100644
--- a/addons/project_mrp/i18n/zh_TW.po
+++ b/addons/project_mrp/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: project_mrp
diff --git a/addons/project_planning/__terp__.py b/addons/project_planning/__terp__.py
index 22dc760e31a..cbc30a912e7 100644
--- a/addons/project_planning/__terp__.py
+++ b/addons/project_planning/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,23 +23,23 @@
 {
     'name': 'Planning Management Module',
     'version': '1.0',
-    'category': 'Generic Modules/Human Ressources',
+    'category': 'Generic Modules/Human Resources',
     'description': """
 This module helps you to manage your plannings.
 
-This module is based on the analytic accounting and is totally integrated with 
+This module is based on the analytic accounting and is totally integrated with
 * the timesheets encoding
 * the holidays management
 * the project management
 
-So that, each department manager can know if someone in his team has still unaloccated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks. 
+So that, each department manager can know if someone in his team has still unaloccated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
 
 At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': [
-        'project', 
+        'project',
         'hr_timesheet',
         'hr_holidays',
     ],
@@ -50,7 +50,7 @@ At the end of the month, the planning manager can also check if the encoded time
         'project_planning_report.xml'
     ],
     'demo_xml': [
-        #'report_account_analytic.planning.csv', 
+        #'report_account_analytic.planning.csv',
         'project_planning_demo.xml',
     ],
     'installable': True,
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 359fdd6887f..bfd2af5566c 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -70,7 +70,7 @@ class report_account_analytic_planning(osv.osv):
         return result
 
     def _check_planning_responsible(self, cr, uid, ids, context={}):
-        for obj_plan in self.browse(cr,uid,ids):
+        for obj_plan in self.browse(cr, uid, ids, context=context):
             cr.execute("""
                 SELECT id FROM report_account_analytic_planning plan
                 WHERE (   (%(date_from)s BETWEEN date_from AND date_to)
@@ -117,19 +117,19 @@ class report_account_analytic_planning(osv.osv):
     ]
 
     def action_open(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'open'})
+        self.write(cr, uid, id, {'state' : 'open'}, context=context)
         return True
 
     def action_cancel(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'cancel'})
+        self.write(cr, uid, id, {'state' : 'cancel'}, context=context)
         return True
 
     def action_draft(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'draft'})
+        self.write(cr, uid, id, {'state' : 'draft'}, context=context)
         return True
 
     def action_done(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'done'})
+        self.write(cr, uid, id, {'state' : 'done'}, context=context)
         return True
 
 report_account_analytic_planning()
@@ -156,8 +156,9 @@ class report_account_analytic_planning_line(osv.osv):
         return res
 
     def _amount_base_uom(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
@@ -220,13 +221,14 @@ class report_account_analytic_planning_user(osv.osv):
 
 
     def _get_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -252,8 +254,9 @@ class report_account_analytic_planning_user(osv.osv):
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -313,8 +316,8 @@ Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holi
                 FROM hr_holidays holidays
                 WHERE holidays.employee_id IN
                     (
-                    SELECT emp.id 
-                    FROM hr_employee emp, resource_resource res WHERE emp.resource_id = res.id and res.user_id = users.id 
+                    SELECT emp.id
+                    FROM hr_employee emp, resource_resource res WHERE emp.resource_id = res.id and res.user_id = users.id
                     )
                 AND holidays.state IN ('validate')
                 AND holidays.type = 'remove'
@@ -360,13 +363,14 @@ class report_account_analytic_planning_account(osv.osv):
     _auto = False
 
     def _get_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -384,8 +388,9 @@ class report_account_analytic_planning_account(osv.osv):
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -456,8 +461,9 @@ class report_account_analytic_planning_stat(osv.osv):
     _order = 'planning_id,user_id'
 
     def _sum_amount_real(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -473,13 +479,14 @@ where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         return result
 
     def _sum_amount_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index c9c746fbd79..7d0031c4177 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -223,7 +223,6 @@
 
 		<menuitem action="action_account_analytic_planning_form"
 			id="menu_report_account_analytic_planning" parent="planning_main" />
-		<menuitem action="resource.action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="planning_main" />
 
 		<!--
 			Planning statistics
@@ -357,7 +356,7 @@
 
 <!--Added link to open the list of all tasks planned on all lines of this planning.-->
 		<act_window context="{'planning': active_id}"
-			id="act_task_of_lines" name="Planning tasks" res_model="project.task"
+			id="act_task_of_lines" name="Tasks" res_model="project.task"
 			src_model="report_account_analytic.planning"
 		/>
 
diff --git a/addons/project_retro_planning/__terp__.py b/addons/project_retro_planning/__terp__.py
index e05b161d8f8..4d89af6bb28 100644
--- a/addons/project_retro_planning/__terp__.py
+++ b/addons/project_retro_planning/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,8 @@
     'version': '0.1',
     'category': 'Generic Modules/Projects & Services',
     'description': """
-        - Stop date of project is change will change all the tasks of that project to same number of days """,
+        - If deadline date of project is changed will
+          then the deadline date for all the tasks will change to the same  """,
     'author': 'Tiny',
     'depends': ['base', 'project'],
     'init_xml': [],
diff --git a/addons/project_retro_planning/i18n/ar.po b/addons/project_retro_planning/i18n/ar.po
index d8dd03d6234..bab396e1bea 100644
--- a/addons/project_retro_planning/i18n/ar.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/bg.po b/addons/project_retro_planning/i18n/bg.po
index d8dd03d6234..bab396e1bea 100644
--- a/addons/project_retro_planning/i18n/bg.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/bs.po b/addons/project_retro_planning/i18n/bs.po
index 61626170b6c..4b4053b61fd 100644
--- a/addons/project_retro_planning/i18n/bs.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ca.po b/addons/project_retro_planning/i18n/ca.po
index 4b352612ded..0f01680d17d 100644
--- a/addons/project_retro_planning/i18n/ca.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/cs.po b/addons/project_retro_planning/i18n/cs.po
index 3946b027736..a9ebacff2f1 100644
--- a/addons/project_retro_planning/i18n/cs.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/de.po b/addons/project_retro_planning/i18n/de.po
index 37f2b32db3f..0d4b80badb5 100644
--- a/addons/project_retro_planning/i18n/de.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
index 6c7f7f698b5..95bc5525de5 100644
--- a/addons/project_retro_planning/i18n/es.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/es_AR.po b/addons/project_retro_planning/i18n/es_AR.po
index 614e4cf751b..1e2ba557e23 100644
--- a/addons/project_retro_planning/i18n/es_AR.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/et.po b/addons/project_retro_planning/i18n/et.po
index c5f50078c85..4d10cd5215e 100644
--- a/addons/project_retro_planning/i18n/et.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/fr.po b/addons/project_retro_planning/i18n/fr.po
index f35381b738f..02af1abc5b4 100644
--- a/addons/project_retro_planning/i18n/fr.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/gl.po b/addons/project_retro_planning/i18n/gl.po
index 6da0f28b1b4..57575319967 100644
--- a/addons/project_retro_planning/i18n/gl.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/hr.po b/addons/project_retro_planning/i18n/hr.po
index 1b0ca1a3f5d..9e8c4fb733a 100644
--- a/addons/project_retro_planning/i18n/hr.po
+++ b/addons/project_retro_planning/i18n/hr.po
@@ -1,22 +1,23 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project_retro_planning
-#
+# * project_retro_planning
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-12-22 12:18+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 19:24+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
 msgid "Project Retro planning"
-msgstr "Retro planiranje projekta"
+msgstr "Retro-aktivno planiranje projekta"
diff --git a/addons/project_retro_planning/i18n/hu.po b/addons/project_retro_planning/i18n/hu.po
index d8dd03d6234..bab396e1bea 100644
--- a/addons/project_retro_planning/i18n/hu.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/id.po b/addons/project_retro_planning/i18n/id.po
index 7c28269cb4a..ab2c55ebdae 100644
--- a/addons/project_retro_planning/i18n/id.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/it.po b/addons/project_retro_planning/i18n/it.po
index 03224863cb4..d5c14ff4479 100644
--- a/addons/project_retro_planning/i18n/it.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ko.po b/addons/project_retro_planning/i18n/ko.po
index 59355313e79..7d6c5af6dd9 100644
--- a/addons/project_retro_planning/i18n/ko.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/lt.po b/addons/project_retro_planning/i18n/lt.po
index d8dd03d6234..bab396e1bea 100644
--- a/addons/project_retro_planning/i18n/lt.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/nl.po b/addons/project_retro_planning/i18n/nl.po
index c4866553b2b..2f670a4c31a 100644
--- a/addons/project_retro_planning/i18n/nl.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/nl_BE.po b/addons/project_retro_planning/i18n/nl_BE.po
index 6b37fa0f371..ffcd641315a 100644
--- a/addons/project_retro_planning/i18n/nl_BE.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/pl.po b/addons/project_retro_planning/i18n/pl.po
index 45e48480da8..0142bdc01ea 100644
--- a/addons/project_retro_planning/i18n/pl.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/pt.po b/addons/project_retro_planning/i18n/pt.po
index a59844dda59..f30bd82e579 100644
--- a/addons/project_retro_planning/i18n/pt.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/pt_BR.po b/addons/project_retro_planning/i18n/pt_BR.po
index c1f8ad4b33a..fe4b813bdea 100644
--- a/addons/project_retro_planning/i18n/pt_BR.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ro.po b/addons/project_retro_planning/i18n/ro.po
index d8dd03d6234..bab396e1bea 100644
--- a/addons/project_retro_planning/i18n/ro.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ru.po b/addons/project_retro_planning/i18n/ru.po
index 9852ddcc191..ecc5bbb59f6 100644
--- a/addons/project_retro_planning/i18n/ru.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/sl.po b/addons/project_retro_planning/i18n/sl.po
index e8b0b41acbe..ee42e316e08 100644
--- a/addons/project_retro_planning/i18n/sl.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/sv.po b/addons/project_retro_planning/i18n/sv.po
index d8dd03d6234..96654b05ffb 100644
--- a/addons/project_retro_planning/i18n/sv.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/tlh.po b/addons/project_retro_planning/i18n/tlh.po
index 9e9396f652e..c3d3fc609a7 100644
--- a/addons/project_retro_planning/i18n/tlh.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index 416c6316e3b..f5c81eece9e 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/uk.po b/addons/project_retro_planning/i18n/uk.po
index 9e9396f652e..c3d3fc609a7 100644
--- a/addons/project_retro_planning/i18n/uk.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ur.po b/addons/project_retro_planning/i18n/ur.po
index 29d7567f92e..d37edb701d9 100644
--- a/addons/project_retro_planning/i18n/ur.po
+++ b/addons/project_retro_planning/i18n/ur.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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/zh_CN.po b/addons/project_retro_planning/i18n/zh_CN.po
index c1f8ad4b33a..ebe59592b95 100644
--- a/addons/project_retro_planning/i18n/zh_CN.po
+++ b/addons/project_retro_planning/i18n/zh_CN.po
@@ -4,19 +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-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:52+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
 msgid "Project Retro planning"
-msgstr ""
+msgstr "项目补充计划"
+
+#~ msgid ""
+#~ "\n"
+#~ "        - Stop date of project is change will change all the tasks of that "
+#~ "project to same number of days "
+#~ msgstr ""
+#~ "\n"
+#~ "        项目的停止日期将改变项目所有的任务日期 "
diff --git a/addons/project_retro_planning/i18n/zh_TW.po b/addons/project_retro_planning/i18n/zh_TW.po
index c1f8ad4b33a..fe4b813bdea 100644
--- a/addons/project_retro_planning/i18n/zh_TW.po
+++ b/addons/project_retro_planning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_timesheet/__init__.py b/addons/project_timesheet/__init__.py
index 6c907cff3bf..9dd42114b9c 100644
--- a/addons/project_timesheet/__init__.py
+++ b/addons/project_timesheet/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 import project_timesheet
+import report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__terp__.py
index 8e4cbb898a7..f98a796a935 100644
--- a/addons/project_timesheet/__terp__.py
+++ b/addons/project_timesheet/__terp__.py
@@ -33,7 +33,7 @@
     'website': 'http://www.openerp.com',
     'depends': ['base', 'project', 'hr_timesheet_sheet'],
     'init_xml': [],
-    'update_xml': ["process/project_timesheet_process.xml"],
+    'update_xml': ["process/project_timesheet_process.xml", "report/task_report_view.xml"],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/project_timesheet/i18n/ar.po b/addons/project_timesheet/i18n/ar.po
index ae036c1d5de..5fa677cdbc9 100644
--- a/addons/project_timesheet/i18n/ar.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/bg.po b/addons/project_timesheet/i18n/bg.po
index ae036c1d5de..5fa677cdbc9 100644
--- a/addons/project_timesheet/i18n/bg.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/bs.po b/addons/project_timesheet/i18n/bs.po
index ac66660bf9a..489218b22d7 100644
--- a/addons/project_timesheet/i18n/bs.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/ca.po b/addons/project_timesheet/i18n/ca.po
index ea0337b1bcb..cb23f6dbe41 100644
--- a/addons/project_timesheet/i18n/ca.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/cs.po b/addons/project_timesheet/i18n/cs.po
index e009b5f3aae..0265c575ab3 100644
--- a/addons/project_timesheet/i18n/cs.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index a95512297c7..00982e362af 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/el.po b/addons/project_timesheet/i18n/el.po
index 02e1b2b7a15..47924d9577f 100644
--- a/addons/project_timesheet/i18n/el.po
+++ b/addons/project_timesheet/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index 0de2340709f..fda25d29af3 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/es_AR.po b/addons/project_timesheet/i18n/es_AR.po
index aff13e38073..b56d026f38b 100644
--- a/addons/project_timesheet/i18n/es_AR.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/et.po b/addons/project_timesheet/i18n/et.po
index 2783b47fbc4..6cadef5a3e8 100644
--- a/addons/project_timesheet/i18n/et.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/fi.po b/addons/project_timesheet/i18n/fi.po
index 2d0a9c06254..d2c57915bd6 100644
--- a/addons/project_timesheet/i18n/fi.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/fr.po b/addons/project_timesheet/i18n/fr.po
index 9150d3ae947..6bcd1748f9d 100644
--- a/addons/project_timesheet/i18n/fr.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/gl.po b/addons/project_timesheet/i18n/gl.po
index fb6a1e1eee7..96ee4046c37 100644
--- a/addons/project_timesheet/i18n/gl.po
+++ b/addons/project_timesheet/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index 1eda6bf396c..d203d671ba9 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* project_timesheet
-#
+# * project_timesheet
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
@@ -9,12 +9,13 @@ msgstr ""
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-12-22 12:22+0000\n"
 "Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
diff --git a/addons/project_timesheet/i18n/hu.po b/addons/project_timesheet/i18n/hu.po
index ae036c1d5de..5fa677cdbc9 100644
--- a/addons/project_timesheet/i18n/hu.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/id.po b/addons/project_timesheet/i18n/id.po
index 704e1b2ee76..f1404707083 100644
--- a/addons/project_timesheet/i18n/id.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/it.po b/addons/project_timesheet/i18n/it.po
index d39d149d30f..558f316346d 100644
--- a/addons/project_timesheet/i18n/it.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/ko.po b/addons/project_timesheet/i18n/ko.po
index bacd70d3a64..9a5c5eb4438 100644
--- a/addons/project_timesheet/i18n/ko.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/lt.po b/addons/project_timesheet/i18n/lt.po
index 04711b6612c..6fd547d4c32 100644
--- a/addons/project_timesheet/i18n/lt.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index 85762fbb5c4..c2140f6f138 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po
index f91582b7a6f..99834f2ca18 100644
--- a/addons/project_timesheet/i18n/nl.po
+++ b/addons/project_timesheet/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: project_timesheet
diff --git a/addons/project_timesheet/i18n/nl_BE.po b/addons/project_timesheet/i18n/nl_BE.po
index a00eaf3dbf1..3419757fbe0 100644
--- a/addons/project_timesheet/i18n/nl_BE.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 5d2c7b524b9..166965aedf5 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/pt.po b/addons/project_timesheet/i18n/pt.po
index 6f0a727f55a..df39d6be05a 100644
--- a/addons/project_timesheet/i18n/pt.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index 896024eedc8..56705b5eaef 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ro.po b/addons/project_timesheet/i18n/ro.po
index ae036c1d5de..f2796c8b2c7 100644
--- a/addons/project_timesheet/i18n/ro.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ru.po b/addons/project_timesheet/i18n/ru.po
index 19ae7fafce1..4cd1058b08b 100644
--- a/addons/project_timesheet/i18n/ru.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po
index f549e38c0ff..9e84405f9c7 100644
--- a/addons/project_timesheet/i18n/sl.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po
index 04e00751d06..29859f610b9 100644
--- a/addons/project_timesheet/i18n/sv.po
+++ b/addons/project_timesheet/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-24 13:30+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/tlh.po b/addons/project_timesheet/i18n/tlh.po
index 6f1429590d5..f4adbfcddad 100644
--- a/addons/project_timesheet/i18n/tlh.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index de70e1a90db..700b6154da9 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/uk.po b/addons/project_timesheet/i18n/uk.po
index 650ce9088ca..7c6bbf1a347 100644
--- a/addons/project_timesheet/i18n/uk.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index 6ca685cc3e5..b8209d5f356 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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-12-01 15:45+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 09:53+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
@@ -24,4 +24,4 @@ msgstr "项目时间表"
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
 msgid "Related Timeline Id"
-msgstr "相关的时间明细 ID"
+msgstr "有关的时间ID"
diff --git a/addons/project_timesheet/i18n/zh_TW.po b/addons/project_timesheet/i18n/zh_TW.po
index 2a95399b03a..69ef4709b57 100644
--- a/addons/project_timesheet/i18n/zh_TW.po
+++ b/addons/project_timesheet/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/report_analytic_line/__init__.py b/addons/project_timesheet/report/__init__.py
similarity index 96%
rename from addons/report_analytic_line/__init__.py
rename to addons/project_timesheet/report/__init__.py
index e68279cad8d..232b71a8975 100644
--- a/addons/report_analytic_line/__init__.py
+++ b/addons/project_timesheet/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,9 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-
+import task_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
new file mode 100644
index 00000000000..fb6331dda0b
--- /dev/null
+++ b/addons/project_timesheet/report/task_report.py
@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+import mx.DateTime
+import tools
+
+#class  task_report(osv.osv):
+#    _name = "task.report"
+#    _description = "Project task report"
+#    _auto = False
+#    _columns = {
+#        'name': fields.char('Task',size=64,required=False, readonly=True),
+#        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+#                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+#        'user_id':fields.many2one('res.users', 'User', readonly=True),
+#        'task_nbr': fields.float('Task Number', readonly=True),
+#        'task_hrs': fields.float('Task Hours', readonly=True),
+#        'task_progress': fields.float('Task Progress', readonly=True),
+#        'company_id' : fields.many2one('res.company', 'Company'),
+#        'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done'),('no','No Task')], 'Status', readonly=True),
+#        'project_id':fields.many2one('project.project', 'Project'),
+#        'year': fields.char('Year',size=64,required=False, readonly=True),
+#        'date_start': fields.datetime('Starting Date',readonly=True),
+#        'date_end': fields.datetime('Ending Date',readonly=True),
+#        'date_deadline': fields.date('Deadline',readonly=True),
+#        'type': fields.many2one('project.task.type', 'Stage'),
+#        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
+#        'assign_to': fields.many2one('res.users', 'Assigned to', readonly=True),
+#        'remaining_hrs': fields.float('Remaining Hours', readonly=True),
+#    }
+#
+#    def init(self, cr):
+#        tools.sql.drop_view_if_exists(cr, 'task_report')
+#        cr.execute('''
+#            create or replace view task_report as (
+#                select
+#                    min(t.id) as id,
+#                    to_char(t.create_date, 'YYYY') as year,
+#                    to_char(t.create_date,'MM') as month,
+#                    u.id as user_id,
+#                    u.company_id as company_id,
+#                    t.name as name,
+#                    t.project_id as project_id,
+#                    to_char(t.date_start,'YYYY/mm/dd') as date_start,
+#                    to_char(t.date_end,'YYYY/mm/dd') as date_end,
+#                    to_char(t.date_deadline,'YYYY/mm/dd') as date_deadline,
+#                    t.type as type,
+#                    t.priority as priority,
+#                    t.user_id as assign_to,
+#                    t.remaining_hours as remaining_hrs,
+#                    count(t.*) as task_nbr,
+#                    sum(t.planned_hours) as task_hrs,
+#                    sum(t.planned_hours * (100 - t.progress) / 100) as task_progress,
+#                    case when t.state is null then 'no' else t.state end as task_state
+#                from
+#                    res_users u
+#                left join
+#                    project_task t on (u.id = t.user_id)
+#                where
+#                    u.active
+#                group by
+#                    to_char(t.create_date, 'YYYY'),to_char(t.create_date,'MM'),u.id, u.company_id, t.state
+#                    ,t.name,t.project_id,t.type,t.priority,
+#                    t.user_id,t.remaining_hours,to_char(t.date_start,'YYYY/mm/dd'),to_char(t.date_end,'YYYY/mm/dd'),to_char(t.date_deadline,'YYYY/mm/dd')
+#            )
+#        ''')
+#task_report()
+
+class report_timesheet_task_user(osv.osv):
+    _name = "report.timesheet.task.user"
+    _auto = False
+    _order = "name"
+
+    def _get_task_hours(self, cr, uid, ids, name,args,context):
+        result = {}
+        for record in self.browse(cr, uid, ids,context):
+            last_date = mx.DateTime.strptime(record.name, '%Y-%m-%d') + mx.DateTime.RelativeDateTime(months=1) - 1
+            task_obj=self.pool.get('project.task.work')
+            task_ids = task_obj.search(cr,uid,[('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))])
+            tsk_hrs = task_obj.read(cr,uid,task_ids,['hours','date','user_id'])
+            total = 0.0
+            for hrs in tsk_hrs:
+                total += hrs['hours']
+            result[record.id] = total
+        return result
+
+    def get_hrs_timesheet(self, cr, uid, ids, name,args,context):
+        result = {}
+        sum = 0.0
+        for record in self.browse(cr, uid, ids, context):
+            last_date = mx.DateTime.strptime(record.name, '%Y-%m-%d') + mx.DateTime.RelativeDateTime(months=1) - 1
+            obj=self.pool.get('hr_timesheet_sheet.sheet.day')
+            sheet_ids = obj.search(cr,uid,[('sheet_id.user_id','=',record.user_id.id),('name','>=',record.name),('name','<=',last_date.strftime('%Y-%m-%d'))])
+            data_days = obj.read(cr,uid,sheet_ids,['name','sheet_id.user_id','total_attendance'])
+            total = 0.0
+            for day_attendance in data_days:
+                total += day_attendance['total_attendance']
+            result[record.id] = total
+        return result
+
+    _columns = {
+        'name': fields.char('Name',size=64),
+        'year': fields.char('Year',size=64,required=False, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+        'user_id': fields.many2one('res.users', 'User',readonly=True),
+        'timesheet_hrs': fields.function(get_hrs_timesheet, method=True, string="Timesheet Hours"),
+        'task_hrs': fields.function(_get_task_hours, method=True, string="Task Hours"),
+
+      }
+
+
+    def init(self, cr):
+       cr.execute(""" create or replace view report_timesheet_task_user as (
+        select
+         ((r.id*12)+to_number(months.m_id,'99'))::integer as id,
+               months.name as name,
+               r.id as user_id,
+               to_char(to_date(months.name, 'YYYY/MM/DD'),'YYYY') as year,
+               to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month
+        from res_users r,
+                (select to_char(p.date,'YYYY-MM-01') as name,
+            to_char(p.date,'MM') as m_id
+                from project_task_work p
+
+            union
+                select to_char(h.name,'YYYY-MM-01') as name,
+                to_char(h.name,'MM') as m_id
+                from hr_timesheet_sheet_sheet_day h) as months
+
+            group by
+                r.id,months.m_id,months.name,
+                to_char(to_date(months.name, 'YYYY/MM/DD'),'YYYY') ,
+                to_char(to_date(months.name, 'YYYY/MM/DD'),'MM')
+              ) """)
+
+report_timesheet_task_user()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
new file mode 100644
index 00000000000..e44e399b292
--- /dev/null
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+          <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
+
+        <!-- Tasks by projects and users
+
+
+        <record id="view_task_project_form" model="ir.ui.view">
+            <field name="name">task.report.form</field>
+            <field name="model">task.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Tasks by User">
+                    <field name="user_id" select="1"/>
+                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                    <field name="task_nbr" select="2"/>
+                    <field name="task_hrs" select="2"/>
+                    <field name="task_progress" select="2"/>
+                    <field name="task_state" select="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_task_project_graph" model="ir.ui.view">
+            <field name="name">task.report.graph</field>
+            <field name="model">task.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Tasks by User" type="bar">
+                    <field name="user_id"/>
+                    <field name="task_progress" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_task_project_tree" model="ir.ui.view">
+            <field name="name">task.report.tree</field>
+            <field name="model">task.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tasks by User">
+                	<field name="date_start" select="1"  invisible="1"/>
+                	<field name="name" select="1"/>
+                	<field name="project_id" select="1"/>
+                	<field name="assign_to" select="1"/>
+                	<field name="type" select="1" invisible="1"/>
+                	<field name="priority" select="1" invisible="1"/>
+                	<field name="date_end" select="1" invisible="1"/>
+	                <field name="month" select="1" invisible="1"/>
+	                <field name="year" select="1" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="remaining_hrs"/>
+                    <field name="date_deadline" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="task_nbr"/>
+                    <field name="task_hrs"/>
+                    <field name="task_progress"/>
+                    <field name="task_state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_report_task_search" model="ir.ui.view">
+            <field name="name">task.report.search</field>
+            <field name="model">task.report</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            	<search string="Tasks by User">
+            		<group col="10" colspan="4">
+	            		<filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
+	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
+	            		<separator orientation="vertical"/>
+	            		<filter string="Start Date" icon="terp-project" domain="[('date_start','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                 		<filter string="End Date" icon="terp-project" domain="[('date_end','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                 	   <filter string="Deadline Date" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
+	            		<separator orientation="vertical"/>
+	            		<field name="project_id" select="1"/>
+	                    <field name="user_id" select="1" widget="selection">
+	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
+                		</field>
+                		<newline/>
+                		<group expand="1" string="Extended options..." colspan="10" col="12">
+                    		<filter icon="terp-project"
+                    		string="Very urgent"
+                    		domain="[('priority','=','0')]"/>
+                    		<filter icon="terp-project"
+                    		string="Urgent"
+                    		domain="[('priority','=','1')]"/>
+                    		<filter icon="terp-project"
+                    		string="Medium"
+                    		domain="[('priority','=','2')]"/>
+                    		<filter icon="terp-project"
+                    		string="Low"
+                    		domain="[('priority','=','3')]"/>
+                    		<filter icon="terp-project"
+                    		string="Very Low"
+                    		domain="[('priority','=','4')]"/>
+                		</group>
+	                    <newline/>
+                		<group expand="1" string="Group By..." colspan="10" col="11">
+                    		<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
+                    		<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
+                    		<filter string="Company" icon="terp-project" context="{'group_by':'company_id'}" />
+                 			<separator orientation="vertical"/>
+                 			<filter string="State" icon="terp-project" context="{'group_by':'task_state'}"/>
+                 			<filter string="Stage" icon="terp-project" context="{'group_by':'type'}"/>
+   							<separator orientation="vertical"/>
+                    		<filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
+                    		<filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
+                		</group>
+	                </group>
+            	</search>
+            </field>
+        </record>
+
+        <record id="action_project_task" model="ir.actions.act_window">
+            <field name="name">Tasks</field>
+            <field name="res_model">task.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="domain">[]</field>
+            <field name="search_view_id" ref="view_report_task_search"/>
+        </record>
+        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+        <menuitem action="action_project_task" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
+-->
+        <!-- Report for Users' Timesheet and Task Hours per Month -->
+
+		<record id="view_report_timesheet_task_user_tree" model="ir.ui.view">
+            <field name="name">report.timesheet.task.user.tree</field>
+            <field name="model">report.timesheet.task.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheet/Task hours Report Per Month" >
+                    <field name="name" select="1"/>
+                    <field name="year" select="1" invisible="1"/>
+                    <field name="month" select="1" invisible="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="timesheet_hrs" widget="float_time" />
+                    <field name="task_hrs"  widget="float_time"/>
+                </tree>
+            </field>
+        </record>
+      <record id="view_report_timesheet_task_user_search" model="ir.ui.view">
+            <field name="name">report.timesheet.task.user.search</field>
+            <field name="model">report.timesheet.task.user</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            	<search string="Tasks by User">
+            		<group colspan="4" col="3">
+	            		<filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" />
+	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" />
+	            		<separator orientation="vertical"/>
+	                    <field name="user_id" select="1" widget="selection">
+	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" />
+                		</field>
+                	</group>
+                	<newline/>
+                	<group expand="1" string="Group By..." colspan="4" col="3">
+                	    <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" default="1" />
+                    	<filter string="Year" icon="terp-project" context="{'group_by':'year'}" />
+                    	<filter string="Month" icon="terp-project" context="{'group_by':'month'}" />
+                	</group>
+            	</search>
+            </field>
+        </record>
+        <record id="action_report_timesheet_task_user" model="ir.actions.act_window">
+            <field name="name">Timesheet / Task Hours Per Month</field>
+            <field name="res_model">report.timesheet.task.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
+        </record>
+        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
+
+    </data>
+</openerp>
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
new file mode 100644
index 00000000000..42c3ea0d15c
--- /dev/null
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_task_report","report.task.report","model_task_report","project.group_project_manager",1,0,0,0
+"access_report_timesheet_task_user","report.timesheet.task.user","model_report_timesheet_task_user","project.group_project_manager",1,0,0,0
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index 7c5aa05f640..dfa362a97c6 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -24,8 +24,11 @@
     'name': 'Purchase Management',
     'version': '1.1',
     'category': 'Generic Modules/Sales & Purchases',
-    'description': """Module for purchase management
-    Request for quotation, Create Supplier Invoice, Print Order...""",
+    'description': """
+    Purchase module is for generating a purchase order for purchase of goods from a supplier.
+    A supplier invoice is created for the particular order placed
+
+    """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'account', 'stock', 'process'],
@@ -36,12 +39,13 @@
         'purchase_workflow.xml',
         'purchase_sequence.xml',
         'purchase_data.xml',
+        'wizard/purchase_order_group_view.xml',
         'purchase_view.xml',
         'purchase_report.xml',
-        'purchase_wizard.xml',
         'stock_view.xml',
         'partner_view.xml',
-        'process/purchase_process.xml'
+        'process/purchase_process.xml',
+        'report/purchase_report_view.xml',
     ],
     'demo_xml': ['purchase_demo.xml'],
     'installable': True,
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index adab450c49d..e5f5d75fe1f 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index ad192d1efd5..9f831b6f0cf 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.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-22 21:23+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\n"
+"PO-Revision-Date: 2010-03-31 08:57+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -482,7 +482,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
 #: model:ir.ui.menu,name:purchase.menu_purchase_root
 msgid "Purchase Management"
-msgstr ""
+msgstr "Поръчки"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 3d591a3a323..cd07039ba71 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index bcaefbcceb2..794a95dc571 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index 2663a6d6a11..97375df99df 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index f25dec8a21d..ad07b9977ce 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index 18af4a1d5bf..61d61b93783 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index c34ce45b746..d96679797cd 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.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-01-26 14:01+0000\n"
-"Last-Translator: Varga Zoltán <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 19:39+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -834,7 +834,7 @@ msgstr "Su referencia"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "Confirmación de orden de compra Nº"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -901,4 +901,4 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Movimientos de stock"
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 2b62d676b22..2e205077440 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index f5da6cd8046..401f421a537 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index 9c98aa834b8..8e788618acb 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -25,7 +25,7 @@ msgstr "Laskutettu ja maksettu"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "Toimittajan lasku esiluotu vastaanotossa kontrollia varten"
+msgstr "Toimittajan lasku ennakoluotu vastaanotettaessa kontrollia varten"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
@@ -35,17 +35,17 @@ msgstr "Kohde"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr "poiminnasta"
+msgstr "Vastaanotossa"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Validated By"
-msgstr "tarkistanut:"
+msgstr "Hyväksyjä"
 
 #. module: purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
 
 #. module: purchase
 #: field:purchase.order,partner_id:0
@@ -70,17 +70,17 @@ msgstr "Tilauksesta"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 msgid "Confirmed Purchase"
-msgstr "Vahvistettu osto"
+msgstr "Vahvistettu ostotilaus"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Invoice Exception"
-msgstr "Poikkeus laskutuksessa"
+msgstr "Poikkeus laskussa"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr "Oletusarvoinen ostojen hinnasto"
+msgstr "Oletushinnasto ostoille"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
@@ -93,18 +93,17 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
-"Tätä hinnastoa käytetään oletusarvoisen sijaan tämänhetkisen "
-"yhteistyökumppanin ostoille."
+"Tätä hinnastoa käytetään oletushinnaston sijasta kyseiselle kumppanille."
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Fax :"
-msgstr "Faksi  :"
+msgstr "Faksi:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
 msgid "Create invoice from product recept"
-msgstr "Luo lasku kuitista"
+msgstr "Luo lasku tuote vastaanotettaessa"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -112,8 +111,8 @@ msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 msgstr ""
-"Hinnasto asettaa käytettävän valuutan tilaukselle. Se arvioi myös "
-"toimittajan hinnan kyseiselle tuotteille/määrille"
+"Hinnasto määrää käytettävän valuutan tilaukselle. Se laskee myös toimittajan "
+"hinnan kyseiselle tuotteille/määrille."
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -123,12 +122,12 @@ msgstr "Ostoprosessi"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 msgid "Invoice from Packing list"
-msgstr "Lasku pakkauslistata"
+msgstr "Lasku pakkauslistasta"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr "Vahvista ostos"
+msgstr "Hyväksy ostotilaus"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -139,12 +138,12 @@ msgstr "Hyväksytty"
 #: model:ir.actions.act_window,name:purchase.purchase_form_action4
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
 msgid "Purchase Orders in Progress"
-msgstr "Ostotilauksia käsitellään"
+msgstr "Ostotilaukset käsittelyssä"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Veroton hinta"
+msgstr "Veroton summa"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -168,7 +167,7 @@ msgstr "Verot"
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr "Osta tilaus"
+msgstr "Ostotilaus"
 
 #. module: purchase
 #: rml:purchase.quotation:0
@@ -178,12 +177,12 @@ msgstr "Terveisin,"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Net Total :"
-msgstr "Yhteensä veroton"
+msgstr "Summa netto:"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Cancelled"
-msgstr "Peruutettu"
+msgstr "Peruttu"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -195,17 +194,17 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
-"Tilauksen tila tai tilauksen hintatarjous. Hintatarjous on tilaus "
-"luonnostilassa. Sen jälkeen, kun käyttäjä on vahvistanut tilauksen, tila "
-"vaihtuu 'Vahvistettu'. Sen jälkeen toimittajan täytyy vahvistaa tilaus, "
-"jolloin tilaksi tulee 'Hyväksytty'. Kun tilaus on maksettu ja vastaanotettu, "
-"tilaksi tulee 'Valmis'. Jos laskussa tai tavaroiden vastaanotossa tulee "
-"peruutus, tila muuttuu poikkeukseksi"
+"Tilauksen tai hintatarjouspyynnön tila. Hintatarjous on ostotilaus jonka "
+"tila on \"Luonnos\". Kun käyttäjä hyväksyy tilauksen, sen tilaksi vaihtuu "
+"\"Vahvistettu\". Tämän jälkeen toimittajan täytyy myös vahvistaa tilaus, "
+"jolloin tila on \"Hyväksytty\". Kun tilaus on maksettu ja vastaanotettu, "
+"tilaksi tulee \"Valmis\". Jos tilauksen laskutuksessa tai vastaanotossa "
+"käytetään peruuta-toimintoa, tilaksi muttuu poikkeukseksi."
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Origin"
-msgstr "Alkuperä"
+msgstr "Lähde"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
@@ -216,12 +215,12 @@ msgstr "Saapuvat tuotteet"
 #: rml:purchase.order:0
 #: rml:purchase.quotation:0
 msgid "Qty"
-msgstr "Lukumäärä"
+msgstr "Määrä"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr "Käsin korjattu"
+msgstr "Korjattu manuaalisesti"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -231,7 +230,7 @@ msgstr "Viite"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "TVA :"
-msgstr "ALV :"
+msgstr "ALV:"
 
 #. module: purchase
 #: rml:purchase.quotation:0
@@ -246,12 +245,12 @@ msgstr "Analyyttinen tili"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 msgid "Purchase Order lines"
-msgstr "Ostotilauslinjat"
+msgstr "Ostotilauksen rivit"
 
 #. module: purchase
 #: field:purchase.order,validator:0
 msgid "Validated by"
-msgstr "Tarkistanut:"
+msgstr "Vahvistaja"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -263,15 +262,17 @@ msgid ""
 "Manual: no invoice will be pre-generated. The accountant will have to encode "
 "manually."
 msgstr ""
-"Tilauksesta: laskuluonnos esivalmistellaan ostotilauksella. Kirjanpitäjän "
-"täytyy vain tarkistaa laskun oikeellisuus varmistukseksi.\n"
-"Nouto: laskuluonnos esivalmistellaan vahvistettujen tilausten perusteella\n"
-"Ohjekirja: laskua ei luonnostella. Kirjanpitäjän täytyy luoda se käsin."
+"Tilauksesta: luonnoslasku luodaan ennakkoon perustuen ostotilaukseen. "
+"Kirjanpidon täytyy vain vahvistaa lasku kontrollin vuoksi.\n"
+"Vastaanotossa: luonnoslasku luodaan ennakkoon perustuen vastaanotettuihin "
+"tavaroihin.\n"
+"Manuaalinen: laskua ei luoda ennakkoon lainkaan. Kirjanpidon täytyy syöttää "
+"se manuaalisesti."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Invoice based on deliveries"
-msgstr "Toimituksiin perustuva lasku"
+msgstr "Lasku perustuen toimituksiin"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -291,17 +292,17 @@ msgstr "Vahvistettu"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Product Receipt"
-msgstr "Tuotekuitti"
+msgstr "Tuotteen vastaanotto"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
 msgid "Confirm"
-msgstr "Hyväksy"
+msgstr "Vahvista"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr "Laskuvalvonta"
+msgstr "Laskunhallinta"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -312,12 +313,12 @@ msgstr "Tarjouspyyntö"
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Waiting"
-msgstr "Odotetaan"
+msgstr "Odottaa"
 
 #. module: purchase
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr "Noutolista"
+msgstr "Pakkauslista"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
@@ -332,7 +333,7 @@ msgstr "Tilausrivit"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "Vahvista ostotilaus tarjouspyynnöstä ilman alkuperää"
+msgstr "Vahvista ostotilaus tarjouspyynnöstä ilman lähdettä"
 
 #. module: purchase
 #: rml:purchase.quotation:0
@@ -342,7 +343,7 @@ msgstr "Faksi:"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed amount"
-msgstr "Veroton määrä"
+msgstr "Veroton summa"
 
 #. module: purchase
 #: rml:purchase.quotation:0
@@ -358,7 +359,7 @@ msgstr "Toimitusosoite:"
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr "Hankintojen hintalista"
+msgstr "Ostojen hinnasto"
 
 #. module: purchase
 #: field:purchase.order,minimum_planned_date:0
@@ -368,7 +369,7 @@ msgstr "Suunniteltu päivämäärä"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
-msgstr "Toimittajan vahvistama"
+msgstr "Toimittajan hyväksymä"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
@@ -413,32 +414,32 @@ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "Pre-generated supplier invoice to control based on order"
-msgstr "Esiluotu toimittajan lasku hallintaperusteisesti tilaukselle"
+msgstr "Ennakkoon luotu toimittajan lasku tilaukseen perustuen"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice from Purchase"
-msgstr "Lasku ostoksesta"
+msgstr "Lasku ostosta"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "Packing is created for the products reception control."
-msgstr "Pakkaus luodaan tuotteen vastaanottohallinnasta"
+msgstr "Pakkaus luodaan tuotteita vastaanotettaessa"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Manual"
-msgstr "Ohje"
+msgstr "Manuaalinen"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirming Purchase"
-msgstr "Vahvista ostos"
+msgstr "Vahvista ostotilaus"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "Approve Purchase order after Confirming"
-msgstr "Vahvista ostos varmennuksen jälkeen"
+msgstr "Hyväksy ostotilaus vahvistuksen jälkeen"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -448,7 +449,7 @@ msgstr "Poikkeus toimituksessa"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Encoded manually by the user."
-msgstr "Käsin koodattu käyttäjän toimesta"
+msgstr "Syötetty käsin käyttäjän toimesta."
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -456,7 +457,7 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
-"Tämä on luotu aikaisimmasta ajoitetusta päivästä kaikille ostotilausten "
+"Tämä on laskettu aikaisimmasta ajoitetusta päivästä kaikille ostotilausten "
 "tuotteille."
 
 #. module: purchase
@@ -472,34 +473,35 @@ msgid ""
 "customer location."
 msgstr ""
 "Anna osoite, jos haluat toimituksen suoraan toimittajalta asiakkaalle. Tässä "
-"tapauksessa se poistaa varastolinkin ja asettaa asiakkaan sijainnin."
+"tapauksessa yhteys varastoon poistetaan ja sen tilalle asetetaan asiakkaan "
+"sijainti."
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr "Hintatarjouspyyntö"
+msgstr "Tarjouspyyntö:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
 msgid "Confirm Purchase order from Request for quotation"
-msgstr "Vahvista ostostilaus hintatarjouksesta"
+msgstr "Vahvista ostotilaus tarjouspyynnöstä"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Confirm Purchase Order"
-msgstr "Vahvista ostostilaus"
+msgstr "Vahvista ostotilaus"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr "Tämä on lista toimituksesta joka on luotu tälle ostokselle"
+msgstr "Tässä on pakkauslistat jotka on luotu tälle ostotilaukselle"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
 #: model:ir.ui.menu,name:purchase.menu_purchase_root
 msgid "Purchase Management"
-msgstr "Ostoskäsittely"
+msgstr "Ostojen hallinta"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
@@ -519,13 +521,13 @@ msgstr "Laskutettu"
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr "Määränpää"
+msgstr "Määränpään osoite"
 
 #. module: purchase
 #: view:purchase.order.line:0
 #: field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr "hankintatilauslinja"
+msgstr "Ostotilauksen rivi"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -540,28 +542,28 @@ msgstr "Aseta luonnokseksi"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 msgid "Purchase order is approved by supplier."
-msgstr "Hankintatilaus on vahvistettu toimittajalta"
+msgstr "Toimittaja on hyväksynyt ostotilauksen."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr "Laskun luonnos"
+msgstr "Luonnoslasku"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order
 msgid "Purchase order"
-msgstr "Hankintatilaus"
+msgstr "Ostotilaus"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 msgid "Request for quotation is proposed by the system."
-msgstr "Tarjouspyyntö on annettua järjestelmän toimesta"
+msgstr "Tarjouspyyntö esitetään järjestelmän toimesta."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 msgid "Packing Invoice"
-msgstr "Pakkauslasku"
+msgstr "Pakkauksen lasku"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -576,7 +578,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoices"
-msgstr "Toimitus & laskut"
+msgstr "Toimitus & laskutus"
 
 #. module: purchase
 #: field:purchase.order,date_order:0
@@ -586,17 +588,17 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr "Asiakirjan viittaus, joka loi tämän hankintatilauspyynnön."
+msgstr "Viittaus dokumenttiin joka loi tämän ostotilauspyynnön."
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Tél. :"
-msgstr "Puh.  :"
+msgstr "Puh.:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid "After Purchase order , Create invoice."
-msgstr "Ostoksen jälkeen, luo lasku"
+msgstr "Ostotilauksen jälkeen, luo lasku."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -606,7 +608,7 @@ msgstr "Arvioitu päivämäärä"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Our Order Reference"
-msgstr "Meidän tilausviitteemme"
+msgstr "Viittemme tilaukselle"
 
 #. module: purchase
 #: rml:purchase.quotation:0
@@ -621,12 +623,12 @@ msgstr "Laske"
 #. module: purchase
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr "Perui hankintatilaus"
+msgstr "Peru ostotilaus"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -641,7 +643,7 @@ msgstr "Yhteensä:"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "When purchase order is approved , it creates its packing list."
-msgstr "Kun hankintatilaus on vahvistettu, se luo oman pakkauslistansa"
+msgstr "Kun ostotilaus on hyväksytty, sille luodaan pakkauslista."
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -661,7 +663,7 @@ msgstr "Välisumma"
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr "Hankintatilauksen hintalistan oletusversio"
+msgstr "Oletus ostotilauksien hinnaston versio"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -672,7 +674,7 @@ msgstr "Yksikköhinta"
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "Verosijainti"
+msgstr "Talouskanta"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -694,7 +696,7 @@ msgstr "Peruuta"
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchases Properties"
-msgstr "Tilaushankinnan ominaisuudet"
+msgstr "Ostojen ominaisuudet"
 
 #. module: purchase
 #: field:purchase.order.line,order_id:0
@@ -705,13 +707,13 @@ msgstr "Tilauksen viite"
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
 msgid "Purchase Orders"
-msgstr "Hankintatilaukset"
+msgstr "Ostotilaukset"
 
 #. module: purchase
 #: wizard_view:purchase.order.merge,init:0
 #: wizard_button:purchase.order.merge,init,merge:0
 msgid "Merge orders"
-msgstr "Liitä tilaukse"
+msgstr "Yhdistä tilaukset"
 
 #. module: purchase
 #: constraint:ir.model:0
@@ -723,7 +725,7 @@ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!
 #: model:ir.actions.act_window,name:purchase.purchase_form_action_new
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
 msgid "New Purchase Order"
-msgstr "Uusi hankintatilaus"
+msgstr "Uusi ostotilaus"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
@@ -740,12 +742,12 @@ msgstr "Tarjouspyyntö"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Out Packing"
-msgstr "Ulospakkaaminen"
+msgstr "Lähetyspakkaus"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Control invoices on receptions"
-msgstr "Kontrolloi laskuja vastaanottaessa"
+msgstr "Laskujen hallinta vastaanotettaessa"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -755,7 +757,7 @@ msgstr "Pyyntöpäivämäärä"
 #. module: purchase
 #: field:purchase.order,date_approve:0
 msgid "Date Approved"
-msgstr "Vahvistuspäivämäärä"
+msgstr "Hyväksymispäivämäärä"
 
 #. module: purchase
 #: model:ir.module.module,description:purchase.module_meta_information
@@ -763,8 +765,8 @@ msgid ""
 "Module for purchase management\n"
 "    Request for quotation, Create Supplier Invoice, Print Order..."
 msgstr ""
-"Ostohallintomoduuli\n"
-"   Tarjouspyyntö, Luo toimittajalasku, Tulosta tilaus"
+"Moduuli ostojen hallintaan\n"
+"    Tarjouspyynnöt, toimittajien laskujen luonti, tilausten tulostus..."
 
 #. module: purchase
 #: field:purchase.order.line,product_id:0
@@ -776,33 +778,33 @@ msgstr "Tuote"
 #: field:purchase.order.line,name:0
 #: rml:purchase.quotation:0
 msgid "Description"
-msgstr "Tiedot"
+msgstr "Kuvaus"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "Product recept invoice"
-msgstr "Tuotteen laskun kuitti"
+msgstr "Tuotteiden vastaanoton lasku"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr "Oletettu toimitusosoite"
+msgstr "Odotettu toimitusosoite:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action3
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
 msgid "Purchase Order Waiting Approval"
-msgstr "Tilaus odottamassa vahvistusta"
+msgstr "Ostotilaus odottaa hyväksymistä"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 msgid "Confirming Purchase Order"
-msgstr "Vahvistetaan tilausta"
+msgstr "Vahvistetaan ostotilausta"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product UOM"
-msgstr "UOM-tuote"
+msgstr "Tuotteen mittayksikkö"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
@@ -812,12 +814,12 @@ msgstr "Varaus"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "Purchase order is confirmed by the user."
-msgstr "Käyttäjä vahvistaa ostotilauksen"
+msgstr "Käyttäjä vahvistaa ostotilauksen."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "Purchase Invoice"
-msgstr "Hankintalasku"
+msgstr "Ostotilauksen lasku"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -842,18 +844,18 @@ msgstr "Tilauspäivämäärä"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr "Tilaushallinta"
+msgstr "Ostojen hallinta"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
 msgid "Request For Quotations"
-msgstr "Tarjouspyyntö"
+msgstr "Tarjouspyynnöt"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr "Laskutushallinta"
+msgstr "Laskujen hallinta"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -863,12 +865,12 @@ msgstr "Hyväksy"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
 msgid "Approved Purchase"
-msgstr "Hyväksytty hankinta"
+msgstr "Hyväksytty ostotilaus"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
 msgid "From Packing list, Create invoice."
-msgstr "Luo lasku pakkauslistasta"
+msgstr "Luo lasku pakkauslistasta."
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -883,50 +885,22 @@ msgstr "Oletko varma että haluat yhdistää nämä tilaukset?"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approving Purchase Order"
-msgstr "Hyväksytään hankintatilaus"
+msgstr "Hyväksytään ostotilaus"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
 msgid "After approved purchase order , it comes into the supplier invoice"
-msgstr "Hankintatilauksen jälkeen siitä tulee toimittajan lasku"
+msgstr "Kun ostotilaus on hyväksytty, siitä tulee toimittajan lasku."
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
 msgstr ""
 
-#~ msgid ""
-#~ "Please note that orders will only be merged if they are to the same partner "
-#~ "and going to the same location, and lines will only be merged if they are "
-#~ "exactly the same except for the quantity and unit."
-#~ msgstr ""
-#~ "Huomiokaa että tilaukset liitetään vain jos ne ovat samalle "
-#~ "yhteistyökumppanille ja lähetetään samaan paikkaan, ja linjat yhdistetään "
-#~ "vain jos ne ovat täysin samat määrää ja mittayksikköä lukuunottamatta"
-
 #, python-format
 #~ msgid "No Pricelist !"
 #~ msgstr "Ei hinnastoa!"
 
-#~ msgid "N°"
-#~ msgstr "N°"
-
-#, python-format
-#~ msgid "You must first cancel all invoices attached to this purchase order."
-#~ msgstr "Sinun täytyy ensin perua kaikki laskut liittynen tilaukseen."
-
-#, python-format
-#~ msgid "Wrong Product UOM !"
-#~ msgstr "Väärä tuote!"
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a pricelist in the purchase form !\n"
-#~ "Please set one before choosing a product."
-#~ msgstr ""
-#~ "Sinun täytyy valita hintalista tilauslomakkeessa!\n"
-#~ "Valitse yksi ennen tuotteen valitsemista"
-
 #, python-format
 #~ msgid "Invalid action !"
 #~ msgstr "Virheellinen toiminto!"
@@ -935,41 +909,5 @@ msgstr ""
 #~ msgid "Error !"
 #~ msgstr "Virhe!"
 
-#, python-format
-#~ msgid ""
-#~ "You have to select a partner in the purchase form !\n"
-#~ "Please set one partner before choosing a product."
-#~ msgstr ""
-#~ "Sinun täytyy valita yhteistyökumppani tilauslomakkeesta!\n"
-#~ "Valitse yksi yhteistyökumppani ennen kuin valitset tuotteen."
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a product UOM in the same category than the purchase UOM "
-#~ "of the product"
-#~ msgstr ""
-#~ "Sinun pitää valita tuote UOM samasta kategoriasta kuin ostos UOM-tuotteesta"
-
-#, python-format
-#~ msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-#~ msgstr "Tälle tuotteelle ei ole määritetty menotiliä \"%s\" (id:%d)"
-
-#, python-format
-#~ msgid "Could not cancel this purchase order !"
-#~ msgstr "Ei voitu perua tätä hankintatilausta"
-
-#, python-format
-#~ msgid "No Partner!"
-#~ msgstr "Ei yhteistyökumppania"
-
-#, python-format
-#~ msgid "You must first cancel all packing attached to this purchase order."
-#~ msgstr ""
-#~ "Sinun täytyy ensin perua kaikki pakkaukset liittyen tähän tilaukseen."
-
-#, python-format
-#~ msgid "Could not cancel purchase order !"
-#~ msgstr "Ei voitu perua hankintatilausta"
-
 #~ msgid "You can not have 2 pricelist version that overlaps!"
 #~ msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 68c9c491ee9..0363434b855 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index adab450c49d..e5f5d75fe1f 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index c2b7a1b0649..ad33450d907 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 4972a9884d4..274474898ca 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index c5bbbcd528d..3d5dae1e08f 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 776313d9e9f..f12f6eeac1e 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 31572f1355a..6cb4caeed8a 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index e39506fb6f6..a287c39c45f 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index d7198f60afe..197a2a1ded2 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 4bb22c8cebd..a8ef608763e 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 2f6c6a8286e..0c498ddc937 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index 25a10d39a33..a509f0d78b6 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index c85a163e7b0..50ed09460b5 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index efc2dfa740d..e884b579366 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index 3de110d0b2d..a5de8764342 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index a7ad2844292..1efc7224bca 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index d228418adcf..c923c2c19f3 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/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-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index b5834ccc8ee..19942e41389 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index cbe51ec0e8e..90bc0460e12 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 8ce7002fd98..3ec56760ac8 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index 6c55b7751eb..c471c36b293 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/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: 2009-12-21 06:56+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:53+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -24,17 +24,17 @@ msgstr "已开票并付清"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "收货时预生成供应商的发票用来核对"
+msgstr "供应商发票预产生控制"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
 msgid "Destination"
-msgstr "目的货位"
+msgstr "目的地"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr "根据分拣"
+msgstr "来自领料/提货"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -44,7 +44,7 @@ msgstr "审核人"
 #. module: purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: purchase
 #: field:purchase.order,partner_id:0
@@ -54,7 +54,7 @@ msgstr "供应商"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr "递送"
+msgstr "送货"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
@@ -64,12 +64,12 @@ msgstr "数量"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Order"
-msgstr "根据采购订单"
+msgstr "来自订单"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 msgid "Confirmed Purchase"
-msgstr "已确认采购"
+msgstr "已确定采购"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -91,24 +91,24 @@ msgstr "创建发票"
 msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
-msgstr "这价格表将取代默认的价格表用于当前业务伙伴采购"
+msgstr "这价格表将用于当前业务伙伴采购的价格表而不是默认的价格表"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Fax :"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
 msgid "Create invoice from product recept"
-msgstr "根据收货分拣创建发票"
+msgstr "从产品接收创建发票"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
-msgstr "该采购订单货币是被价格表设定.它还计算选定产品的供应商价格/数量"
+msgstr "采购订单使用的价格表.它还计算选定产品的供应商价格/数量"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -118,7 +118,7 @@ msgstr "采购流程"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 msgid "Invoice from Packing list"
-msgstr "装箱单发票"
+msgstr "从包装单创建发票"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -128,7 +128,7 @@ msgstr "批准采购"
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Approved"
-msgstr "已审核通过"
+msgstr "已通过"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action4
@@ -147,7 +147,7 @@ msgstr "未完税金额"
 #: view:purchase.order.line:0
 #: field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -168,12 +168,12 @@ msgstr "采购订单"
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Regards,"
-msgstr "敬意，"
+msgstr "问候"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Net Total :"
-msgstr "净总额："
+msgstr "净合计:"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -190,8 +190,8 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
-"该采购订单或报价请求的状态。报价请求是'草稿'状态下的采购订单。报价请求必须被用户确认，状态才能转变为‘确认’。然后，供应商必须确认采购订单，以将状态改变"
-"为‘批准’。当采购订单支付和接收，状态变成‘完成’。如果在发票或在货物接收时取消，状态则变为‘异常’。"
+"采购订单或询价的状态.询价是一个采购订单的‘草稿’状态.订单被用户确定为‘已确认’状态.然后订单的供应商必须被确定这时状态改为为‘已审批通过’.当采购订单"
+"支付和已收货,状态变为‘完成’.如果在发票或接收产品时执行取消操作,状态将变为‘异常’."
 
 #. module: purchase
 #: field:purchase.order,origin:0
@@ -201,7 +201,7 @@ msgstr "来源"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
 msgid "Incoming Products"
-msgstr "入库货品"
+msgstr "接收产品"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -217,32 +217,32 @@ msgstr "手动更正"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr "参照"
+msgstr "参考"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "TVA :"
-msgstr "增值税 ："
+msgstr "增值税:"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Tel.:"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 msgid "Purchase Order lines"
-msgstr "采购订单细目"
+msgstr "采购订单明细"
 
 #. module: purchase
 #: field:purchase.order,validator:0
 msgid "Validated by"
-msgstr "审核人："
+msgstr "审核人:"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -254,11 +254,12 @@ msgid ""
 "Manual: no invoice will be pre-generated. The accountant will have to encode "
 "manually."
 msgstr ""
+"来自订单:根据采购单预先生成发票草稿,财务人员将只是验证发票控制.   来自领料/提货:根据已经验证的接收来预先产生发票草稿.  手动:没有发票预先生成"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Invoice based on deliveries"
-msgstr "根据收货分拣创建发票"
+msgstr "发票基于送货"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -273,12 +274,12 @@ msgstr "采购订单明细"
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Confirmed"
-msgstr "已审核"
+msgstr "已确认"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Product Receipt"
-msgstr "接收货品"
+msgstr "产品收据"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
@@ -288,13 +289,13 @@ msgstr "确认"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr "发票核对"
+msgstr "发票控制"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr "报价请求"
+msgstr "要求报价"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -314,17 +315,17 @@ msgstr "仓库"
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr "采购订单细目"
+msgstr "订单明细"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "确认没有单据来源的报价请求转为采购订单"
+msgstr "没有询价确定采购订单"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Fax:"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -334,12 +335,12 @@ msgstr "未完税金额"
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Expected Date"
-msgstr "预计时间"
+msgstr "预计日期"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Shipping address :"
-msgstr "运货地址："
+msgstr "运货地址:"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -350,17 +351,17 @@ msgstr "采购价格表"
 #. module: purchase
 #: field:purchase.order,minimum_planned_date:0
 msgid "Planned Date"
-msgstr "计划时间"
+msgstr "计划日期"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
-msgstr "供应商审核通过"
+msgstr "供应商通过"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Packing"
-msgstr "分拣"
+msgstr "包装"
 
 #. module: purchase
 #: model:ir.actions.wizard,name:purchase.purchase_order_merge
@@ -375,7 +376,7 @@ msgstr "预定目的地"
 #. module: purchase
 #: field:purchase.order,name:0
 msgid "Order Reference"
-msgstr "订单编号"
+msgstr "订单参考"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -390,27 +391,27 @@ msgstr "价格表"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "When controlling invoice from orders"
-msgstr "当从采购订单核对发票"
+msgstr "当订单控制发票时"
 
 #. module: purchase
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "Pre-generated supplier invoice to control based on order"
-msgstr "根据采购订单预生成供应商发票用来核对"
+msgstr "基于订单预产生供应商发票"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice from Purchase"
-msgstr "根据采购订单生成发票"
+msgstr "从采购产生发票"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "Packing is created for the products reception control."
-msgstr "创建分拣单用来核对货品接收"
+msgstr "产品接收控制创建包装"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -420,29 +421,29 @@ msgstr "手动"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirming Purchase"
-msgstr "确认采购订单"
+msgstr "确定采购"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "Approve Purchase order after Confirming"
-msgstr "确认后批准采购订单"
+msgstr "确定后审批通过采购订单"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Shipping Exception"
-msgstr "运送异常"
+msgstr "运输异常"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Encoded manually by the user."
-msgstr "用户手动输入。"
+msgstr "用户手动"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
 msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
-msgstr "该计算作为采购所有明细中货品的最早计划日期"
+msgstr "这是计算手动采购单产品的最小计划日期"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -455,17 +456,17 @@ msgid ""
 "Put an address if you want to deliver directly from the supplier to the "
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
-msgstr "如果你想直接从供应商送货到客户请填入地址.在这种情况下，它将删除与仓库的链接并设置客户地址。"
+msgstr "如果你想直接从供应商送货到客户填入地址.这个业务个案它将删除与仓库的连接并设置客户地址"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr "报价请求："
+msgstr "询价:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
 msgid "Confirm Purchase order from Request for quotation"
-msgstr "以报价请求确认转为采购订单"
+msgstr "从询价确定采购订单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -476,7 +477,7 @@ msgstr "审核采购订单"
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr "这是为本次采购生成的分拣单列表"
+msgstr "从领料/提货中产生采购"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
@@ -487,22 +488,22 @@ msgstr "采购管理"
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Partner Ref."
-msgstr "业务伙伴编号"
+msgstr "业务伙伴参考"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Taxes :"
-msgstr "税："
+msgstr "税:"
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "开发票"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr "目的地地址"
+msgstr "目的地址"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -513,17 +514,17 @@ msgstr "采购订单明细"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr "日历视图"
+msgstr "日程表视图"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr "设置为草稿"
+msgstr "草稿"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 msgid "Purchase order is approved by supplier."
-msgstr "采购订单已由供应商批准"
+msgstr "采购订单供应商审批通过"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -539,27 +540,27 @@ msgstr "采购订单"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 msgid "Request for quotation is proposed by the system."
-msgstr "报价请求已由系统提出。"
+msgstr "询价进展"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 msgid "Packing Invoice"
-msgstr "分拣单发票"
+msgstr "包装发票"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
 msgid "Creates invoice from packin list"
-msgstr "根据分拣单生成发票"
+msgstr "从包装列表创建发票"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr "该文件已创建日期"
+msgstr "文档的创建日期"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoices"
-msgstr "递送与发票"
+msgstr "送货&发票"
 
 #. module: purchase
 #: field:purchase.order,date_order:0
@@ -569,12 +570,12 @@ msgstr "日期"
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr "生成该采购报价请求的单据编号"
+msgstr "参考的文档生成这个采购订单请求"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Tél. :"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -589,12 +590,12 @@ msgstr "计划日期"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Our Order Reference"
-msgstr "我方的采购订单编号"
+msgstr "订单参考"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "TVA:"
-msgstr "增值税："
+msgstr "增值税:"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -604,7 +605,7 @@ msgstr "计算"
 #. module: purchase
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "你不能有两个重复的价格表版本！"
+msgstr "你不能有两个价格表版本它是重复的！"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -614,27 +615,27 @@ msgstr "取消采购订单"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Create Packing list"
-msgstr "创建分拣单"
+msgstr "创建包装单"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "When purchase order is approved , it creates its packing list."
-msgstr "当采购订单批准以后将创建分拣单。"
+msgstr "当采购订单获得批准时,它创建包装单"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr "历史"
+msgstr "日志"
 
 #. module: purchase
 #: field:purchase.order,state:0
 msgid "Order Status"
-msgstr "采购订单状态"
+msgstr "订单状态"
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -655,12 +656,12 @@ msgstr "单价"
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "财务状况"
+msgstr "财务结构"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr "报价请求编号："
+msgstr "询价"
 
 #. module: purchase
 #: field:purchase.order,invoice_id:0
@@ -700,13 +701,13 @@ msgstr "合并采购订单"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action_new
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
 msgid "New Purchase Order"
-msgstr "新建采购订单"
+msgstr "新的采购订单"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
@@ -723,12 +724,12 @@ msgstr "报价请求"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Out Packing"
-msgstr "发货分拣单"
+msgstr "发出的包装"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Control invoices on receptions"
-msgstr "接收时核对发票"
+msgstr "控制发票在接收"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -738,16 +739,14 @@ msgstr "要求日期"
 #. module: purchase
 #: field:purchase.order,date_approve:0
 msgid "Date Approved"
-msgstr "批准日期"
+msgstr "通过日期"
 
 #. module: purchase
 #: model:ir.module.module,description:purchase.module_meta_information
 msgid ""
 "Module for purchase management\n"
 "    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"采购管理模块\\n\n"
-"    报价请求,创建供应商发票，打印采购订单。。"
+msgstr "采购管理模块报价,创建供应商发票,打印单据.."
 
 #. module: purchase
 #: field:purchase.order.line,product_id:0
@@ -764,23 +763,23 @@ msgstr "说明"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "Product recept invoice"
-msgstr "货品接收的发票"
+msgstr "产品接收发票"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr "预定送货地址："
+msgstr "预期交货地址:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action3
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
 msgid "Purchase Order Waiting Approval"
-msgstr "采购订单等待批准"
+msgstr "等待审批的采购订单"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 msgid "Confirming Purchase Order"
-msgstr "正在确认采购定单"
+msgstr "确定采购订单"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -795,7 +794,7 @@ msgstr "预定"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "Purchase order is confirmed by the user."
-msgstr "采购订单已由该用户确认。"
+msgstr "采购订单用户确定"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
@@ -805,33 +804,33 @@ msgstr "采购发票"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Your Order Reference"
-msgstr "您的订单编号"
+msgstr "你订单参考"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr "采购订单确认编号"
+msgstr "采购订单确认"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr "总金额"
+msgstr "金额合计"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Date Ordered"
-msgstr "订货日期"
+msgstr "订购日期"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr "采购管理"
+msgstr "采购控制"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
 msgid "Request For Quotations"
-msgstr "报价请求"
+msgstr "询价"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -841,22 +840,22 @@ msgstr "开票方式"
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr "批准"
+msgstr "通过"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
 msgid "Approved Purchase"
-msgstr "已批准采购"
+msgstr "通过采购"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
 msgid "From Packing list, Create invoice."
-msgstr "从分拣单创建发票"
+msgstr "从包装单创建发票"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: purchase
 #: wizard_view:purchase.order.merge,init:0
@@ -866,7 +865,7 @@ msgstr "你确定要合并此订单吗？"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approving Purchase Order"
-msgstr "正在批准采购订单"
+msgstr "通过采购订单"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -876,4 +875,13 @@ msgstr "采购订单审批通过后创建供应商发票"
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr "库存调拨列表"
+msgstr "仓库调拨"
+
+#~ msgid "Purchase Order Lines"
+#~ msgstr "采购订单明细"
+
+#~ msgid "Invoicing"
+#~ msgstr "发票"
+
+#~ msgid "Address"
+#~ msgstr "地址"
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 5540ea48f21..5757f939392 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f512406738b..0dc7926f428 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -32,7 +32,7 @@ from tools import config
 from tools.translate import _
 
 import decimal_precision as dp
-
+from osv.orm import browse_record, browse_null
 
 #
 # Model definition
@@ -394,7 +394,9 @@ class purchase_order(osv.osv):
             istate = 'none'
             if order.invoice_method=='picking':
                 istate = '2binvoiced'
+            pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in')
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                'name': pick_name,
                 'origin': order.name+((order.origin and (':'+order.origin)) or ''),
                 'type': 'in',
                 'address_id': order.dest_address_id.id or order.partner_address_id.id,
@@ -444,6 +446,114 @@ class purchase_order(osv.osv):
         })
         return super(purchase_order, self).copy(cr, uid, id, default, context)
 
+
+    def do_merge(self, cr, uid, ids, context):
+        """ 
+        To merge similar type of purchase orders.        
+        Orders will only be merged if: 
+        * Purchase Orders are in draft  
+        * Purchase Orders belong to the same partner   
+        * Purchase Orders are have same stock location, same pricelist
+        Lines will only be merged if: 
+        * Order lines are exactly the same except for the quantity and unit 
+
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: the ID or list of IDs 
+         @param context: A standard dictionary 
+         
+         @return: new purchase order id
+            
+        """          
+        wf_service = netsvc.LocalService("workflow")    
+        def make_key(br, fields):                    
+            list_key = []
+            for field in fields:
+                field_val = getattr(br, field)
+                if field in ('product_id', 'move_dest_id', 'account_analytic_id'):
+                    if not field_val:
+                        field_val = False
+                if isinstance(field_val, browse_record):
+                    field_val = field_val.id
+                elif isinstance(field_val, browse_null):
+                    field_val = False
+                elif isinstance(field_val, list):
+                    field_val = ((6, 0, tuple([v.id for v in field_val])),)
+                list_key.append((field, field_val))
+            list_key.sort()
+            return tuple(list_key)
+
+    # compute what the new orders should contain
+  
+        new_orders = {}
+    
+        for porder in [order for order in self.browse(cr, uid, ids) if order.state == 'draft']:
+            order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
+            new_order = new_orders.setdefault(order_key, ({}, []))
+            new_order[1].append(porder.id)
+            order_infos = new_order[0]
+            if not order_infos:
+                order_infos.update({
+                'origin': porder.origin,
+                'date_order': time.strftime('%Y-%m-%d'),
+                'partner_id': porder.partner_id.id,
+                'partner_address_id': porder.partner_address_id.id,
+                'dest_address_id': porder.dest_address_id.id,
+                'warehouse_id': porder.warehouse_id.id,
+                'location_id': porder.location_id.id,
+                'pricelist_id': porder.pricelist_id.id,
+                'state': 'draft',
+                'order_line': {},
+                'notes': '%s' % (porder.notes or '',),
+                })
+            else:
+                #order_infos['name'] += ', %s' % porder.name
+                if porder.notes:
+                    order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
+                if porder.origin:
+                    order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
+
+            for order_line in porder.order_line:
+                line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
+                o_line = order_infos['order_line'].setdefault(line_key, {})
+                if o_line:
+                    # merge the line with an existing line
+                    o_line['product_qty'] += order_line.product_qty * order_line.product_uom.factor / o_line['uom_factor']
+                else:
+                    # append a new "standalone" line
+                    for field in ('product_qty', 'product_uom'):
+                        field_val = getattr(order_line, field)
+                        if isinstance(field_val, browse_record):
+                            field_val = field_val.id
+                        o_line[field] = field_val
+                    o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
+
+        
+
+        allorders = []
+        for order_key, (order_data, old_ids) in new_orders.iteritems():
+            # skip merges with only one order
+            if len(old_ids) < 2:
+                allorders += (old_ids or [])
+                continue
+
+            # cleanup order line data
+            for key, value in order_data['order_line'].iteritems():
+                del value['uom_factor']
+                value.update(dict(key))
+            order_data['order_line'] = [(0, 0, value) for value in order_data['order_line'].itervalues()]
+
+            # create the new order
+            neworder_id = self.create(cr, uid, order_data)
+            allorders.append(neworder_id)
+
+            # make triggers pointing to the old orders point to the new order
+            for old_id in old_ids:
+                wf_service.trg_redirect(uid, 'purchase.order', old_id, neworder_id, cr)
+                wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
+        return allorders
+
 purchase_order()
 
 class purchase_order_line(osv.osv):
@@ -522,7 +632,7 @@ class purchase_order_line(osv.osv):
                         'uom': uom,
                         'date': date_order,
                         })[pricelist]
-        dt = (datetime.now() + relativedelta(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
+        dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
 
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b8be61e1665..653238748b9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -160,6 +160,7 @@
                         <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>                        
                     </field>
                 </group>
+                <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="10">
                     <filter string="Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>    
                     <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>                
@@ -288,6 +289,15 @@
             name="Product purchases"
             res_model="purchase.order.line"
             src_model="product.product"/>
-
+<!-- 
+	<record model="ir.values" id="action_merge_purchase_order">
+                <field name="object" eval="1" />
+                <field name="name">Purchase Order</field>
+                <field name="key2">client_action_multi</field>
+                <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_purchase_order_group'))" />
+                <field name="key">action</field>
+                <field name="model">purchase.order</field>
+         </record>
+          -->
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_wizard.xml b/addons/purchase/purchase_wizard.xml
index e7fd3ce6efc..d76ce1e3819 100644
--- a/addons/purchase/purchase_wizard.xml
+++ b/addons/purchase/purchase_wizard.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
+  <!-- 
     <wizard id="purchase_order_merge"
             model="purchase.order"
             multi="True"
             keyword="client_action_multi"
             name="purchase.order.merge"
             string="Merge purchases"/>
+             -->
   </data>
 </openerp>
diff --git a/addons/purchase/report/__init__.py b/addons/purchase/report/__init__.py
index c4cc8211bd9..65d4fb0bc65 100644
--- a/addons/purchase/report/__init__.py
+++ b/addons/purchase/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,12 +15,13 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import order
 import request_quotation
+import purchase_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/report/order.py b/addons/purchase/report/order.py
index 0e4e0d982d9..6c99d6381f4 100644
--- a/addons/purchase/report/order.py
+++ b/addons/purchase/report/order.py
@@ -42,7 +42,7 @@ class order(report_sxw.rml_parse):
             tax_ids = [t[0] for t in res]
         else:
             tax_ids = res[0]
-        res = [tax.name for tax in pooler.get_pool(cr.dbname).get('account.tax').browse(self.cr, self.uid, tax_ids)]
+        res = [tax.name for tax in pooler.get_pool(self.cr.dbname).get('account.tax').browse(self.cr, self.uid, tax_ids)]
         return ",\n ".join(res)
     
     def _get_tax(self, order_obj):
@@ -55,7 +55,7 @@ class order(report_sxw.rml_parse):
             tax_ids = [t[0] for t in res]
         else:
             tax_ids = res[0]
-        tax_obj = pooler.get_pool(cr.dbname).get('account.tax')
+        tax_obj = pooler.get_pool(self.cr.dbname).get('account.tax')
         res = []
         for tax in tax_obj.browse(self.cr, self.uid, tax_ids):
             self.cr.execute("SELECT DISTINCT order_line_id FROM purchase_order_line, purchase_order_taxe \
@@ -67,7 +67,7 @@ class order(report_sxw.rml_parse):
                 else:
                     line_ids = lines[0]
                 base = 0
-                for line in pooler.get_pool(cr.dbname).get('purchase.order.line').browse(self.cr, self.uid, line_ids):
+                for line in pooler.get_pool(self.cr.dbname).get('purchase.order.line').browse(self.cr, self.uid, line_ids):
                     base += line.price_subtotal
                 res.append({'code':tax.name,
                     'base':base,
diff --git a/addons/report_purchase/report_purchase.py b/addons/purchase/report/purchase_report.py
similarity index 56%
rename from addons/report_purchase/report_purchase.py
rename to addons/purchase/report/purchase_report.py
index caf482fe14e..ac9abaaf590 100644
--- a/addons/report_purchase/report_purchase.py
+++ b/addons/purchase/report/purchase_report.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,11 +26,12 @@
 from osv import fields,osv
 import tools
 
-class report_purchase_order_product(osv.osv):
-    _name = "report.purchase.order.product"
-    _description = "Purchases Orders by Products"
+class report_purchase_order(osv.osv):
+    _name = "report.purchase.order"
+    _description = "Purchases Orders"
     _auto = False
     _columns = {
+        'date': fields.date('Date', readonly=True),
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'state': fields.selection([
             ('draft','Quotation'),
@@ -43,6 +44,11 @@ class report_purchase_order_product(osv.osv):
             ('cancel','Cancel')
         ], 'Order State', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
+        'category_id': fields.many2one('product.category', 'Categories', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'quantity': fields.float('# of Products', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Average Price', readonly=True),
@@ -53,62 +59,20 @@ class report_purchase_order_product(osv.osv):
     }
     _order = 'name desc,price_total desc'
     def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'report_purchase_order_product')
+        tools.sql.drop_view_if_exists(cr, 'report_purchase_order')
         cr.execute("""
-            create or replace view report_purchase_order_product as (
+            create or replace view report_purchase_order as (
                 select
                     min(l.id) as id,
+                    s.date_order as date,
                     to_char(s.date_order, 'YYYY') as name,
                     to_char(s.date_order, 'MM') as month,
                     s.state,
+                    s.warehouse_id as warehouse_id,
+                    s.partner_id as partner_id,
+                    s.create_uid as user_id,
+                    s.company_id as company_id,
                     l.product_id,
-                    sum(l.product_qty*u.factor) as quantity,
-                    count(*),
-                    sum(l.product_qty*l.price_unit) as price_total,
-                    (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
-                from purchase_order s
-                    left join purchase_order_line l on (s.id=l.order_id)
-                    left join product_uom u on (u.id=l.product_uom)
-                where l.product_id is not null
-                group by l.product_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state
-            )
-        """)
-report_purchase_order_product()
-
-class report_purchase_order_category(osv.osv):
-    _name = "report.purchase.order.category"
-    _description = "Purchases Orders by Categories"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'state': fields.selection([
-            ('draft','Quotation'),
-            ('waiting_date','Waiting Schedule'),
-            ('manual','Manual in progress'),
-            ('progress','In progress'),
-            ('shipping_except','Shipping Exception'),
-            ('invoice_except','Invoice Exception'),
-            ('done','Done'),
-            ('cancel','Cancel')
-        ], 'Order State', readonly=True),
-        'category_id': fields.many2one('product.category', 'Categories', readonly=True),
-        'quantity': fields.float('# of Products', readonly=True),
-        'price_total': fields.float('Total Price', readonly=True),
-        'price_average': fields.float('Average Price', readonly=True),
-        'count': fields.integer('# of Lines', readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-    }
-    _order = 'name desc,price_total desc'
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'report_purchase_order_category')
-        cr.execute("""
-            create or replace view report_purchase_order_category as (
-                select
-                    min(l.id) as id,
-                    to_char(s.date_order, 'YYYY') as name,
-                    to_char(s.date_order, 'MM') as month,
-                    s.state,
                     t.categ_id as category_id,
                     sum(l.product_qty*u.factor) as quantity,
                     count(*),
@@ -120,10 +84,13 @@ class report_purchase_order_category(osv.osv):
                     left join product_template t on (t.id=p.product_tmpl_id)
                     left join product_uom u on (u.id=l.product_uom)
                 where l.product_id is not null
-                group by t.categ_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state
-             )
+                group by s.company_id,s.create_uid,s.partner_id,
+                         t.categ_id,l.product_id,s.date_order,
+                         to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state,
+                         s.warehouse_id
+            )
         """)
-report_purchase_order_category()
+report_purchase_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
new file mode 100644
index 00000000000..0810b013b23
--- /dev/null
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_purchase_order_graph">
+            <field name="name">product.month.graph</field>
+            <field name="model">report.purchase.order</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Purchase Orders Statistics" type="bar">
+                    <field name="product_id"/>
+                    <field name="quantity" operator="+"/>
+                    <field name="price_total" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_purchase_order_tree" model="ir.ui.view">
+            <field name="name">report.purchase.order.tree</field>
+            <field name="model">report.purchase.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Purchase Orders Statistics">
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="warehouse_id" invisible="1"/>
+                    <field name="category_id" invisible="1"/>
+                    <field name="date" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <field name="count"/>
+                    <field name="quantity"/>
+                    <field name="price_total"/>
+                    <field name="price_average"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_purchase_order_search" model="ir.ui.view">
+        <field name="name">report.purchase.order.search</field>
+        <field name="model">report.purchase.order</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Purchase Orders">
+                <filter icon="terp-purchase"
+                    string="This Year"
+                    domain="[('name','=',time.strftime('%%Y'))]"
+                    default="1"
+                    help="Purchase orders of the year"/>
+                <filter icon="terp-purchase"
+                    string="This Month"
+                    default="1"
+                    domain="[('month','=',time.strftime('%%m'))]"
+                    help="Purchase orders of this month"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-purchase"
+                    string="Quotations"
+                    domain="[('state','=','draft')]"/>
+                <filter icon="terp-purchase"
+                    string="Purchase"
+                    default="1"
+                    domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                <separator orientation="vertical"/>
+                <field name="product_id"/>
+                <field name="user_id" widget="selection">
+                    <filter icon="terp-purchase"
+                        string="My Purchases"
+                        domain="[('user_id','=',uid)]"/>
+                </field>
+                <field name="partner_id"/>
+                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+
+                <newline/>
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}"/>
+                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}" default="1"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <filter string="Product Category" icon="terp-purchase" context="{'group_by':'category_id'}"/>
+                    <filter string="Partner" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Month" icon="terp-purchase" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_purchase_order_report_all" model="ir.actions.act_window">
+        <field name="name">Purchase Orders</field>
+        <field name="res_model">report.purchase.order</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="search_view_id" ref="view_purchase_order_search"/>
+    </record>
+
+    <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"/>
+    <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
+
+    </data>
+</openerp>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 5fb968e6ce1..e1eb2cdf199 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -7,4 +7,5 @@
 "access_stock_move_purchase_user","stock.move purchase_user","stock.model_stock_move","purchase.group_purchase_user",1,1,1,1
 "access_purchase_order_stock_worker","purchase.order stock_worker","model_purchase_order","stock.group_stock_user",1,0,0,0
 "access_purchase_order_line_stock_worker","purchase.order.line stock_worker","model_purchase_order_line","stock.group_stock_user",1,0,0,0
-"access_account_tax_purchase_user","account.tax purchase_user","account.model_account_tax","purchase.group_purchase_user",1,0,0,0
\ No newline at end of file
+"access_account_tax_purchase_user","account.tax purchase_user","account.model_account_tax","purchase.group_purchase_user",1,0,0,0
+"access_report_purchase_order","report.purchase.order","model_report_purchase_order","purchase.group_purchase_manager",1,0,0,0
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 84b9a87ff05..2685e52d909 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -18,7 +18,7 @@
     <record model="ir.rule" id="purchase_order_comp_rule">
         <field name="field_id" search="[('model','=','purchase.order'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="purchase_order_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="purchase_order_line_comp_rule_group">
@@ -29,7 +29,7 @@
     <record model="ir.rule" id="purchase_order_line_comp_rule">
         <field name="field_id" search="[('model','=','purchase.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="purchase_order_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/purchase/wizard/__init__.py b/addons/purchase/wizard/__init__.py
index e79d70fbaeb..73bb88500a8 100644
--- a/addons/purchase/wizard/__init__.py
+++ b/addons/purchase/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wizard_group
+import purchase_order_group
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
new file mode 100644
index 00000000000..8c4e0784a7b
--- /dev/null
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+import netsvc
+import pooler
+import time
+import wizard
+from osv.orm import browse_record, browse_null
+
+class purchase_order_group(osv.osv_memory):
+    _name = "purchase.order.group"
+    _description = "Purchase Wizard"
+    _columns = {
+          
+        } 
+
+    def merge_orders(self, cr, uid, ids, context):
+        """ 
+             To merge similar type of purchase orders.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs 
+             @param context: A standard dictionary 
+             
+             @return: purchase order view
+            
+        """              
+        order_obj = self.pool.get('purchase.order')
+        mod_obj =self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+      
+
+        allorders = order_obj.do_merge(cr, uid, context.get('active_ids',[]), context)
+        
+
+        return {
+        'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
+        'name': 'Purchase Orders',
+        'view_type': 'form',
+        'view_mode': 'tree,form',
+        'res_model': 'purchase.order',
+        'view_id': False,
+        'type': 'ir.actions.act_window',
+        'search_view_id': id['res_id']
+        }
+purchase_order_group()
+
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
new file mode 100644
index 00000000000..aa835b36f0b
--- /dev/null
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_purchase_order_group" model="ir.ui.view">
+            <field name="name">Merger Purchase Orders</field>
+            <field name="model">purchase.order.group</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="Merge orders">
+        			<separator string="Are you sure you want to merge these orders ?" colspan="4"/>
+       				<newline/>
+    				<label string="
+Please note that: &#13; &#13;  
+Orders will only be merged if: &#13;  
+* Purchase Orders are in draft &#13;  
+* Purchase Orders belong to the same partner &#13;  
+* Purchase Orders are have same stock location, same pricelist &#13; &#13;   
+Lines will only be merged if: &#13;  
+* Order lines are exactly the same except for the quantity and unit &#13;
+" colspan="4"/>				
+				    <newline/>    				
+        			<separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+            	    <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
+    			</form>
+            </field>
+		</record>
+
+         <act_window name="Merge Purchase orders"		    
+		    res_model="purchase.order.group"
+		    src_model="purchase.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_purchase_order_group"/>	
+		    			
+    </data>
+</openerp>
+
diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
deleted file mode 100644
index 050be8c88d6..00000000000
--- a/addons/purchase/wizard/wizard_group.py
+++ /dev/null
@@ -1,173 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-
-import wizard
-import netsvc
-import pooler
-from osv.orm import browse_record, browse_null
-
-
-merge_form = """<?xml version="1.0"?>
-<form string="Merge orders">
-    <separator string="Are you sure you want to merge these orders ?"/>
-    <newline/>
-    <label>Please note that:
-      - orders will only be merged if:
-        * their status is draft
-        * they belong to the same partner
-        * are going to the same location
-        * have the same pricelist
-      - lines will only be merged if:
-        * they are exactly the same except for the quantity and unit</label>
-</form>
-"""
-
-merge_fields = {
-}
-
-ack_form = """<?xml version="1.0"?>
-<form string="Merge orders">
-    <separator string="Orders merged"/>
-</form>"""
-
-ack_fields = {}
-
-
-def _merge_orders(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('purchase.order')
-    mod_obj = pool.get('ir.model.data')
-    result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])
-
-    def make_key(br, fields):
-        list_key = []
-        for field in fields:
-            field_val = getattr(br, field)
-            if field in ('product_id', 'move_dest_id', 'account_analytic_id'):
-                if not field_val:
-                    field_val = False
-            if isinstance(field_val, browse_record):
-                field_val = field_val.id
-            elif isinstance(field_val, browse_null):
-                field_val = False
-            elif isinstance(field_val, list):
-                field_val = ((6, 0, tuple([v.id for v in field_val])),)
-            list_key.append((field, field_val))
-        list_key.sort()
-        return tuple(list_key)
-
-    # compute what the new orders should contain
-    new_orders = {}
-    for porder in [order for order in order_obj.browse(cr, uid, data['ids']) if order.state == 'draft']:
-        order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
-
-        new_order = new_orders.setdefault(order_key, ({}, []))
-        new_order[1].append(porder.id)
-        order_infos = new_order[0]
-        if not order_infos:
-            order_infos.update({
-                'origin': porder.origin,
-                'date_order': time.strftime('%Y-%m-%d'),
-                'partner_id': porder.partner_id.id,
-                'partner_address_id': porder.partner_address_id.id,
-                'dest_address_id': porder.dest_address_id.id,
-                'warehouse_id': porder.warehouse_id.id,
-                'location_id': porder.location_id.id,
-                'pricelist_id': porder.pricelist_id.id,
-                'state': 'draft',
-                'order_line': {},
-                'notes': '%s' % (porder.notes or '',),
-            })
-        else:
-            #order_infos['name'] += ', %s' % porder.name
-            if porder.notes:
-                order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
-            if porder.origin:
-                order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
-
-        for order_line in porder.order_line:
-            line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
-            o_line = order_infos['order_line'].setdefault(line_key, {})
-            if o_line:
-                # merge the line with an existing line
-                o_line['product_qty'] += order_line.product_qty * order_line.product_uom.factor / o_line['uom_factor']
-            else:
-                # append a new "standalone" line
-                for field in ('product_qty', 'product_uom'):
-                    field_val = getattr(order_line, field)
-                    if isinstance(field_val, browse_record):
-                        field_val = field_val.id
-                    o_line[field] = field_val
-                o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
-
-    wf_service = netsvc.LocalService("workflow")
-
-    allorders = []
-    for order_key, (order_data, old_ids) in new_orders.iteritems():
-        # skip merges with only one order
-        if len(old_ids) < 2:
-            allorders += (old_ids or [])
-            continue
-
-        # cleanup order line data
-        for key, value in order_data['order_line'].iteritems():
-            del value['uom_factor']
-            value.update(dict(key))
-        order_data['order_line'] = [(0, 0, value) for value in order_data['order_line'].itervalues()]
-
-        # create the new order
-        neworder_id = order_obj.create(cr, uid, order_data)
-        allorders.append(neworder_id)
-
-        # make triggers pointing to the old orders point to the new order
-        for old_id in old_ids:
-            wf_service.trg_redirect(uid, 'purchase.order', old_id, neworder_id, cr)
-            wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
-
-    return {
-        'domain': "[('id','in', [" + ','.join(map(str, allorders)) + "])]",
-        'name': 'Purchase Orders',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'purchase.order',
-        'view_id': False,
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']
-    }
-
-
-class merge_orders(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': merge_form, 'fields' : merge_fields, 'state' : [('end', 'Cancel'), ('merge', 'Merge orders') ]}
-        },
-        'merge': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _merge_orders, 'state': 'end'}
-        },
-    }
-
-merge_orders("purchase.order.merge")
-
diff --git a/addons/purchase_analytic_plans/i18n/ar.po b/addons/purchase_analytic_plans/i18n/ar.po
index c3378beb832..9baa0d4c19e 100644
--- a/addons/purchase_analytic_plans/i18n/ar.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/bg.po b/addons/purchase_analytic_plans/i18n/bg.po
index 4e7e761574e..0c077268451 100644
--- a/addons/purchase_analytic_plans/i18n/bg.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/bs.po b/addons/purchase_analytic_plans/i18n/bs.po
index c8d352bc607..11b35bf094d 100644
--- a/addons/purchase_analytic_plans/i18n/bs.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ca.po b/addons/purchase_analytic_plans/i18n/ca.po
index 554e0bd68d6..c783f68a9f2 100644
--- a/addons/purchase_analytic_plans/i18n/ca.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/cs.po b/addons/purchase_analytic_plans/i18n/cs.po
index 04803a43a63..44995511f92 100644
--- a/addons/purchase_analytic_plans/i18n/cs.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po
index a2920f1e609..d71aa133aa2 100644
--- a/addons/purchase_analytic_plans/i18n/de.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/el.po b/addons/purchase_analytic_plans/i18n/el.po
index 4dfa384167c..b7c3b296f2a 100644
--- a/addons/purchase_analytic_plans/i18n/el.po
+++ b/addons/purchase_analytic_plans/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/purchase_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index f5c0deff956..b2b543bcb4a 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_analytic_plans/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/es_AR.po b/addons/purchase_analytic_plans/i18n/es_AR.po
index 70d7d1ef1c3..378d00c36e2 100644
--- a/addons/purchase_analytic_plans/i18n/es_AR.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/et.po b/addons/purchase_analytic_plans/i18n/et.po
index ec911769a82..1bc86d7b0d2 100644
--- a/addons/purchase_analytic_plans/i18n/et.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/fr.po b/addons/purchase_analytic_plans/i18n/fr.po
index 39776912504..6c322f83a5d 100644
--- a/addons/purchase_analytic_plans/i18n/fr.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/gl.po b/addons/purchase_analytic_plans/i18n/gl.po
index 0d1cbb7f40d..e43e4e9b91a 100644
--- a/addons/purchase_analytic_plans/i18n/gl.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index a0308a12285..ee518cfe370 100644
--- a/addons/purchase_analytic_plans/i18n/hr.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/hu.po b/addons/purchase_analytic_plans/i18n/hu.po
index c3378beb832..9baa0d4c19e 100644
--- a/addons/purchase_analytic_plans/i18n/hu.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/id.po b/addons/purchase_analytic_plans/i18n/id.po
index 8eb92c20f19..662e3ca93a8 100644
--- a/addons/purchase_analytic_plans/i18n/id.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/it.po b/addons/purchase_analytic_plans/i18n/it.po
index af39ecf3b15..c41e1ee1c80 100644
--- a/addons/purchase_analytic_plans/i18n/it.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ko.po b/addons/purchase_analytic_plans/i18n/ko.po
index 37dd3f0d53b..78c5557b830 100644
--- a/addons/purchase_analytic_plans/i18n/ko.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/lt.po b/addons/purchase_analytic_plans/i18n/lt.po
index c3378beb832..9baa0d4c19e 100644
--- a/addons/purchase_analytic_plans/i18n/lt.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/nl.po b/addons/purchase_analytic_plans/i18n/nl.po
index e97e075783f..ed6a501f28c 100644
--- a/addons/purchase_analytic_plans/i18n/nl.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/nl_BE.po b/addons/purchase_analytic_plans/i18n/nl_BE.po
index e60d4c7c014..751c58af557 100644
--- a/addons/purchase_analytic_plans/i18n/nl_BE.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/pl.po b/addons/purchase_analytic_plans/i18n/pl.po
index 0925705f99f..a116fec31e2 100644
--- a/addons/purchase_analytic_plans/i18n/pl.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/pt.po b/addons/purchase_analytic_plans/i18n/pt.po
index 33b223545af..7981f6f1d70 100644
--- a/addons/purchase_analytic_plans/i18n/pt.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/pt_BR.po b/addons/purchase_analytic_plans/i18n/pt_BR.po
index 99199c8fb8f..2875f2648e9 100644
--- a/addons/purchase_analytic_plans/i18n/pt_BR.po
+++ b/addons/purchase_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-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ro.po b/addons/purchase_analytic_plans/i18n/ro.po
index 29d62c16350..0b399799144 100644
--- a/addons/purchase_analytic_plans/i18n/ro.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po
index f3b962ae25f..b2a1dbe547e 100644
--- a/addons/purchase_analytic_plans/i18n/ru.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/sl.po b/addons/purchase_analytic_plans/i18n/sl.po
index b80f57276b8..7d13f76b47c 100644
--- a/addons/purchase_analytic_plans/i18n/sl.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/sv.po b/addons/purchase_analytic_plans/i18n/sv.po
index c3378beb832..9baa0d4c19e 100644
--- a/addons/purchase_analytic_plans/i18n/sv.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/tlh.po b/addons/purchase_analytic_plans/i18n/tlh.po
index 28048bd7809..95dc9b662b8 100644
--- a/addons/purchase_analytic_plans/i18n/tlh.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index b65db32a218..be0ec6c9ed2 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/uk.po b/addons/purchase_analytic_plans/i18n/uk.po
index 1806013a722..75f1dfd0d6f 100644
--- a/addons/purchase_analytic_plans/i18n/uk.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ur.po b/addons/purchase_analytic_plans/i18n/ur.po
index 199f740813e..efb09db73d8 100644
--- a/addons/purchase_analytic_plans/i18n/ur.po
+++ b/addons/purchase_analytic_plans/i18n/ur.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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index f9006fb7d48..54005c01ac4 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/i18n/zh_CN.po
@@ -7,26 +7,26 @@ 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-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:56+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "辅助核算分配"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr ""
+msgstr "采购辅助核算分配管理"
 
 #. module: purchase_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
diff --git a/addons/purchase_analytic_plans/i18n/zh_TW.po b/addons/purchase_analytic_plans/i18n/zh_TW.po
index f9006fb7d48..131b1d5858f 100644
--- a/addons/purchase_analytic_plans/i18n/zh_TW.po
+++ b/addons/purchase_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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_tender/__terp__.py b/addons/purchase_tender/__terp__.py
index 1e684e7c4ef..fb514e64bd0 100644
--- a/addons/purchase_tender/__terp__.py
+++ b/addons/purchase_tender/__terp__.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,16 +14,18 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 {
     "name" : "Purchase - Purchase Tender",
     "version" : "0.1",
     "author" : "Tiny",
-    "category" : "Generic Modules/Purchase",
+    "category" : "Generic Modules/Sales & Purchases",
     "website" : "http://www.openerp.com",
-    "description": """ This module allows you to manage your Purchase Tenders. When a purchase order is created, you now have the opportunity to save the related tender. 
+    "description": """
+    This module allows you to manage your Purchase Tenders.
+    When a purchase order is created, you now have the opportunity to save the related tender.
     This new object will regroup and will allow you to easily keep track and order all your purchase orders.
 """,
     "depends" : ["purchase"],
diff --git a/addons/report_account/__init__.py b/addons/report_account/__init__.py
deleted file mode 100644
index a32842f6570..00000000000
--- a/addons/report_account/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import report_receivable
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_account/__terp__.py b/addons/report_account/__terp__.py
deleted file mode 100644
index 43f9ab946f8..00000000000
--- a/addons/report_account/__terp__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-{
-    'name': 'Account Reporting - Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """A module that adds new reports based on the account module.""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['account'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_receivable_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0061754222813',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_account/i18n/ar.po b/addons/report_account/i18n/ar.po
index 4e5d7f9da46..db3d4c3cee2 100644
--- a/addons/report_account/i18n/ar.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/bg.po b/addons/report_account/i18n/bg.po
index 0c15310a6cf..2d956531547 100644
--- a/addons/report_account/i18n/bg.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/bs.po b/addons/report_account/i18n/bs.po
index f2045edfa79..c6d6ccc6ff8 100644
--- a/addons/report_account/i18n/bs.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/ca.po b/addons/report_account/i18n/ca.po
index 528ead8f57a..970cf828c40 100644
--- a/addons/report_account/i18n/ca.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/cs.po b/addons/report_account/i18n/cs.po
index 4e5d7f9da46..db3d4c3cee2 100644
--- a/addons/report_account/i18n/cs.po
+++ b/addons/report_account/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: report_account
diff --git a/addons/report_account/i18n/de.po b/addons/report_account/i18n/de.po
index 2d2b0009f37..c5a6597e45b 100644
--- a/addons/report_account/i18n/de.po
+++ b/addons/report_account/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: report_account
diff --git a/addons/report_account/i18n/el.po b/addons/report_account/i18n/el.po
index fcf4678a579..4134a1ea750 100644
--- a/addons/report_account/i18n/el.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/es.po b/addons/report_account/i18n/es.po
index 9e9e67db9ed..6d105c54717 100644
--- a/addons/report_account/i18n/es.po
+++ b/addons/report_account/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/es_AR.po b/addons/report_account/i18n/es_AR.po
index d99abf05411..74cc8cda3ec 100644
--- a/addons/report_account/i18n/es_AR.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/et.po b/addons/report_account/i18n/et.po
index a9001ec8fc6..7014e2acafd 100644
--- a/addons/report_account/i18n/et.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/fr.po b/addons/report_account/i18n/fr.po
index 5bb8a32c0dc..65310a4c1d4 100644
--- a/addons/report_account/i18n/fr.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/gl.po b/addons/report_account/i18n/gl.po
index 7fd272f6be4..62d34cef2b5 100644
--- a/addons/report_account/i18n/gl.po
+++ b/addons/report_account/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: report_account
diff --git a/addons/report_account/i18n/hr.po b/addons/report_account/i18n/hr.po
index 8fbac0905bd..ee3e9acccfe 100644
--- a/addons/report_account/i18n/hr.po
+++ b/addons/report_account/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_account
-#
+# * report_account
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-11-17 10:14+0000\n"
-"Last-Translator: dzuvela <drazen@radez.hr>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 00:58+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
@@ -31,27 +32,27 @@ msgstr ""
 #. module: report_account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Raspon Mjeseci"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Račun Stranke"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Računi kreirani u zadnjih 15 dana"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Izvještaj o računima kreiranima u zadnjih 15 dana"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Račun Dobavljača"
 
 #. module: report_account
 #: field:report.invoice.created,state:0
@@ -61,27 +62,27 @@ msgstr "Status"
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: report_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_account
 #: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Dug"
 
 #. module: report_account
 #: field:report.account.receivable,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Tip Tvrtke Kupca"
 
 #. module: report_account
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: report_account
 #: field:report.invoice.created,name:0
@@ -96,47 +97,47 @@ msgstr "Ukupni iznos"
 #. module: report_account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "Preostali"
 
 #. module: report_account
 #: field:report.invoice.created,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum izrade računa"
 
 #. module: report_account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Tvrtke kupci po tipu"
 
 #. module: report_account
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Broj računa"
 
 #. module: report_account
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Bez poreza"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Stara potraživanja do danas"
 
 #. module: report_account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Konta Potraživanja"
 
 #. module: report_account
 #: field:report.invoice.created,date_due:0
@@ -146,22 +147,22 @@ msgstr "Datum dospijeća"
 #. module: report_account
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: report_account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Raspon"
 
 #. module: report_account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "Modul koji dodaje nove izvještaje na osnovi ACCOUNT Modula"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Namirenje dobavljača"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
@@ -172,33 +173,33 @@ msgstr "Poništeno"
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: report_account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Izvještavanje o tvrtki Kupcu - Izvještavanje"
 
 #. module: report_account
 #: field:report.invoice.created,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Porijeklo"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo po tipu konta"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Invoices"
-msgstr ""
+msgstr "računi"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: report_account
 #: field:report.invoice.created,currency_id:0
@@ -213,18 +214,18 @@ msgstr "Tjedan"
 #. module: report_account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Stara potraživanja"
 
 #. module: report_account
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: report_account
 #: field:report.invoice.created,amount_total:0
@@ -234,9 +235,9 @@ msgstr "Ukupno"
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Iznos bez poreza"
diff --git a/addons/report_account/i18n/hu.po b/addons/report_account/i18n/hu.po
index 4e5d7f9da46..db3d4c3cee2 100644
--- a/addons/report_account/i18n/hu.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/id.po b/addons/report_account/i18n/id.po
index b9b573e4cf6..f72bc8a333c 100644
--- a/addons/report_account/i18n/id.po
+++ b/addons/report_account/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/it.po b/addons/report_account/i18n/it.po
index 677e8381873..ac45aaadabc 100644
--- a/addons/report_account/i18n/it.po
+++ b/addons/report_account/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/ko.po b/addons/report_account/i18n/ko.po
index 3ddf7157aa8..bb58c38370a 100644
--- a/addons/report_account/i18n/ko.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/lt.po b/addons/report_account/i18n/lt.po
index 4e5d7f9da46..db3d4c3cee2 100644
--- a/addons/report_account/i18n/lt.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/nl.po b/addons/report_account/i18n/nl.po
index ee4108d8046..b2ec071ae65 100644
--- a/addons/report_account/i18n/nl.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/pl.po b/addons/report_account/i18n/pl.po
index 470b837c2e8..b9ab015612c 100644
--- a/addons/report_account/i18n/pl.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/pt.po b/addons/report_account/i18n/pt.po
index 4360e0d7b0f..fe5f3e7c99f 100644
--- a/addons/report_account/i18n/pt.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/pt_BR.po b/addons/report_account/i18n/pt_BR.po
index 03acfbb1c9e..e2f77bef73e 100644
--- a/addons/report_account/i18n/pt_BR.po
+++ b/addons/report_account/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/ro.po b/addons/report_account/i18n/ro.po
index f1853964a62..87615236a77 100644
--- a/addons/report_account/i18n/ro.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/ru.po b/addons/report_account/i18n/ru.po
index 0a109bd017d..aad60e4e8fd 100644
--- a/addons/report_account/i18n/ru.po
+++ b/addons/report_account/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/sl.po b/addons/report_account/i18n/sl.po
index 2ce9a892ffb..ba0856d21a4 100644
--- a/addons/report_account/i18n/sl.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/sv.po b/addons/report_account/i18n/sv.po
index 56cef16e44c..6739e5f83b8 100644
--- a/addons/report_account/i18n/sv.po
+++ b/addons/report_account/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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/tlh.po b/addons/report_account/i18n/tlh.po
index 268cb5d1695..4312043c2b9 100644
--- a/addons/report_account/i18n/tlh.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/tr.po b/addons/report_account/i18n/tr.po
index 81de5fdb31b..51bb88f1d17 100644
--- a/addons/report_account/i18n/tr.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/uk.po b/addons/report_account/i18n/uk.po
index 32f2d87e503..6be03fa0c97 100644
--- a/addons/report_account/i18n/uk.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/zh_CN.po b/addons/report_account/i18n/zh_CN.po
index 5ac78aaeb98..0882a6257bd 100644
--- a/addons/report_account/i18n/zh_CN.po
+++ b/addons/report_account/i18n/zh_CN.po
@@ -4,48 +4,48 @@
 #
 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-02-14 15:53+0000\n"
-"Last-Translator: baomin <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:57+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "客户退款"
 
 #. module: report_account
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "月度"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "客户发票"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "发票建立在15天前"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "最近15天创建的发票报表"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
@@ -55,7 +55,7 @@ msgstr "供应商发票"
 #. module: report_account
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr "省"
+msgstr "状态"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
@@ -65,177 +65,180 @@ msgstr "草稿"
 #. module: report_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中输入的对象名称错误"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_account
 #: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: report_account
 #: field:report.account.receivable,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "科目类型"
 
 #. module: report_account
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: report_account
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "金额合计"
 
 #. module: report_account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "剩余的"
 
 #. module: report_account
 #: field:report.invoice.created,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "发票日期"
 
 #. module: report_account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "科目类型"
 
 #. module: report_account
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "发票编号"
 
 #. module: report_account
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "未完税"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "到今天旧的应收款"
 
 #. module: report_account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "应收款科目"
 
 #. module: report_account
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "到期日"
 
 #. module: report_account
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "贷方"
 
 #. module: report_account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "范围"
 
 #. module: report_account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "在基础账户模块里增加新的报表模块"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "供应商退款"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: report_account
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "余额"
 
 #. module: report_account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "科目报表-报表"
 
 #. module: report_account
 #: field:report.invoice.created,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "源"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "科目余额"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Invoices"
-msgstr ""
+msgstr "发票"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "形式发票"
 
 #. module: report_account
 #: field:report.invoice.created,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "货币"
 
 #. module: report_account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "年里的周"
 
 #. module: report_account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "旧的应收款"
 
 #. module: report_account
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: report_account
 #: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr ""
+msgstr "待处理"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "未完税金额"
+
+#~ msgid "A Temporary table used for Dashboard view"
+#~ msgstr "控制台视图使用的临时表"
diff --git a/addons/report_account/i18n/zh_TW.po b/addons/report_account/i18n/zh_TW.po
index 4a2357471bd..014de8ae7b1 100644
--- a/addons/report_account/i18n/zh_TW.po
+++ b/addons/report_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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/security/ir.model.access.csv b/addons/report_account/security/ir.model.access.csv
deleted file mode 100644
index b37051847a4..00000000000
--- a/addons/report_account/security/ir.model.access.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,0,0,0
-"access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
-"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0
-"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,0,0,0
-"access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
-"access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
diff --git a/addons/report_analytic/__init__.py b/addons/report_analytic/__init__.py
deleted file mode 100644
index ad14dd13f4e..00000000000
--- a/addons/report_analytic/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import report_analytic
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_analytic/__terp__.py b/addons/report_analytic/__terp__.py
deleted file mode 100644
index c5ec3a0dd8f..00000000000
--- a/addons/report_analytic/__terp__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-{
-    'name': 'Analytic Account Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """A module that adds new reports based on analytic accounts.""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['account', 'hr_timesheet_invoice'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_analytic_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0059950675429',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_analytic/i18n/ar.po b/addons/report_analytic/i18n/ar.po
index ed0093b520e..ad24d4d5a52 100644
--- a/addons/report_analytic/i18n/ar.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/bg.po b/addons/report_analytic/i18n/bg.po
index 507687783ad..6e424ffbe3d 100644
--- a/addons/report_analytic/i18n/bg.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/bs.po b/addons/report_analytic/i18n/bs.po
index 1df7431eafc..081c88c594d 100644
--- a/addons/report_analytic/i18n/bs.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/ca.po b/addons/report_analytic/i18n/ca.po
index da43d18cd6d..ac0bd3d925b 100644
--- a/addons/report_analytic/i18n/ca.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/cs.po b/addons/report_analytic/i18n/cs.po
index ed0093b520e..ad24d4d5a52 100644
--- a/addons/report_analytic/i18n/cs.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/da.po b/addons/report_analytic/i18n/da.po
index d04666e07b0..4d5fdec1a5d 100644
--- a/addons/report_analytic/i18n/da.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/de.po b/addons/report_analytic/i18n/de.po
index ef0d838a7f0..3dc328b4c45 100644
--- a/addons/report_analytic/i18n/de.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/el.po b/addons/report_analytic/i18n/el.po
index 4a82609cbf7..c0309105af5 100644
--- a/addons/report_analytic/i18n/el.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/es.po b/addons/report_analytic/i18n/es.po
index da819a91b5e..c5a24770061 100644
--- a/addons/report_analytic/i18n/es.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/es_AR.po b/addons/report_analytic/i18n/es_AR.po
index 67f928fd59a..fb371bb6c96 100644
--- a/addons/report_analytic/i18n/es_AR.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/et.po b/addons/report_analytic/i18n/et.po
index 47525fb9c38..c8e772ad59a 100644
--- a/addons/report_analytic/i18n/et.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/fr.po b/addons/report_analytic/i18n/fr.po
index d94e46f0135..48baebf3b1a 100644
--- a/addons/report_analytic/i18n/fr.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/gl.po b/addons/report_analytic/i18n/gl.po
index 00a550467ce..0f16cd7be2c 100644
--- a/addons/report_analytic/i18n/gl.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/hr.po b/addons/report_analytic/i18n/hr.po
index 5b903e730d2..ad5efd1bb81 100644
--- a/addons/report_analytic/i18n/hr.po
+++ b/addons/report_analytic/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic
-#
+# * report_analytic
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-11-17 10:14+0000\n"
-"Last-Translator: dzuvela <drazen@radez.hr>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:39+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_analytic
 #: model:ir.model,name:report_analytic.model_report_analytic_account_close
@@ -26,36 +27,37 @@ msgstr ""
 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: report_analytic
 #: field:report.analytic.account.close,quantity_max:0
 msgid "Max. Quantity"
-msgstr ""
+msgstr "Maks. količina"
 
 #. module: report_analytic
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,name:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analitički Konto"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Rok"
 
 #. module: report_analytic
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_analytic
 #: model:ir.module.module,shortdesc:report_analytic.module_meta_information
@@ -65,19 +67,19 @@ msgstr "Izvještaji analitike"
 #. module: report_analytic
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: report_analytic
 #: model:ir.actions.act_window,name:report_analytic.action_analytic_account_tree
 #: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree
 #: view:report.analytic.account.close:0
 msgid "Expired analytic accounts"
-msgstr ""
+msgstr "Zastarjela Analitička Konta"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity:0
diff --git a/addons/report_analytic/i18n/hu.po b/addons/report_analytic/i18n/hu.po
index ed0093b520e..ad24d4d5a52 100644
--- a/addons/report_analytic/i18n/hu.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/id.po b/addons/report_analytic/i18n/id.po
index 582aeb1c2e1..c3ece6b872d 100644
--- a/addons/report_analytic/i18n/id.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/it.po b/addons/report_analytic/i18n/it.po
index 9bb9ddc8db3..9c08c4bce24 100644
--- a/addons/report_analytic/i18n/it.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/ko.po b/addons/report_analytic/i18n/ko.po
index daf98ecafe0..89da4b83139 100644
--- a/addons/report_analytic/i18n/ko.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/lt.po b/addons/report_analytic/i18n/lt.po
index d1a09097ced..ad24d4d5a52 100644
--- a/addons/report_analytic/i18n/lt.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/nl.po b/addons/report_analytic/i18n/nl.po
index a9c76285f54..faddf864b76 100644
--- a/addons/report_analytic/i18n/nl.po
+++ b/addons/report_analytic/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/nl_BE.po b/addons/report_analytic/i18n/nl_BE.po
index 0b769132687..b3e49d51814 100644
--- a/addons/report_analytic/i18n/nl_BE.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/pl.po b/addons/report_analytic/i18n/pl.po
index 01b93503eb9..4714910b624 100644
--- a/addons/report_analytic/i18n/pl.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/pt.po b/addons/report_analytic/i18n/pt.po
index 61e05abb1d4..5833a2821e0 100644
--- a/addons/report_analytic/i18n/pt.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/pt_BR.po b/addons/report_analytic/i18n/pt_BR.po
index 1b2a3bdddbf..7a33af77653 100644
--- a/addons/report_analytic/i18n/pt_BR.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/ro.po b/addons/report_analytic/i18n/ro.po
index d1a09097ced..ad24d4d5a52 100644
--- a/addons/report_analytic/i18n/ro.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/ru.po b/addons/report_analytic/i18n/ru.po
index 0c8f3c4388a..bba8d3fa3a6 100644
--- a/addons/report_analytic/i18n/ru.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/sl.po b/addons/report_analytic/i18n/sl.po
index 464becf2a28..ffd4ae8b00b 100644
--- a/addons/report_analytic/i18n/sl.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/sv.po b/addons/report_analytic/i18n/sv.po
index a3f77b72e83..14ce414f472 100644
--- a/addons/report_analytic/i18n/sv.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/tlh.po b/addons/report_analytic/i18n/tlh.po
index 67b7bc28ff9..f362c85aaca 100644
--- a/addons/report_analytic/i18n/tlh.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/tr.po b/addons/report_analytic/i18n/tr.po
index 3f8dfb9e717..59bd3ebe515 100644
--- a/addons/report_analytic/i18n/tr.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/uk.po b/addons/report_analytic/i18n/uk.po
index 7aeb51038d8..85492d7eafb 100644
--- a/addons/report_analytic/i18n/uk.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/zh_CN.po b/addons/report_analytic/i18n/zh_CN.po
index 17adcd1ea9d..9e87c49c69a 100644
--- a/addons/report_analytic/i18n/zh_CN.po
+++ b/addons/report_analytic/i18n/zh_CN.po
@@ -7,79 +7,79 @@ 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-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:57+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
 #: model:ir.model,name:report_analytic.model_report_analytic_account_close
 msgid "Analytic account to close"
-msgstr ""
+msgstr "辅助核算项关闭"
 
 #. module: report_analytic
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以x_开头并且不能含有特殊字符"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity_max:0
 msgid "Max. Quantity"
-msgstr ""
+msgstr "最大数量"
 
 #. module: report_analytic
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,name:0
 msgid "Analytic account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "截止期限"
 
 #. module: report_analytic
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中无效的模块名"
 
 #. module: report_analytic
 #: model:ir.module.module,shortdesc:report_analytic.module_meta_information
 msgid "Analytic Account Reporting"
-msgstr ""
+msgstr "辅助核算项报表"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "差额"
 
 #. module: report_analytic
 #: model:ir.actions.act_window,name:report_analytic.action_analytic_account_tree
 #: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree
 #: view:report.analytic.account.close:0
 msgid "Expired analytic accounts"
-msgstr ""
+msgstr "过期的辅助核算项"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
diff --git a/addons/report_analytic/i18n/zh_TW.po b/addons/report_analytic/i18n/zh_TW.po
index 17adcd1ea9d..20138d7480c 100644
--- a/addons/report_analytic/i18n/zh_TW.po
+++ b/addons/report_analytic/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/security/ir.model.access.csv b/addons/report_analytic/security/ir.model.access.csv
deleted file mode 100644
index 67807398c36..00000000000
--- a/addons/report_analytic/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_analytic_account_close,report.analytic.account.close,model_report_analytic_account_close,account.group_account_manager,1,0,0,0
-access_report_account_analytic_line_to_invoice,report.account.analytic.line.to.invoice,model_report_account_analytic_line_to_invoice,account.group_account_manager,1,0,0,0
\ No newline at end of file
diff --git a/addons/report_analytic_line/i18n/ar.po b/addons/report_analytic_line/i18n/ar.po
index 58a63e4d8ee..41f682cd7f9 100644
--- a/addons/report_analytic_line/i18n/ar.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/bg.po b/addons/report_analytic_line/i18n/bg.po
index 704bb1e46a5..7ec5a596b26 100644
--- a/addons/report_analytic_line/i18n/bg.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/bs.po b/addons/report_analytic_line/i18n/bs.po
index 458acf3e419..686787d0735 100644
--- a/addons/report_analytic_line/i18n/bs.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/ca.po b/addons/report_analytic_line/i18n/ca.po
index 668f6952526..6d2c859d86b 100644
--- a/addons/report_analytic_line/i18n/ca.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/cs.po b/addons/report_analytic_line/i18n/cs.po
index 58a63e4d8ee..41f682cd7f9 100644
--- a/addons/report_analytic_line/i18n/cs.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/de.po b/addons/report_analytic_line/i18n/de.po
index 87f509771ba..e2b1ec086ff 100644
--- a/addons/report_analytic_line/i18n/de.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/el.po b/addons/report_analytic_line/i18n/el.po
index 480ca9be833..75d496bccc0 100644
--- a/addons/report_analytic_line/i18n/el.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/es.po b/addons/report_analytic_line/i18n/es.po
index 933b0ed84c1..77ca04afb27 100644
--- a/addons/report_analytic_line/i18n/es.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/es_AR.po b/addons/report_analytic_line/i18n/es_AR.po
index 0bddfa96cd2..5dc162ddd33 100644
--- a/addons/report_analytic_line/i18n/es_AR.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/et.po b/addons/report_analytic_line/i18n/et.po
index 88c2c2f6813..35490187cd0 100644
--- a/addons/report_analytic_line/i18n/et.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/fr.po b/addons/report_analytic_line/i18n/fr.po
index 45fbc2af5fc..526ece3aa87 100644
--- a/addons/report_analytic_line/i18n/fr.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/gl.po b/addons/report_analytic_line/i18n/gl.po
index b444c220304..49732f186ef 100644
--- a/addons/report_analytic_line/i18n/gl.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/hr.po b/addons/report_analytic_line/i18n/hr.po
index 48d5e8f2418..b8bbb439b4a 100644
--- a/addons/report_analytic_line/i18n/hr.po
+++ b/addons/report_analytic_line/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_line
-#
+# * report_analytic_line
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-12-22 12:39+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:46+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_analytic_line
 #: model:ir.actions.act_window,name:report_analytic_line.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
@@ -24,7 +25,7 @@ msgstr "Stavke za fakturiranje"
 #. module: report_analytic_line
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za izgradnju preglednog ekrana!"
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,product_id:0
@@ -78,7 +79,7 @@ msgstr "Analitičke stavke za ispis na fakturi"
 #. module: report_analytic_line
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
+msgstr "Pogrešno ime modela u definiciji Radnje"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,unit_amount:0
diff --git a/addons/report_analytic_line/i18n/hu.po b/addons/report_analytic_line/i18n/hu.po
index 58a63e4d8ee..41f682cd7f9 100644
--- a/addons/report_analytic_line/i18n/hu.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/id.po b/addons/report_analytic_line/i18n/id.po
index 1c8109d2147..1f3170dd434 100644
--- a/addons/report_analytic_line/i18n/id.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/it.po b/addons/report_analytic_line/i18n/it.po
index f19cf64f005..f7bef480936 100644
--- a/addons/report_analytic_line/i18n/it.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/ko.po b/addons/report_analytic_line/i18n/ko.po
index 29df350e760..dd6925d82cd 100644
--- a/addons/report_analytic_line/i18n/ko.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/lt.po b/addons/report_analytic_line/i18n/lt.po
index 58a63e4d8ee..41f682cd7f9 100644
--- a/addons/report_analytic_line/i18n/lt.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/nl.po b/addons/report_analytic_line/i18n/nl.po
index c5757d2a35b..2f6cd91500d 100644
--- a/addons/report_analytic_line/i18n/nl.po
+++ b/addons/report_analytic_line/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:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/nl_BE.po b/addons/report_analytic_line/i18n/nl_BE.po
index 26c1bb58748..b7dab54fd95 100644
--- a/addons/report_analytic_line/i18n/nl_BE.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/pl.po b/addons/report_analytic_line/i18n/pl.po
index e834c15501d..593de6b1258 100644
--- a/addons/report_analytic_line/i18n/pl.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/pt.po b/addons/report_analytic_line/i18n/pt.po
index dc74bc5e625..2ddec6eca42 100644
--- a/addons/report_analytic_line/i18n/pt.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/pt_BR.po b/addons/report_analytic_line/i18n/pt_BR.po
index d9a6b2daaf1..204be544d62 100644
--- a/addons/report_analytic_line/i18n/pt_BR.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/ro.po b/addons/report_analytic_line/i18n/ro.po
index 58a63e4d8ee..41f682cd7f9 100644
--- a/addons/report_analytic_line/i18n/ro.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/ru.po b/addons/report_analytic_line/i18n/ru.po
index e60f3a49c51..69eb85adc6b 100644
--- a/addons/report_analytic_line/i18n/ru.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/sl.po b/addons/report_analytic_line/i18n/sl.po
index 962c36d93ef..def8024356f 100644
--- a/addons/report_analytic_line/i18n/sl.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/sv.po b/addons/report_analytic_line/i18n/sv.po
index a7e34c61d7b..6b6d198902b 100644
--- a/addons/report_analytic_line/i18n/sv.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/tlh.po b/addons/report_analytic_line/i18n/tlh.po
index 6ad647d90e8..132559ba6a7 100644
--- a/addons/report_analytic_line/i18n/tlh.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/tr.po b/addons/report_analytic_line/i18n/tr.po
index 7d4b60bb1d3..d8f0b55c11c 100644
--- a/addons/report_analytic_line/i18n/tr.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/uk.po b/addons/report_analytic_line/i18n/uk.po
index 29c4d00c326..89f1430fa73 100644
--- a/addons/report_analytic_line/i18n/uk.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/zh_CN.po b/addons/report_analytic_line/i18n/zh_CN.po
index 9d331c042b5..dcdcec2540d 100644
--- a/addons/report_analytic_line/i18n/zh_CN.po
+++ b/addons/report_analytic_line/i18n/zh_CN.po
@@ -4,87 +4,90 @@
 #
 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 13:14+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:57+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
 #: model:ir.actions.act_window,name:report_analytic_line.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
 msgid "Lines to Invoice"
-msgstr ""
+msgstr "辅助核算开发票"
 
 #. module: report_analytic_line
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: report_analytic_line
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_analytic_line
 #: model:ir.actions.act_window,name:report_analytic_line.action_account_analytic_line_to_invoice
 #: model:ir.ui.menu,name:report_analytic_line.account_analytic_lines_to_invoice_report
 #: view:report.account.analytic.line.to.invoice:0
 msgid "Analytic Lines to Invoice"
-msgstr ""
+msgstr "辅助核算的发票"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,sale_price:0
 msgid "Sale price"
-msgstr ""
+msgstr "售价"
 
 #. module: report_analytic_line
 #: model:ir.module.module,shortdesc:report_analytic_line.module_meta_information
 msgid "Analytic lines - Reporting"
-msgstr ""
+msgstr "辅助核算 - 报表"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,name:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,account_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: report_analytic_line
 #: model:ir.model,name:report_analytic_line.model_report_account_analytic_line_to_invoice
 msgid "Analytic lines to invoice report"
-msgstr ""
+msgstr "辅助核算开的发票报表"
 
 #. module: report_analytic_line
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,unit_amount:0
 msgid "Units"
-msgstr ""
+msgstr "单位"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "计量单位"
+
+#~ msgid "A report on analytic lines, costs by products, months and accounts."
+#~ msgstr "辅助核算明细的报表:产品成本,月度和科目"
diff --git a/addons/report_analytic_line/i18n/zh_TW.po b/addons/report_analytic_line/i18n/zh_TW.po
index 9d331c042b5..9c0256957f2 100644
--- a/addons/report_analytic_line/i18n/zh_TW.po
+++ b/addons/report_analytic_line/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:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/security/ir.model.access.csv b/addons/report_analytic_line/security/ir.model.access.csv
deleted file mode 100644
index 7390bda1e77..00000000000
--- a/addons/report_analytic_line/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_account_analytic_line_to_invoice,report.account.analytic.line.to.invoice,model_report_account_analytic_line_to_invoice,account.group_account_manager,1,0,0,0
diff --git a/addons/report_analytic_planning/i18n/ar.po b/addons/report_analytic_planning/i18n/ar.po
index df089d6cf3b..9788723315c 100644
--- a/addons/report_analytic_planning/i18n/ar.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/bg.po b/addons/report_analytic_planning/i18n/bg.po
index ded0d0744df..52b59feb411 100644
--- a/addons/report_analytic_planning/i18n/bg.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/bs.po b/addons/report_analytic_planning/i18n/bs.po
index 0322e7ed894..107d06790dd 100644
--- a/addons/report_analytic_planning/i18n/bs.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/ca.po b/addons/report_analytic_planning/i18n/ca.po
index c6a4b6c4033..06afc2f6a15 100644
--- a/addons/report_analytic_planning/i18n/ca.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/cs.po b/addons/report_analytic_planning/i18n/cs.po
index df089d6cf3b..4b34ea577ae 100644
--- a/addons/report_analytic_planning/i18n/cs.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/de.po b/addons/report_analytic_planning/i18n/de.po
index 0e775ac8727..98fd50dda91 100644
--- a/addons/report_analytic_planning/i18n/de.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/el.po b/addons/report_analytic_planning/i18n/el.po
index fd82db970ff..cb7f463aca0 100644
--- a/addons/report_analytic_planning/i18n/el.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/es.po b/addons/report_analytic_planning/i18n/es.po
index b77b70a4193..511c5a4ee25 100644
--- a/addons/report_analytic_planning/i18n/es.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/es_AR.po b/addons/report_analytic_planning/i18n/es_AR.po
index 34c8e9d97e4..38d08d9a5cc 100644
--- a/addons/report_analytic_planning/i18n/es_AR.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/et.po b/addons/report_analytic_planning/i18n/et.po
index 1627a0322cf..dfc8f21368a 100644
--- a/addons/report_analytic_planning/i18n/et.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/fr.po b/addons/report_analytic_planning/i18n/fr.po
index 47d9037d3ca..db32fe2c9f0 100644
--- a/addons/report_analytic_planning/i18n/fr.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/hr.po b/addons/report_analytic_planning/i18n/hr.po
index 33103817671..0ad98276f28 100644
--- a/addons/report_analytic_planning/i18n/hr.po
+++ b/addons/report_analytic_planning/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_analytic_planning
-#
+# * report_analytic_planning
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-10-01 07:47+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -24,170 +25,171 @@ msgstr ""
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
-msgstr ""
+msgstr "Planiranje po Kontu"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
-msgstr ""
+msgstr "Sižetak po Projektu"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr ""
+msgstr "Količina JM"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
-msgstr ""
+msgstr "Stat Planiranja"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analitički Konto"
 
 #. module: report_analytic_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_analytic_planning
 #: 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: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
-msgstr ""
+msgstr "Statistike Planiranja"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
-msgstr ""
+msgstr "Stat Planskog Konta"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
-msgstr ""
+msgstr "Planirani Sati"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
-msgstr ""
+msgstr "Stvarno"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
-msgstr ""
+msgstr "Moje Statistike Planiranja"
 
 #. module: report_analytic_planning
 #: model:ir.module.module,description:report_analytic_planning.module_meta_information
 msgid "Planning on analytic accounts."
-msgstr ""
+msgstr "Planiranje Analitičkih konta"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
-msgstr ""
+msgstr "Ime Planiranja"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
-msgstr ""
+msgstr "Količine"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
-msgstr ""
+msgstr "Planiranje Ljudskih resursa"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
-msgstr ""
+msgstr "Raspored"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
-msgstr ""
+msgstr "Linija Planiranja"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
-msgstr ""
+msgstr "Odgovoran :"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
-msgstr ""
+msgstr "Količine po Kontu"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
-msgstr ""
+msgstr "Od:"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
-msgstr ""
+msgstr "Vrijeme po Kontu"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Datum završetka"
 
 #. module: report_analytic_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
-msgstr ""
+msgstr "Vrijem po Korisniku"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
-msgstr ""
+msgstr "Dtatistike Planiranja za moje Projekte"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
-msgstr ""
+msgstr "Tekuće Planiranje"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
-msgstr ""
+msgstr "Sižetak prema Korisniku"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
-msgstr ""
+msgstr "Analiza"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -195,7 +197,7 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,user_id:0
 #: field:report_account_analytic.planning.stat.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -205,97 +207,97 @@ msgstr ""
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
-msgstr ""
+msgstr "Zbirni Raspored"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
-msgstr ""
+msgstr "Detalji Vremena Korisnika po Projektima"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
-msgstr ""
+msgstr "Stat Planiranja Korisnika"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
-msgstr ""
+msgstr "Planiran"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr ""
+msgstr "Analiza Planiranja"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr ""
+msgstr "Linija Planiranja"
 
 #. module: report_analytic_planning
 #: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
 msgid "Analytic planning - Reporting"
-msgstr ""
+msgstr "Analitičko Planiranje - Izvještavanje"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
-msgstr ""
+msgstr "Moje Planiranje"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
-msgstr ""
+msgstr "Planiranje prema Korisniku"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
-msgstr ""
+msgstr "Zadaci"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
-msgstr ""
+msgstr "Planiranje po Kontu"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
-msgstr ""
+msgstr "Količine prema Korisniku"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
-msgstr ""
+msgstr "Moje Tekuće Planiranje"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički konto"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Upravitelj"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
@@ -310,7 +312,7 @@ msgstr ""
 #: field:report_account_analytic.planning.stat.account,planning_id:0
 #: field:report_account_analytic.planning.stat.user,planning_id:0
 msgid "Planning"
-msgstr ""
+msgstr "Planiranje"
 
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
@@ -320,25 +322,25 @@ msgstr ""
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
-msgstr ""
+msgstr "Ukupno planirano"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
-msgstr ""
+msgstr "Statistike Planiranja"
 
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
-msgstr ""
+msgstr "Novo Planiranje"
diff --git a/addons/report_analytic_planning/i18n/hu.po b/addons/report_analytic_planning/i18n/hu.po
index df089d6cf3b..4b34ea577ae 100644
--- a/addons/report_analytic_planning/i18n/hu.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/id.po b/addons/report_analytic_planning/i18n/id.po
index 8c27dfac245..564da9a4181 100644
--- a/addons/report_analytic_planning/i18n/id.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/it.po b/addons/report_analytic_planning/i18n/it.po
index b63380ca441..b28e8f67bd6 100644
--- a/addons/report_analytic_planning/i18n/it.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/ko.po b/addons/report_analytic_planning/i18n/ko.po
index 6b67e85d08c..b311891c166 100644
--- a/addons/report_analytic_planning/i18n/ko.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/lt.po b/addons/report_analytic_planning/i18n/lt.po
index df089d6cf3b..4b34ea577ae 100644
--- a/addons/report_analytic_planning/i18n/lt.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/nl.po b/addons/report_analytic_planning/i18n/nl.po
index 29733a5fd06..1478ef3d1de 100644
--- a/addons/report_analytic_planning/i18n/nl.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/nl_BE.po b/addons/report_analytic_planning/i18n/nl_BE.po
index 76b68908c79..4e84393a862 100644
--- a/addons/report_analytic_planning/i18n/nl_BE.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/pl.po b/addons/report_analytic_planning/i18n/pl.po
index fc7640f9bee..03d5128115c 100644
--- a/addons/report_analytic_planning/i18n/pl.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/pt.po b/addons/report_analytic_planning/i18n/pt.po
index 92193a88ef3..2a77819682c 100644
--- a/addons/report_analytic_planning/i18n/pt.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/pt_BR.po b/addons/report_analytic_planning/i18n/pt_BR.po
index 528289bcf3e..fdf091ea93e 100644
--- a/addons/report_analytic_planning/i18n/pt_BR.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/ro.po b/addons/report_analytic_planning/i18n/ro.po
index df089d6cf3b..4b34ea577ae 100644
--- a/addons/report_analytic_planning/i18n/ro.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/ru.po b/addons/report_analytic_planning/i18n/ru.po
index dbfd0920a18..13bf0101149 100644
--- a/addons/report_analytic_planning/i18n/ru.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/sl.po b/addons/report_analytic_planning/i18n/sl.po
index 497145f1e6f..99e51e72d29 100644
--- a/addons/report_analytic_planning/i18n/sl.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/sv.po b/addons/report_analytic_planning/i18n/sv.po
index dcced482832..2db7e6cd917 100644
--- a/addons/report_analytic_planning/i18n/sv.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/tlh.po b/addons/report_analytic_planning/i18n/tlh.po
index a9d8a203b7a..9d3e5a4f5dd 100644
--- a/addons/report_analytic_planning/i18n/tlh.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/tr.po b/addons/report_analytic_planning/i18n/tr.po
index 734d65a9162..c95607a2f4e 100644
--- a/addons/report_analytic_planning/i18n/tr.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/uk.po b/addons/report_analytic_planning/i18n/uk.po
index ef9ef632310..a019380cdf5 100644
--- a/addons/report_analytic_planning/i18n/uk.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/zh_CN.po b/addons/report_analytic_planning/i18n/zh_CN.po
index 1d2cae18663..2a489fcbf05 100644
--- a/addons/report_analytic_planning/i18n/zh_CN.po
+++ b/addons/report_analytic_planning/i18n/zh_CN.po
@@ -7,187 +7,187 @@ 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-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:58+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
-msgstr ""
+msgstr "到:"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
-msgstr ""
+msgstr "计划科目"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
-msgstr ""
+msgstr "项目摘要"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr ""
+msgstr "数量(计量单位)"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "有责任的"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
-msgstr ""
+msgstr "计划统计"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: report_analytic_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在动作定义中无效的模块名"
 
 #. module: report_analytic_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须是以x_开头并且不能包含特殊的字符"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
-msgstr ""
+msgstr "计划统计"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
-msgstr ""
+msgstr "计划科目统计"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
-msgstr ""
+msgstr "计划时间"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
-msgstr ""
+msgstr "真"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
-msgstr ""
+msgstr "我的计划统计"
 
 #. module: report_analytic_planning
 #: model:ir.module.module,description:report_analytic_planning.module_meta_information
 msgid "Planning on analytic accounts."
-msgstr ""
+msgstr "辅助核算项计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
-msgstr ""
+msgstr "计划名"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
-msgstr ""
+msgstr "数量"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
-msgstr ""
+msgstr "人力资源计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
-msgstr ""
+msgstr "时间表"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
-msgstr ""
+msgstr "计划明细"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
-msgstr ""
+msgstr "有责任的:"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
-msgstr ""
+msgstr "科目数量"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
-msgstr ""
+msgstr "从:"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
-msgstr ""
+msgstr "时间科目"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "结束时间"
 
 #. module: report_analytic_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
-msgstr ""
+msgstr "用户时间"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
-msgstr ""
+msgstr "我的项目计划统计"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
-msgstr ""
+msgstr "当前的计划"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
-msgstr ""
+msgstr "用户摘要"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
-msgstr ""
+msgstr "辅助核算"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -195,39 +195,39 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,user_id:0
 #: field:report_account_analytic.planning.stat.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
-msgstr ""
+msgstr "总时间表"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
-msgstr ""
+msgstr "项目用户时间详情"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
-msgstr ""
+msgstr "计划用户统计"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
-msgstr ""
+msgstr "已计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr ""
+msgstr "计划辅助核算"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -237,12 +237,12 @@ msgstr ""
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr ""
+msgstr "计划明细"
 
 #. module: report_analytic_planning
 #: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
 msgid "Analytic planning - Reporting"
-msgstr ""
+msgstr "辅助核算计划 - 报表"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -253,49 +253,49 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
-msgstr ""
+msgstr "我的计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
-msgstr ""
+msgstr "用户计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
-msgstr ""
+msgstr "备注"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
-msgstr ""
+msgstr "科目计划"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
-msgstr ""
+msgstr "用户数量"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
-msgstr ""
+msgstr "我当前的计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "管理人员"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
@@ -310,35 +310,35 @@ msgstr ""
 #: field:report_account_analytic.planning.stat.account,planning_id:0
 #: field:report_account_analytic.planning.stat.user,planning_id:0
 msgid "Planning"
-msgstr ""
+msgstr "计划"
 
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
-msgstr ""
+msgstr "总计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
-msgstr ""
+msgstr "计划统计"
 
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr ""
+msgstr "打开"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
-msgstr ""
+msgstr "新计划"
diff --git a/addons/report_analytic_planning/i18n/zh_TW.po b/addons/report_analytic_planning/i18n/zh_TW.po
index 1d2cae18663..b43e7033f04 100644
--- a/addons/report_analytic_planning/i18n/zh_TW.po
+++ b/addons/report_analytic_planning/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_crm/i18n/ar.po b/addons/report_crm/i18n/ar.po
index 41e8fa1f6be..808bbc5cca1 100644
--- a/addons/report_crm/i18n/ar.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/bg.po b/addons/report_crm/i18n/bg.po
index 1cc716ae7e3..77ce7825f8c 100644
--- a/addons/report_crm/i18n/bg.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/bs.po b/addons/report_crm/i18n/bs.po
index 681e9567cf7..91785aa7990 100644
--- a/addons/report_crm/i18n/bs.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/ca.po b/addons/report_crm/i18n/ca.po
index d6b90274c75..9d7f55b78f5 100644
--- a/addons/report_crm/i18n/ca.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/cs.po b/addons/report_crm/i18n/cs.po
index 41e8fa1f6be..808bbc5cca1 100644
--- a/addons/report_crm/i18n/cs.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/de.po b/addons/report_crm/i18n/de.po
index 4096c66c27a..6c02e2a7f7d 100644
--- a/addons/report_crm/i18n/de.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/el.po b/addons/report_crm/i18n/el.po
index e85ab7da69f..b85ab46497e 100644
--- a/addons/report_crm/i18n/el.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/es.po b/addons/report_crm/i18n/es.po
index a792d206d2d..22972b49162 100644
--- a/addons/report_crm/i18n/es.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/es_AR.po b/addons/report_crm/i18n/es_AR.po
index f2c8e4e451c..1738e8e2641 100644
--- a/addons/report_crm/i18n/es_AR.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/et.po b/addons/report_crm/i18n/et.po
index 9c4e5846166..f23a3f5ef18 100644
--- a/addons/report_crm/i18n/et.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/fr.po b/addons/report_crm/i18n/fr.po
index a8f5a64126d..0dabd82728d 100644
--- a/addons/report_crm/i18n/fr.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/hr.po b/addons/report_crm/i18n/hr.po
index 41e8fa1f6be..4555268d535 100644
--- a/addons/report_crm/i18n/hr.po
+++ b/addons/report_crm/i18n/hr.po
@@ -1,225 +1,228 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_crm
-#
+# * report_crm
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 00:55+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_crm
 #: field:report.crm.case.categ,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: report_crm
 #: field:report.crm.case.categ,probability:0
 #: field:report.crm.case.user,probability:0
 msgid "Avg. Probability"
-msgstr ""
+msgstr "Prosječna Vjerojatnost"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Planirani prihod"
 
 #. module: report_crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_categ
 msgid "Cases by section and category"
-msgstr ""
+msgstr "Slučajevi po Grupi i Kategoriji"
 
 #. module: report_crm
 #: field:report.crm.case.categ,section_id:0
 #: field:report.crm.case.section,section_id:0
 #: field:report.crm.case.user,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Grupa"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: report_crm
 #: field:report.crm.case.section,perc_done:0
 msgid "%Done"
-msgstr ""
+msgstr "%Done"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Planirani troškovi"
 
 #. module: report_crm
 #: field:report.crm.case.section,nbr_cases:0
 #: field:report.crm.case.user,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# SLučaja"
 
 #. module: report_crm
 #: model:ir.module.module,shortdesc:report_crm.module_meta_information
 msgid "CRM Management - Reporting"
-msgstr ""
+msgstr "Upravljanje CRM-om - Izvještavanje"
 
 #. module: report_crm
 #: field:report.crm.case.categ,delay_close:0
 msgid "Delay Close"
-msgstr ""
+msgstr "Odgodi zaključivanje"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_section_tree
 #: model:ir.model,name:report_crm.model_report_crm_case_section
 #: view:report.crm.case.section:0
 msgid "Cases by Section"
-msgstr ""
+msgstr "Sučajevi po grupi"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Zaključen"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree_month
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree_month
 msgid "Cases by categories and section (this month)"
-msgstr ""
+msgstr "Slučajevi po Kategorijama i Grupi (Ovaj mjesec)"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_66
 msgid "All Months"
-msgstr ""
+msgstr "Svi mjeseci"
 
 #. module: report_crm
 #: 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: report_crm
 #: field:report.crm.case.categ,amount_revenue_prob:0
 #: field:report.crm.case.user,amount_revenue_prob:0
 msgid "Est. Rev*Prob."
-msgstr ""
+msgstr "Est. Rev*Prob."
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Pending"
-msgstr ""
+msgstr "U toku"
 
 #. module: report_crm
 #: field:report.crm.case.section,avg_answers:0
 msgid "Avg. Answers"
-msgstr ""
+msgstr "Prosječni odgovori"
 
 #. module: report_crm
 #: field:report.crm.case.categ,state:0
 #: field:report.crm.case.service.dashboard,state:0
 #: field:report.crm.case.user,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,name:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month
 msgid "Cases by user and section (this month)"
-msgstr ""
+msgstr "Slučajevi po Korisniku i Grupi (Ovaj mjesec)"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_user
 msgid "Monthly cases by user"
-msgstr ""
+msgstr "Mjesečni Slučajevi po korisniku"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "Planned costs"
-msgstr ""
+msgstr "Planirani troškovi"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_view_closed_crm_case_dashboard
 msgid "Closed CRM Cases Within Past 15 Days"
-msgstr ""
+msgstr "CRM Slučajevi zaključeni u proteklih 15 dana"
 
 #. module: report_crm
 #: field:report.crm.case.categ,amount_costs:0
 #: field:report.crm.case.user,amount_costs:0
 msgid "Est.Cost"
-msgstr ""
+msgstr "Procijenjeni trošak"
 
 #. module: report_crm
 #: field:report.crm.case.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_categ
 msgid "Monthly cases by section"
-msgstr ""
+msgstr "Mjesečni Slučajevi po grupi"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month_my
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month_my
 msgid "My cases by section (this month)"
-msgstr ""
+msgstr "Moji SLučajevi po Grupi (Ovaj mjesec)"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_65
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_view_open_crm_case_dashboard
 msgid "Open CRM Cases Within Past 15 Days"
-msgstr ""
+msgstr "CRM Slučajevi otvoreni u proteklih 15 dana"
 
 #. module: report_crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_service_dashboard
 msgid "Report of Closed and Open CRM Cases within past 15 days"
 msgstr ""
+"Izvještaj o zaključenim i otvorenim CRM Slučajevima u proteklih 15 dana"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree
@@ -227,91 +230,91 @@ msgstr ""
 #: view:report.crm.case.categ:0
 #: view:report.crm.case.user:0
 msgid "Cases by User and Section"
-msgstr ""
+msgstr "Slučajevi po Korisniku i Grupi"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_categ_2_report_crm_case_categ
 #: model:ir.actions.act_window,name:report_crm.act_res_users_2_report_crm_case_user
 msgid "Monthly cases"
-msgstr ""
+msgstr "Mjesečni Slučajevi"
 
 #. module: report_crm
 #: field:report.crm.case.categ,amount_revenue:0
 #: field:report.crm.case.user,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Procijenjeni prihod"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,date_closed:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Datum zaključenja"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #. module: report_crm
 #: field:report.crm.case.section,perc_cancel:0
 msgid "%Cancel"
-msgstr ""
+msgstr "%Cancel"
 
 #. module: report_crm
 #: field:report.crm.case.section,delay_close:0
 #: field:report.crm.case.user,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Odgodi zaključivanje"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree
 msgid "Cases by Categories and Section"
-msgstr ""
+msgstr "Slučajevi po Kategorijama i Grupi"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "CRM Cases"
-msgstr ""
+msgstr "CRM Slučajevi"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_my
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_my
 msgid "My cases by section"
-msgstr ""
+msgstr "Moji Slučajevi po grupi"
 
 #. module: report_crm
 #: field:report.crm.case.categ,name:0
 #: field:report.crm.case.section,name:0
 #: field:report.crm.case.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazan"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Datum stvaranja"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Rok"
 
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_user
 msgid "Cases by user and section"
-msgstr ""
+msgstr "Slučajevi po Korisniku i Grupi"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: report_crm
 #: model:ir.module.module,description:report_crm.module_meta_information
@@ -319,15 +322,17 @@ msgid ""
 "A module that adds new reports based on CRM cases.\n"
 "    Case By section, Case By category"
 msgstr ""
+"Modul koji dodaje nove izvještaje na temelju CRM SLučajeva. Slučaj po Grupi, "
+"Slučaj po Kategoriji"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "Planned revenue"
-msgstr ""
+msgstr "Planirani prihod"
diff --git a/addons/report_crm/i18n/hu.po b/addons/report_crm/i18n/hu.po
index 41e8fa1f6be..808bbc5cca1 100644
--- a/addons/report_crm/i18n/hu.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/id.po b/addons/report_crm/i18n/id.po
index 9224e86ae6a..1f7eb0f448f 100644
--- a/addons/report_crm/i18n/id.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/it.po b/addons/report_crm/i18n/it.po
index 02c72132797..a1f21c678b1 100644
--- a/addons/report_crm/i18n/it.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/ko.po b/addons/report_crm/i18n/ko.po
index fca92c3f3a7..ec53932af06 100644
--- a/addons/report_crm/i18n/ko.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/lt.po b/addons/report_crm/i18n/lt.po
index a44eb9707fb..5db231f442d 100644
--- a/addons/report_crm/i18n/lt.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/nl.po b/addons/report_crm/i18n/nl.po
index 03b9fab4bea..c04972f3677 100644
--- a/addons/report_crm/i18n/nl.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/nl_BE.po b/addons/report_crm/i18n/nl_BE.po
index b4eed5028e0..03fc15ea371 100644
--- a/addons/report_crm/i18n/nl_BE.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/pl.po b/addons/report_crm/i18n/pl.po
index c8acdb89bf6..5e291c294fb 100644
--- a/addons/report_crm/i18n/pl.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/pt.po b/addons/report_crm/i18n/pt.po
index e4e7649f161..6642740c2e4 100644
--- a/addons/report_crm/i18n/pt.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/pt_BR.po b/addons/report_crm/i18n/pt_BR.po
index 10a31c6e643..067ab7c6c9d 100644
--- a/addons/report_crm/i18n/pt_BR.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/ro.po b/addons/report_crm/i18n/ro.po
index 6648d5e718a..d96665db213 100644
--- a/addons/report_crm/i18n/ro.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/ru.po b/addons/report_crm/i18n/ru.po
index 14603431ee9..f4b9605b404 100644
--- a/addons/report_crm/i18n/ru.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/sk.po b/addons/report_crm/i18n/sk.po
index e4f4d92966c..47b8280fbcd 100644
--- a/addons/report_crm/i18n/sk.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/sl.po b/addons/report_crm/i18n/sl.po
index 90db1b06b9d..026f5a681e9 100644
--- a/addons/report_crm/i18n/sl.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/sv.po b/addons/report_crm/i18n/sv.po
index 6ef18da46dd..7fdd7390977 100644
--- a/addons/report_crm/i18n/sv.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/tlh.po b/addons/report_crm/i18n/tlh.po
index 71c72b4b4b7..a4d602e7acf 100644
--- a/addons/report_crm/i18n/tlh.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/tr.po b/addons/report_crm/i18n/tr.po
index a0ade7e4e98..eea6c08ff17 100644
--- a/addons/report_crm/i18n/tr.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/uk.po b/addons/report_crm/i18n/uk.po
index 3cf56d0c5ad..dddd9fefd7c 100644
--- a/addons/report_crm/i18n/uk.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/zh_CN.po b/addons/report_crm/i18n/zh_CN.po
index 5a9c2eafb64..f6442e0d73a 100644
--- a/addons/report_crm/i18n/zh_CN.po
+++ b/addons/report_crm/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 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-12-29 07:25+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:58+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
@@ -25,34 +25,34 @@ msgstr "分类"
 #: field:report.crm.case.categ,probability:0
 #: field:report.crm.case.user,probability:0
 msgid "Avg. Probability"
-msgstr "平均. 概率"
+msgstr "平均概率"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,planned_revenue:0
 msgid "Planned Revenue"
-msgstr "计划收入"
+msgstr "已计划收入"
 
 #. module: report_crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_categ
 msgid "Cases by section and category"
-msgstr "按组和分类排列案例"
+msgstr "业务个案项和分类"
 
 #. module: report_crm
 #: field:report.crm.case.categ,section_id:0
 #: field:report.crm.case.section,section_id:0
 #: field:report.crm.case.user,section_id:0
 msgid "Section"
-msgstr "组"
+msgstr "项"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,user_id:0
 msgid "Responsible"
-msgstr "负责的"
+msgstr "有责任的"
 
 #. module: report_crm
 #: field:report.crm.case.section,perc_done:0
@@ -62,30 +62,30 @@ msgstr "%完成"
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,planned_cost:0
 msgid "Planned Costs"
-msgstr "计划成本"
+msgstr "已计划成本"
 
 #. module: report_crm
 #: field:report.crm.case.section,nbr_cases:0
 #: field:report.crm.case.user,nbr:0
 msgid "# of Cases"
-msgstr "# 案例"
+msgstr "业务个案"
 
 #. module: report_crm
 #: model:ir.module.module,shortdesc:report_crm.module_meta_information
 msgid "CRM Management - Reporting"
-msgstr "客户关系管理-报表"
+msgstr "客户关系管理 - 报表"
 
 #. module: report_crm
 #: field:report.crm.case.categ,delay_close:0
 msgid "Delay Close"
-msgstr "办理期"
+msgstr "延迟关闭"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_section_tree
 #: model:ir.model,name:report_crm.model_report_crm_case_section
 #: view:report.crm.case.section:0
 msgid "Cases by Section"
-msgstr "按组排列案例"
+msgstr "业务个案项"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
@@ -99,13 +99,13 @@ msgstr "草稿"
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Closed"
-msgstr "已关闭"
+msgstr "关闭"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree_month
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree_month
 msgid "Cases by categories and section (this month)"
-msgstr "按(该月)分类和组排列案例"
+msgstr "业务个案分类和项(该月)"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_66
@@ -122,7 +122,7 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #: field:report.crm.case.categ,amount_revenue_prob:0
 #: field:report.crm.case.user,amount_revenue_prob:0
 msgid "Est. Rev*Prob."
-msgstr "评估收入乘以可能性"
+msgstr "估计收入 × 概率"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
@@ -134,7 +134,7 @@ msgstr "未决"
 #. module: report_crm
 #: field:report.crm.case.section,avg_answers:0
 msgid "Avg. Answers"
-msgstr "回答平均值"
+msgstr "平均回答"
 
 #. module: report_crm
 #: field:report.crm.case.categ,state:0
@@ -152,33 +152,33 @@ msgstr "说明"
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month
 msgid "Cases by user and section (this month)"
-msgstr "按(该月)用户和组排列案例"
+msgstr "用户业务个案和项(该月)"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_user
 msgid "Monthly cases by user"
-msgstr "按用户排列月度案例"
+msgstr "月度用户业务个案"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_64
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "Planned costs"
-msgstr "计划成本"
+msgstr "已计划成本"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_view_closed_crm_case_dashboard
 msgid "Closed CRM Cases Within Past 15 Days"
-msgstr "关闭15天前的客户关系管理案例"
+msgstr "关闭15天前的客户关系管理业务个案"
 
 #. module: report_crm
 #: field:report.crm.case.categ,amount_costs:0
 #: field:report.crm.case.user,amount_costs:0
 msgid "Est.Cost"
-msgstr "评估成本"
+msgstr "估计成本"
 
 #. module: report_crm
 #: field:report.crm.case.user,user_id:0
@@ -188,7 +188,7 @@ msgstr "用户"
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_categ
 msgid "Monthly cases by section"
-msgstr "按组排列月度案例"
+msgstr "月度业务个案项"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,date:0
@@ -199,7 +199,7 @@ msgstr "日期"
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month_my
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month_my
 msgid "My cases by section (this month)"
-msgstr "我的按组排列的案例(该月)"
+msgstr "我的业务个案项(该月)"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_65
@@ -209,7 +209,7 @@ msgstr "本月"
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_view_open_crm_case_dashboard
 msgid "Open CRM Cases Within Past 15 Days"
-msgstr "15天前的未结客户关系管理案例"
+msgstr "打开15天前的客户关系管理业务个案"
 
 #. module: report_crm
 #: constraint:ir.ui.view:0
@@ -219,7 +219,7 @@ msgstr "无效XML视图结构!"
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_service_dashboard
 msgid "Report of Closed and Open CRM Cases within past 15 days"
-msgstr "15天前关闭或未结的客户关系管理案例报表"
+msgstr "关闭报表和打开15天前的客户关系管理业务个案"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree
@@ -227,24 +227,24 @@ msgstr "15天前关闭或未结的客户关系管理案例报表"
 #: view:report.crm.case.categ:0
 #: view:report.crm.case.user:0
 msgid "Cases by User and Section"
-msgstr "按用户和组排列案例"
+msgstr "用户业务个案和项"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_categ_2_report_crm_case_categ
 #: model:ir.actions.act_window,name:report_crm.act_res_users_2_report_crm_case_user
 msgid "Monthly cases"
-msgstr "月度案例"
+msgstr "月度业务个案"
 
 #. module: report_crm
 #: field:report.crm.case.categ,amount_revenue:0
 #: field:report.crm.case.user,amount_revenue:0
 msgid "Est.Revenue"
-msgstr "评估收入"
+msgstr "估计收入"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,date_closed:0
 msgid "Date Closed"
-msgstr "关闭日期"
+msgstr "结束日期"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,priority:0
@@ -260,38 +260,38 @@ msgstr "%取消"
 #: field:report.crm.case.section,delay_close:0
 #: field:report.crm.case.user,delay_close:0
 msgid "Delay to close"
-msgstr "办理期"
+msgstr "延迟关闭"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree
 msgid "Cases by Categories and Section"
-msgstr "按分类和组排列案例"
+msgstr "业务个案分类和项"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "CRM Cases"
-msgstr "客户关系管理案例"
+msgstr "客户关系管理业务个案"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_my
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_my
 msgid "My cases by section"
-msgstr "我的按组排列案例"
+msgstr "我的业务个案项"
 
 #. module: report_crm
 #: field:report.crm.case.categ,name:0
 #: field:report.crm.case.section,name:0
 #: field:report.crm.case.user,name:0
 msgid "Month"
-msgstr "月份"
+msgstr "月"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,create_date:0
@@ -306,7 +306,7 @@ msgstr "最后期限"
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_user
 msgid "Cases by user and section"
-msgstr "按用户和组排列案例"
+msgstr "用户业务个案和项"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,partner_id:0
@@ -318,16 +318,16 @@ msgstr "业务伙伴"
 msgid ""
 "A module that adds new reports based on CRM cases.\n"
 "    Case By section, Case By category"
-msgstr ""
+msgstr "这模块增加一新报表基于客户关系管理业务个案,项业务个案,分类业务个案"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Open"
-msgstr "未结"
+msgstr "待处理"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "Planned revenue"
-msgstr "计划收入"
+msgstr "已计划收入"
diff --git a/addons/report_crm/i18n/zh_TW.po b/addons/report_crm/i18n/zh_TW.po
index d3e7274e74b..c9a0a7847e0 100644
--- a/addons/report_crm/i18n/zh_TW.po
+++ b/addons/report_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_designer/__terp__.py b/addons/report_designer/__terp__.py
index 866eb535b72..f36973f740b 100644
--- a/addons/report_designer/__terp__.py
+++ b/addons/report_designer/__terp__.py
@@ -25,6 +25,7 @@
     "version" : "1.0",
     "depends" : ["base"],
     "author" : "Tiny",
+    "category": "Tools",
     "description": """Installer for reporting tools selection
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/report_document/__terp__.py b/addons/report_document/__terp__.py
deleted file mode 100644
index a75bccbcf05..00000000000
--- a/addons/report_document/__terp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-{
-    'name': 'Document Management - Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Document Management',
-    'description': """
-    Reporting for the Document Management module:
-    * My Files
-    * All users Files 
-    """,
-    'author': 'Tiny',
-    'depends': ['document'],
-    'init_xml': [],
-    'update_xml': ['report_document_view.xml', 'security/ir.model.access.csv'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0068012774557',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_document/i18n/ar.po b/addons/report_document/i18n/ar.po
index 5c13f05f1d0..725ffdcfa28 100644
--- a/addons/report_document/i18n/ar.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/bg.po b/addons/report_document/i18n/bg.po
index 816956a759e..d18f08152f3 100644
--- a/addons/report_document/i18n/bg.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/bs.po b/addons/report_document/i18n/bs.po
index b8e526e69c2..68d47c2fa1e 100644
--- a/addons/report_document/i18n/bs.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/ca.po b/addons/report_document/i18n/ca.po
index f1adfe72252..b301386cb65 100644
--- a/addons/report_document/i18n/ca.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/cs.po b/addons/report_document/i18n/cs.po
index 5c13f05f1d0..725ffdcfa28 100644
--- a/addons/report_document/i18n/cs.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/de.po b/addons/report_document/i18n/de.po
index 198d3b395b1..4bb144158a5 100644
--- a/addons/report_document/i18n/de.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/es.po b/addons/report_document/i18n/es.po
index 8a8c8ff727c..76fa7437d82 100644
--- a/addons/report_document/i18n/es.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/es_AR.po b/addons/report_document/i18n/es_AR.po
index f9a6b15a360..ac99e1dc885 100644
--- a/addons/report_document/i18n/es_AR.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/et.po b/addons/report_document/i18n/et.po
index 1c335591b7e..9b14c66cbc0 100644
--- a/addons/report_document/i18n/et.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/fr.po b/addons/report_document/i18n/fr.po
index 75282d57a01..7fc9e6764ce 100644
--- a/addons/report_document/i18n/fr.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/hr.po b/addons/report_document/i18n/hr.po
index 0cea7c6d5b7..1705946600c 100644
--- a/addons/report_document/i18n/hr.po
+++ b/addons/report_document/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_document
-#
+# * report_document
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-10-01 07:47+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_document
 #: field:report.document.user,create_date:0
@@ -25,188 +26,189 @@ msgstr ""
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_partner
 msgid "Files Per Month"
-msgstr ""
+msgstr "Spisi po Mjesecu"
 
 #. module: report_document
 #: 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: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_wall
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Zid Srama"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr ""
+msgstr "Detalji Spisa po Partneru"
 
 #. module: report_document
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 #: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Veličina Spisa"
 
 #. module: report_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all
 msgid "All Months"
-msgstr ""
+msgstr "Svi mjeseci"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_myfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_myfile
 msgid "My files"
-msgstr ""
+msgstr "Moji Spisi"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "Spisi po Korisniku"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files"
-msgstr ""
+msgstr "Spisi"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "Spisi po Mjesecu"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree1
 msgid "My files (All months)"
-msgstr ""
+msgstr "Moji Spisi (Svi mjeseci)"
 
 #. module: report_document
 #: field:report.document.wall,file_name:0
 msgid "Last Posted File Name"
-msgstr ""
+msgstr "Zadnje postavljeno Ime Spisa"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Korisnici koji jedan mjesec nisu unijeli Dokument"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
 msgid "Document Management"
-msgstr ""
+msgstr "Upravljanje Dokumentima"
 
 #. module: report_document
 #: field:report.document.user,type:0
 #: field:report.files.partner,type:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Tip Direktorija"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr ""
+msgstr "Spisi po Partneru"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: report_document
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: report_document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_userfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_userfile
 msgid "All Users files"
-msgstr ""
+msgstr "Svi Spisi Korisnika"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree
 msgid "My files (This months)"
-msgstr ""
+msgstr "Moji Spisi (Ovaj mjesec)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_user
 msgid "Files details by Users"
-msgstr ""
+msgstr "Detalji Spisa prema Korisnicima"
 
 #. module: report_document
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Vlasnik"
 
 #. module: report_document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr ""
+msgstr "# Spisa"
 
 #. module: report_document
 #: field:report.document.user,directory:0
 #: field:report.files.partner,directory:0
 msgid "Directory"
-msgstr ""
+msgstr "Direktorij"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_user_graph
 msgid "Files By Users"
-msgstr ""
+msgstr "Spisi prema Korisnicima"
 
 #. module: report_document
 #: model:ir.module.module,shortdesc:report_document.module_meta_information
 msgid "Document Management - Reporting"
-msgstr ""
+msgstr "Upravljanje Dokumentima - Izvještavanje"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree1
 msgid "All Users files (All months)"
-msgstr ""
+msgstr "Spisi svih Korisnika (Svi mjeseci)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_file
 msgid "Files details by Directory"
-msgstr ""
+msgstr "Detalji Spisa prema Direktoriju"
 
 #. module: report_document
 #: field:report.document.user,change_date:0
 #: field:report.files.partner,change_date:0
 msgid "Modified Date"
-msgstr ""
+msgstr "Izmjenjen Datum"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr ""
+msgstr "Veličina spisa po Mjesecu"
 
 #. module: report_document
 #: field:report.document.user,file_title:0
 #: field:report.files.partner,file_title:0
 msgid "File Name"
-msgstr ""
+msgstr "Ime Spisa"
 
 #. module: report_document
 #: field:report.document.file,month:0
@@ -216,32 +218,32 @@ msgstr ""
 #: field:report.document.wall,name:0
 #: field:report.files.partner,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr ""
+msgstr "Spisi po Mjesecu"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "Spisi po tipu Izvora"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr ""
+msgstr "Spisi svih Korisnika (Ovaj mjesec)"
 
 #. module: report_document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr ""
+msgstr "Zadnje postavljeno Vrijeme"
 
 #. module: report_document
 #: field:report.document.user,partner:0
 #: field:report.files.partner,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
diff --git a/addons/report_document/i18n/hu.po b/addons/report_document/i18n/hu.po
index 5c13f05f1d0..725ffdcfa28 100644
--- a/addons/report_document/i18n/hu.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/id.po b/addons/report_document/i18n/id.po
index 5a9915f87f9..9c4abce49af 100644
--- a/addons/report_document/i18n/id.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/it.po b/addons/report_document/i18n/it.po
index d4686cae998..23ea111cbc5 100644
--- a/addons/report_document/i18n/it.po
+++ b/addons/report_document/i18n/it.po
@@ -7,25 +7,25 @@ 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:50+0000\n"
-"Last-Translator: LucaSub <subluca@gmail.com>\n"
+"PO-Revision-Date: 2010-03-18 08:30+0000\n"
+"Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
 #: field:report.document.user,create_date:0
 #: field:report.files.partner,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Data creazione"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_partner
 msgid "Files Per Month"
-msgstr ""
+msgstr "File per mesi"
 
 #. module: report_document
 #: constraint:ir.model:0
@@ -40,24 +40,24 @@ msgstr ""
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Muro della vergogna"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr ""
+msgstr "Dettagli file per Partner"
 
 #. module: report_document
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 #: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Dimensione file"
 
 #. module: report_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all
@@ -68,32 +68,32 @@ msgstr "Tutti i Mesi"
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_myfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_myfile
 msgid "My files"
-msgstr ""
+msgstr "I Miei File"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "File per utenti"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files"
-msgstr ""
+msgstr "Files"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "File per mesi"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree1
 msgid "My files (All months)"
-msgstr ""
+msgstr "I Miei file (Tutti i mesi)"
 
 #. module: report_document
 #: field:report.document.wall,file_name:0
 msgid "Last Posted File Name"
-msgstr ""
+msgstr "Ultimo file inviato"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report
@@ -103,7 +103,7 @@ msgstr "Reportistica"
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Utenti che non inviano documenti da un mese"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
@@ -114,7 +114,7 @@ msgstr "Gestione Documentale"
 #: field:report.document.user,type:0
 #: field:report.files.partner,type:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Tipo Cartella"
 
 #. module: report_document
 #: view:report.files.partner:0
@@ -157,7 +157,7 @@ msgstr ""
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Propietario"
 
 #. module: report_document
 #: field:report.document.file,nbr:0
diff --git a/addons/report_document/i18n/ko.po b/addons/report_document/i18n/ko.po
index 768b966dce8..6d3ef607c4a 100644
--- a/addons/report_document/i18n/ko.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/lt.po b/addons/report_document/i18n/lt.po
index 5c13f05f1d0..725ffdcfa28 100644
--- a/addons/report_document/i18n/lt.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/nl.po b/addons/report_document/i18n/nl.po
index 15cd92f3ee6..328c636f436 100644
--- a/addons/report_document/i18n/nl.po
+++ b/addons/report_document/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: report_document
diff --git a/addons/report_document/i18n/nl_BE.po b/addons/report_document/i18n/nl_BE.po
index e243ddb1cf4..3e2508368c1 100644
--- a/addons/report_document/i18n/nl_BE.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/pl.po b/addons/report_document/i18n/pl.po
index 4d4801e4677..d6fecdf675c 100644
--- a/addons/report_document/i18n/pl.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/pt.po b/addons/report_document/i18n/pt.po
index 2bced5932b9..9b6f057d4ee 100644
--- a/addons/report_document/i18n/pt.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/pt_BR.po b/addons/report_document/i18n/pt_BR.po
index 973b432abd2..40031220b38 100644
--- a/addons/report_document/i18n/pt_BR.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/ro.po b/addons/report_document/i18n/ro.po
index 5c13f05f1d0..725ffdcfa28 100644
--- a/addons/report_document/i18n/ro.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/ru.po b/addons/report_document/i18n/ru.po
index 7c4194dfc0a..c37f589720f 100644
--- a/addons/report_document/i18n/ru.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/sl.po b/addons/report_document/i18n/sl.po
index c151e262164..d4651fd7e25 100644
--- a/addons/report_document/i18n/sl.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/sv.po b/addons/report_document/i18n/sv.po
index ecbe9355f13..cd92165c270 100644
--- a/addons/report_document/i18n/sv.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/tlh.po b/addons/report_document/i18n/tlh.po
index 47d6eaf8f5b..771f018c153 100644
--- a/addons/report_document/i18n/tlh.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/tr.po b/addons/report_document/i18n/tr.po
index eb5e97e2d41..6eab5ac7582 100644
--- a/addons/report_document/i18n/tr.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/uk.po b/addons/report_document/i18n/uk.po
index 7e4f1fc9c6e..6f41154410d 100644
--- a/addons/report_document/i18n/uk.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/zh_CN.po b/addons/report_document/i18n/zh_CN.po
index 9e99ada9516..6c183a1037a 100644
--- a/addons/report_document/i18n/zh_CN.po
+++ b/addons/report_document/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: 2009-12-29 08:55+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:59+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
@@ -31,7 +31,7 @@ msgstr "月度文件"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_wall
@@ -43,19 +43,19 @@ msgstr "羞愧者名单"
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr "按业务伙伴排列文件详情"
+msgstr "业务伙伴文件详细信息"
 
 #. module: report_document
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 #: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr "文件大小"
+msgstr "文件尺寸"
 
 #. module: report_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all
@@ -71,37 +71,37 @@ msgstr "我的文件"
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "按用户排列文件"
+msgstr "用户文件"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files"
-msgstr "文件列表"
+msgstr "文件"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr "按月度排列文件"
+msgstr "每月的文件"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree1
 msgid "My files (All months)"
-msgstr "我的文件（所有月份）"
+msgstr "我的文件(所有月份)"
 
 #. module: report_document
 #: field:report.document.wall,file_name:0
 msgid "Last Posted File Name"
-msgstr "最近上传的文件"
+msgstr "最近发布的文件名"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr "一个月内没有新文件的用户"
+msgstr "一个月以来用户没有新文件"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
@@ -117,7 +117,7 @@ msgstr "目录类型"
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr "按业务伙伴排列文件"
+msgstr "业务伙伴文件"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this
@@ -133,36 +133,36 @@ msgstr "用户"
 #. module: report_document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_userfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_userfile
 msgid "All Users files"
-msgstr "所有用户的文件"
+msgstr "所有用户文件"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree
 msgid "My files (This months)"
-msgstr "我的文件（本月）"
+msgstr "我的文件(这月)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_user
 msgid "Files details by Users"
-msgstr "用户的文件详情"
+msgstr "用户详细信息"
 
 #. module: report_document
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr "所有者"
+msgstr "拥有者"
 
 #. module: report_document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr "文件数目"
+msgstr "文件号"
 
 #. module: report_document
 #: field:report.document.user,directory:0
@@ -173,22 +173,22 @@ msgstr "目录"
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_user_graph
 msgid "Files By Users"
-msgstr "用户的文件"
+msgstr "用户文件"
 
 #. module: report_document
 #: model:ir.module.module,shortdesc:report_document.module_meta_information
 msgid "Document Management - Reporting"
-msgstr "文档管理——报表"
+msgstr "文档管理 - 报表"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree1
 msgid "All Users files (All months)"
-msgstr "所有用户的文件（所有月份）"
+msgstr "所有文件(所有月份)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_file
 msgid "Files details by Directory"
-msgstr "按目录排列文件详情"
+msgstr "文件详细目录"
 
 #. module: report_document
 #: field:report.document.user,change_date:0
@@ -200,7 +200,7 @@ msgstr "修改日期"
 #: model:ir.actions.act_window,name:report_document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr "按月度排列文件大小"
+msgstr "这月的文件大小"
 
 #. module: report_document
 #: field:report.document.user,file_title:0
@@ -216,24 +216,24 @@ msgstr "文件名"
 #: field:report.document.wall,name:0
 #: field:report.files.partner,name:0
 msgid "Month"
-msgstr "月份"
+msgstr "月"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr "按月度排列文件"
+msgstr "这月的文件"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr "按资源类型排列文件"
+msgstr "文件的资源类型"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr "所有用户的文件（本月）"
+msgstr "所有文件(所有月份)"
 
 #. module: report_document
 #: field:report.document.wall,last:0
@@ -245,3 +245,19 @@ msgstr "最近的发布时间"
 #: field:report.files.partner,partner:0
 msgid "Partner"
 msgstr "业务伙伴"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Reporting for the Document Management module:\n"
+#~ "    * My Files\n"
+#~ "    * All users Files \n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    报告文档管理模块:\n"
+#~ "\t\t- 我的文件\n"
+#~ "\t\t- 所有用户的文件 \n"
+#~ "    "
+
+#~ msgid "Files Per Partner"
+#~ msgstr "每个业务伙伴文件"
diff --git a/addons/report_document/i18n/zh_TW.po b/addons/report_document/i18n/zh_TW.po
index 01b608d30b2..c9e5822fc85 100644
--- a/addons/report_document/i18n/zh_TW.po
+++ b/addons/report_document/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/security/ir.model.access.csv b/addons/report_document/security/ir.model.access.csv
deleted file mode 100644
index b9a90b3a610..00000000000
--- a/addons/report_document/security/ir.model.access.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","document.group_document_manager",1,0,0,0
-"access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0
-"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","document.group_document_manager",1,0,0,0
-"access_report_files_partner_group_system","report.files.partner group system","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","document.group_document_manager",1,0,0,0
-"access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0
-"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
diff --git a/addons/report_intrastat/__terp__.py b/addons/report_intrastat/__terp__.py
index 4f2366dfe81..5fb8f7e564c 100644
--- a/addons/report_intrastat/__terp__.py
+++ b/addons/report_intrastat/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,9 @@
     'name': 'Intrastat Reporting - Reporting',
     'version': '1.0',
     'category': 'Generic Modules/Inventory Control',
-    'description': """A module that adds intrastat reports.""",
+    'description': """
+    A module that adds intrastat reports.
+    This module gives the details of the goods traded between the countries of Europan Union """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'product', 'stock', 'sale', 'purchase'],
diff --git a/addons/report_intrastat/i18n/ar.po b/addons/report_intrastat/i18n/ar.po
index 7a38f85adfd..36dae840ac6 100644
--- a/addons/report_intrastat/i18n/ar.po
+++ b/addons/report_intrastat/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: report_intrastat
diff --git a/addons/report_intrastat/i18n/bg.po b/addons/report_intrastat/i18n/bg.po
index 1806196b2af..5d63cea22a7 100644
--- a/addons/report_intrastat/i18n/bg.po
+++ b/addons/report_intrastat/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: report_intrastat
diff --git a/addons/report_intrastat/i18n/bs.po b/addons/report_intrastat/i18n/bs.po
index f2b1d98c350..1ba55d20540 100644
--- a/addons/report_intrastat/i18n/bs.po
+++ b/addons/report_intrastat/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: report_intrastat
diff --git a/addons/report_intrastat/i18n/ca.po b/addons/report_intrastat/i18n/ca.po
index 1d2e45326d9..3c380dd060d 100644
--- a/addons/report_intrastat/i18n/ca.po
+++ b/addons/report_intrastat/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: report_intrastat
diff --git a/addons/report_intrastat/i18n/cs.po b/addons/report_intrastat/i18n/cs.po
index 7a38f85adfd..36dae840ac6 100644
--- a/addons/report_intrastat/i18n/cs.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/de.po b/addons/report_intrastat/i18n/de.po
index cdb0d250a8d..ab8fd49dd9a 100644
--- a/addons/report_intrastat/i18n/de.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 2814af9a2b5..45f921f9306 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/es_AR.po b/addons/report_intrastat/i18n/es_AR.po
index 50e087e96fc..c961a67891f 100644
--- a/addons/report_intrastat/i18n/es_AR.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/et.po b/addons/report_intrastat/i18n/et.po
index 0d2754c255a..8920ac739ee 100644
--- a/addons/report_intrastat/i18n/et.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/fi.po b/addons/report_intrastat/i18n/fi.po
index ac51aa30a22..66334681103 100644
--- a/addons/report_intrastat/i18n/fi.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/fr.po b/addons/report_intrastat/i18n/fr.po
index eac98a8d318..3e721b013af 100644
--- a/addons/report_intrastat/i18n/fr.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index 7a38f85adfd..98d08e5dca6 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.po
@@ -1,173 +1,175 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_intrastat
-#
+# * report_intrastat
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_intrastat
 #: 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: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Poništen Račun"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat
 msgid "Intrastat (this month)"
-msgstr ""
+msgstr "Intrastat (Ovaj mjesec)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Račun Dobavljača"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: report_intrastat
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr ""
+msgstr "Razdoblje"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
 msgid "All Months"
-msgstr ""
+msgstr "Svi mjeseci"
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Import"
-msgstr ""
+msgstr "Uvoz"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "PDV :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: field:report.intrastat.code,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
 msgid "Invoice Intrastat"
-msgstr ""
+msgstr "Intrastat Račun"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum Računa"
 
 #. module: report_intrastat
 #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
 msgid "Intrastat Reporting - Reporting"
-msgstr ""
+msgstr "Intrastat Izvještavanje - Izvještavanje"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "Osnova"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_89
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Referenca Partnera"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Ukupno (uklj. poreze)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Povrat novca"
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
 msgid "Intrastat report"
-msgstr ""
+msgstr "Intrastat Izvještaj"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -177,29 +179,29 @@ msgstr ""
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr ""
+msgstr "Intrastat Podaci"
 
 #. module: report_intrastat
 #: field:report.intrastat,value:0
 msgid "Value"
-msgstr ""
+msgstr "Vrijednost"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
 msgid "Intrastat"
-msgstr ""
+msgstr "Intrastat"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "Jedinice Dobave"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -207,67 +209,67 @@ msgstr ""
 #: field:report.intrastat,intrastat_id:0
 #: view:report.intrastat.code:0
 msgid "Intrastat code"
-msgstr ""
+msgstr "Intrastat Kod"
 
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr ""
+msgstr "Porijeklo"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: field:report.intrastat,weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Težina"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
 msgid "Intrastat member"
-msgstr ""
+msgstr "Intarstat Član"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Porez"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
 msgid "Country code"
-msgstr ""
+msgstr "Kod Zemlje"
 
 #. module: report_intrastat
 #: field:report.intrastat,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr ""
+msgstr "Izvezi"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Povrat Dobavljaču"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Ukupno (isklj. poreze)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
-msgstr ""
+msgstr "Intrastat Kod"
diff --git a/addons/report_intrastat/i18n/hu.po b/addons/report_intrastat/i18n/hu.po
index 7a38f85adfd..36dae840ac6 100644
--- a/addons/report_intrastat/i18n/hu.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/id.po b/addons/report_intrastat/i18n/id.po
index 11768aa1345..ead5783d9ee 100644
--- a/addons/report_intrastat/i18n/id.po
+++ b/addons/report_intrastat/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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index de6e780b2e4..f3ffbebceb3 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/ko.po b/addons/report_intrastat/i18n/ko.po
index bd6c5ad3a1b..204d0a32cf9 100644
--- a/addons/report_intrastat/i18n/ko.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/lt.po b/addons/report_intrastat/i18n/lt.po
index 7a38f85adfd..36dae840ac6 100644
--- a/addons/report_intrastat/i18n/lt.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/nl.po b/addons/report_intrastat/i18n/nl.po
index 7b4c61fb47c..4354decf790 100644
--- a/addons/report_intrastat/i18n/nl.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/nl_BE.po b/addons/report_intrastat/i18n/nl_BE.po
index 2db92ecd63b..2a280cefe7a 100644
--- a/addons/report_intrastat/i18n/nl_BE.po
+++ b/addons/report_intrastat/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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/pl.po b/addons/report_intrastat/i18n/pl.po
index e95c77ed0c4..0e296870906 100644
--- a/addons/report_intrastat/i18n/pl.po
+++ b/addons/report_intrastat/i18n/pl.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: 2009-09-08 13:42+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-29 19:03+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
@@ -27,79 +27,79 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Anulowana faktura"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Up. (%)"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat
 msgid "Intrastat (this month)"
-msgstr ""
+msgstr "Intrastat (ten miesiąc)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Faktura od dostawcy"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Cena jednostkowa"
 
 #. module: report_intrastat
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr ""
+msgstr "Okres"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
 msgid "All Months"
-msgstr ""
+msgstr "Wszystkie miesiące"
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Import"
-msgstr ""
+msgstr "Importuj"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "VAT :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Podatki:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: field:report.intrastat.code,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
@@ -109,47 +109,47 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data faktury"
 
 #. module: report_intrastat
 #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
 msgid "Intrastat Reporting - Reporting"
-msgstr ""
+msgstr "Raportowanie Intrastat"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "Podstawowe"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_89
 msgid "This Month"
-msgstr ""
+msgstr "Bieżący miesiąc"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Odn. partnera"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Suma (z podatkami)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Korekta"
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
@@ -159,49 +159,49 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
 msgid "Intrastat report"
-msgstr ""
+msgstr "Raport Intrastat"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Podatki"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Amount"
-msgstr ""
+msgstr "Kwota"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr ""
+msgstr "Dane Intrastat"
 
 #. module: report_intrastat
 #: field:report.intrastat,value:0
 msgid "Value"
-msgstr ""
+msgstr "Wartość"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
 msgid "Intrastat"
-msgstr ""
+msgstr "Intrastat"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Projekt faktury"
 
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "Jednostki dostawy"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -209,67 +209,67 @@ msgstr ""
 #: field:report.intrastat,intrastat_id:0
 #: view:report.intrastat.code:0
 msgid "Intrastat code"
-msgstr ""
+msgstr "Kod intrastat"
 
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr ""
+msgstr "Pochodzenie"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 #: field:report.intrastat,weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Waga"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
 msgid "Intrastat member"
-msgstr ""
+msgstr "Członek Intrastat"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Podatek"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
 msgid "Country code"
-msgstr ""
+msgstr "Kod kraju"
 
 #. module: report_intrastat
 #: field:report.intrastat,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr ""
+msgstr "Eksport"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Faks :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Korekta od dostawcy"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Suma (bez podatków)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Cena"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
-msgstr ""
+msgstr "Kod Intrastat"
diff --git a/addons/report_intrastat/i18n/pt.po b/addons/report_intrastat/i18n/pt.po
index 8266e536d15..ca92943e0e7 100644
--- a/addons/report_intrastat/i18n/pt.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 654032a6436..ffd4eb5e5de 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/ro.po b/addons/report_intrastat/i18n/ro.po
index 7a38f85adfd..36dae840ac6 100644
--- a/addons/report_intrastat/i18n/ro.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/ru.po b/addons/report_intrastat/i18n/ru.po
index 6f61eaab202..f137f3a73ad 100644
--- a/addons/report_intrastat/i18n/ru.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/sl.po b/addons/report_intrastat/i18n/sl.po
index 1e878acd933..5109ac12f9a 100644
--- a/addons/report_intrastat/i18n/sl.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index 94839798fcc..64dc425eb29 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tlh.po b/addons/report_intrastat/i18n/tlh.po
index 20ccbaad4e7..313e00d5fc1 100644
--- a/addons/report_intrastat/i18n/tlh.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 485e937cfe3..1c22a9b6572 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/uk.po b/addons/report_intrastat/i18n/uk.po
index a44bd045092..e7bdf277cc4 100644
--- a/addons/report_intrastat/i18n/uk.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index dbe5946dfb5..c674aa3ce9e 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -7,30 +7,30 @@ 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-12-21 12:25+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:00+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名必须要以x_开头并且不能含有特殊字符"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr "已取消发票"
+msgstr "已取消的发票"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Disc. (%)"
-msgstr "折扣（％）"
+msgstr "折扣 (%)"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree
@@ -51,12 +51,12 @@ msgstr "单价"
 #. module: report_intrastat
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "这动作定义中无效的模块名"
 
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr "时段"
+msgstr "会计周期"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
@@ -66,22 +66,22 @@ msgstr "所有月份"
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Import"
-msgstr "导入"
+msgstr "收入"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr "增值税："
+msgstr "增值税:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr "文件"
+msgstr "文档"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "形式发票"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -92,7 +92,7 @@ msgstr "税:"
 #: rml:account.invoice.intrastat:0
 #: field:report.intrastat.code,description:0
 msgid "Description"
-msgstr "说明"
+msgstr "描述"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
@@ -117,12 +117,12 @@ msgstr "内部统计报告-报告"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "基于"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -137,22 +137,22 @@ msgstr "本月"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr "业务伙伴参照"
+msgstr "业务伙伴参考"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "总计(含税)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr "退款"
+msgstr "退还"
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
@@ -167,12 +167,12 @@ msgstr "发票"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr "税款"
+msgstr "税"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Amount"
-msgstr "总计"
+msgstr "金额"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
@@ -182,7 +182,7 @@ msgstr ""
 #. module: report_intrastat
 #: field:report.intrastat,value:0
 msgid "Value"
-msgstr "数值"
+msgstr "价格"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -199,7 +199,7 @@ msgstr "发票草稿"
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "供应单位"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -212,7 +212,7 @@ msgstr ""
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr "来源"
+msgstr "源"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -228,7 +228,7 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr "税目"
+msgstr "税"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
@@ -243,22 +243,22 @@ msgstr "货币"
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr "导出"
+msgstr "支出"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr "供应商退款"
+msgstr "供应商退还"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "总计(不含税)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/zh_TW.po b/addons/report_intrastat/i18n/zh_TW.po
index af5c9c32e4d..75baaeae1f4 100644
--- a/addons/report_intrastat/i18n/zh_TW.po
+++ b/addons/report_intrastat/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:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_mrp/__terp__.py b/addons/report_mrp/__terp__.py
deleted file mode 100644
index b58dbd5c601..00000000000
--- a/addons/report_mrp/__terp__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-{
-    'name': 'MRP Management - Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Production',
-    'description': """A module that adds new reports based on MRP cases.
-    Work Center loads, Weekly Stock value variation""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['mrp'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_mrp_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'certificate': '0071582896029',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_mrp/i18n/ar.po b/addons/report_mrp/i18n/ar.po
index c9d28466885..70c5a9d90b3 100644
--- a/addons/report_mrp/i18n/ar.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/bg.po b/addons/report_mrp/i18n/bg.po
index f3edf56ba08..1eb54395ea3 100644
--- a/addons/report_mrp/i18n/bg.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/bs.po b/addons/report_mrp/i18n/bs.po
index 6792b30b78e..df8055cfe1d 100644
--- a/addons/report_mrp/i18n/bs.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/ca.po b/addons/report_mrp/i18n/ca.po
index 4e634bc6529..9194d8b427d 100644
--- a/addons/report_mrp/i18n/ca.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/cs.po b/addons/report_mrp/i18n/cs.po
index ef3f9796236..549cd36c10e 100644
--- a/addons/report_mrp/i18n/cs.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/de.po b/addons/report_mrp/i18n/de.po
index c3ae3e664b8..3637a4286e6 100644
--- a/addons/report_mrp/i18n/de.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/el.po b/addons/report_mrp/i18n/el.po
index 828839a9ddc..7ea981d4c22 100644
--- a/addons/report_mrp/i18n/el.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/es.po b/addons/report_mrp/i18n/es.po
index a9f3e7d1955..f597454c579 100644
--- a/addons/report_mrp/i18n/es.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/es_AR.po b/addons/report_mrp/i18n/es_AR.po
index 9067e4914e5..c567648df88 100644
--- a/addons/report_mrp/i18n/es_AR.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/et.po b/addons/report_mrp/i18n/et.po
index 45e6ba39791..0175797f184 100644
--- a/addons/report_mrp/i18n/et.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/fr.po b/addons/report_mrp/i18n/fr.po
index ffbcb2f6af3..1b2d8cc2661 100644
--- a/addons/report_mrp/i18n/fr.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/hr.po b/addons/report_mrp/i18n/hr.po
index 8f25955e687..4991b3f1125 100644
--- a/addons/report_mrp/i18n/hr.po
+++ b/addons/report_mrp/i18n/hr.po
@@ -1,83 +1,85 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_mrp
-#
+# * report_mrp
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-17 10:24+0000\n"
-"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr ""
+msgstr "Tjedni"
 
 #. module: report_mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: report_mrp
 #: model:ir.ui.menu,name:report_mrp.next_id_77
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: report_mrp
 #: 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: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenters load"
-msgstr ""
+msgstr "Teret Radnih Centara"
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_workcenter_load
 msgid "Workcenter Load"
-msgstr ""
+msgstr "Teret Radnog Centra"
 
 #. module: report_mrp
 #: model:ir.module.module,shortdesc:report_mrp.module_meta_information
 msgid "MRP Management - Reporting"
-msgstr ""
+msgstr "Upravljanje Proizvodnjom - Izvještavanje"
 
 #. module: report_mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
-msgstr ""
+msgstr "Vrijednost Zalihe"
 
 #. module: report_mrp
 #: field:report.workcenter.load,cycle:0
 msgid "Nbr of cycle"
-msgstr ""
+msgstr "Broj Ciklusa"
 
 #. module: report_mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr ""
+msgstr "Broj Sati"
 
 #. module: report_mrp
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "Radni Centar"
 
 #. module: report_mrp
 #: model:ir.actions.act_window,name:report_mrp.action_report_workcenter_load_tree
 #: model:ir.ui.menu,name:report_mrp.menu_report_workcenter_load
 msgid "Workcenter Loads"
-msgstr ""
+msgstr "Tereti Radnog Centra"
 
 #. module: report_mrp
 #: model:ir.actions.act_window,name:report_mrp.action_report_in_out_picking_tree
@@ -88,15 +90,15 @@ msgstr "Tjedna Varijacija Vrijednosti Zalihe"
 #. module: report_mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
+msgstr "Pogrešno ime modela u definiciji Radnje."
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
-msgstr ""
+msgstr "Varijacija vrijednosti Zalihe"
 
 #. module: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenter load"
-msgstr ""
+msgstr "Teret Radnog Centra"
diff --git a/addons/report_mrp/i18n/hu.po b/addons/report_mrp/i18n/hu.po
index c9d28466885..70c5a9d90b3 100644
--- a/addons/report_mrp/i18n/hu.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/id.po b/addons/report_mrp/i18n/id.po
index d3862b2ed26..4d7b6e50afb 100644
--- a/addons/report_mrp/i18n/id.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/it.po b/addons/report_mrp/i18n/it.po
index 7aab86dd644..0fdf4cfe692 100644
--- a/addons/report_mrp/i18n/it.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/ko.po b/addons/report_mrp/i18n/ko.po
index 38f6a04b14b..0c7f6cbfd5e 100644
--- a/addons/report_mrp/i18n/ko.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/lt.po b/addons/report_mrp/i18n/lt.po
index c9d28466885..2e6ae6c695c 100644
--- a/addons/report_mrp/i18n/lt.po
+++ b/addons/report_mrp/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: report_mrp
diff --git a/addons/report_mrp/i18n/nl.po b/addons/report_mrp/i18n/nl.po
index 388507c8b06..5712f80e1f4 100644
--- a/addons/report_mrp/i18n/nl.po
+++ b/addons/report_mrp/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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/nl_BE.po b/addons/report_mrp/i18n/nl_BE.po
index 4545b7c861b..f7a9494ebe6 100644
--- a/addons/report_mrp/i18n/nl_BE.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/pl.po b/addons/report_mrp/i18n/pl.po
index 029487bdacc..066729063cd 100644
--- a/addons/report_mrp/i18n/pl.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/pt.po b/addons/report_mrp/i18n/pt.po
index 2ea30889b43..4b946ca7c96 100644
--- a/addons/report_mrp/i18n/pt.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/pt_BR.po b/addons/report_mrp/i18n/pt_BR.po
index da7b12ea9dc..489d67ecd72 100644
--- a/addons/report_mrp/i18n/pt_BR.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/ro.po b/addons/report_mrp/i18n/ro.po
index 83a34df66bc..af9d44b6bfa 100644
--- a/addons/report_mrp/i18n/ro.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/ru.po b/addons/report_mrp/i18n/ru.po
index 35795ec3ae1..8107181b9eb 100644
--- a/addons/report_mrp/i18n/ru.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/sl.po b/addons/report_mrp/i18n/sl.po
index 2c99b2e8602..f600f8393f7 100644
--- a/addons/report_mrp/i18n/sl.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/sv.po b/addons/report_mrp/i18n/sv.po
index e4e470d1ec0..92cf9b4313b 100644
--- a/addons/report_mrp/i18n/sv.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/tlh.po b/addons/report_mrp/i18n/tlh.po
index 0af63ad1564..16e67dc8f58 100644
--- a/addons/report_mrp/i18n/tlh.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/tr.po b/addons/report_mrp/i18n/tr.po
index 7cb37f9078a..eaee2b5652b 100644
--- a/addons/report_mrp/i18n/tr.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/uk.po b/addons/report_mrp/i18n/uk.po
index 3757acae5d7..6169ae84120 100644
--- a/addons/report_mrp/i18n/uk.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/zh_CN.po b/addons/report_mrp/i18n/zh_CN.po
index 56a40c5219c..c6563bc8629 100644
--- a/addons/report_mrp/i18n/zh_CN.po
+++ b/addons/report_mrp/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 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-12-29 08:45+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:01+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
@@ -25,18 +25,18 @@ msgstr "周"
 #. module: report_mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: report_mrp
 #: model:ir.ui.menu,name:report_mrp.next_id_77
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_mrp
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_mrp
 #: view:report.workcenter.load:0
@@ -51,7 +51,7 @@ msgstr "工作中心负荷"
 #. module: report_mrp
 #: model:ir.module.module,shortdesc:report_mrp.module_meta_information
 msgid "MRP Management - Reporting"
-msgstr "MRP管理—报表"
+msgstr "MRP管理 - 报表"
 
 #. module: report_mrp
 #: field:report.mrp.inout,value:0
@@ -88,15 +88,20 @@ msgstr "每周库存值变动"
 #. module: report_mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
-msgstr "库存值变动"
+msgstr "库存值变化"
 
 #. module: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenter load"
 msgstr "工作中心负荷"
+
+#~ msgid ""
+#~ "A module that adds new reports based on MRP cases.\n"
+#~ "    Workcenter loads, Weekly Stock value variation"
+#~ msgstr "这模块增加新的报表基于MRP业务个案,工作中心负荷,每周的库存变化"
diff --git a/addons/report_mrp/i18n/zh_TW.po b/addons/report_mrp/i18n/zh_TW.po
index edaa9093c88..37aba100df7 100644
--- a/addons/report_mrp/i18n/zh_TW.po
+++ b/addons/report_mrp/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/security/ir.model.access.csv b/addons/report_mrp/security/ir.model.access.csv
deleted file mode 100644
index 57029b92b13..00000000000
--- a/addons/report_mrp/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_workcenter_load,report.workcenter.load,model_report_workcenter_load,mrp.group_mrp_manager,1,0,0,0
-access_report_mrp_inout,report.mrp.inout,model_report_mrp_inout,mrp.group_mrp_manager,1,0,0,0
diff --git a/addons/report_project/__terp__.py b/addons/report_project/__terp__.py
deleted file mode 100644
index 0c55a666abf..00000000000
--- a/addons/report_project/__terp__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-{
-    'name': 'Project Management - Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
-    'description': """A module that adds some reports on projects.
-    Closed Tasks (By User and By Project), Finished Task (By User and By Project)""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['project', 'report_task'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_project_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0086804423149',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_project/i18n/ar.po b/addons/report_project/i18n/ar.po
index 23bcf965374..c81e1f79b28 100644
--- a/addons/report_project/i18n/ar.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/bg.po b/addons/report_project/i18n/bg.po
index 9830e176943..a2e9351ab5a 100644
--- a/addons/report_project/i18n/bg.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/bs.po b/addons/report_project/i18n/bs.po
index e80605f9afd..0fe10198539 100644
--- a/addons/report_project/i18n/bs.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/ca.po b/addons/report_project/i18n/ca.po
index ae9824cbe4c..d0bcee3cc64 100644
--- a/addons/report_project/i18n/ca.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/cs.po b/addons/report_project/i18n/cs.po
index 23bcf965374..c81e1f79b28 100644
--- a/addons/report_project/i18n/cs.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/de.po b/addons/report_project/i18n/de.po
index d7dee651400..088b4162424 100644
--- a/addons/report_project/i18n/de.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/es.po b/addons/report_project/i18n/es.po
index 1c25ae780d8..78a660b375b 100644
--- a/addons/report_project/i18n/es.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/es_AR.po b/addons/report_project/i18n/es_AR.po
index 6a8ff9b4fd5..0a6cfebfe1a 100644
--- a/addons/report_project/i18n/es_AR.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/et.po b/addons/report_project/i18n/et.po
index adbdf2f8194..f74d534c765 100644
--- a/addons/report_project/i18n/et.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/fr.po b/addons/report_project/i18n/fr.po
index 1df91aea6cb..00f5459af3d 100644
--- a/addons/report_project/i18n/fr.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/hr.po b/addons/report_project/i18n/hr.po
index 23bcf965374..10d8eda0174 100644
--- a/addons/report_project/i18n/hr.po
+++ b/addons/report_project/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_project
-#
+# * report_project
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 19:24+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree_month
@@ -27,114 +28,115 @@ msgstr ""
 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: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree
 msgid "Tasks Closed by Project and User"
-msgstr ""
+msgstr "Zadatak zaključen prema Projektu i Korisniku"
 
 #. module: report_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree_month
 msgid "Tasks finished by project and user (this month)"
-msgstr ""
+msgstr "Izvršeni Zadaci prema Projektu i Korisniku (Ovaj mjesec)"
 
 #. module: report_project
 #: field:report.project.task,hours_effective:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Efektivni sati"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Zadaci prema Korisniku i Projektu"
 
 #. module: report_project
 #: field:report.project.task,task_closed:0
 #: field:report.project.task.user,task_closed:0
 msgid "Task Closed"
-msgstr ""
+msgstr "Zadatak zaključen"
 
 #. module: report_project
 #: view:report.project.task:0
 msgid "Tasks by Project"
-msgstr ""
+msgstr "Zadaci prema Projektu"
 
 #. module: report_project
 #: model:ir.module.module,shortdesc:report_project.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr ""
+msgstr "Upravljanje Prodajom - Izvještavanje"
 
 #. module: report_project
 #: field:report.project.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by Project and User"
-msgstr ""
+msgstr "Zadaci prema Projektu i Korisniku"
 
 #. module: report_project
 #: model:ir.ui.menu,name:report_project.next_id_63
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: report_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by projects and users"
-msgstr ""
+msgstr "Zadaci prema Projektima i Korisnicima"
 
 #. module: report_project
 #: field:report.project.task,project_id:0
 #: field:report.project.task.user,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: report_project
 #: field:report.project.task,closing_days:0
 #: field:report.project.task.user,closing_days:0
 msgid "Avg Closing Delay"
-msgstr ""
+msgstr "Prosječno kašnjenje zaključivanja"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task
 #: view:report.project.task:0
 msgid "Tasks by project"
-msgstr ""
+msgstr "Zadaci prema Projektu"
 
 #. module: report_project
 #: field:report.project.task,hours_delay:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Prosj. Plan.- Efekt."
 
 #. module: report_project
 #: field:report.project.task,name:0
 #: field:report.project.task.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree
 msgid "Tasks Closed by Project"
-msgstr ""
+msgstr "Zadaci zaključeni prema Projektu"
 
 #. module: report_project
 #: field:report.project.task,hours_planned:0
 #: field:report.project.task.user,hours_planned:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planirani Sati"
diff --git a/addons/report_project/i18n/hu.po b/addons/report_project/i18n/hu.po
index 23bcf965374..c81e1f79b28 100644
--- a/addons/report_project/i18n/hu.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/id.po b/addons/report_project/i18n/id.po
index 038af97cc75..633c6590343 100644
--- a/addons/report_project/i18n/id.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/it.po b/addons/report_project/i18n/it.po
index fce0bd12971..801d37dcca6 100644
--- a/addons/report_project/i18n/it.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/ko.po b/addons/report_project/i18n/ko.po
index 0f000a3e5ac..43883beba49 100644
--- a/addons/report_project/i18n/ko.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/lt.po b/addons/report_project/i18n/lt.po
index 23bcf965374..c81e1f79b28 100644
--- a/addons/report_project/i18n/lt.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/nl.po b/addons/report_project/i18n/nl.po
index 507357a7863..d351046c008 100644
--- a/addons/report_project/i18n/nl.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/nl_BE.po b/addons/report_project/i18n/nl_BE.po
index 98be1e1e763..09b6e6b0c58 100644
--- a/addons/report_project/i18n/nl_BE.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/pl.po b/addons/report_project/i18n/pl.po
index bcd32bcce60..c32032f54bd 100644
--- a/addons/report_project/i18n/pl.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/pt.po b/addons/report_project/i18n/pt.po
index a31b2205e07..cfb60ed8b41 100644
--- a/addons/report_project/i18n/pt.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/pt_BR.po b/addons/report_project/i18n/pt_BR.po
index 325d5a5ffab..f67ccc4d1ec 100644
--- a/addons/report_project/i18n/pt_BR.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/ro.po b/addons/report_project/i18n/ro.po
index 23bcf965374..c81e1f79b28 100644
--- a/addons/report_project/i18n/ro.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/ru.po b/addons/report_project/i18n/ru.po
index 1085f2442a0..734af555c1e 100644
--- a/addons/report_project/i18n/ru.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/sl.po b/addons/report_project/i18n/sl.po
index 2464ac77320..d1c087c9823 100644
--- a/addons/report_project/i18n/sl.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/sv.po b/addons/report_project/i18n/sv.po
index acba090a0bf..273a2bc1910 100644
--- a/addons/report_project/i18n/sv.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/tlh.po b/addons/report_project/i18n/tlh.po
index e4b44f6e629..3f1eeb913c6 100644
--- a/addons/report_project/i18n/tlh.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/tr.po b/addons/report_project/i18n/tr.po
index 69eb1db2d1f..d83a16ad6fc 100644
--- a/addons/report_project/i18n/tr.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/uk.po b/addons/report_project/i18n/uk.po
index 5e0ed3a3b35..4bfe3328b32 100644
--- a/addons/report_project/i18n/uk.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/zh_CN.po b/addons/report_project/i18n/zh_CN.po
index 802f5f45631..e9b59cca9c3 100644
--- a/addons/report_project/i18n/zh_CN.po
+++ b/addons/report_project/i18n/zh_CN.po
@@ -7,70 +7,70 @@ 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-12-16 01:45+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:02+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree_month
 msgid "Tasks finished by project (this month)"
-msgstr ""
+msgstr "项目的完成的任务(这月)"
 
 #. module: report_project
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以x_开头并且不能含有特殊字符"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree
 msgid "Tasks Closed by Project and User"
-msgstr ""
+msgstr "项目和用户关闭的任务"
 
 #. module: report_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "这动作定义中无效的模块名"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree_month
 msgid "Tasks finished by project and user (this month)"
-msgstr ""
+msgstr "项目和用户完成的任务(这月)"
 
 #. module: report_project
 #: field:report.project.task,hours_effective:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "有效时间"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr "用户的任务和项目"
+msgstr "项目和用户的任务"
 
 #. module: report_project
 #: field:report.project.task,task_closed:0
 #: field:report.project.task.user,task_closed:0
 msgid "Task Closed"
-msgstr ""
+msgstr "任务关闭"
 
 #. module: report_project
 #: view:report.project.task:0
 msgid "Tasks by Project"
-msgstr "项目任务"
+msgstr "项目的任务"
 
 #. module: report_project
 #: model:ir.module.module,shortdesc:report_project.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr "销售管理——报表"
+msgstr "销售管理 - 报表"
 
 #. module: report_project
 #: field:report.project.task.user,user_id:0
@@ -80,7 +80,7 @@ msgstr "用户"
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by Project and User"
-msgstr ""
+msgstr "项目和用户的任务"
 
 #. module: report_project
 #: model:ir.ui.menu,name:report_project.next_id_63
@@ -90,12 +90,12 @@ msgstr "本月"
 #. module: report_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效的视图结构xml文件"
 
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by projects and users"
-msgstr "按项目和用户的任务"
+msgstr "项目和用户的任务"
 
 #. module: report_project
 #: field:report.project.task,project_id:0
@@ -107,13 +107,13 @@ msgstr "项目"
 #: field:report.project.task,closing_days:0
 #: field:report.project.task.user,closing_days:0
 msgid "Avg Closing Delay"
-msgstr "平均延迟关闭"
+msgstr "平均关闭延迟"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task
 #: view:report.project.task:0
 msgid "Tasks by project"
-msgstr "按项目任务"
+msgstr "项目任务"
 
 #. module: report_project
 #: field:report.project.task,hours_delay:0
@@ -131,7 +131,7 @@ msgstr "月"
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree
 msgid "Tasks Closed by Project"
-msgstr ""
+msgstr "项目关闭的任务"
 
 #. module: report_project
 #: field:report.project.task,hours_planned:0
diff --git a/addons/report_project/i18n/zh_TW.po b/addons/report_project/i18n/zh_TW.po
index 3ea2f521fd0..3e63db02d25 100644
--- a/addons/report_project/i18n/zh_TW.po
+++ b/addons/report_project/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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml
deleted file mode 100644
index 58338959f2c..00000000000
--- a/addons/report_project/report_project_view.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Tasks by projects and users -->
-        <record id="view_task_project_user_form" model="ir.ui.view">
-            <field name="name">report.project.task.user.form</field>
-            <field name="model">report.project.task.user</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Tasks by Project and User">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="project_id" select="1" default="context.get('project_id', False)"/>
-                    <field name="task_closed" select="1"/>
-                    <field name="hours_planned" select="1"/>
-                    <field name="hours_effective" select="1"/>
-                    <field name="hours_delay" select="1"/>
-                    <field name="closing_days"/>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="view_task_project_user_tree" model="ir.ui.view">
-            <field name="name">report.project.task.user.tree</field>
-            <field name="model">report.project.task.user</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Tasks by projects and users">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="project_id" select="1"/>
-                    <field name="task_closed" select="1"/>
-                    <field name="hours_planned" select="1"/>
-                    <field name="hours_effective" select="1"/>
-                    <field name="hours_delay" select="1"/>
-                    <field name="closing_days"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_task_project_user_search" model="ir.ui.view">
-            <field name="name">report.project.task.user.search</field>
-            <field name="model">report.project.task.user</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-            	<search string="Tasks by projects and users">
-            		<group col="8" colspan="4">
-	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
-	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
-	            		<separator orientation="vertical"/>
-	            		<field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="user_id" select="1"/>
-	                    <field name="project_id" select="1" default="context.get('project_id', False)"/>
-            		</group>
-            	</search>
-            </field>
-        </record>
-
-        <record id="action_project_task_user_tree" model="ir.actions.act_window">
-            <field name="name">Tasks Closed by Project and User</field>
-            <field name="res_model">report.project.task.user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="search_view_id" ref="view_task_project_user_search"/>
-        </record>
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
-
-        <!-- Tasks by projects -->
-
-        <record id="view_task_project_form" model="ir.ui.view">
-            <field name="name">report.project.task.form</field>
-            <field name="model">report.project.task</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Tasks by Project">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="project_id" select="1"/>
-                    <field name="task_closed" select="1"/>
-                    <field name="hours_planned" select="1"/>
-                    <field name="hours_effective" select="1"/>
-                    <field name="hours_delay" select="1"/>
-                    <field name="closing_days"/>
-                </form>
-            </field>
-        </record>
-        <record id="view_task_project_tree" model="ir.ui.view">
-            <field name="name">report.project.task.tree</field>
-            <field name="model">report.project.task</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Tasks by project">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="project_id" select="1"/>
-                    <field name="task_closed" select="1"/>
-                    <field name="hours_planned" select="1"/>
-                    <field name="hours_effective" select="1"/>
-                    <field name="hours_delay" select="1"/>
-                    <field name="closing_days"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_task_project_search" model="ir.ui.view">
-            <field name="name">report.project.task.search</field>
-            <field name="model">report.project.task</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-            	<search string="Tasks by projects">
-            		<group col="8" colspan="4">
-	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
-	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
-	            		<separator orientation="vertical"/>
-	            		<field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="project_id" select="1" default="context.get('project_id', False)"/>
-	                    <field name="task_closed" select="1"/>
-	                </group>
-            	</search>
-            </field>
-        </record>
-
-        <record id="action_project_task_tree" model="ir.actions.act_window">
-            <field name="name">Tasks Closed by Project</field>
-            <field name="res_model">report.project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="search_view_id" ref="view_task_project_search"/>
-        </record>
-        <menuitem action="action_project_task_tree" id="menu_project_task_tree" parent="base.menu_project_report"/>
-
-    </data>
-</openerp>
diff --git a/addons/report_project/security/ir.model.access.csv b/addons/report_project/security/ir.model.access.csv
deleted file mode 100644
index 8222c7cc0fe..00000000000
--- a/addons/report_project/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,0,0,0
-access_report_project_task,report.project.task,model_report_project_task,project.group_project_manager,1,0,0,0
diff --git a/addons/report_purchase/__init__.py b/addons/report_purchase/__init__.py
deleted file mode 100644
index 83e17dc65d0..00000000000
--- a/addons/report_purchase/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import report_purchase
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_purchase/__terp__.py b/addons/report_purchase/__terp__.py
deleted file mode 100644
index 279ff24ca8e..00000000000
--- a/addons/report_purchase/__terp__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-{
-    'name': 'Purchase Management - Reporting',
-    'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
-    'description': """Module to add views like
-    Purchase By Product, Purchase By Category of Product, All Months, Current Month.""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['purchase'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_purchase_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0073370750365',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_purchase/i18n/ar.po b/addons/report_purchase/i18n/ar.po
index ddf7bfaded3..c55678fcca7 100644
--- a/addons/report_purchase/i18n/ar.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/bg.po b/addons/report_purchase/i18n/bg.po
index fd6cdc1bb6d..c5f107581dd 100644
--- a/addons/report_purchase/i18n/bg.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/bs.po b/addons/report_purchase/i18n/bs.po
index 790ec313947..599fb4c201d 100644
--- a/addons/report_purchase/i18n/bs.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/ca.po b/addons/report_purchase/i18n/ca.po
index 1bfab404083..f14120d90f3 100644
--- a/addons/report_purchase/i18n/ca.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/cs.po b/addons/report_purchase/i18n/cs.po
index ddf7bfaded3..c55678fcca7 100644
--- a/addons/report_purchase/i18n/cs.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/de.po b/addons/report_purchase/i18n/de.po
index f52714f0749..464cf3ebd41 100644
--- a/addons/report_purchase/i18n/de.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/el.po b/addons/report_purchase/i18n/el.po
index 0741dc42f6d..25e1cf3eaf9 100644
--- a/addons/report_purchase/i18n/el.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/es.po b/addons/report_purchase/i18n/es.po
index f38e6f2fb58..80abed64cfb 100644
--- a/addons/report_purchase/i18n/es.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/es_AR.po b/addons/report_purchase/i18n/es_AR.po
index 97ca9e7553d..5b0404e78b3 100644
--- a/addons/report_purchase/i18n/es_AR.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/et.po b/addons/report_purchase/i18n/et.po
index d9303d5eab0..a2a3319c0d0 100644
--- a/addons/report_purchase/i18n/et.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/fr.po b/addons/report_purchase/i18n/fr.po
index a6792a532aa..80ac826311d 100644
--- a/addons/report_purchase/i18n/fr.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/hr.po b/addons/report_purchase/i18n/hr.po
index ddf7bfaded3..b1d46249c00 100644
--- a/addons/report_purchase/i18n/hr.po
+++ b/addons/report_purchase/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_purchase
-#
+# * report_purchase
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 21:23+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_average:0
@@ -26,107 +27,108 @@ msgstr ""
 #: field:report.purchase.order.category,state:0
 #: field:report.purchase.order.product,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Stanje Narudžbe"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree_all
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category_all
 #: view:report.purchase.order.category:0
 msgid "Purchases by Category of Products"
-msgstr ""
+msgstr "Kupnje po Kategoriji i Proizvodu"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_product
 msgid "Purchases Orders by Products"
-msgstr ""
+msgstr "Kupovne narudžbe prema Proizvodima"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree_all
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product_all
 msgid "Purchases by Products"
-msgstr ""
+msgstr "Kupnje prema Proizvodima"
 
 #. module: report_purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_75
 msgid "All Months"
-msgstr ""
+msgstr "Svi mjeseci"
 
 #. module: report_purchase
 #: 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: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Raspored čekanja"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product
 msgid "Purchases by Products (this month)"
-msgstr ""
+msgstr "Kupnje prem Proizvodima (Ovaj mjesec)"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_category
 msgid "Purchases Orders by Categories"
-msgstr ""
+msgstr "Kupovne narudžbe prema Kategorijama"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_73
 msgid "Reporting"
-msgstr ""
+msgstr "izvještavanje"
 
 #. module: report_purchase
 #: model:ir.module.module,shortdesc:report_purchase.module_meta_information
 msgid "Purchase Management - Reporting"
-msgstr ""
+msgstr "Upravljanje Nabavom - Izvještavanje"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Izuzetak kod Računa"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_total:0
 #: field:report.purchase.order.product,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Ukupna cijena"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,quantity:0
 #: field:report.purchase.order.product,quantity:0
 msgid "# of Products"
-msgstr ""
+msgstr "# Proizvoda"
 
 #. module: report_purchase
 #: view:report.purchase.order.product:0
 msgid "Purchases by products"
-msgstr ""
+msgstr "Kupnje prema Proizvodima"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.act_product_category_2_report_purchase_order_category
 #: model:ir.actions.act_window,name:report_purchase.act_product_product_2_report_purchases_order_product
 msgid "Monthly purchases"
-msgstr ""
+msgstr "Mjesečne Kupnje"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_74
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: report_purchase
 #: model:ir.module.module,description:report_purchase.module_meta_information
@@ -135,66 +137,68 @@ msgid ""
 "    Purchase By Product, Purchase By Category of Product, All Months, "
 "Current Month."
 msgstr ""
+"Modul koji dodaje prikaze poput: Kupnje prema proizvodima, Kupnje prema "
+"Kategorijama Proizvoda, Svi mjeseci, Tekući mjesec."
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Ponuda"
 
 #. module: report_purchase
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Priručnik u tijeku"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category
 msgid "Purchases by Category of Product (this month)"
-msgstr ""
+msgstr "Kupnje po Kategoriji Proizvoda (Ovaj mjesec)"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Izuzetak kod Otpreme"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "In progress"
-msgstr ""
+msgstr "U razvoju"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,name:0
 #: field:report.purchase.order.product,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,count:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# Linija"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,category_id:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
diff --git a/addons/report_purchase/i18n/hu.po b/addons/report_purchase/i18n/hu.po
index ddf7bfaded3..c55678fcca7 100644
--- a/addons/report_purchase/i18n/hu.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/id.po b/addons/report_purchase/i18n/id.po
index 32377799c5d..802137db904 100644
--- a/addons/report_purchase/i18n/id.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/it.po b/addons/report_purchase/i18n/it.po
index 0ffb940694d..f5a92b37518 100644
--- a/addons/report_purchase/i18n/it.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index 8210afa1078..980b91c42e4 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/lt.po b/addons/report_purchase/i18n/lt.po
index ddf7bfaded3..c55678fcca7 100644
--- a/addons/report_purchase/i18n/lt.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/nl.po b/addons/report_purchase/i18n/nl.po
index 4de49e84c7e..6102bf29568 100644
--- a/addons/report_purchase/i18n/nl.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/nl_BE.po b/addons/report_purchase/i18n/nl_BE.po
index 77fd367c006..02531b497bf 100644
--- a/addons/report_purchase/i18n/nl_BE.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/pl.po b/addons/report_purchase/i18n/pl.po
index 8a15d4b655b..84835fd44f2 100644
--- a/addons/report_purchase/i18n/pl.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/pt.po b/addons/report_purchase/i18n/pt.po
index 0bc4956efa4..2aa15788eb0 100644
--- a/addons/report_purchase/i18n/pt.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/pt_BR.po b/addons/report_purchase/i18n/pt_BR.po
index c60b9291d97..4f2287d6bd9 100644
--- a/addons/report_purchase/i18n/pt_BR.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/ro.po b/addons/report_purchase/i18n/ro.po
index ddf7bfaded3..c55678fcca7 100644
--- a/addons/report_purchase/i18n/ro.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/ru.po b/addons/report_purchase/i18n/ru.po
index 70a428f3ba3..15db000100d 100644
--- a/addons/report_purchase/i18n/ru.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/sl.po b/addons/report_purchase/i18n/sl.po
index 355e331d2a7..74b4a375f9f 100644
--- a/addons/report_purchase/i18n/sl.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/sv.po b/addons/report_purchase/i18n/sv.po
index aa203e34765..50453743780 100644
--- a/addons/report_purchase/i18n/sv.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/tlh.po b/addons/report_purchase/i18n/tlh.po
index e8a090856f1..ed9b936fbe6 100644
--- a/addons/report_purchase/i18n/tlh.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/tr.po b/addons/report_purchase/i18n/tr.po
index c61c3aa1fe9..e8bc9dc5183 100644
--- a/addons/report_purchase/i18n/tr.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/uk.po b/addons/report_purchase/i18n/uk.po
index e9fcdf36eb4..05494a45b3c 100644
--- a/addons/report_purchase/i18n/uk.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/zh_CN.po b/addons/report_purchase/i18n/zh_CN.po
index 47f4e0f60b6..ccd8fc5f729 100644
--- a/addons/report_purchase/i18n/zh_CN.po
+++ b/addons/report_purchase/i18n/zh_CN.po
@@ -4,23 +4,23 @@
 #
 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-12-03 13:39+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:09+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_average:0
 #: field:report.purchase.order.product,price_average:0
 msgid "Average Price"
-msgstr "均价"
+msgstr "平均价格"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,state:0
@@ -33,23 +33,23 @@ msgstr "订单状态"
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category_all
 #: view:report.purchase.order.category:0
 msgid "Purchases by Category of Products"
-msgstr "商品种类采购情况"
+msgstr "产品采购类别"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_product
 msgid "Purchases Orders by Products"
-msgstr "商品采购订单"
+msgstr "产品采购订单"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree_all
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product_all
 msgid "Purchases by Products"
-msgstr "商品采购情况"
+msgstr "产品采购"
 
 #. module: report_purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中无效的模块名"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_75
@@ -60,29 +60,29 @@ msgstr "所有月份"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Waiting Schedule"
-msgstr "等待安排"
+msgstr "等待的计划调度"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product
 msgid "Purchases by Products (this month)"
-msgstr "商品采购情况（本月）"
+msgstr "采购的产品(这月)"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_category
 msgid "Purchases Orders by Categories"
-msgstr "分类采购订单"
+msgstr "采购订单的类别"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,product_id:0
 msgid "Product"
-msgstr "商品"
+msgstr "产品"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_73
@@ -92,7 +92,7 @@ msgstr "报表"
 #. module: report_purchase
 #: model:ir.module.module,shortdesc:report_purchase.module_meta_information
 msgid "Purchase Management - Reporting"
-msgstr "采购管理——报表"
+msgstr "采购管理 - 报表"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
@@ -104,24 +104,24 @@ msgstr "发票异常"
 #: field:report.purchase.order.category,price_total:0
 #: field:report.purchase.order.product,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "总价格"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,quantity:0
 #: field:report.purchase.order.product,quantity:0
 msgid "# of Products"
-msgstr "商品数"
+msgstr "产品#"
 
 #. module: report_purchase
 #: view:report.purchase.order.product:0
 msgid "Purchases by products"
-msgstr "商品采购情况"
+msgstr "产品采购"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.act_product_category_2_report_purchase_order_category
 #: model:ir.actions.act_window,name:report_purchase.act_product_product_2_report_purchases_order_product
 msgid "Monthly purchases"
-msgstr "月度采购"
+msgstr "每月采购"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_74
@@ -135,63 +135,65 @@ msgid ""
 "    Purchase By Product, Purchase By Category of Product, All Months, "
 "Current Month."
 msgstr ""
+"模块增加视图\n"
+"    产品采购, 产品采购类型, 所有月份, 当前月份."
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Quotation"
-msgstr "报价单"
+msgstr "数量"
 
 #. module: report_purchase
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Manual in progress"
-msgstr "正在手工处理"
+msgstr "手动进展"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category
 msgid "Purchases by Category of Product (this month)"
-msgstr "商品种类采购情况（本月）"
+msgstr "产品采购类型(这月)"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Shipping Exception"
-msgstr "发货例外项"
+msgstr "运输异常"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "In progress"
-msgstr "正在处理"
+msgstr "进展"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,name:0
 #: field:report.purchase.order.product,name:0
 msgid "Month"
-msgstr "月份"
+msgstr "月"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,count:0
 msgid "# of Lines"
-msgstr "行数"
+msgstr "明细#"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Done"
-msgstr "已完成"
+msgstr "完成"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,category_id:0
 msgid "Categories"
-msgstr "分类"
+msgstr "类别"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
diff --git a/addons/report_purchase/i18n/zh_TW.po b/addons/report_purchase/i18n/zh_TW.po
index 4998557a3e2..2c1f31ab0ae 100644
--- a/addons/report_purchase/i18n/zh_TW.po
+++ b/addons/report_purchase/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:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
deleted file mode 100644
index e2559b2c539..00000000000
--- a/addons/report_purchase/report_purchase_view.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Purchases by products by month -->
-        <record id="view_order_product_form" model="ir.ui.view">
-            <field name="name">report.purchase.order.product.form</field>
-            <field name="model">report.purchase.order.product</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Purchases by products">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="product_id" select="1"/>
-                    <field name="count"/>
-                    <field name="quantity" select="1"/>
-                    <field name="price_total" select="1"/>
-                    <field name="price_average" select="1"/>
-                    <field name="state" select="1"/>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_product_month_graph">
-            <field name="name">product.month.graph</field>
-            <field name="model">report.purchase.order.product</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Purchases by products" type="bar">
-                    <field name="product_id"/>
-                    <field name="quantity" operator="+"/>
-                    <field name="price_total" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="view_order_product_tree" model="ir.ui.view">
-            <field name="name">report.purchase.order.product.tree</field>
-            <field name="model">report.purchase.order.product</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Purchases by products">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="product_id"/>
-                    <field name="count"/>
-                    <field name="quantity"/>
-                    <field name="price_total"/>
-                    <field name="price_average"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_order_product_search" model="ir.ui.view">
-            <field name="name">report.purchase.order.product.search</field>
-            <field name="model">report.purchase.order.product</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-            	<search string="Purchases by products">
-            		<group col="8" colspan="4">
-	            		<filter icon="terp-purchase" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Purchases by products during this year"/>
-	            		<filter icon="terp-purchase" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Purchases by products during this month"/>
-	            		<separator orientation="vertical"/>
-	            		<field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="product_id" select="1"/>
-	                    <field name="state" select="1"/>
-            		</group>
-            	</search>
-            </field>
-        </record>
-
-        <record id="action_order_product_tree_all" model="ir.actions.act_window">
-            <field name="name">Purchases by Products</field>
-            <field name="res_model">report.purchase.order.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="view_order_product_search"/>
-        </record>
-
-        <menuitem id="next_id_73" name="Reporting" parent="base.menu_purchase_root"/>
-        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all"
-        	name="PO by Products" parent="next_id_73"/>
-
-        <!-- Purchases by category by month -->
-
-        <record id="view_order_category_form" model="ir.ui.view">
-            <field name="name">report.purchase.order.category.form</field>
-            <field name="model">report.purchase.order.category</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Purchases by Category of Products">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="category_id" select="1"/>
-                    <field name="count"/>
-                    <field name="quantity" select="1"/>
-                    <field name="price_total" select="1"/>
-                    <field name="price_average" select="1"/>
-                    <field name="state" select="1"/>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_product_category_graph">
-            <field name="name">product.category.graph</field>
-            <field name="model">report.purchase.order.category</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Purchases by Category of Products" type="bar">
-                    <field name="category_id"/>
-                    <field name="quantity" operator="+"/>
-                    <field name="price_total" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="view_order_category_tree" model="ir.ui.view">
-            <field name="name">report.purchase.order.category.tree</field>
-            <field name="model">report.purchase.order.category</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Purchases by Category of Products">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="category_id"/>
-                    <field name="count"/>
-                    <field name="quantity"/>
-                    <field name="price_total"/>
-                    <field name="price_average"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-		<record id="view_order_category_search" model="ir.ui.view">
-            <field name="name">report.purchase.order.category.search</field>
-            <field name="model">report.purchase.order.category</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-            	<search string="Purchases by category of products">
-            		<group col="8" colspan="4">
-	            		<filter icon="terp-purchase" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Purchases by categories of products during this year"/>
-	            		<filter icon="terp-purchase" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Purchases by categories of products during this month"/>
-	            		<separator orientation="vertical"/>
-	            		<field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="category_id" select="1"/>
-	                    <field name="state" select="1"/>
-            		</group>
-            	</search>
-            </field>
-        </record>
-
-        <record id="action_order_category_tree_all" model="ir.actions.act_window">
-            <field name="name">Purchases by Category of Products</field>
-            <field name="res_model">report.purchase.order.category</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="view_order_category_search"/>
-        </record>
-        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all"
-        	name="PO by Products Category" parent="report_purchase.next_id_73"/>
-
-        <act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_purchases_order_product" name="Monthly purchases" res_model="report.purchase.order.product" src_model="product.product"/>
-
-        <act_window domain="[('category_id', '=', active_id)]" id="act_product_category_2_report_purchase_order_category" name="Monthly purchases" res_model="report.purchase.order.category" src_model="product.category"/>
-
-    </data>
-</openerp>
diff --git a/addons/report_purchase/security/ir.model.access.csv b/addons/report_purchase/security/ir.model.access.csv
deleted file mode 100644
index ee05ec94cd5..00000000000
--- a/addons/report_purchase/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_purchase_order_product,report.purchase.order.product,model_report_purchase_order_product,purchase.group_purchase_manager,1,0,0,0
-access_report_purchase_order_category,report.purchase.order.category,model_report_purchase_order_category,purchase.group_purchase_manager,1,0,0,0
diff --git a/addons/report_sale/i18n/ar.po b/addons/report_sale/i18n/ar.po
index 5ff5fb8f654..c63fd3c8453 100644
--- a/addons/report_sale/i18n/ar.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/bg.po b/addons/report_sale/i18n/bg.po
index 45bc43c676f..0930c149bbf 100644
--- a/addons/report_sale/i18n/bg.po
+++ b/addons/report_sale/i18n/bg.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: 2009-11-09 19:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-29 14:13+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
@@ -25,52 +25,52 @@ msgstr "Изпълнява се"
 #: field:report.sale.order.category,price_average:0
 #: field:report.sale.order.product,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средна цена"
 
 #. module: report_sale
 #: field:report.sale.order.category,state:0
 #: field:report.sale.order.created,state:0
 #: field:report.sale.order.product,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Състояние на поръчка"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_created
 msgid "Report of Created Sale Order"
-msgstr ""
+msgstr "Доклад за изготвена поръчка за продажба"
 
 #. module: report_sale
 #: view:report.sale.order.category:0
 msgid "Sales Orders by category"
-msgstr ""
+msgstr "Поръчки за продажба по категория"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_6
 #: model:ir.report.custom,title:report_sale.ir_report_custom_6
 msgid "Monthly cumulated sales turnover over one year"
-msgstr ""
+msgstr "Натрупан годишен оборот от продажби по месеци"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_product
 msgid "Sales Orders by Products"
-msgstr ""
+msgstr "Поръчки за продажба по продукт"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu1
 msgid "Monthly Sales Turnover Over One Year"
-msgstr ""
+msgstr "Годишен оборот от продажби по месеци"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_turnover_product_tree
 #: model:ir.model,name:report_sale.model_report_turnover_per_product
 #: view:report.turnover.per.product:0
 msgid "Turnover Per Product"
-msgstr "Оборот за продукт"
+msgstr "Оборот по продукт"
 
 #. module: report_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_82
@@ -90,36 +90,36 @@ msgstr ""
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Очакване на планиране"
 
 #. module: report_sale
 #: field:report.sale.order.category,price_total:0
 #: field:report.sale.order.product,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Крайна цена"
 
 #. module: report_sale
 #: field:report.sale.order.product,product_id:0
 #: field:report.turnover.per.product,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Продукт"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_category
 msgid "Sales Orders by Categories"
-msgstr ""
+msgstr "Поръчки за продажби по категории"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_sale_list
 #: model:ir.ui.menu,name:report_sale.menu_report_order_sale_list
 msgid "Sales of the Month"
-msgstr ""
+msgstr "Продажби на месеца"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_product_tree
 #: model:ir.ui.menu,name:report_sale.menu_report_order_product
 msgid "Sales by Product (this month)"
-msgstr ""
+msgstr "Продажби по продукт (този месец)"
 
 #. module: report_sale
 #: field:report.sale.order.created,partner_shipping_id:0
@@ -130,37 +130,37 @@ msgstr "Адрес за доставка"
 #: model:ir.report.custom,name:report_sale.ir_report_custom_4
 #: model:ir.report.custom,title:report_sale.ir_report_custom_4
 msgid "Monthly sales turnover over one year"
-msgstr ""
+msgstr "Годишен оборот от продажби по месеци"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Грешка при фактуриране"
 
 #. module: report_sale
 #: model:ir.module.module,shortdesc:report_sale.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr ""
+msgstr "Управление на продажби – справки"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_category_tree_all
 #: model:ir.ui.menu,name:report_sale.menu_report_order_category_all
 #: view:report.sale.order.category:0
 msgid "Sales by Category of Products"
-msgstr ""
+msgstr "Продажби по категория от продукти"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu3
 msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr ""
+msgstr "Натрупан годишен оборот от продажби по месеци"
 
 #. module: report_sale
 #: field:report.sale.order.category,quantity:0
 #: field:report.sale.order.product,quantity:0
 msgid "# of Products"
-msgstr ""
+msgstr "# на продукти"
 
 #. module: report_sale
 #: field:report.sale.order.created,name:0
@@ -172,7 +172,7 @@ msgstr "Отпратка към поръчка"
 #: model:ir.ui.menu,name:report_sale.menu_report_order_product_all
 #: view:report.sale.order.product:0
 msgid "Sales by Product"
-msgstr ""
+msgstr "Продажби по продукт"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_81
@@ -182,14 +182,14 @@ msgstr "Този месец"
 #. module: report_sale
 #: field:report.sale.order.category,category_id:0
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Оферта"
 
 #. module: report_sale
 #: field:report.sale.order.created,partner_id:0
@@ -221,7 +221,7 @@ msgstr "Оборот за месец"
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu2
 msgid "Daily Sales Turnover Over One Year"
-msgstr ""
+msgstr "Годишен оборот от продажби по дни"
 
 #. module: report_sale
 #: field:report.sale.order.created,date_order:0
@@ -231,25 +231,25 @@ msgstr "Дата на поръчка"
 #. module: report_sale
 #: view:sale.order:0
 msgid "Sales orders"
-msgstr ""
+msgstr "Поръчки за продажба"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_83
 msgid "Graphs"
-msgstr ""
+msgstr "Диаграми"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Ръчно в изпълнение"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Грешка при доставка"
 
 #. module: report_sale
 #: field:report.turnover.per.month,turnover:0
@@ -261,7 +261,7 @@ msgstr "Общо оборот"
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.product,state:0
 msgid "In progress"
-msgstr ""
+msgstr "Извършва се"
 
 #. module: report_sale
 #: view:report.sale.order.created:0
@@ -272,13 +272,13 @@ msgstr "Отпратка"
 #: model:ir.actions.act_window,name:report_sale.action_order_category_tree
 #: model:ir.ui.menu,name:report_sale.menu_report_order_category
 msgid "Sales by Category of Product (this month)"
-msgstr ""
+msgstr "Продажби по катерия от продукти (този месец)"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_5
 #: model:ir.report.custom,title:report_sale.ir_report_custom_5
 msgid "Daily sales turnover over one year"
-msgstr ""
+msgstr "Годишен оборот от продажби по дни"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
@@ -290,13 +290,13 @@ msgstr "Ръчно в развитие"
 #: field:report.sale.order.product,name:0
 #: field:report.turnover.per.month,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: report_sale
 #: field:report.sale.order.category,count:0
 #: field:report.sale.order.product,count:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# от редове"
 
 #. module: report_sale
 #: field:report.sale.order.created,create_date:0
@@ -308,25 +308,25 @@ msgstr "Дата на създаване"
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. module: report_sale
 #: view:report.sale.order.created:0
 msgid "Created Sales orders"
-msgstr "Създадени поръчки за продажба"
+msgstr "Изготвени поръчки за продажба"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_so_pipeline
 #: view:sale.order:0
 msgid "Sales by State"
-msgstr ""
+msgstr "Продажби по област"
 
 #. module: report_sale
 #: field:report.sale.order.created,amount_untaxed:0
diff --git a/addons/report_sale/i18n/bs.po b/addons/report_sale/i18n/bs.po
index c12f5cf3979..7d8dbcd3905 100644
--- a/addons/report_sale/i18n/bs.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/ca.po b/addons/report_sale/i18n/ca.po
index 686650d7ed8..583fd41fa63 100644
--- a/addons/report_sale/i18n/ca.po
+++ b/addons/report_sale/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/cs.po b/addons/report_sale/i18n/cs.po
index 5ff5fb8f654..c63fd3c8453 100644
--- a/addons/report_sale/i18n/cs.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/de.po b/addons/report_sale/i18n/de.po
index 5d55e836550..8a2a9f986e4 100644
--- a/addons/report_sale/i18n/de.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/el.po b/addons/report_sale/i18n/el.po
index e87076a6a43..23bcee3287c 100644
--- a/addons/report_sale/i18n/el.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/es.po b/addons/report_sale/i18n/es.po
index a04ec90b5ed..fc9bca02453 100644
--- a/addons/report_sale/i18n/es.po
+++ b/addons/report_sale/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/es_AR.po b/addons/report_sale/i18n/es_AR.po
index 04ae04ceb39..a9eda5c8b98 100644
--- a/addons/report_sale/i18n/es_AR.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/et.po b/addons/report_sale/i18n/et.po
index 4975b6a398a..2e15d1fb077 100644
--- a/addons/report_sale/i18n/et.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/fi.po b/addons/report_sale/i18n/fi.po
index 1290fa29390..738606df609 100644
--- a/addons/report_sale/i18n/fi.po
+++ b/addons/report_sale/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-16 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/fr.po b/addons/report_sale/i18n/fr.po
index fdb71b6d528..5b5ad5e993a 100644
--- a/addons/report_sale/i18n/fr.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/hr.po b/addons/report_sale/i18n/hr.po
index 5ff5fb8f654..ed78cc96e26 100644
--- a/addons/report_sale/i18n/hr.po
+++ b/addons/report_sale/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_sale
-#
+# * report_sale
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 21:28+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
@@ -37,296 +38,297 @@ msgstr ""
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_created
 msgid "Report of Created Sale Order"
-msgstr ""
+msgstr "Izvještaj o kreiranoj Prodajnoj narudžbi"
 
 #. module: report_sale
 #: view:report.sale.order.category:0
 msgid "Sales Orders by category"
-msgstr ""
+msgstr "Prodajne narudžbe prema Kategoriji"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_6
 #: model:ir.report.custom,title:report_sale.ir_report_custom_6
 msgid "Monthly cumulated sales turnover over one year"
-msgstr ""
+msgstr "Kumulativni promet prodaje po mjesecima u godini"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_product
 msgid "Sales Orders by Products"
-msgstr ""
+msgstr "Prodajne narudžbe prema Proizvodima"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu1
 msgid "Monthly Sales Turnover Over One Year"
-msgstr ""
+msgstr "Mjesečni promet prodaje tijekom jedne godine"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_turnover_product_tree
 #: model:ir.model,name:report_sale.model_report_turnover_per_product
 #: view:report.turnover.per.product:0
 msgid "Turnover Per Product"
-msgstr ""
+msgstr "Promet po Proizvodu"
 
 #. module: report_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_82
 msgid "All Months"
-msgstr ""
+msgstr "Svi mjeseci"
 
 #. module: report_sale
 #: 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: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Raspored čekanja"
 
 #. module: report_sale
 #: field:report.sale.order.category,price_total:0
 #: field:report.sale.order.product,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Ukupna cijena"
 
 #. module: report_sale
 #: field:report.sale.order.product,product_id:0
 #: field:report.turnover.per.product,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_category
 msgid "Sales Orders by Categories"
-msgstr ""
+msgstr "Prodajne narudžbe prema Kategorijama"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_sale_list
 #: model:ir.ui.menu,name:report_sale.menu_report_order_sale_list
 msgid "Sales of the Month"
-msgstr ""
+msgstr "Prodaje u mjesecu"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_product_tree
 #: model:ir.ui.menu,name:report_sale.menu_report_order_product
 msgid "Sales by Product (this month)"
-msgstr ""
+msgstr "Prodaje prema Proizvodima (Ovaj mjesec)"
 
 #. module: report_sale
 #: field:report.sale.order.created,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Adresa otpreme"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_4
 #: model:ir.report.custom,title:report_sale.ir_report_custom_4
 msgid "Monthly sales turnover over one year"
-msgstr ""
+msgstr "Mjesečni promet prodaje tijekom jedne godine"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Izuzetak u izdavanju Računa"
 
 #. module: report_sale
 #: model:ir.module.module,shortdesc:report_sale.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr ""
+msgstr "Upravljanje prodajom - Izvještavanje"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_category_tree_all
 #: model:ir.ui.menu,name:report_sale.menu_report_order_category_all
 #: view:report.sale.order.category:0
 msgid "Sales by Category of Products"
-msgstr ""
+msgstr "Prodaje prema Kategorijama Proizvoda"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu3
 msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr ""
+msgstr "Kumulativni promet prodaje po mjesecima u godini"
 
 #. module: report_sale
 #: field:report.sale.order.category,quantity:0
 #: field:report.sale.order.product,quantity:0
 msgid "# of Products"
-msgstr ""
+msgstr "# Proizvoda"
 
 #. module: report_sale
 #: field:report.sale.order.created,name:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Referenca Narudžbe"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_product_tree_all
 #: model:ir.ui.menu,name:report_sale.menu_report_order_product_all
 #: view:report.sale.order.product:0
 msgid "Sales by Product"
-msgstr ""
+msgstr "prodaja prema Proizvodu"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_81
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: report_sale
 #: field:report.sale.order.category,category_id:0
 msgid "Categories"
-msgstr ""
+msgstr "kategorije"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "ponuda"
 
 #. module: report_sale
 #: field:report.sale.order.created,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Stranka"
 
 #. module: report_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_view_created_sale_order_dashboard
 msgid "Created Sale Orders"
-msgstr ""
+msgstr "Kreirane Prodajne Narudžbe"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_80
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_turnover_month_tree
 #: model:ir.model,name:report_sale.model_report_turnover_per_month
 #: view:report.turnover.per.month:0
 msgid "Turnover Per Month"
-msgstr ""
+msgstr "Promet po mjesecu"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu2
 msgid "Daily Sales Turnover Over One Year"
-msgstr ""
+msgstr "Dnevni promet prodaje tijekom jedne godine"
 
 #. module: report_sale
 #: field:report.sale.order.created,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "datum narudžbe"
 
 #. module: report_sale
 #: view:sale.order:0
 msgid "Sales orders"
-msgstr ""
+msgstr "Prodajne Narudžbe"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_83
 msgid "Graphs"
-msgstr ""
+msgstr "Grafikoni"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Priručnik u tijeku"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Izuzetak kod Otpreme"
 
 #. module: report_sale
 #: field:report.turnover.per.month,turnover:0
 #: field:report.turnover.per.product,turnover:0
 msgid "Total Turnover"
-msgstr ""
+msgstr "Ukupni promet"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.product,state:0
 msgid "In progress"
-msgstr ""
+msgstr "U Tijeku"
 
 #. module: report_sale
 #: view:report.sale.order.created:0
 msgid "Reference"
-msgstr ""
+msgstr "Referenca"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_category_tree
 #: model:ir.ui.menu,name:report_sale.menu_report_order_category
 msgid "Sales by Category of Product (this month)"
-msgstr ""
+msgstr "Prodaje prema Kategoriji Proizvoda (Ovaj mjesec)"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_5
 #: model:ir.report.custom,title:report_sale.ir_report_custom_5
 msgid "Daily sales turnover over one year"
-msgstr ""
+msgstr "Dnevni promet prodaje tijekom jedne godine"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Priručnik u tijeku"
 
 #. module: report_sale
 #: field:report.sale.order.category,name:0
 #: field:report.sale.order.product,name:0
 #: field:report.turnover.per.month,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: report_sale
 #: field:report.sale.order.category,count:0
 #: field:report.sale.order.product,count:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# Linija"
 
 #. module: report_sale
 #: field:report.sale.order.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: report_sale
 #: view:report.sale.order.created:0
 msgid "Created Sales orders"
-msgstr ""
+msgstr "Kreirane Prodajne Narudžbe"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_so_pipeline
 #: view:sale.order:0
 msgid "Sales by State"
-msgstr ""
+msgstr "Prodaje prema Stanju"
 
 #. module: report_sale
 #: field:report.sale.order.created,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Iznos bez Poreza"
diff --git a/addons/report_sale/i18n/hu.po b/addons/report_sale/i18n/hu.po
index 5ff5fb8f654..c63fd3c8453 100644
--- a/addons/report_sale/i18n/hu.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/id.po b/addons/report_sale/i18n/id.po
index 674a99c240e..ff4637533f0 100644
--- a/addons/report_sale/i18n/id.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/it.po b/addons/report_sale/i18n/it.po
index b5684f7cfef..46da36782b2 100644
--- a/addons/report_sale/i18n/it.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/ko.po b/addons/report_sale/i18n/ko.po
index 7221fdffd27..6b64500cd28 100644
--- a/addons/report_sale/i18n/ko.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/lt.po b/addons/report_sale/i18n/lt.po
index 5ff5fb8f654..c63fd3c8453 100644
--- a/addons/report_sale/i18n/lt.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/nl.po b/addons/report_sale/i18n/nl.po
index 55f5bb57044..cf2ec761134 100644
--- a/addons/report_sale/i18n/nl.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/nl_BE.po b/addons/report_sale/i18n/nl_BE.po
index e380e1cd44e..d65389303e7 100644
--- a/addons/report_sale/i18n/nl_BE.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/pl.po b/addons/report_sale/i18n/pl.po
index d7653466c86..ae1f4d0dd48 100644
--- a/addons/report_sale/i18n/pl.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/pt.po b/addons/report_sale/i18n/pt.po
index d8ab16f3ac5..ebd6ab34939 100644
--- a/addons/report_sale/i18n/pt.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/pt_BR.po b/addons/report_sale/i18n/pt_BR.po
index 03317b1c569..7214233e4c4 100644
--- a/addons/report_sale/i18n/pt_BR.po
+++ b/addons/report_sale/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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/ro.po b/addons/report_sale/i18n/ro.po
index da6ed4249af..dfb95957913 100644
--- a/addons/report_sale/i18n/ro.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/ru.po b/addons/report_sale/i18n/ru.po
index 0e85870818f..0e42bc6d352 100644
--- a/addons/report_sale/i18n/ru.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/sl.po b/addons/report_sale/i18n/sl.po
index 5d08ab67984..bc96ed374c6 100644
--- a/addons/report_sale/i18n/sl.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/sv.po b/addons/report_sale/i18n/sv.po
index ed45bc9f58c..2a91f57c87f 100644
--- a/addons/report_sale/i18n/sv.po
+++ b/addons/report_sale/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:35+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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: report_sale
diff --git a/addons/report_sale/i18n/tlh.po b/addons/report_sale/i18n/tlh.po
index 66ccf21f1fa..01cef300c94 100644
--- a/addons/report_sale/i18n/tlh.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/tr.po b/addons/report_sale/i18n/tr.po
index b4ffbc79ba4..384351003d6 100644
--- a/addons/report_sale/i18n/tr.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/uk.po b/addons/report_sale/i18n/uk.po
index 0b1808d440a..d66f5ddc603 100644
--- a/addons/report_sale/i18n/uk.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_sale/i18n/zh_CN.po b/addons/report_sale/i18n/zh_CN.po
index 59b328e84e6..c8ef8b55d79 100644
--- a/addons/report_sale/i18n/zh_CN.po
+++ b/addons/report_sale/i18n/zh_CN.po
@@ -4,73 +4,73 @@
 #
 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-07 08:07+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
 msgid "In Progress"
-msgstr "进行中"
+msgstr "进展"
 
 #. module: report_sale
 #: field:report.sale.order.category,price_average:0
 #: field:report.sale.order.product,price_average:0
 msgid "Average Price"
-msgstr "均价"
+msgstr "平均价"
 
 #. module: report_sale
 #: field:report.sale.order.category,state:0
 #: field:report.sale.order.created,state:0
 #: field:report.sale.order.product,state:0
 msgid "Order State"
-msgstr "订单状态"
+msgstr "状态"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_created
 msgid "Report of Created Sale Order"
-msgstr "已创建销售单的报表"
+msgstr "创建销售订单报表"
 
 #. module: report_sale
 #: view:report.sale.order.category:0
 msgid "Sales Orders by category"
-msgstr "按类别分类的销售订单"
+msgstr "销售订单分类"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_6
 #: model:ir.report.custom,title:report_sale.ir_report_custom_6
 msgid "Monthly cumulated sales turnover over one year"
-msgstr ""
+msgstr "一年内月累积营业额"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_product
 msgid "Sales Orders by Products"
-msgstr "按商品分类的销售订单"
+msgstr "销售订单产品"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu1
 msgid "Monthly Sales Turnover Over One Year"
-msgstr ""
+msgstr "一年内月累积营业额"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_turnover_product_tree
 #: model:ir.model,name:report_sale.model_report_turnover_per_product
 #: view:report.turnover.per.product:0
 msgid "Turnover Per Product"
-msgstr ""
+msgstr "每产品的营业额"
 
 #. module: report_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_82
@@ -81,54 +81,54 @@ msgstr "所有月份"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Waiting Schedule"
-msgstr "等待安排"
+msgstr "等待调度"
 
 #. module: report_sale
 #: field:report.sale.order.category,price_total:0
 #: field:report.sale.order.product,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "价格合计"
 
 #. module: report_sale
 #: field:report.sale.order.product,product_id:0
 #: field:report.turnover.per.product,product_id:0
 msgid "Product"
-msgstr "商品"
+msgstr "产品"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_category
 msgid "Sales Orders by Categories"
-msgstr "按类别分类的销售单列表"
+msgstr "销售订单分类"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_sale_list
 #: model:ir.ui.menu,name:report_sale.menu_report_order_sale_list
 msgid "Sales of the Month"
-msgstr "月度销售情况"
+msgstr "这月的销售"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_product_tree
 #: model:ir.ui.menu,name:report_sale.menu_report_order_product
 msgid "Sales by Product (this month)"
-msgstr "商品销售情况（本月）"
+msgstr "销售的产品(这月)"
 
 #. module: report_sale
 #: field:report.sale.order.created,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr "发运地址"
+msgstr "运输地址"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_4
 #: model:ir.report.custom,title:report_sale.ir_report_custom_4
 msgid "Monthly sales turnover over one year"
-msgstr ""
+msgstr "一年内月累积营业额"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
@@ -140,37 +140,37 @@ msgstr "发票异常"
 #. module: report_sale
 #: model:ir.module.module,shortdesc:report_sale.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr "销售管理——报表"
+msgstr "销售管理 - 报表"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_category_tree_all
 #: model:ir.ui.menu,name:report_sale.menu_report_order_category_all
 #: view:report.sale.order.category:0
 msgid "Sales by Category of Products"
-msgstr "商品分类的销售情况"
+msgstr "销售的产品分类"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu3
 msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr ""
+msgstr "一年内月累积营业额"
 
 #. module: report_sale
 #: field:report.sale.order.category,quantity:0
 #: field:report.sale.order.product,quantity:0
 msgid "# of Products"
-msgstr "商品数量"
+msgstr "产品#"
 
 #. module: report_sale
 #: field:report.sale.order.created,name:0
 msgid "Order Reference"
-msgstr "订单引用"
+msgstr "订单参考"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_product_tree_all
 #: model:ir.ui.menu,name:report_sale.menu_report_order_product_all
 #: view:report.sale.order.product:0
 msgid "Sales by Product"
-msgstr "商品销售情况"
+msgstr "销售的产品"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_81
@@ -197,34 +197,34 @@ msgstr "客户"
 #. module: report_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_view_created_sale_order_dashboard
 msgid "Created Sale Orders"
-msgstr "已创建的销售订单列表"
+msgstr "创建销售订单"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_80
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_turnover_month_tree
 #: model:ir.model,name:report_sale.model_report_turnover_per_month
 #: view:report.turnover.per.month:0
 msgid "Turnover Per Month"
-msgstr ""
+msgstr "每月的营业额"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu2
 msgid "Daily Sales Turnover Over One Year"
-msgstr ""
+msgstr "一年内每天的营业额"
 
 #. module: report_sale
 #: field:report.sale.order.created,date_order:0
 msgid "Date Ordered"
-msgstr "订货日期"
+msgstr "订单日期"
 
 #. module: report_sale
 #: view:sale.order:0
@@ -240,66 +240,66 @@ msgstr "图表"
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Manual in progress"
-msgstr "正在手工处理的"
+msgstr "手动处理"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Shipping Exception"
-msgstr "发货例外项"
+msgstr "运输异常"
 
 #. module: report_sale
 #: field:report.turnover.per.month,turnover:0
 #: field:report.turnover.per.product,turnover:0
 msgid "Total Turnover"
-msgstr ""
+msgstr "总营业额"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.product,state:0
 msgid "In progress"
-msgstr "正在处理"
+msgstr "图表"
 
 #. module: report_sale
 #: view:report.sale.order.created:0
 msgid "Reference"
-msgstr "引用"
+msgstr "参考"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_category_tree
 #: model:ir.ui.menu,name:report_sale.menu_report_order_category
 msgid "Sales by Category of Product (this month)"
-msgstr "商品分类销售情况（本月）"
+msgstr "销售的产品分类(这月)"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_5
 #: model:ir.report.custom,title:report_sale.ir_report_custom_5
 msgid "Daily sales turnover over one year"
-msgstr ""
+msgstr "一年内每天的营业额"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "进展"
 
 #. module: report_sale
 #: field:report.sale.order.category,name:0
 #: field:report.sale.order.product,name:0
 #: field:report.turnover.per.month,name:0
 msgid "Month"
-msgstr "月份"
+msgstr "月"
 
 #. module: report_sale
 #: field:report.sale.order.category,count:0
 #: field:report.sale.order.product,count:0
 msgid "# of Lines"
-msgstr "行数"
+msgstr "明细#"
 
 #. module: report_sale
 #: field:report.sale.order.created,create_date:0
 msgid "Create Date"
-msgstr "创建时间"
+msgstr "创建日期"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
@@ -311,7 +311,7 @@ msgstr "完成"
 #. module: report_sale
 #: view:report.sale.order.created:0
 msgid "Created Sales orders"
-msgstr "已创建的销售订单"
+msgstr "创建销售订单"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
@@ -324,9 +324,33 @@ msgstr "取消"
 #: model:ir.actions.act_window,name:report_sale.action_so_pipeline
 #: view:sale.order:0
 msgid "Sales by State"
-msgstr ""
+msgstr "销售的状态"
 
 #. module: report_sale
 #: field:report.sale.order.created,amount_untaxed:0
 msgid "Untaxed Amount"
 msgstr "未完税金额"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Reporting for the sale module:\n"
+#~ "    * Sales order by product (my/this month/all)\n"
+#~ "    * Sales order by category of product (my/this month/all)\n"
+#~ "\n"
+#~ "    Some predefined lists:\n"
+#~ "    * Sales of the month\n"
+#~ "    * Open quotations\n"
+#~ "    * Uninvoiced Sales\n"
+#~ "    * Uninvoiced but shipped Sales\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    销售报表模块:\n"
+#~ "\t- 销售订单产品(我的、这月、所有)\n"
+#~ "\t- 销售订单的产品分来(我的、这月、所有)\n"
+#~ "\t\n"
+#~ "\t\t一些预定清单:\n"
+#~ "\t\t- 这月的销售\n"
+#~ "\t\t- 待处理的报价\n"
+#~ "\t\t- 未开票但已运输的销售\n"
+#~ "    "
diff --git a/addons/report_sale/i18n/zh_TW.po b/addons/report_sale/i18n/zh_TW.po
index 609ed5c6479..a95a2d5c1a0 100644
--- a/addons/report_sale/i18n/zh_TW.po
+++ b/addons/report_sale/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: report_sale
diff --git a/addons/report_task/__terp__.py b/addons/report_task/__terp__.py
deleted file mode 100644
index 843bfa4c79e..00000000000
--- a/addons/report_task/__terp__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-{
-    'name': 'Report on tasks by user for projects',
-    'version': '1.0',
-    'category': 'Generic Modules/Projects & Services',
-    'description': """Gives statistics on tasks by user on projects to check the pipeline of users.""",
-    'author': 'Tiny',
-    'depends': ['base', 'project','hr_timesheet_sheet'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_task_view.xml'],
-    'installable': True,
-    'active': False,
-    'certificate': '0027671328157',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_task/i18n/ar.po b/addons/report_task/i18n/ar.po
index 8662fc5fe6b..4aaa707fe07 100644
--- a/addons/report_task/i18n/ar.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/bg.po b/addons/report_task/i18n/bg.po
index 8c7c4a01f0e..2331c52da07 100644
--- a/addons/report_task/i18n/bg.po
+++ b/addons/report_task/i18n/bg.po
@@ -8,26 +8,26 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 19:49+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-29 13:41+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "В прогрес"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_project_task
 #: model:ir.ui.menu,name:report_task.menu_project_task_user_tree
 #: view:report.task.user.pipeline.open:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Задачи според потребител"
 
 #. module: report_task
 #: constraint:ir.model:0
@@ -40,86 +40,86 @@ msgstr ""
 #. module: report_task
 #: field:report.closed.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Оставащи часове"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "No Task"
-msgstr ""
+msgstr "Няма задача"
 
 #. module: report_task
 #: model:ir.module.module,shortdesc:report_task.module_meta_information
 msgid "Report on tasks by user for projects"
-msgstr ""
+msgstr "Доклад на задачите по проекти според потребител"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Delay"
-msgstr ""
+msgstr "Закъснение"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Много ниско"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Draft"
-msgstr ""
+msgstr "Чернова"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Нисък"
 
 #. module: report_task
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: report_task
 #: field:report.closed.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "Резюме на задача"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Pending"
-msgstr ""
+msgstr "Висящи"
 
 #. module: report_task
 #: field:report.closed.task,state:0
 #: field:report.task.user.pipeline.open,task_state:0
 msgid "Status"
-msgstr ""
+msgstr "Състояние"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Среден"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:report_task.menu_timesheet_task_user
 msgid "Timesheet / Task Hours Per Month"
-msgstr ""
+msgstr "График / Часове задачи на месец"
 
 #. module: report_task
 #: field:report.closed.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Напредък (%)"
 
 #. module: report_task
 #: field:report.closed.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "Важност"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Фирма"
 
 #. module: report_task
 #: model:ir.ui.menu,name:report_task.next_id_57
@@ -136,29 +136,29 @@ msgstr ""
 #: field:report.task.user.pipeline.open,user_id:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Потребител"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_closed_task_board
 msgid "Task Closed Within Past 15 Days"
-msgstr ""
+msgstr "Приключени задачи през последните 15 дни"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Много спешно"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_hrs:0
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Часове задачи"
 
 #. module: report_task
 #: constraint:ir.ui.view:0
@@ -168,100 +168,100 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Часове забавяне"
 
 #. module: report_task
 #: field:report.closed.task,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Проект"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_nbr:0
 msgid "Task Number"
-msgstr ""
+msgstr "Номер на задача"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_task_user_pipeline_open
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Задачи според потребител и проект"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Планирани"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отказани"
 
 #. module: report_task
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "График / Доклад на часовете задачи на месец"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_progress:0
 msgid "Task Progress"
-msgstr ""
+msgstr "Напредък на задачата"
 
 #. module: report_task
 #: field:report.closed.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Дата на приключване"
 
 #. module: report_task
 #: field:report.closed.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Назначено на"
 
 #. module: report_task
 #: field:report.closed.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Последователност"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_closed_task
 msgid "Closed Task Report"
-msgstr ""
+msgstr "Доклад за приключена задача"
 
 #. module: report_task
 #: field:report.timesheet.task.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Спешно"
 
 #. module: report_task
 #: field:report.closed.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Краен срок"
 
 #. module: report_task
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Часове по график"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Closed Tasks"
-msgstr ""
+msgstr "Приключени задачи"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Open"
-msgstr ""
+msgstr "Отвoри"
 
 #. module: report_task
 #: field:report.closed.task,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Планирани часове"
diff --git a/addons/report_task/i18n/bs.po b/addons/report_task/i18n/bs.po
index 60cde8c34f3..c4b2f3541ca 100644
--- a/addons/report_task/i18n/bs.po
+++ b/addons/report_task/i18n/bs.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: report_task
diff --git a/addons/report_task/i18n/ca.po b/addons/report_task/i18n/ca.po
index c77c491dcd4..438badf71f2 100644
--- a/addons/report_task/i18n/ca.po
+++ b/addons/report_task/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/cs.po b/addons/report_task/i18n/cs.po
index 8662fc5fe6b..4aaa707fe07 100644
--- a/addons/report_task/i18n/cs.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/de.po b/addons/report_task/i18n/de.po
index 80ee7094f83..fdd5ab92564 100644
--- a/addons/report_task/i18n/de.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/es.po b/addons/report_task/i18n/es.po
index f7248cd8d18..21766fd6ba5 100644
--- a/addons/report_task/i18n/es.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/es_AR.po b/addons/report_task/i18n/es_AR.po
index 1b001c22c6d..c580497ace4 100644
--- a/addons/report_task/i18n/es_AR.po
+++ b/addons/report_task/i18n/es_AR.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: report_task
diff --git a/addons/report_task/i18n/et.po b/addons/report_task/i18n/et.po
index a48a8bd0fcf..df5b922f0d7 100644
--- a/addons/report_task/i18n/et.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/fr.po b/addons/report_task/i18n/fr.po
index 87f5cc3bda9..c01fd6f0f0a 100644
--- a/addons/report_task/i18n/fr.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/hr.po b/addons/report_task/i18n/hr.po
index 8662fc5fe6b..f19dadfac5e 100644
--- a/addons/report_task/i18n/hr.po
+++ b/addons/report_task/i18n/hr.po
@@ -1,264 +1,268 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_task
-#
+# * report_task
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-16 11:14+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 21:37+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "U razvoju"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_project_task
 #: model:ir.ui.menu,name:report_task.menu_project_task_user_tree
 #: view:report.task.user.pipeline.open:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Zadaci prema Korisniku"
 
 #. module: report_task
 #: 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: report_task
 #: field:report.closed.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Preostali Sati"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "No Task"
-msgstr ""
+msgstr "Nema Zadatka"
 
 #. module: report_task
 #: model:ir.module.module,shortdesc:report_task.module_meta_information
 msgid "Report on tasks by user for projects"
-msgstr ""
+msgstr "Izvještaj o Zadacima prema korisniku za projekte"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Delay"
-msgstr ""
+msgstr "Odgoda"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Vrlo Nisko"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Nizak"
 
 #. module: report_task
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_task
 #: field:report.closed.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "Sižetak Zadatka"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Pending"
-msgstr ""
+msgstr "U tijeku"
 
 #. module: report_task
 #: field:report.closed.task,state:0
 #: field:report.task.user.pipeline.open,task_state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Srednji"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:report_task.menu_timesheet_task_user
 msgid "Timesheet / Task Hours Per Month"
-msgstr ""
+msgstr "Raspored / Zadaci u satima po mjesecu"
 
 #. module: report_task
 #: field:report.closed.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Progres (%)"
 
 #. module: report_task
 #: field:report.closed.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "Važnost"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
 
 #. module: report_task
 #: model:ir.ui.menu,name:report_task.next_id_57
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: report_task
 #: model:ir.module.module,description:report_task.module_meta_information
 msgid ""
 "Gives statistics on tasks by user on projects to check the pipeline of users."
 msgstr ""
+"Daje statistike o Zadacima prema Korisniku na projektima radi provjere "
+"slijeda zadataka korisnika."
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,user_id:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_closed_task_board
 msgid "Task Closed Within Past 15 Days"
-msgstr ""
+msgstr "Zadaci zaključeni u proteklih 15 dana"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Vrlo hitno"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_hrs:0
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Zadatak u satima"
 
 #. module: report_task
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Odgoda u satima"
 
 #. module: report_task
 #: field:report.closed.task,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_nbr:0
 msgid "Task Number"
-msgstr ""
+msgstr "Broj Zadatka"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_task_user_pipeline_open
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Zadatak prema Korisniku i Projektu"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planiran"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazan"
 
 #. module: report_task
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Raspored / Zadaci u satima po mjesecu"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_progress:0
 msgid "Task Progress"
-msgstr ""
+msgstr "Progres Zadatka"
 
 #. module: report_task
 #: field:report.closed.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Datum zaključenja"
 
 #. module: report_task
 #: field:report.closed.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Dodijeljeno"
 
 #. module: report_task
 #: field:report.closed.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Slijed"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_closed_task
 msgid "Closed Task Report"
-msgstr ""
+msgstr "Izvještaj o zaključenju Zadatka"
 
 #. module: report_task
 #: field:report.timesheet.task.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Hitno"
 
 #. module: report_task
 #: field:report.closed.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Rok"
 
 #. module: report_task
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Sati Rasporeda"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Closed Tasks"
-msgstr ""
+msgstr "Zaključeni Zadaci"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: report_task
 #: field:report.closed.task,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planirani Sati"
diff --git a/addons/report_task/i18n/hu.po b/addons/report_task/i18n/hu.po
index 8662fc5fe6b..4aaa707fe07 100644
--- a/addons/report_task/i18n/hu.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/id.po b/addons/report_task/i18n/id.po
index 3fd7d8c237d..b35e00c9651 100644
--- a/addons/report_task/i18n/id.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/it.po b/addons/report_task/i18n/it.po
index 1a45aeae629..5c44deeef92 100644
--- a/addons/report_task/i18n/it.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/lt.po b/addons/report_task/i18n/lt.po
index 8662fc5fe6b..4aaa707fe07 100644
--- a/addons/report_task/i18n/lt.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/nl.po b/addons/report_task/i18n/nl.po
index bad40afe2d1..7ebd85e4871 100644
--- a/addons/report_task/i18n/nl.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/nl_BE.po b/addons/report_task/i18n/nl_BE.po
index 45b90b3a1fd..f28f4e2773c 100644
--- a/addons/report_task/i18n/nl_BE.po
+++ b/addons/report_task/i18n/nl_BE.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: report_task
diff --git a/addons/report_task/i18n/pl.po b/addons/report_task/i18n/pl.po
index 35895a75a63..5f9bfbc96e7 100644
--- a/addons/report_task/i18n/pl.po
+++ b/addons/report_task/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:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/pt.po b/addons/report_task/i18n/pt.po
index fa3228b6c98..af40af291f5 100644
--- a/addons/report_task/i18n/pt.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/pt_BR.po b/addons/report_task/i18n/pt_BR.po
index dd5349e9155..fa5d9f063df 100644
--- a/addons/report_task/i18n/pt_BR.po
+++ b/addons/report_task/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/ro.po b/addons/report_task/i18n/ro.po
index 8662fc5fe6b..4aaa707fe07 100644
--- a/addons/report_task/i18n/ro.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/ru.po b/addons/report_task/i18n/ru.po
index eec67b83789..1e8f5611985 100644
--- a/addons/report_task/i18n/ru.po
+++ b/addons/report_task/i18n/ru.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: report_task
diff --git a/addons/report_task/i18n/sl.po b/addons/report_task/i18n/sl.po
index 808790f54bb..6a53d48a379 100644
--- a/addons/report_task/i18n/sl.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/sv.po b/addons/report_task/i18n/sv.po
index 0552b943dbb..04dbba8f85c 100644
--- a/addons/report_task/i18n/sv.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/tr.po b/addons/report_task/i18n/tr.po
index 71ec0f335ff..ec3be0289d4 100644
--- a/addons/report_task/i18n/tr.po
+++ b/addons/report_task/i18n/tr.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: report_task
diff --git a/addons/report_task/i18n/uk.po b/addons/report_task/i18n/uk.po
index b0a6634cce6..cecdaa39ac8 100644
--- a/addons/report_task/i18n/uk.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/i18n/zh_CN.po b/addons/report_task/i18n/zh_CN.po
index 4057041bc92..c9e27d84fa5 100644
--- a/addons/report_task/i18n/zh_CN.po
+++ b/addons/report_task/i18n/zh_CN.po
@@ -4,178 +4,178 @@
 #
 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-16 11:14+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 10:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "进展"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_project_task
 #: model:ir.ui.menu,name:report_task.menu_project_task_user_tree
 #: view:report.task.user.pipeline.open:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "用户任务"
 
 #. module: report_task
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_task
 #: field:report.closed.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "剩余的小时数"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "No Task"
-msgstr ""
+msgstr "没任务"
 
 #. module: report_task
 #: model:ir.module.module,shortdesc:report_task.module_meta_information
 msgid "Report on tasks by user for projects"
-msgstr ""
+msgstr "项目用户任务报表"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Delay"
-msgstr ""
+msgstr "延迟"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "非常低"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低"
 
 #. module: report_task
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_task
 #: field:report.closed.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "任务摘要"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Pending"
-msgstr ""
+msgstr "未决"
 
 #. module: report_task
 #: field:report.closed.task,state:0
 #: field:report.task.user.pipeline.open,task_state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "中"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:report_task.menu_timesheet_task_user
 msgid "Timesheet / Task Hours Per Month"
-msgstr ""
+msgstr "时间表/每月任务小时数"
 
 #. module: report_task
 #: field:report.closed.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "进度(%)"
 
 #. module: report_task
 #: field:report.closed.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "重要"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: report_task
 #: model:ir.ui.menu,name:report_task.next_id_57
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_task
 #: model:ir.module.module,description:report_task.module_meta_information
 msgid ""
 "Gives statistics on tasks by user on projects to check the pipeline of users."
-msgstr ""
+msgstr "项目用户任务的统计来检查用户的管线"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,user_id:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_closed_task_board
 msgid "Task Closed Within Past 15 Days"
-msgstr ""
+msgstr "15天前关闭的任务"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "非常紧急"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_hrs:0
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "任务的小时数"
 
 #. module: report_task
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "延迟的小时数"
 
 #. module: report_task
 #: field:report.closed.task,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_nbr:0
 msgid "Task Number"
-msgstr ""
+msgstr "任务数"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_timesheet_task_user
@@ -185,80 +185,83 @@ msgstr ""
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_task_user_pipeline_open
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "用户任务和项目"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Planned"
-msgstr ""
+msgstr "已计划"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: report_task
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "时间表/每月任务小时数报表"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_progress:0
 msgid "Task Progress"
-msgstr ""
+msgstr "任务进度"
 
 #. module: report_task
 #: field:report.closed.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "关闭日期"
 
 #. module: report_task
 #: field:report.closed.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "指定给"
 
 #. module: report_task
 #: field:report.closed.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_closed_task
 msgid "Closed Task Report"
-msgstr ""
+msgstr "关闭任务报表"
 
 #. module: report_task
 #: field:report.timesheet.task.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "紧急"
 
 #. module: report_task
 #: field:report.closed.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "最后期限"
 
 #. module: report_task
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "时间表小时数"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Closed Tasks"
-msgstr ""
+msgstr "关闭任务"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Open"
-msgstr ""
+msgstr "待处理"
 
 #. module: report_task
 #: field:report.closed.task,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "已计划的小时数"
+
+#~ msgid "All Months"
+#~ msgstr "所有月份"
diff --git a/addons/report_task/i18n/zh_TW.po b/addons/report_task/i18n/zh_TW.po
index 8662fc5fe6b..4aaa707fe07 100644
--- a/addons/report_task/i18n/zh_TW.po
+++ b/addons/report_task/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: report_task
diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
deleted file mode 100644
index 54792395053..00000000000
--- a/addons/report_task/report_task.py
+++ /dev/null
@@ -1,162 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields,osv
-import mx.DateTime
-
-class  report_task_user_pipeline_open (osv.osv):
-    _name = "report.task.user.pipeline.open"
-    _description = "Tasks by user and project"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'task_nbr': fields.float('Task Number', readonly=True),
-        'task_hrs': fields.float('Task Hours', readonly=True),
-        'task_progress': fields.float('Task Progress', readonly=True),
-        'company_id' : fields.many2one('res.company', 'Company'),
-        'task_state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done'),('no','No Task')], 'Status', readonly=True),
-    }
-
-    def init(self, cr):
-        cr.execute('''
-            create or replace view report_task_user_pipeline_open as (
-                select
-                    min(t.id) as id,
-                    to_char(t.create_date, 'YYYY') as name,
-                    to_char(t.create_date,'MM') as month,
-                    u.id as user_id,
-                    u.company_id as company_id,
-                    count(t.*) as task_nbr,
-                    sum(t.planned_hours) as task_hrs,
-                    sum(t.planned_hours * (100 - t.progress) / 100) as task_progress,
-                    case when t.state is null then 'no' else t.state end as task_state
-                from
-                    res_users u
-                left join
-                    project_task t on (u.id = t.user_id)
-                where
-                    u.active
-                group by
-                    to_char(t.create_date, 'YYYY'),to_char(t.create_date,'MM'),u.id, u.company_id, t.state
-            )
-        ''')
-report_task_user_pipeline_open()
-
-class  report_closed_task(osv.osv):
-    _name = "report.closed.task"
-    _description = "Closed Task Report"
-    _auto = False
-    _columns = {
-        'sequence': fields.integer('Sequence', readonly=True, help="Gives the sequence order when displaying a list of closed task reports."),
-        'name': fields.char('Task summary', size=128, readonly=True),
-        'project_id': fields.many2one('project.project', 'Project', readonly=True),
-        'user_id': fields.many2one('res.users', 'Assigned to', readonly=True),
-        'date_deadline': fields.datetime('Deadline', readonly=True),
-        'planned_hours': fields.float('Planned Hours', readonly=True),
-        'delay_hours': fields.float('Delay Hours', readonly=True),
-        'progress': fields.float('Progress (%)', readonly=True),
-        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance', readonly=True),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True),
-        'remaining_hours': fields.float('Remaining Hours', readonly=True),
-        'date_end' : fields.datetime('Date Closed', readonly=True)
-    }
-
-    def init(self, cr):
-        cr.execute('''
-            create or replace view report_closed_task as (
-                select
-                   tsk.id as id, tsk.sequence as sequence, tsk.name as name,
-                   tsk.project_id as project_id, tsk.user_id as user_id,
-                   tsk.date_deadline as date_deadline, tsk.planned_hours as planned_hours,
-                   tsk.delay_hours as delay_hours, tsk.progress as progress,
-                   tsk.priority as priority, tsk.state as state,
-                   tsk.remaining_hours as remaining_hours, tsk.date_end as date_end
-                from
-                    project_task tsk
-              where
-                    (tsk.date_end <= CURRENT_DATE AND tsk.date_end > (CURRENT_DATE-15))
-            )
-        ''')
-report_closed_task()
-
-class report_timesheet_task_user(osv.osv):
-    _name = "report.timesheet.task.user"
-    _auto = False
-    _order = "name"
-
-    def _get_task_hours(self, cr, uid, ids, name,args,context):
-        result = {}
-        for record in self.browse(cr, uid, ids,context):
-            last_date = mx.DateTime.strptime(record.name, '%Y-%m-%d') + mx.DateTime.RelativeDateTime(months=1) - 1
-            task_obj=self.pool.get('project.task.work')
-            task_ids = task_obj.search(cr,uid,[('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))])
-            tsk_hrs = task_obj.read(cr,uid,task_ids,['hours','date','user_id'])
-            total = 0.0
-            for hrs in tsk_hrs:
-                total += hrs['hours']
-            result[record.id] = total
-        return result
-
-    def get_hrs_timesheet(self, cr, uid, ids, name,args,context):
-        result = {}
-        sum = 0.0
-        for record in self.browse(cr, uid, ids, context):
-            last_date = mx.DateTime.strptime(record.name, '%Y-%m-%d') + mx.DateTime.RelativeDateTime(months=1) - 1
-            obj=self.pool.get('hr_timesheet_sheet.sheet.day')
-            sheet_ids = obj.search(cr,uid,[('sheet_id.user_id','=',record.user_id.id),('name','>=',record.name),('name','<=',last_date.strftime('%Y-%m-%d'))])
-            data_days = obj.read(cr,uid,sheet_ids,['name','sheet_id.user_id','total_attendance'])
-            total = 0.0
-            for day_attendance in data_days:
-                total += day_attendance['total_attendance']
-            result[record.id] = total
-        return result
-
-    _columns = {
-        'name': fields.date('Month',readonly=True),
-        'user_id': fields.many2one('res.users', 'User',readonly=True),
-        'timesheet_hrs': fields.function(get_hrs_timesheet, method=True, string="Timesheet Hours"),
-        'task_hrs': fields.function(_get_task_hours, method=True, string="Task Hours"),
-      }
-
-
-    def init(self, cr):
-       cr.execute(""" create or replace view report_timesheet_task_user as (
-        select
-         ((r.id*12)+to_number(months.m_id,'99'))::integer as id,
-               months.name as name,
-               r.id as user_id
-        from res_users r,
-                (select to_char(p.date,'YYYY-MM-01') as name,
-            to_char(p.date,'MM') as m_id
-                from project_task_work p
-
-            union
-                select to_char(h.name,'YYYY-MM-01') as name,
-                to_char(h.name,'MM') as m_id
-                from hr_timesheet_sheet_sheet_day h) as months) """)
-
-report_timesheet_task_user()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
deleted file mode 100644
index 77ea6e1aa5c..00000000000
--- a/addons/report_task/report_task_view.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-          <menuitem
-            id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="40" />
-
-        <!-- Tasks by projects and users -->
-        
-
-        <record id="view_task_project_form" model="ir.ui.view">
-            <field name="name">report.project.task.form</field>
-            <field name="model">report.task.user.pipeline.open</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Tasks by User">
-                    <field name="user_id" select="1"/>
-                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
-                    <field name="task_nbr" select="2"/>
-                    <field name="task_hrs" select="2"/>
-                    <field name="task_progress" select="2"/>
-                    <field name="task_state" select="1"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_task_project_graph" model="ir.ui.view">
-            <field name="name">report.project.task.graph</field>
-            <field name="model">report.task.user.pipeline.open</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Tasks by User" type="bar">
-                    <field name="user_id"/>
-                    <field name="task_progress" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="view_task_project_tree" model="ir.ui.view">
-            <field name="name">report.project.task.tree</field>
-            <field name="model">report.task.user.pipeline.open</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Tasks by User">
-                	<field name="name" select="1"/>
-	                <field name="month" select="1"/>
-                    <field name="user_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="task_nbr"/>
-                    <field name="task_hrs"/>
-                    <field name="task_progress"/>
-                    <field name="task_state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_report_task_user_pipeline_open_search" model="ir.ui.view">
-            <field name="name">report.task.user.pipeline.open.search</field>
-            <field name="model">report.task.user.pipeline.open</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-            	<search string="Tasks by User">
-            		<group col="10" colspan="4">
-	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
-	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
-	            		<separator orientation="vertical"/>
-	            		<field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="user_id" select="1"/>
-	                </group>
-            	</search>
-            </field>
-        </record>
-
-        <record id="action_project_task" model="ir.actions.act_window">
-            <field name="name">Tasks by User</field>
-            <field name="res_model">report.task.user.pipeline.open</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="domain">[]</field>
-            <field name="search_view_id" ref="view_report_task_user_pipeline_open_search"/>
-        </record>
-        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
-        <menuitem action="action_project_task" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
-
-        <!-- Closed Task in Random Acitivities dashboard -->
-
-        <record id="view_task_closed_board_tree" model="ir.ui.view">
-            <field name="name">report.closed.task.tree</field>
-            <field name="model">report.closed.task</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Closed Tasks">
-                	<field name="date_close" />
-                    <field name="sequence"/>
-                    <field name="name" select="1"/>
-                    <field name="project_id" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="date_deadline"/>
-                    <field name="planned_hours" sum="Planned" widget="float_time"/>
-                    <field name="delay_hours" sum="Delay" widget="float_time"/>
-                    <field name="progress" widget="progressbar"/>
-                    <field name="priority"/>
-                    <field name="state"/>
-                    <field name="remaining_hours" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_closed_task_board" model="ir.actions.act_window">
-            <field name="name">Task Closed Within Past 15 Days</field>
-            <field name="res_model">report.closed.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_task_closed_board_tree"/>
-        </record>
-
-        <!-- Report for Users' Timesheet and Task Hours per Month -->
-
-		<record id="view_report_timesheet_task_user_tree" model="ir.ui.view">
-            <field name="name">report.timesheet.task.user.tree</field>
-            <field name="model">report.timesheet.task.user</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Timesheet/Task hours Report Per Month" >
-                    <field name="name" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="timesheet_hrs" widget="float_time" />
-                    <field name="task_hrs"  widget="float_time"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_report_timesheet_task_user" model="ir.actions.act_window">
-            <field name="name">Timesheet / Task Hours Per Month</field>
-            <field name="res_model">report.timesheet.task.user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-        </record>
-        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
-
-    </data>
-</openerp>
diff --git a/addons/report_task/security/ir.model.access.csv b/addons/report_task/security/ir.model.access.csv
deleted file mode 100644
index 68361fbd928..00000000000
--- a/addons/report_task/security/ir.model.access.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_task_user_pipeline_open","report.task.user.pipeline.open","model_report_task_user_pipeline_open","project.group_project_manager",1,0,0,0
-"access_report_timesheet_task_user","report.timesheet.task.user","model_report_timesheet_task_user","project.group_project_manager",1,0,0,0
-"access_report_closed_task","report.closed.task","model_report_closed_task","project.group_project_manager",1,0,0,0
diff --git a/addons/report_timesheet/__init__.py b/addons/report_timesheet/__init__.py
deleted file mode 100644
index 4b57906849c..00000000000
--- a/addons/report_timesheet/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import report_timesheet
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_timesheet/i18n/ar.po b/addons/report_timesheet/i18n/ar.po
index 8e04b42fd48..aa3e172e0de 100644
--- a/addons/report_timesheet/i18n/ar.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/bg.po b/addons/report_timesheet/i18n/bg.po
index f7ec9f6a6ad..431d8fd0fb2 100644
--- a/addons/report_timesheet/i18n/bg.po
+++ b/addons/report_timesheet/i18n/bg.po
@@ -7,31 +7,31 @@ 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-02-03 10:50+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-29 13:23+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_my
 msgid "My daily timesheets by account"
-msgstr ""
+msgstr "Моите дневни графици според сметка"
 
 #. module: report_timesheet
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr ""
+msgstr "График според потребител"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_all
 msgid "Timesheet by Account"
-msgstr ""
+msgstr "График според сметка"
 
 #. module: report_timesheet
 #: constraint:ir.model:0
@@ -44,78 +44,78 @@ msgstr ""
 #. module: report_timesheet
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr ""
+msgstr "График според сметка"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_invoice
 #: model:ir.model,name:report_timesheet.model_report_timesheet_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "Превърни \"разходи\" на фактура"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_my
 msgid "My Timesheet of the Month"
-msgstr ""
+msgstr "Мой график за месеца"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_random_timesheet_lines_board
 #: model:ir.model,name:report_timesheet.model_random_timesheet_lines
 msgid "Random Timesheet Lines"
-msgstr ""
+msgstr "Случайни редове от график"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_account_analytic_account_2_report_timehsheet_account
 msgid "Timesheets"
-msgstr ""
+msgstr "Графици"
 
 #. module: report_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr ""
+msgstr "Графици според сметка"
 
 #. module: report_timesheet
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr ""
+msgstr "Превърни графици във фактура"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr ""
+msgstr "Графици според ден"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_all
 msgid "Daily Timesheet by Account"
-msgstr ""
+msgstr "Дневен график според сметка"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Продукт"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,name:0
 #: field:report.random.timesheet,name:0
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr ""
+msgstr "График според сметка"
 
 #. module: report_timesheet
 #: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
 msgid "Timesheet - Reporting"
-msgstr ""
+msgstr "График – Докладване"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,date:0
@@ -123,12 +123,12 @@ msgstr ""
 #: field:report_timesheet.account.date,name:0
 #: field:report_timesheet.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: report_timesheet
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr ""
+msgstr "Създай график от фактура"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,quantity:0
@@ -138,7 +138,7 @@ msgstr ""
 #: field:report_timesheet.invoice,quantity:0
 #: field:report_timesheet.user,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Количество"
 
 #. module: report_timesheet
 #: model:ir.ui.menu,name:report_timesheet.next_id_69
@@ -149,12 +149,12 @@ msgstr "Този месец"
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_my
 msgid "My timesheets by account"
-msgstr ""
+msgstr "Моите графици според сметка"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_random_timesheet
 msgid "Random Timesheet Report"
-msgstr ""
+msgstr "Случаен доклад за график"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,user_id:0
@@ -164,7 +164,7 @@ msgstr ""
 #: field:report_timesheet.invoice,user_id:0
 #: field:report_timesheet.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Потребител"
 
 #. module: report_timesheet
 #: constraint:ir.ui.view:0
@@ -174,76 +174,76 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: report_timesheet
 #: view:report.random.timesheet:0
 msgid "Random Timesheets"
-msgstr ""
+msgstr "Случайни графици"
 
 #. module: report_timesheet
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr ""
+msgstr "Дневен график според сметка"
 
 #. module: report_timesheet
 #: view:random.timesheet.lines:0
 msgid "Random Timesheets Lines"
-msgstr ""
+msgstr "Случайни редове от графици"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,account_id:0
 msgid "Project"
-msgstr ""
+msgstr "Проект"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Количество"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,amount_invoice:0
 msgid "To invoice"
-msgstr ""
+msgstr "Към фактура"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_all
 msgid "Timesheet by User"
-msgstr ""
+msgstr "График според потребител"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_all
 msgid "Timesheet by Invoice"
-msgstr ""
+msgstr "График според фактура"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_random_timesheet_board
 msgid "Random Timesheet"
-msgstr ""
+msgstr "Случаен график"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,to_invoice:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Издаване на фактура"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Основна сметка"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_user
 msgid "Timesheet per day"
-msgstr ""
+msgstr "График по ден"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_my
 msgid "My timesheets to invoice"
-msgstr ""
+msgstr "Мойте графици превърнати във фактура"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr ""
+msgstr "Дневен график по сметка"
 
 #. module: report_timesheet
 #: model:ir.module.module,description:report_timesheet.module_meta_information
@@ -255,7 +255,7 @@ msgstr ""
 #. module: report_timesheet
 #: field:report_timesheet.account,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,analytic_account_id:0
@@ -263,25 +263,25 @@ msgstr ""
 #: field:report_timesheet.account,account_id:0
 #: field:report_timesheet.account.date,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Аналитична сметка"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Управител"
 
 #. module: report_timesheet
 #: field:report_timesheet.user,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Разход"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "Мерни единици"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user
 msgid "Timesheet by user (this month)"
-msgstr ""
+msgstr "График според потребител (този месец)"
diff --git a/addons/report_timesheet/i18n/bs.po b/addons/report_timesheet/i18n/bs.po
index 5650b150b21..4b3dea79bbe 100644
--- a/addons/report_timesheet/i18n/bs.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/ca.po b/addons/report_timesheet/i18n/ca.po
index 7a42e7768b1..babf0e446ab 100644
--- a/addons/report_timesheet/i18n/ca.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/cs.po b/addons/report_timesheet/i18n/cs.po
index 8e04b42fd48..aa3e172e0de 100644
--- a/addons/report_timesheet/i18n/cs.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/de.po b/addons/report_timesheet/i18n/de.po
index e8e3061846f..cfdcb0412e8 100644
--- a/addons/report_timesheet/i18n/de.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/es.po b/addons/report_timesheet/i18n/es.po
index b03e57fd150..4c08c5d7bd5 100644
--- a/addons/report_timesheet/i18n/es.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/es_AR.po b/addons/report_timesheet/i18n/es_AR.po
index 726d8c7c5c2..952be717aa4 100644
--- a/addons/report_timesheet/i18n/es_AR.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/et.po b/addons/report_timesheet/i18n/et.po
index 9da0d415aaa..333a3b063ea 100644
--- a/addons/report_timesheet/i18n/et.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/fr.po b/addons/report_timesheet/i18n/fr.po
index bf9e518e15e..c6da4e9f8fd 100644
--- a/addons/report_timesheet/i18n/fr.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/hr.po b/addons/report_timesheet/i18n/hr.po
index d052b76ffa9..22e4503a66e 100644
--- a/addons/report_timesheet/i18n/hr.po
+++ b/addons/report_timesheet/i18n/hr.po
@@ -1,37 +1,38 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* report_timesheet
-#
+# * report_timesheet
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-11-17 10:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 21:39+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_my
 msgid "My daily timesheets by account"
-msgstr ""
+msgstr "Moji dnevni Rasporedi po Kupcu"
 
 #. module: report_timesheet
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr ""
+msgstr "Raspored po Korisniku"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_all
 msgid "Timesheet by Account"
-msgstr ""
+msgstr "Raspored po Kupcu"
 
 #. module: report_timesheet
 #: constraint:ir.model:0
@@ -43,7 +44,7 @@ msgstr ""
 #. module: report_timesheet
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr ""
+msgstr "Raspored po Stranki"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_invoice
@@ -55,44 +56,44 @@ msgstr "Troškovi za fakturiranje"
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_my
 msgid "My Timesheet of the Month"
-msgstr ""
+msgstr "Moj raspored u mjesecu"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_random_timesheet_lines_board
 #: model:ir.model,name:report_timesheet.model_random_timesheet_lines
 msgid "Random Timesheet Lines"
-msgstr ""
+msgstr "Nasumični tokovi Rasporeda"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_account_analytic_account_2_report_timehsheet_account
 msgid "Timesheets"
-msgstr ""
+msgstr "Rasporedi"
 
 #. module: report_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr ""
+msgstr "Rasporedi po Stranki"
 
 #. module: report_timesheet
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr ""
+msgstr "Rasporedi za obračun"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr ""
+msgstr "Rasporedi po danu"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_all
 msgid "Daily Timesheet by Account"
-msgstr ""
+msgstr "Dnevni Rasporedi po Kupcu"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,product_id:0
@@ -109,12 +110,12 @@ msgstr "Opis"
 #: model:ir.model,name:report_timesheet.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr ""
+msgstr "Raspored po Kupcu"
 
 #. module: report_timesheet
 #: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
 msgid "Timesheet - Reporting"
-msgstr ""
+msgstr "Raspored - Izvještavanje"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,date:0
@@ -127,7 +128,7 @@ msgstr "Datum"
 #. module: report_timesheet
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr ""
+msgstr "Raspored za obračun"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,quantity:0
@@ -148,12 +149,12 @@ msgstr "Ovaj Mjesec"
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_my
 msgid "My timesheets by account"
-msgstr ""
+msgstr "Moji rasporedi prema Kupcu"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_random_timesheet
 msgid "Random Timesheet Report"
-msgstr ""
+msgstr "Nasumičan izvještaj Rasporeda"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,user_id:0
@@ -173,17 +174,17 @@ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 #. module: report_timesheet
 #: view:report.random.timesheet:0
 msgid "Random Timesheets"
-msgstr ""
+msgstr "Nasumični Rasporedi"
 
 #. module: report_timesheet
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr ""
+msgstr "Dnevni Raspored po Kupcu"
 
 #. module: report_timesheet
 #: view:random.timesheet.lines:0
 msgid "Random Timesheets Lines"
-msgstr ""
+msgstr "Nasumični tokovi Rasporeda"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,account_id:0
@@ -204,18 +205,18 @@ msgstr "Za fakturiranje"
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_all
 msgid "Timesheet by User"
-msgstr ""
+msgstr "Raspored po Korisniku"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_all
 msgid "Timesheet by Invoice"
-msgstr ""
+msgstr "Raspored prema Računu"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_random_timesheet_board
 msgid "Random Timesheet"
-msgstr ""
+msgstr "Nasumičan Raspored"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,to_invoice:0
@@ -225,24 +226,24 @@ msgstr "Fakturiranje"
 #. module: report_timesheet
 #: field:random.timesheet.lines,general_account_id:0
 msgid "General Account"
-msgstr "Opći Račun"
+msgstr "Opći Račun Kupca"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_user
 msgid "Timesheet per day"
-msgstr ""
+msgstr "Raspored po danu"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_my
 msgid "My timesheets to invoice"
-msgstr ""
+msgstr "Moji rasporedi za obračun"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr ""
+msgstr "Dnevni Raspored po Kupcu"
 
 #. module: report_timesheet
 #: model:ir.module.module,description:report_timesheet.module_meta_information
@@ -250,6 +251,8 @@ msgid ""
 "Module to add timesheet views like\n"
 "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
 msgstr ""
+"Modul koji dodaje poglede Rasporeda poput: Čitav Mjesec, Raspored prema "
+"Korisniku, Raspored Mjeseca, Raspored prema Kupcu"
 
 #. module: report_timesheet
 #: field:report_timesheet.account,name:0
@@ -262,7 +265,7 @@ msgstr "Mjesec"
 #: field:report_timesheet.account,account_id:0
 #: field:report_timesheet.account.date,account_id:0
 msgid "Analytic Account"
-msgstr "Analitički Račun"
+msgstr "Analitički konto"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,manager_id:0
@@ -283,4 +286,4 @@ msgstr "UoM"
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user
 msgid "Timesheet by user (this month)"
-msgstr ""
+msgstr "Raspored prema Korisniku (Ovaj mjesec)"
diff --git a/addons/report_timesheet/i18n/hu.po b/addons/report_timesheet/i18n/hu.po
index 8e04b42fd48..aa3e172e0de 100644
--- a/addons/report_timesheet/i18n/hu.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/id.po b/addons/report_timesheet/i18n/id.po
index 8ba4503ba9a..c208edfd31b 100644
--- a/addons/report_timesheet/i18n/id.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/it.po b/addons/report_timesheet/i18n/it.po
index 6ef03ef6e12..b6bc7f57584 100644
--- a/addons/report_timesheet/i18n/it.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/ko.po b/addons/report_timesheet/i18n/ko.po
index 69e574939eb..58f8c9b6e71 100644
--- a/addons/report_timesheet/i18n/ko.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/lt.po b/addons/report_timesheet/i18n/lt.po
index 8e04b42fd48..aa3e172e0de 100644
--- a/addons/report_timesheet/i18n/lt.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/nl.po b/addons/report_timesheet/i18n/nl.po
index 1edd70fa6bc..a7cb2281052 100644
--- a/addons/report_timesheet/i18n/nl.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/nl_BE.po b/addons/report_timesheet/i18n/nl_BE.po
index aeab6834b32..cfd904767ab 100644
--- a/addons/report_timesheet/i18n/nl_BE.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/pl.po b/addons/report_timesheet/i18n/pl.po
index e40bbb23169..71b311f0d2b 100644
--- a/addons/report_timesheet/i18n/pl.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/pt.po b/addons/report_timesheet/i18n/pt.po
index 2fcece9ac79..42a771036d5 100644
--- a/addons/report_timesheet/i18n/pt.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/pt_BR.po b/addons/report_timesheet/i18n/pt_BR.po
index 59ff43bb5e0..c49fd45f64d 100644
--- a/addons/report_timesheet/i18n/pt_BR.po
+++ b/addons/report_timesheet/i18n/pt_BR.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: report_timesheet
diff --git a/addons/report_timesheet/i18n/ro.po b/addons/report_timesheet/i18n/ro.po
index 8e04b42fd48..aa3e172e0de 100644
--- a/addons/report_timesheet/i18n/ro.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/ru.po b/addons/report_timesheet/i18n/ru.po
index bc8d3688527..ae9060363e4 100644
--- a/addons/report_timesheet/i18n/ru.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/sl.po b/addons/report_timesheet/i18n/sl.po
index 2ce0202dfdd..586dab7760e 100644
--- a/addons/report_timesheet/i18n/sl.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/sv.po b/addons/report_timesheet/i18n/sv.po
index 9c7b4498545..0e4b3e2b965 100644
--- a/addons/report_timesheet/i18n/sv.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/tlh.po b/addons/report_timesheet/i18n/tlh.po
index 17f87a3f564..3c5e279ac13 100644
--- a/addons/report_timesheet/i18n/tlh.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/tr.po b/addons/report_timesheet/i18n/tr.po
index 544d688b493..66c34a2206a 100644
--- a/addons/report_timesheet/i18n/tr.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/uk.po b/addons/report_timesheet/i18n/uk.po
index b1aa7528555..3d1e08a86e8 100644
--- a/addons/report_timesheet/i18n/uk.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/i18n/zh_CN.po b/addons/report_timesheet/i18n/zh_CN.po
index c363dc912a3..0ba43b66132 100644
--- a/addons/report_timesheet/i18n/zh_CN.po
+++ b/addons/report_timesheet/i18n/zh_CN.po
@@ -4,34 +4,34 @@
 #
 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-12-19 07:49+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:12+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_my
 msgid "My daily timesheets by account"
-msgstr ""
+msgstr "我的科目每天时间表"
 
 #. module: report_timesheet
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr ""
+msgstr "用户时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_all
 msgid "Timesheet by Account"
-msgstr ""
+msgstr "科目时间表"
 
 #. module: report_timesheet
 #: constraint:ir.model:0
@@ -42,25 +42,25 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #. module: report_timesheet
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr ""
+msgstr "科目时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_invoice
 #: model:ir.model,name:report_timesheet.model_report_timesheet_invoice
 msgid "Costs to invoice"
-msgstr "费用发票"
+msgstr "成本开发票"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_my
 msgid "My Timesheet of the Month"
-msgstr ""
+msgstr "我的月度时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_random_timesheet_lines_board
 #: model:ir.model,name:report_timesheet.model_random_timesheet_lines
 msgid "Random Timesheet Lines"
-msgstr ""
+msgstr "任意时间表明细"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_account_analytic_account_2_report_timehsheet_account
@@ -70,50 +70,50 @@ msgstr "时间表"
 #. module: report_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在操作定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr ""
+msgstr "每科目时间表"
 
 #. module: report_timesheet
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr ""
+msgstr "时间表开发票"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr ""
+msgstr "每天时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_all
 msgid "Daily Timesheet by Account"
-msgstr ""
+msgstr "科目每日时间表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,name:0
 #: field:report.random.timesheet,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr ""
+msgstr "每科目时间表"
 
 #. module: report_timesheet
 #: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
 msgid "Timesheet - Reporting"
-msgstr ""
+msgstr "时间表 - 报表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,date:0
@@ -121,12 +121,12 @@ msgstr ""
 #: field:report_timesheet.account.date,name:0
 #: field:report_timesheet.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: report_timesheet
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr ""
+msgstr "发票时间表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,quantity:0
@@ -136,7 +136,7 @@ msgstr ""
 #: field:report_timesheet.invoice,quantity:0
 #: field:report_timesheet.user,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: report_timesheet
 #: model:ir.ui.menu,name:report_timesheet.next_id_69
@@ -147,12 +147,12 @@ msgstr "本月"
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_my
 msgid "My timesheets by account"
-msgstr ""
+msgstr "我的科目时间表"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_random_timesheet
 msgid "Random Timesheet Report"
-msgstr ""
+msgstr "任意时间表报表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,user_id:0
@@ -162,98 +162,98 @@ msgstr ""
 #: field:report_timesheet.invoice,user_id:0
 #: field:report_timesheet.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: report_timesheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: report_timesheet
 #: view:report.random.timesheet:0
 msgid "Random Timesheets"
-msgstr ""
+msgstr "任意时间表"
 
 #. module: report_timesheet
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr ""
+msgstr "科目每日时间表"
 
 #. module: report_timesheet
 #: view:random.timesheet.lines:0
 msgid "Random Timesheets Lines"
-msgstr ""
+msgstr "任意时间表明细"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,account_id:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,amount_invoice:0
 msgid "To invoice"
-msgstr ""
+msgstr "开发票"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_all
 msgid "Timesheet by User"
-msgstr ""
+msgstr "用户时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_all
 msgid "Timesheet by Invoice"
-msgstr ""
+msgstr "发票时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_random_timesheet_board
 msgid "Random Timesheet"
-msgstr ""
+msgstr "任意时间表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,to_invoice:0
 msgid "Invoicing"
-msgstr ""
+msgstr "发票"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "一般科目"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_user
 msgid "Timesheet per day"
-msgstr ""
+msgstr "每天时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_my
 msgid "My timesheets to invoice"
-msgstr ""
+msgstr "我的时间表开发票"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr ""
+msgstr "科目每日时间表"
 
 #. module: report_timesheet
 #: model:ir.module.module,description:report_timesheet.module_meta_information
 msgid ""
 "Module to add timesheet views like\n"
 "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-msgstr ""
+msgstr "模块增加时间表视图如:所有月份,用户时间表,月度时间表,科目时间表"
 
 #. module: report_timesheet
 #: field:report_timesheet.account,name:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,analytic_account_id:0
@@ -261,25 +261,28 @@ msgstr ""
 #: field:report_timesheet.account,account_id:0
 #: field:report_timesheet.account.date,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "管理者"
 
 #. module: report_timesheet
 #: field:report_timesheet.user,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "成本"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user
 msgid "Timesheet by user (this month)"
-msgstr ""
+msgstr "用户时间表(这月)"
+
+#~ msgid "All Months"
+#~ msgstr "所有月份"
diff --git a/addons/report_timesheet/i18n/zh_TW.po b/addons/report_timesheet/i18n/zh_TW.po
index 825a0ffd06a..2901b2e035f 100644
--- a/addons/report_timesheet/i18n/zh_TW.po
+++ b/addons/report_timesheet/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: report_timesheet
diff --git a/addons/report_timesheet/security/ir.model.access.csv b/addons/report_timesheet/security/ir.model.access.csv
deleted file mode 100644
index 84001f23c56..00000000000
--- a/addons/report_timesheet/security/ir.model.access.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_user",1,0,0,0
-"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_user",1,0,0,0
-"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_user",1,0,0,0
-"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_user",1,0,0,0
-"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_user",1,0,0,0
-"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_user",1,0,0,0
diff --git a/addons/resource/__terp__.py b/addons/resource/__terp__.py
index fb2a0f5899c..41872ca22a7 100755
--- a/addons/resource/__terp__.py
+++ b/addons/resource/__terp__.py
@@ -24,11 +24,14 @@
     "name" : "Resource",
     "version" : "1.1",
     "author" : "Tiny",
-    "category" : "Generic Modules/Projects",
+    "category" : "Generic Modules/Projects & Services",
     "website" : "http://www.openerp.com",
     "description": """
-    Module for resource management. You can manage:
-    * Leave/Holidays or Days off of the company
+    Module for resource management
+     A resource represent something that can be scheduled
+     (a developer on a task or a workcenter on manufacturing orders).
+     This module manages a resource calendar associated to every resource.
+     It also manages the leaves of every resource.
 
     """,
     'author': 'Tiny',
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 09a752850c9..38ba539c912 100755
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -21,6 +21,7 @@
 import mx.DateTime
 import time
 import math
+
 from osv import fields, osv
 from tools.translate import _
 
@@ -34,7 +35,7 @@ class resource_calendar(osv.osv):
         'manager' : fields.many2one('res.users', 'Workgroup manager'),
     }
     _defaults = {
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', c)
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', c)
     }
 
     def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):
@@ -152,9 +153,9 @@ class resource_resource(osv.osv):
         'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the resource record without removing it."),
         'company_id' : fields.many2one('res.company', 'Company', required=True),
         'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
-        'user_id' : fields.many2one('res.users', 'User',help='Related user name for the resource to manage its access.'),
-        'time_efficiency' : fields.float('Efficiency factor', size=8, required=True,help="This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
-        'calendar_id' : fields.many2one("resource.calendar", "Working time",help="Define the schedule of resource"),
+        'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'),
+        'time_efficiency' : fields.float('Efficiency factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
+        'calendar_id' : fields.many2one("resource.calendar", "Working time", help="Define the schedule of resource"),
     }
     _defaults = {
         'resource_type' : lambda *a: 'user',
@@ -187,7 +188,7 @@ class resource_calendar_leaves(osv.osv):
         'date_to' : fields.datetime('End Date', required=True),
         'resource_id' : fields.many2one("resource.resource", "Resource", help="If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"),
     }
-    def check_dates(self, cr, uid, ids):
+    def check_dates(self, cr, uid, ids, context={}):
          leave = self.read(cr, uid, ids[0], ['date_from', 'date_to'])
          if leave['date_from'] and leave['date_to']:
              if leave['date_from'] > leave['date_to']:
@@ -198,7 +199,7 @@ class resource_calendar_leaves(osv.osv):
         (check_dates, 'Error! leave start-date must be lower then leave end-date.', ['date_from', 'date_to'])
     ]
 
-    def onchange_resource(self,cr,uid,ids,resource):
+    def onchange_resource(self,cr, uid, ids, resource, context={}):
         result = {}
         if resource:
             resource_pool = self.pool.get('resource.resource')
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index aacac7cef42..f08b03600f8 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -35,9 +35,10 @@
             <field name="model">resource.calendar</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Resource Calendar">
+                <search string="Search Working Period">
                    <group col='15' colspan='4'>
-                       <field name="name" string="Working Calendar"/>
+                   	   <field name="name" string="Name"/>
+               <!--     <field name="name" string="Working Calendar"/> -->
                        <field name="manager" string="Workgroup Manager" widget="selection"/>
                        <field name="company_id" string="Company" widget="selection"/>
                    </group>
@@ -50,7 +51,7 @@
             <field name="model">resource.calendar.leaves</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Resource Calendar Leaves">
+                <search string="Search Working Period Leaves">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
                        <field name="company_id" string="Company" widget="selection"/>
@@ -70,7 +71,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Resource Calendar">
+            	<form string="Working Period">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -85,7 +86,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Resource Calendar">
+            	<tree string="Working Period">
                     <field name="name"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -94,7 +95,7 @@
         </record>
 
         <record id="action_resource_calendar_form" model="ir.actions.act_window">
-            <field name="name">Resource Calendar</field>
+            <field name="name">Working Period</field>
             <field name="res_model">resource.calendar</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -181,10 +182,10 @@
                 <tree string="Resources">
                     <field name="name" />
                     <field name="company_id" />
-                    <field name="calendar_id" />
                     <field name="resource_type" />
-                    <field name="user_id" />
+                    <field name="calendar_id" />
                     <field name="time_efficiency" />
+                    <field name="user_id" />
                 </tree>
             </field>
         </record>
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 8e1da80d257..ebc12a1089e 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,8 +27,6 @@ import sale
 import stock
 import product
 import mrp
-import sale_report
-
 import wizard
 import report
 
diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index 70d9f084afb..a6ff79b38cd 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -45,18 +45,17 @@
     'depends': ['product', 'stock', 'mrp', 'process'],
     'init_xml': [],
     'update_xml': [
+        'wizard/sale_make_invoice_advance.xml',
+        'wizard/sale_line_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
         'sale_workflow.xml',
         'sale_sequence.xml',
         'sale_data.xml',
-        'sale_wizard.xml',
         'sale_view.xml',
-        'sale_report_view.xml',
+        'report/sale_report_view.xml',
         'sale_report.xml',
-        'sale_wizard.xml',
         'stock_view.xml',
-        'report_sale_view.xml',
         'process/sale_process.xml',
     ],
     'demo_xml': ['sale_demo.xml'],
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index 7ac1ea9ca3c..d59d888c21f 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/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:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 733a658ccd2..aa551a7ace7 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -7,13 +7,13 @@ 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-12-26 09:01+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\n"
+"PO-Revision-Date: 2010-04-01 14:53+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -268,7 +268,7 @@ msgstr "Нетна цена"
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr "Мойте активни поръчки за продажба"
+msgstr "Мои активни поръчки за продажба"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -382,7 +382,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_order_tree8
 #: model:ir.ui.menu,name:sale.menu_action_order_tree8
 msgid "My sales order waiting Invoice"
-msgstr "Мойте поръчки за продажба очакващи фактура"
+msgstr "Мои поръчки за продажба, очакващи фактура"
 
 #. module: sale
 #: rml:sale.order:0
@@ -536,7 +536,7 @@ msgstr "Групиране на фактури"
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 #: model:ir.ui.menu,name:sale.menu_action_order_tree5
 msgid "All Quotations"
-msgstr "Всички запитвания"
+msgstr "Всички оферти"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -563,7 +563,7 @@ msgstr "Снабдяване за всеки ред"
 #: model:ir.actions.act_window,name:sale.action_order_tree10
 #: model:ir.ui.menu,name:sale.menu_action_order_tree10
 msgid "My Quotations"
-msgstr "Моите запитвания"
+msgstr "Мои оферти"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
@@ -599,7 +599,7 @@ msgstr "Опаковане"
 #: model:ir.module.module,shortdesc:sale.module_meta_information
 #: model:ir.ui.menu,name:sale.menu_sale_root
 msgid "Sales Management"
-msgstr "Управление на продажби"
+msgstr "Продажби"
 
 #. module: sale
 #: field:sale.order.line,order_id:0
@@ -758,7 +758,7 @@ msgstr "Продажба на продукти"
 #. module: sale
 #: rml:sale.order:0
 msgid "Our Salesman"
-msgstr "Нашия търговец"
+msgstr "Лице за контакт"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,init,create:0
@@ -797,7 +797,7 @@ msgstr "Свойства"
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.order,state:0
 msgid "Quotation"
-msgstr "Запитване"
+msgstr "Оферта"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -876,7 +876,7 @@ msgstr ""
 #. module: sale
 #: rml:sale.order:0
 msgid "Your Reference"
-msgstr "Вашата отпратка"
+msgstr "Ваш референтен номер"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -1054,7 +1054,7 @@ msgstr "Поръчка за продажба"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Quotation (A sale order in draft state)"
-msgstr "Запитване (проект на поръчка за продажба)"
+msgstr "Оферта (поръчка за продажба в етап на проект)"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1101,7 +1101,7 @@ msgstr "Доставка"
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr "Запитване / Поръчка"
+msgstr "Оферта / Поръчка"
 
 #. module: sale
 #: rml:sale.order:0
@@ -1111,7 +1111,7 @@ msgstr "Тел. :"
 #. module: sale
 #: rml:sale.order:0
 msgid "Quotation N°"
-msgstr "Запитване N°"
+msgstr "Оферта №"
 
 #. module: sale
 #: field:stock.move,sale_line_id:0
@@ -1174,7 +1174,7 @@ msgstr "Фактура за"
 #: model:ir.actions.act_window,name:sale.action_order_tree_new
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_new
 msgid "New Quotation"
-msgstr "Ново запитване"
+msgstr "Нова оферта"
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index 7b9c3ced083..5db744789b1 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/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:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 37fb04ea4d7..40a6d88145d 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/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:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 00876478ca3..7d79fd62ee2 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 03b4fbe284d..c5d92194564 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index bb4552879f1..63597774fc1 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index d1300dad79f..0a2a25ce5d9 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 28a54da876e..27c43226991 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 6bdfbc5d819..fcbb972e6ac 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index dd87f5f87b5..185974e129a 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/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: sale
@@ -272,7 +272,7 @@ msgstr "Omat myyntitilaukset käsittelyssä"
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Määrä (myyntiyksikkö)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -484,7 +484,7 @@ msgstr "Liittyvä pakkaus"
 #. module: sale
 #: field:sale.shop,payment_account_id:0
 msgid "Payment Accounts"
-msgstr ""
+msgstr "Maksujen tilit"
 
 #. module: sale
 #: constraint:product.template:0
@@ -898,7 +898,7 @@ msgstr "Pakkaus ULOS luodaan varastoitaville tuotteille."
 #. module: sale
 #: view:sale.order:0
 msgid "Other data"
-msgstr "Muu data"
+msgstr "Muut tiedot"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,amount:0
@@ -944,6 +944,11 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
+"Ilmoittaa tarjouksen tai myyntitilauksen tilan. Poikkeustila asetetaan "
+"automaattisesti jos peruutustoimintoja tehdään laskua hyväksyttäessä "
+"(Poikkeus laskutuksessa) tai pakkausprosessin aikana (Poikkeus "
+"toimituksessa). Tila \"Odottaa aikataulua\" asetetaan kun lasku on "
+"hyväksytty mutta tilaus odottaa \"Tilauspäivämäärän\" mukaista ajankohtaa."
 
 #. module: sale
 #: view:sale.order:0
@@ -954,7 +959,7 @@ msgstr "Mittayksikkö"
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr ""
+msgstr "Pakkauksien määrä"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1103,7 +1108,7 @@ msgstr "Peruuta luovutus"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from the Packing"
-msgstr ""
+msgstr "Lasku pakkauksesta"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
@@ -1167,12 +1172,12 @@ msgstr "Tilauspäivämäärä"
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Tuotteen myyntiyksikkö"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Manuaalisessa käsittelyssä"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -1225,7 +1230,7 @@ msgstr "Liittyvät laskut"
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "Myymälän nimi"
 
 #. module: sale
 #: field:sale.order,payment_term:0
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index b36dae505fc..04d9d70f328 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 42f6b560db5..9d96c065ef4 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -1,55 +1,56 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale
-#
+# * sale
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 00:11+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Djelomična isporuka"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Procurement"
-msgstr ""
+msgstr "Postavite Dobavu"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr ""
+msgstr "Potvrdite Ponudu"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Isporuka narudžbe"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr ""
+msgstr "Dodjeljeni Partner"
 
 #. module: sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Raspored čekanja"
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -57,80 +58,82 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
+"Prihvaćate li djelomičnu isporuku ako nematu na raspolaganju dovoljno robe "
+"na zalihi?"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr ""
+msgstr "Iz zalihe"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sale Order"
-msgstr ""
+msgstr "Koraci do isporuke Prodajne Narudžbe"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,qtty:0
 #: rml:sale.order:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "You invoice has been successfully created !"
-msgstr ""
+msgstr "Vaš je račun uspješno kreiran!"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Automatic Declaration"
-msgstr ""
+msgstr "Automatska Deklaracija"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr ""
+msgstr "Neobračunate i isporučene linije"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi na Nacrt"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Izuzetak u izdavanju Računa"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr ""
+msgstr "Ovo je ispis liste odabira robe koja je generirana ovim računom"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Delivery, from the warehouse to the customer."
-msgstr ""
+msgstr "Isporuka, sa skladišta kupcu."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
 msgid "sale.config.picking_policy"
-msgstr ""
+msgstr "sale.config.picking_policy"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "Ovjeri"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Napravi račun"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Međuzbroj"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -138,22 +141,24 @@ msgid ""
 "Whenever confirm button is clicked, the draft state is moved to manual. that "
 "is, quotation is moved to  sale order."
 msgstr ""
+"Kad god se klikne mišem na ikonu Potvrdi, stanje Nacrt prelazi u Ručno "
+"(Manual). To znači da Ponuda postaje Prodajna Narudžba."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Otkaži Narudžbu"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Premještanje Zaliha"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Manual Designation"
-msgstr ""
+msgstr "Ručno Doznačivanje"
 
 #. module: sale
 #: view:sale.order:0
@@ -161,115 +166,115 @@ msgstr ""
 #: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 msgid "Invoice after delivery"
-msgstr ""
+msgstr "Račun nakon isporuke"
 
 #. module: sale
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Netto zbroj:"
 
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr ""
+msgstr "Pravila otpreme"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Izuzetak kod Otpreme"
 
 #. module: sale
 #: field:sale.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Porijeklo"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Adresa Računa"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Izlazni proizvodi"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Referenca"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "Sve od jednom"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr ""
+msgstr "Nabava je kreirana po potvrdi Prodajne Narudžbe"
 
 #. module: sale
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički konto"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Metod Nabave"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax:"
 
 #. module: sale
 #: field:sale.order.line,price_net:0
 msgid "Net Price"
-msgstr ""
+msgstr "Netto cijena"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr ""
+msgstr "Moja Prodajna Narudžba u tijeku"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Količina (Uos)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -279,86 +284,90 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
+"Prodajna Narudžba automatski će kreirati prijedlog računa (Nacrt računa). "
+"Naručene i isporučene količine mogu biti različite. Trebate odlučiti želite "
+"li temeljiti račun na naručenoj ili otpremljenoj količini. Ako jese radi o "
+"usluzi, isporučena količina znači sate utrošene na pridružene zadatke."
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđen"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr ""
+msgstr "Standardan uvjet plaćanja"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_all
 msgid "All Sales Order"
-msgstr ""
+msgstr "Sva Prodajne Narudžbe"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdite"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Adresa otpreme"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "Količine Otpreme"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr ""
+msgstr "Račun temeljen na Prodajnim Narudžbama"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sale Shop"
-msgstr ""
+msgstr "Dućan prodaje"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Skladište"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "Narudžba broj"
 
 #. module: sale
 #: field:sale.order,order_line:0
 #: view:sale.order.line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Vezane Prodajne Narudžbe"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Vezani Računi"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr ""
+msgstr "Prisilno dodijeljivanje"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Neoporeziv iznos"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -366,17 +375,19 @@ msgid ""
 "Packing list is created when 'Assign' is being clicked after confirming the "
 "sale order. This transaction moves the sale order to packing list."
 msgstr ""
+"Tovarni list kreira se kada se klikom miša odabere \"Dodijeli\" po potvrdi "
+"Prodajne Narudžbe. Ta transakcija prenosi Prodajnu Narudžbu na Tovarni list."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree8
 #: model:ir.ui.menu,name:sale.menu_action_order_tree8
 msgid "My sales order waiting Invoice"
-msgstr ""
+msgstr "Moja Prodajna Narudžba koja čeka izdavanje Računa"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Adresa Otpreme"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -384,223 +395,225 @@ msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
 msgstr ""
+"Kada odlučite da je Politika Otpreme =  \"Račun automatski po Isporuci\", "
+"Račun će se automatski kreirati nakon Isporuke."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr ""
+msgstr "Zaključite Isporuku"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Manual Description"
-msgstr ""
+msgstr "Ručno opisivanje"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Količina (UoM)"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree1
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr ""
+msgstr "vezane Prodajne Narudžbe"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr ""
+msgstr "Količine Narudžbe"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sale Order Procurement"
-msgstr ""
+msgstr "Pribavljanje Prodajne Narudžbe"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Packing"
-msgstr ""
+msgstr "Pakiranje"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Potvrdite Narudžbu"
 
 #. module: sale
 #: field:sale.order,name:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Referenca Narudžbe"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
 #: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Cjenik"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_shop_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on Order After Delivery"
-msgstr ""
+msgstr "Račun po Naudžbi nakon Isporuke"
 
 #. module: sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Packing"
-msgstr ""
+msgstr "Odgovarajuće Pakiranje"
 
 #. module: sale
 #: field:sale.shop,payment_account_id:0
 msgid "Payment Accounts"
-msgstr ""
+msgstr "Račun Plaćanja"
 
 #. module: sale
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Greška: UOS mora biti u kategoriji drogačijoj od one u kojoj je UOM"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Ref"
-msgstr ""
+msgstr "Referenca Stranke"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales orders"
-msgstr ""
+msgstr "Prodajne Narudžbe"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "Nabava"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Payment accounts"
-msgstr ""
+msgstr "Računi Plaćanja"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,end:0
 msgid "Close"
-msgstr ""
+msgstr "Zaključi"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: sale
 #: wizard_field:sale.order.line.make_invoice,init,grouped:0
 #: wizard_field:sale.order.make_invoice,init,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Grupa računa"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 #: model:ir.ui.menu,name:sale.menu_action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "Sve Ponude"
 
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "Draft customer invoice, to be reviewed by accountant."
-msgstr ""
+msgstr "Nacrt računa Stranki, koji mora pregledati Knjigovođa."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_tree3
 msgid "Sales Order To Be Invoiced"
-msgstr ""
+msgstr "Prodajne Narudžbe na osnovi kojih treba izdati račune"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Procurement for each line"
-msgstr ""
+msgstr "Nabava za svaki liniju"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree10
 #: model:ir.ui.menu,name:sale.menu_action_order_tree10
 msgid "My Quotations"
-msgstr ""
+msgstr "Moje Ponude"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "Invoices"
-msgstr ""
+msgstr "Računi"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr ""
+msgstr "Linija Narudžbe"
 
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Packing Default Policy"
-msgstr ""
+msgstr "Uobičajena politika Pakiranja"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Manages the delivery and invoicing progress"
-msgstr ""
+msgstr "Upravlja napredovanjem postupka Isporučivanja i izdavanja Računa"
 
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr ""
+msgstr "Uobičajena politika Pakiranja"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
 msgid "Packaging"
-msgstr ""
+msgstr "Pakiranje"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
 #: model:ir.ui.menu,name:sale.menu_sale_root
 msgid "Sales Management"
-msgstr ""
+msgstr "Upravljanje Prodajom"
 
 #. module: sale
 #: field:sale.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "Referenca Narudžbe"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Invoice"
-msgstr ""
+msgstr "Ponovo izradi Račun"
 
 #. module: sale
 #: field:sale.order,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Prodavač"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -608,45 +621,46 @@ msgid ""
 "In sale order , procuerement for each line and it comes into the procurement "
 "order"
 msgstr ""
+"U Prodajnoj narudžbi, Nabava svake linije koja dolazi u Narudžbi Nabave"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Porezi :"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Izdan Račun"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.advance_payment
 msgid "Advance Invoice"
-msgstr ""
+msgstr "Račun predujma"
 
 #. module: sale
 #: field:sale.order,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Stanje Narudžbe"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
 msgid "Uninvoiced Lines"
-msgstr ""
+msgstr "Nefakturirani vezani Računi"
 
 #. module: sale
 #: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
 msgid ""
 "This Configuration step use to set default picking policy when make sale "
 "order"
-msgstr ""
+msgstr "Ova se korak konfiguracije koristi kod izrade Prodajne Narudžbe"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
 msgid "Sales Process"
-msgstr ""
+msgstr "Prodajni Proces"
 
 #. module: sale
 #: wizard_view:sale.order.line.make_invoice,init:0
@@ -654,130 +668,131 @@ msgstr ""
 #: wizard_view:sale.order.make_invoice,init:0
 #: wizard_button:sale.order.make_invoice,init,invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Napravi Račune"
 
 #. module: sale
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Greška: Predefinirani UOM i UOM kupnje moraju biti u istoj kategoriji."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree7
 #: model:ir.ui.menu,name:sale.menu_action_order_tree7
 msgid "My sales in shipping exception"
-msgstr ""
+msgstr "Moje prodaje kod Iznimke Otpreme"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Sales Configuration"
-msgstr ""
+msgstr "Konfiguracija Prodaje"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 #: model:ir.ui.menu,name:sale.menu_action_order_tree2
 msgid "Sales in Exception"
-msgstr ""
+msgstr "Prodaje u Iznimki"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr ""
+msgstr "Po Narudžbi"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr ""
+msgstr "Plaćeno"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Procurement Corrected"
-msgstr ""
+msgstr "Ispravljena Narudžba"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr ""
+msgstr "Otprema i ručno izdan Račun"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Sale Procurement"
-msgstr ""
+msgstr "Pribavljanje za Prodaju"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sale Order Logistic"
-msgstr ""
+msgstr "Konfiguriraj logistiku Prodajne Narudžbe"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Iznos bez Poreza"
 
 #. module: sale
 #: field:sale.order.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Packing Policy"
-msgstr ""
+msgstr "Politika Pakiranja"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 msgid "Product sales"
-msgstr ""
+msgstr "Prodaje Proizvoda"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Our Salesman"
-msgstr ""
+msgstr "Naš Prodavač"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,init,create:0
 msgid "Create Advance Invoice"
-msgstr ""
+msgstr "Napravi Račun Predujma"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid "One procurement for each product."
-msgstr ""
+msgstr "Jedna Nabava za svaki Proizvod"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
 #: model:ir.ui.menu,name:sale.menu_sale_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Prodajne Narudžbe"
 
 #. module: sale
 #: field:product.product,pricelist_sale:0
 msgid "Sale Pricelists"
-msgstr ""
+msgstr "Prodajni Cjenici"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Izravna Isporuka"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
-msgstr ""
+msgstr "Svojstva"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.order,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Ponuda"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -790,39 +805,41 @@ msgid ""
 "Invoice is created when 'Create Invoice' is being clicked after confirming "
 "the sale order. This transaction moves the sale order to invoices."
 msgstr ""
+"Račun se kreira kada se klikne na 'Kriraj Račun' nakon potvrde Prodajne "
+"Narudžbe. Ova transakcija prenosi podatke Prodajne Narudžbe u Račune."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Compute"
-msgstr ""
+msgstr "Izračunaj"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
 #: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Dućan"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "VAT"
-msgstr ""
+msgstr "PDV"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 #: model:ir.ui.menu,name:sale.menu_action_order_tree4
 msgid "Sales Order in Progress"
-msgstr ""
+msgstr "Prodajne Narudžbe u tijeku"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
-msgstr ""
+msgstr "Dodijeli"
 
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -838,71 +855,82 @@ msgid ""
 "  - The 'Invoice from the packing' choice is used to create an invoice "
 "during the packing process."
 msgstr ""
+"Politika pakiranja koristi se kod usklađivanja operacija izdavanja računa i "
+"Isporučivanja.\n"
+"  - Izbor \"Platite prije isporuke\" prvo će generirati Račun i pa tek onda "
+"nalog za pakiranje kada je Račun plaćen.\n"
+"  - \"Isporuka i ručno izdan Račun\" kreirat će izravno nalog za isporuku te "
+"čekati da korisnik ručno klikne na ikonu \"Račun\" kako bi se generirao "
+"Nacrt Računa.\n"
+"  - Račun po Nalogu nakon Isporuke\" generirat će Nacrt Računa na osnovi "
+"prodajne Narudžbe nakon što su svi Tovarni Listovi dovršeni.\n"
+"  - Opcija \"Račun na osnovi Pakiranja\" koristi se za izdavanje računa "
+"tijekom postupka pakiranja."
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Vaša Referenca"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Delivery Order Only"
-msgstr ""
+msgstr "Samo Nalog za Isporuku"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales order lines"
-msgstr ""
+msgstr "Vezane Prodajne Narudžbe"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Redoslijed"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Sales"
-msgstr ""
+msgstr "Prodaje"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
-msgstr ""
+msgstr "Količina"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Packing OUT is created for stockable products."
-msgstr ""
+msgstr "Pakiranje VAN kreira se za proizvode na zalihi."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other data"
-msgstr ""
+msgstr "Drugi podaci"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,amount:0
 #: rml:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Porezna Pozicija"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "Adresa Računa :"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
 #: field:sale.order,invoice_ids:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -914,7 +942,7 @@ msgstr ""
 #: wizard_button:sale.order.line.make_invoice,init,end:0
 #: wizard_button:sale.order.make_invoice,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -925,17 +953,22 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
+"Daje stanje Ponude ili Prodajne Narudžbe. Stanje Iznimke automatski se "
+"postavlja kada se dogodi Otkaz tijekom provjere Računa (Iznimka kod Računa) "
+"ili u postupku izrade Tovarnog Lista (Iznimka kod Otpreme). Stanje "
+"\"Raspored Čekanja\" postavlja se kada je račun potvrđen ali se čeka da se "
+"na Rsporedniku pojavi \" Datum Narudžbe\"."
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "UoM"
-msgstr ""
+msgstr "UoM"
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr ""
+msgstr "Broj Paketa"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -943,54 +976,57 @@ msgid ""
 "Confirming the packing list moves them to delivery order. This can be done "
 "by clicking on 'Validate' button."
 msgstr ""
+"Potvrda Tovarnog Lista prenosi stavke u Nalog za Isporuku. To se može "
+"učiniti klikom na ikonu \"Ovjeri\"."
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "U razvoju"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
 msgid "Advance Payment"
-msgstr ""
+msgstr "Predujam"
 
 #. module: sale
 #: 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: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
 msgid "Confirm sale order and Create invoice."
-msgstr ""
+msgstr "Potvrdi Prodajnu Narudžbu i kreiraj Račun"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Packing List & Delivery Order"
-msgstr ""
+msgstr "Tovarni List i Nalog za Otpremu"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
-msgstr ""
+msgstr "Iznimka"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order Lines"
-msgstr ""
+msgstr "Vezane Prodajne Narudžbe"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.order:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Napravi Račun"
 
 #. module: sale
 #: wizard_view:sale.order.line.make_invoice,init:0
 #: wizard_view:sale.order.make_invoice,init:0
 msgid "Do you really want to create the invoices ?"
-msgstr ""
+msgstr "Želite li zaista kreirati Račune?"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
@@ -1000,112 +1036,112 @@ msgstr ""
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Set Default"
-msgstr ""
+msgstr "Postavi kao predefinirano"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales order"
-msgstr ""
+msgstr "Prodajna narudžba"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Quotation (A sale order in draft state)"
-msgstr ""
+msgstr "Ponuda (Prodajna Narudžba kao Nacrt)"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "Sale Invoice"
-msgstr ""
+msgstr "Prodajni Račun"
 
 #. module: sale
 #: field:sale.order,incoterm:0
 msgid "Incoterm"
-msgstr ""
+msgstr "Inkoterm"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,product_id:0
 #: field:sale.order.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,open:0
 msgid "Open Advance Invoice"
-msgstr ""
+msgstr "Otvori Račun Predujma"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr ""
+msgstr "Osoba za kontakt kod naručivanja"
 
 #. module: sale
 #: rml:sale.order:0
 #: field:sale.order.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Deliver"
-msgstr ""
+msgstr "Isporuči"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr ""
+msgstr "Ponuda / Narudžba"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel:"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Quotation N°"
-msgstr ""
+msgstr "Ponuda Broj"
 
 #. module: sale
 #: field:stock.move,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Vezana Zaključnica"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr ""
+msgstr "Otkaži dodjelu"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from the Packing"
-msgstr ""
+msgstr "Račun na osnovi pakiranja"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
 msgid "Make invoices"
-msgstr ""
+msgstr "Napravi Račune"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact that requested the order or quotation."
-msgstr ""
+msgstr "Ime i adresa kontakta koji je zatražio Prodajnu Narudžnu ili Ponudu."
 
 #. module: sale
 #: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Stranka"
 
 #. module: sale
 #: field:product.product,pricelist_purchase:0
 msgid "Purchase Pricelists"
-msgstr ""
+msgstr "Kupovni cjenici"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1114,49 +1150,49 @@ msgstr ""
 #: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Prodajna narudžba"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr ""
+msgstr "Račun za"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_new
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_new
 msgid "New Quotation"
-msgstr ""
+msgstr "Nova Ponuda"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: sale
 #: rml:sale.order:0
 #: field:sale.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Datum narudžbe"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "Proizvod UoS"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "Ručni postupak u tijeku"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Proizvod UoM"
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1166,51 +1202,54 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
+"Standardno, Open ERP može upravljati kompleksnim tokovima robe u Skladištu "
+"ili lokacijama Partnera. Tako će se odrediti najčešći i jednostavni načini "
+"za isporuku proizvoda kupcu kroz jednu do dvije operacije djelatnika."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sale Order"
-msgstr ""
+msgstr "Konfiguriraj Politiku Odabira robe za Prodajnu Narudžbu"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_order0
 msgid "Order"
-msgstr ""
+msgstr "Narudžba"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Uvjeti plaćanja"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Račun Ispravljen"
 
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Delay"
-msgstr ""
+msgstr "Kašnjenje s Isporukom"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Related invoices"
-msgstr ""
+msgstr "Srodni Računi"
 
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr ""
+msgstr "Ime dućana"
 
 #. module: sale
 #: field:sale.order,payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Uvjet plaćanja"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr ""
+msgstr "Plaćanje prije isporuke"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1219,56 +1258,59 @@ msgid ""
 "The same sale order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Ovo je spisak Računa koji su rađeni na osnovi ove Prodajne Narudžbe. Po "
+"jednoj Prodajnoj Narudžbi možda je bilo potrebno izdati više računa (Po "
+"linijama, na primjer)"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "States"
-msgstr ""
+msgstr "Stanja"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Težina"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "After confirming order, Create the invoice."
-msgstr ""
+msgstr "Po potvrdi Narudžbe, napravi"
 
 #. module: sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Nepravilan ean kod"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
 #: field:sale.order,shipped:0
 msgid "Picked"
-msgstr ""
+msgstr "Odabran"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Accounting"
-msgstr ""
+msgstr "Računovodstvo"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr ""
+msgstr "Račun na temelju dostava"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Premiještanje zaliha"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 #: model:ir.ui.menu,name:sale.menu_action_order_tree
 msgid "My Sales Order"
-msgstr ""
+msgstr "Moja Prodajna narudžba"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
-msgstr ""
+msgstr "Vezane Prodajne Narudžbe"
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index c82132de144..5a3e081f82d 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index b346194a043..0d58f5b00fa 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index b12089576df..7436a4032fb 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -7,13 +7,13 @@ 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: 2010-01-09 11:23+0000\n"
+"PO-Revision-Date: 2010-03-18 10:45+0000\n"
 "Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -650,7 +650,7 @@ msgstr "Stato Ordine"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
 msgid "Uninvoiced Lines"
-msgstr "RIghe non fatturate"
+msgstr "Righe non fatturate"
 
 #. module: sale
 #: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 3e6debb75fb..7af6fa080b5 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 220fd9c280b..bd7816ad6fa 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index 8fa2f48c003..1d7ef0aa976 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 27a47afb4f8..e1736ad59b4 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 15514d2e334..b00975ed8a5 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 3ac97dd56f4..c6f138ee333 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 751bb0ff879..a6b5f6526e3 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index b1ffc509b8b..f71d12df2be 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 0bf504728e1..24a23185207 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index 59b6d31645e..d8b8856f309 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index ddceda9db38..1726cc91102 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/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: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 75ad3cb2706..3f2b9cda58c 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index f383c6adf6d..bf4aeac75cc 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/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-03-09 21:01+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 89ad79a2c8d..1049e1f3fc1 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 75f74a5c689..588570379b6 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 129b81c689c..523a034f64b 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 9e388d42181..3616941a39a 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 77e50b8edd6..7e50a50a387 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 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: 2010-03-04 15:14+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:13+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr "分批出货"
+msgstr "部分交付"
 
 #. module: sale
 #: view:sale.order:0
@@ -39,34 +39,34 @@ msgstr "送货单"
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr "分配业务伙伴"
+msgstr "分配给业务伙伴"
 
 #. module: sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Waiting Schedule"
-msgstr "等待MRP计算"
+msgstr "等待调度"
 
 #. module: sale
 #: help:sale.order,picking_policy:0
 msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
-msgstr "如果您没有足够的库存可以一次运输所有货物，您是否可以接受分批出货?"
+msgstr "如果你没足够的库存可以一次提供,可以接受部分货物不?"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr "备货"
+msgstr "来自库存"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sale Order"
-msgstr "完成销售订单的步骤"
+msgstr "步骤提供销售订单"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,qtty:0
@@ -77,7 +77,7 @@ msgstr "数量"
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "You invoice has been successfully created !"
-msgstr "您的发票已成功创建！"
+msgstr "你的发票已经成功创建!"
 
 #. module: sale
 #: view:sale.order:0
@@ -105,27 +105,27 @@ msgstr "发票异常"
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr "此是该发票生成的运货清单."
+msgstr "这领料/提货单已产生在此发票上."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Delivery, from the warehouse to the customer."
-msgstr "送货，从仓库到客户"
+msgstr "送货,从仓库到客户"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
 msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+msgstr "销售设置领料/提货方式"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr "生成发票"
+msgstr "建立发票"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -137,7 +137,7 @@ msgstr "小计"
 msgid ""
 "Whenever confirm button is clicked, the draft state is moved to manual. that "
 "is, quotation is moved to  sale order."
-msgstr "当点击确认按钮草稿状态将转到手动.报价单转到销售订单."
+msgstr "当点击确认按钮草稿状态将转为手动.报价单转为销售订单."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -161,7 +161,7 @@ msgstr "手动指定"
 #: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
@@ -177,12 +177,12 @@ msgstr "税款"
 #. module: sale
 #: rml:sale.order:0
 msgid "Net Total :"
-msgstr "净总额："
+msgstr "净合计:"
 
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr "发运策略"
+msgstr "运送方式"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.order.line,state:0
@@ -192,12 +192,12 @@ msgstr "已取消"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Shipping Exception"
-msgstr "送货异常"
+msgstr "运送异常"
 
 #. module: sale
 #: field:sale.order,amount_total:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: sale
 #: field:sale.order,origin:0
@@ -212,7 +212,7 @@ msgstr "发票地址"
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr "发出货品"
+msgstr "发出的产品"
 
 #. module: sale
 #: view:sale.order:0
@@ -222,23 +222,23 @@ msgstr "参考"
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr "一次性发出"
+msgstr "所有一起"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr "销售订单确认后生成需求单"
+msgstr "确认销售订单后创建产品需求"
 
 #. module: sale
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "TVA :"
-msgstr "增值税："
+msgstr "增值税:"
 
 #. module: sale
 #: field:sale.order.line,type:0
@@ -253,7 +253,7 @@ msgstr "额外信息"
 #. module: sale
 #: rml:sale.order:0
 msgid "Fax :"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: sale
 #: field:sale.order.line,price_net:0
@@ -264,12 +264,12 @@ msgstr "净价"
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr "我的处理中订单"
+msgstr "我的销售订单进展"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr "数量（销售单位）"
+msgstr "数量(销售单位)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -279,17 +279,18 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
-"销售订单将自动创建发票草稿。订单数量和送货数量可能不一致，开票时必须选择基于订单数量还是送货数量。如果该产品是一种服务，发货量是相关的任务所花费的小时数"
+"销售订单将自动创建发票(发票草稿).订单和送货数量可能不相同.如果你的发票基于已订购或送货数量你必须选择你必须选择.如果产品是一个服务运送数量以任务花费的"
+"小时数计算."
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr "已审核"
+msgstr "已确认"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr "默认付款期限"
+msgstr "默认付款条件"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
@@ -305,7 +306,7 @@ msgstr "确认"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr "发运地址"
+msgstr "运送地址"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -315,13 +316,13 @@ msgstr "已运数量"
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr "基于销售订单开票"
+msgstr "发票基于销售订单"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sale Shop"
-msgstr "销售点"
+msgstr "销售商店"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -342,19 +343,19 @@ msgstr "订单明细"
 #. module: sale
 #: rml:sale.order:0
 msgid "Disc.(%)"
-msgstr "折扣（％）"
+msgstr "折扣(%)"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr "发票明细"
+msgstr "发票行"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr "强制分配"
+msgstr "强制指定"
 
 #. module: sale
 #: view:sale.order:0
@@ -366,30 +367,30 @@ msgstr "未完税金额"
 msgid ""
 "Packing list is created when 'Assign' is being clicked after confirming the "
 "sale order. This transaction moves the sale order to packing list."
-msgstr "确认销售订单后点击‘分配’时创建发货分拣清单.销售订单转到发货分拣单"
+msgstr "确认销售订单点击‘指定’后创建包装单.销售订单转为包装单"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree8
 #: model:ir.ui.menu,name:sale.menu_action_order_tree8
 msgid "My sales order waiting Invoice"
-msgstr "我的待开票订单"
+msgstr "我的待开票的销售订单"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Shipping address :"
-msgstr "货运地址："
+msgstr "运送地址:"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
 msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
-msgstr "当你选择交货方式=‘送货后自动产生发票’.送货后将自动创建发票."
+msgstr "当你选择运送方式=‘送货后自动产生发票’.将在送货后自动创建发票."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr "一次性出货"
+msgstr "完成送货"
 
 #. module: sale
 #: view:sale.order:0
@@ -399,7 +400,7 @@ msgstr "手动添加描述"
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr "数量（计量单位）"
+msgstr "数量(计量单位)"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree1
@@ -416,27 +417,27 @@ msgstr "已订数量"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sale Order Procurement"
-msgstr "销售订单需求单"
+msgstr "销售单产品需求"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Packing"
-msgstr "分拣单"
+msgstr "包装"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr "审核订单"
+msgstr "确认订单"
 
 #. module: sale
 #: field:sale.order,name:0
 msgid "Order Reference"
-msgstr "订单编号"
+msgstr "订单参考"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -459,17 +460,17 @@ msgstr "设置"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on Order After Delivery"
-msgstr "送货后按订单开发票"
+msgstr "按发票运送"
 
 #. module: sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Packing"
-msgstr "相关的分拣单"
+msgstr "相关的包装"
 
 #. module: sale
 #: field:sale.shop,payment_account_id:0
@@ -479,12 +480,12 @@ msgstr "付款科目"
 #. module: sale
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Ref"
-msgstr "客户引用"
+msgstr "客户参考"
 
 #. module: sale
 #: view:sale.order:0
@@ -495,7 +496,7 @@ msgstr "销售订单"
 #: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr "需求单"
+msgstr "产品需求"
 
 #. module: sale
 #: view:sale.shop:0
@@ -511,7 +512,7 @@ msgstr "关闭"
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Draft Invoice"
-msgstr "草稿发票"
+msgstr "发票草稿"
 
 #. module: sale
 #: wizard_field:sale.order.line.make_invoice,init,grouped:0
@@ -533,18 +534,18 @@ msgstr "降价 (%)"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "Draft customer invoice, to be reviewed by accountant."
-msgstr "会计人员即将审查的客户发票草稿"
+msgstr "会计人员审查的客户发票草稿"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_tree3
 msgid "Sales Order To Be Invoiced"
-msgstr "要开票的销售订单"
+msgstr "销售订单开发票"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Procurement for each line"
-msgstr "每订单行的需求单"
+msgstr "产品需求明细"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree10
@@ -555,7 +556,7 @@ msgstr "我的报价单"
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "Invoices"
-msgstr "发票列表"
+msgstr "发票"
 
 #. module: sale
 #: view:sale.order:0
@@ -565,7 +566,7 @@ msgstr "订单明细"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Packing Default Policy"
-msgstr "默认出货方式"
+msgstr "包装默认方式"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
@@ -575,7 +576,7 @@ msgstr "管理送货和发票进展"
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr "默认交货方式"
+msgstr "默认运送方式"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -608,18 +609,18 @@ msgstr "业务员"
 msgid ""
 "In sale order , procuerement for each line and it comes into the procurement "
 "order"
-msgstr "每销售订单行均计算需求并生成需求单"
+msgstr "在销售订单产品需求的每个明细并都转为产品需求单."
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Taxes :"
-msgstr "税捐 :"
+msgstr "税:"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "已开发票"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.advance_payment
@@ -642,7 +643,7 @@ msgstr "未开票明细"
 msgid ""
 "This Configuration step use to set default picking policy when make sale "
 "order"
-msgstr "这设置步骤用来设定建立销售订单的默认出货方式"
+msgstr "这设置步骤用来设定建立销售订单的默认领料/提货方式"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -661,13 +662,13 @@ msgstr "创建发票"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类下。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree7
 #: model:ir.ui.menu,name:sale.menu_action_order_tree7
 msgid "My sales in shipping exception"
-msgstr "我的销售运输异常"
+msgstr "我销售的运输异常"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -683,7 +684,7 @@ msgstr "销售异常"
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr "订货"
+msgstr "来自订单"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -693,12 +694,12 @@ msgstr "草稿"
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr "已付"
+msgstr "支付"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Procurement Corrected"
-msgstr "需求单已更正"
+msgstr "产品需求已修正"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -709,12 +710,12 @@ msgstr "交货及手动开发票"
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Sale Procurement"
-msgstr "销售需求单"
+msgstr "销售产品需求"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sale Order Logistic"
-msgstr "配置销售订单物流"
+msgstr "设置销售订单逻辑"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -729,17 +730,17 @@ msgstr "状态"
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Packing Policy"
-msgstr "分拣策略"
+msgstr "包装方式"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 msgid "Product sales"
-msgstr "货品销售"
+msgstr "产品销售"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Our Salesman"
-msgstr "我方销售员"
+msgstr "业务员"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,init,create:0
@@ -749,7 +750,7 @@ msgstr "创建预付款发票"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid "One procurement for each product."
-msgstr "每个产品的需求单"
+msgstr "每个产品的产品需求"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -760,12 +761,12 @@ msgstr "销售订单"
 #. module: sale
 #: field:product.product,pricelist_sale:0
 msgid "Sale Pricelists"
-msgstr "销售价格列表"
+msgstr "销售价格表"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr "直接运送"
+msgstr "直接送货"
 
 #. module: sale
 #: view:sale.order:0
@@ -783,14 +784,14 @@ msgstr "报价"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance Product"
-msgstr "Advance Product"
+msgstr "预付产品"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
 "Invoice is created when 'Create Invoice' is being clicked after confirming "
 "the sale order. This transaction moves the sale order to invoices."
-msgstr "确认订单后点击‘创建发票’则会创建一个新的发票。这笔交易把销售订单转移到发票"
+msgstr "确认销售订单点击‘创建发票’创建发票.销售订单转为发票."
 
 #. module: sale
 #: view:sale.order:0
@@ -813,17 +814,17 @@ msgstr "增值税"
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 #: model:ir.ui.menu,name:sale.menu_action_order_tree4
 msgid "Sales Order in Progress"
-msgstr "销售订单在进展中"
+msgstr "销售订单进展"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
-msgstr "分配"
+msgstr "指定"
 
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -839,18 +840,16 @@ msgid ""
 "  - The 'Invoice from the packing' choice is used to create an invoice "
 "during the packing process."
 msgstr ""
-"付运条款是用于同步发票与送货.\\n\n"
-"  - ‘送货前付款’选项将会先生成发票，按此发票付款完成后生成分拣单.\\n\n"
-"  - ‘交货及手动开发票’选项将直接创建分拣单并在用户手动点击‘发票’后生成发\n"
-"票.\\n\"\n"
-"  - ‘送货后按订单开发票’选项将会在所有分拣单完成后按照销售订单生成草稿发\n"
-"票.\\n\"\n"
-"  - ‘按发货分拣单开发票’选项用于在准备发货过程中创建发票."
+"运输策略是用来同步发票和交货操作\n"
+"  在运输前付款将先产生发票和包装单后支付发票\n"
+"  运输和手动开发票将创建包装单并等待用户手动开发票\n"
+"  发票在交货后将在销售订单建立所有包装单后产生发票\n"
+"  发票来自包装是用户在包装的时候生成发票"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Your Reference"
-msgstr "您的编号"
+msgstr "你参考"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -866,12 +865,12 @@ msgstr "销售订单明细"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Sales"
-msgstr "销售订单"
+msgstr "销售"
 
 #. module: sale
 #: view:sale.order:0
@@ -882,12 +881,12 @@ msgstr "数量"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Packing OUT is created for stockable products."
-msgstr "为可库存货品创建发货分拣单"
+msgstr "可库存物产品发出包装"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other data"
-msgstr "其他数据"
+msgstr "其它数据"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,amount:0
@@ -899,12 +898,12 @@ msgstr "单价"
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "应税设定"
+msgstr "财务结构"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Invoice address :"
-msgstr "发票地址："
+msgstr "发票地址:"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -933,6 +932,8 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
+"给出这报价单或销售订单的状态这异常状态是在发票确认(发票异常)或在包装单处理(送货异常)自动设定时取消操作发生的.这\"等待调度表\"状态是在发票已确认但"
+"在等待在\"日期排序\"内运行调度."
 
 #. module: sale
 #: view:sale.order:0
@@ -943,40 +944,40 @@ msgstr "计量单位"
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr "包装数量"
+msgstr "包装数"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
 msgid ""
 "Confirming the packing list moves them to delivery order. This can be done "
 "by clicking on 'Validate' button."
-msgstr "点击‘确认’按钮把分拣单转到送货单"
+msgstr "点击‘确认’按钮.确认包装单转为送货单"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "In Progress"
-msgstr "在进程中"
+msgstr "进展"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
 msgid "Advance Payment"
-msgstr "预付款"
+msgstr "预付款支付"
 
 #. module: sale
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
 msgid "Confirm sale order and Create invoice."
-msgstr "确认销售订单并生成发票"
+msgstr "确认销售订单并创建发票"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Packing List & Delivery Order"
-msgstr "发货分拣单及送货单"
+msgstr "包装单&送货单"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1003,12 +1004,12 @@ msgstr "你确定要创建发票吗?"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Invoice based on packing lists"
-msgstr "按分拣单生成发票"
+msgstr "发票基于包装单"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Set Default"
-msgstr "设为默认"
+msgstr "设为草稿"
 
 #. module: sale
 #: view:sale.order:0
@@ -1018,7 +1019,7 @@ msgstr "销售订单"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Quotation (A sale order in draft state)"
-msgstr "报价（一份销售订单草稿）"
+msgstr "报价(销售订单在草稿状态)"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1039,12 +1040,12 @@ msgstr "产品"
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,open:0
 msgid "Open Advance Invoice"
-msgstr "打开预付发票"
+msgstr "待处理预付款发票"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr "订单联系人"
+msgstr "订购联系"
 
 #. module: sale
 #: rml:sale.order:0
@@ -1060,22 +1061,22 @@ msgstr "价格"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Deliver"
-msgstr "运送"
+msgstr "送货"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr "报价/订单"
+msgstr "报价单/订单"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Tel. :"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Quotation N°"
-msgstr "报价编号"
+msgstr "报价单号"
 
 #. module: sale
 #: field:stock.move,sale_line_id:0
@@ -1085,18 +1086,18 @@ msgstr "销售订单明细"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr "取消分配"
+msgstr "取消指定"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from the Packing"
-msgstr "按发货分拣单生成发票"
+msgstr "发票来自包装"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
 msgid "Make invoices"
-msgstr "创建发票"
+msgstr "建立发票"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
@@ -1113,7 +1114,7 @@ msgstr "客户"
 #. module: sale
 #: field:product.product,pricelist_purchase:0
 msgid "Purchase Pricelists"
-msgstr "采购价格列表"
+msgstr "采购价格表"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1127,7 +1128,7 @@ msgstr "销售订单"
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr "姓名"
+msgstr "名称"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1138,12 +1139,12 @@ msgstr "开票依据"
 #: model:ir.actions.act_window,name:sale.action_order_tree_new
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_new
 msgid "New Quotation"
-msgstr "新报价"
+msgstr "新报价单"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total amount"
-msgstr "总金额"
+msgstr "金额合计"
 
 #. module: sale
 #: rml:sale.order:0
@@ -1154,7 +1155,7 @@ msgstr "订购日期"
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr "货品销售单位"
+msgstr "产品销售单位"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1173,12 +1174,12 @@ msgid ""
 "in your warehouse and partner locations. This will configure the most common "
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
-msgstr ""
+msgstr "默认情况下系统能管理复杂的路线和从你的仓库到业务伙伴库位的路径.这将设置最常见和最简单的方法把产品交付给客户通过一、两个操作."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sale Order"
-msgstr "设置销售订单出货方式"
+msgstr "销售订单设置领料/提货方式"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_order0
@@ -1198,7 +1199,7 @@ msgstr "已更正发票"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Delay"
-msgstr "货运延期"
+msgstr "运送延期"
 
 #. module: sale
 #: view:sale.order:0
@@ -1218,7 +1219,7 @@ msgstr "付款条件"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr "交货前付款"
+msgstr "运送前付款"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1226,7 +1227,7 @@ msgid ""
 "This is the list of invoices that have been generated for this sale order. "
 "The same sale order may have been invoiced in several times (by line for "
 "example)."
-msgstr "这是该销售订单生成的发票列表.同一销售订单可能已经开发票几次（比如按行开具）."
+msgstr "这是发票列表已经产生销售订单.上述销售订单可能已经开发票."
 
 #. module: sale
 #: view:sale.order:0
@@ -1242,18 +1243,18 @@ msgstr "重量"
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "After confirming order, Create the invoice."
-msgstr "确认订单后创建发票。"
+msgstr "创建这发票"
 
 #. module: sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的(EAN)条码"
+msgstr "错误:无效EAN编码"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
 #: field:sale.order,shipped:0
 msgid "Picked"
-msgstr "已提货"
+msgstr "已领料/退货"
 
 #. module: sale
 #: view:sale.shop:0
@@ -1263,7 +1264,7 @@ msgstr "会计"
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr "按送货单开发票"
+msgstr "发票基于送货单"
 
 #. module: sale
 #: view:sale.order:0
@@ -1279,4 +1280,39 @@ msgstr "我的销售订单"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
-msgstr "订单明细"
+msgstr "销售订单明细"
+
+#~ msgid ""
+#~ "\n"
+#~ "    The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ "    * Workflow with validation steps:\n"
+#~ "        - Quotation -> Sale order -> Invoice\n"
+#~ "    * Invoicing methods:\n"
+#~ "        - Invoice on order (before or after shipping)\n"
+#~ "        - Invoice on delivery\n"
+#~ "        - Invoice on timesheets\n"
+#~ "        - Advance invoice\n"
+#~ "    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ "    * Products stocks and prices\n"
+#~ "    * Delivery methods:\n"
+#~ "        - all at once, multi-parcel\n"
+#~ "        - delivery costs\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这基础模块管理报价和销售订单\n"
+#~ "\n"
+#~ "\t* 工作流批准的步骤:\n"
+#~ "\t\t- 报价 -》 销售订单 -》 发票\n"
+#~ "\t*开票方式:\n"
+#~ "\t\t- 发票基于订单(之前和之后运输)\n"
+#~ "\t\t- 发票基于送货单\n"
+#~ "\t\t- 发票基于时间表\n"
+#~ "\t\t- 预付款发票\n"
+#~ "\t*业务伙伴优先级(运输单,发票,国际贸易术语)\n"
+#~ "    *库存产品和价格\n"
+#~ "\t*送货方式:\n"
+#~ "\t\t- 多业务伙伴一起\n"
+#~ "\t\t- 送货成本\n"
+#~ "    "
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 14bc492975e..2e4d98fecc6 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py
index 60b6a2999fc..fb04b328a57 100644
--- a/addons/sale/report/__init__.py
+++ b/addons/sale/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,11 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import sale_prepare_allot
 import order
+import sale_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_report.py b/addons/sale/report/sale_report.py
similarity index 97%
rename from addons/sale/sale_report.py
rename to addons/sale/report/sale_report.py
index 2f387ee3883..3ba814b438f 100644
--- a/addons/sale/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -32,7 +32,7 @@ class sale_report(osv.osv):
         'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), 
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
@@ -57,7 +57,7 @@ class sale_report(osv.osv):
     }
     _order = 'date desc'
     def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_sale_order_product')
+        tools.drop_view_if_exists(cr, 'sale_report')
         cr.execute("""
             create or replace view sale_report as (
                  select
diff --git a/addons/sale/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
similarity index 99%
rename from addons/sale/sale_report_view.xml
rename to addons/sale/report/sale_report_view.xml
index 3592cda4662..2e36b7d9923 100644
--- a/addons/sale/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -62,13 +62,13 @@
                     default="1"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
-                <field name="product_id"/>
                 <field name="user_id" widget="selection">
                     <filter icon="terp-sale"
-                        string="My Sales"
+                        help="My Sales"
                         domain="[('user_id','=',uid)]"/>
                 </field>
                 <field name="partner_id"/>
+                <field name="product_id"/>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 
                 <newline/>
diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml
deleted file mode 100644
index 30816750035..00000000000
--- a/addons/sale/report_sale_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    </data>
-</openerp>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 501d9ac1ea7..8b77719171a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -593,7 +593,9 @@ class sale_order(osv.osv):
                     location_id = order.shop_id.warehouse_id.lot_stock_id.id
                     if not picking_id:
                         loc_dest_id = order.partner_id.property_stock_customer.id
+                        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
                         picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                            'name': pick_name,
                             'origin': order.name,
                             'type': 'out',
                             'state': 'auto',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b3cec7496e4..073d95dac27 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -30,9 +30,9 @@
             <field name="arch" type="xml">
                 <tree string="Sale Shop">
                     <field name="name"/>
+                    <field name="warehouse_id"/>
                     <field name="pricelist_id"/>
                     <field name="project_id"/>
-                    <field name="warehouse_id"/>
                 </tree>
             </field>
         </record>
@@ -80,6 +80,7 @@
                     <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="partner_shipping_id"/>
+                    <field name="user_id" />
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
@@ -149,7 +150,12 @@
                                             <field name="state" select="2"/>
                                             <group col="3" colspan="2">
                                                 <field name="invoiced" select="2"/>
-                                                <button colspan="1" name="%(wizard_sale_order_line_invoice)d" states="confirmed" string="Make Invoice" type="action" icon="gtk-print"/>
+                                                <button colspan="1"
+                                                    name="%(action_view_sale_order_line_make_invoice)d"
+                                                    states="confirmed"
+                                                    string="Make Invoice"
+                                                    type="action"
+                                                    icon="gtk-print" />
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -224,7 +230,7 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
+                                <field name="create_date" widget="datetime"/>
                                 <field name="date_confirm"/>
                             </group>
                             <separator colspan="4" string="Notes"/>
@@ -261,6 +267,7 @@
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
@@ -379,8 +386,14 @@
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">
-                                <button name="button_done" states="confirmed,exception" string="Done" type="object" icon="gtk-jump-to"/>
-                                <button name="button_cancel" states="confirmed,exception" string="Cancel" type="object" icon="gtk-cancel" />
+                                <button name="button_done"
+                                	states="confirmed,exception"
+                                	string="Done" type="object"
+                                	icon="gtk-jump-to" />
+                                <button name="button_cancel"
+                                	states="confirmed,exception"
+                                	string="Cancel" type="object"
+                                	icon="gtk-cancel" />
                             </group>
                         </page>
                         <page string="Properties">
@@ -428,15 +441,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                	<filter icon="terp-purchase" string="Shipped"
-                		domain="[('state','=','done')]"
-                		separator="1" />
-                	<filter icon="terp-purchase" string="Uninvoiced"
-                		domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
-                		separator="1" />
-                	<separator orientation="vertical"/>
-                    <field name="order_id" select="1"/>
+                    <filter icon="terp-purchase" string="Shipped"
+                        domain="[('state','=','done')]"
+                        separator="1" />
+                    <filter icon="terp-purchase" string="Uninvoiced"
+                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
+                        separator="1" />
+                    <separator orientation="vertical"/>
                     <field name="product_id" select="1"/>
+                    <field name="order_id" select="1"/>
                     <field name="order_partner_id" select="1"/>
                     <field name="state" select="1"/>
                     <newline />
diff --git a/addons/sale/sale_wizard.xml b/addons/sale/sale_wizard.xml
deleted file mode 100644
index 9df05e8e5dd..00000000000
--- a/addons/sale/sale_wizard.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <wizard
-            id="wizard_sale_order_make_invoice"
-            keyword="client_action_multi"
-            model="sale.order"
-            name="sale.order.make_invoice"
-            multi="True"
-            string="Make invoices"/>
-
-        <wizard
-            id="wizard_sale_order_line_invoice"
-            keyword="client_action_multi"
-            model="sale.order.line"
-            name="sale.order.line.make_invoice"
-            multi="True"
-            string="Make invoices"/>
-
-        <wizard string="Advance Invoice"
-            model="sale.order"
-            name="sale.advance_payment_inv"
-            id="sale.advance_payment"
-            menu="True"/>
-
-    </data>
-</openerp>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 937322578cd..44ce9f7d1fa 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -21,3 +21,10 @@
 "access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","group_sale_manager",1,1,1,1
 "access_sale_report","sale.report","model_sale_report","group_sale_user",1,1,1,0
 "access_sale_report_manager","sale.report","model_sale_report","group_sale_manager",1,1,1,1
+"access_sale_order_line_make_invoice","sale.order.line.make.invoice","model_sale_order_line_make_invoice","group_sale_user",1,1,1,0
+"access_sale_order_line_make_invoice_manager","sale.order.line.make.invoice","model_sale_order_line_make_invoice","group_sale_manager",1,1,1,1
+"access_sale_advance_payment_inv","sale.advance.payment.inv","model_sale_advance_payment_inv","group_sale_user",1,1,1,0
+"access_sale_advance_payment_inv_manager","sale.advance.payment.inv","model_sale_advance_payment_inv","group_sale_manager",1,1,1,1
+"access_sale_open_invoice","sale.open.invoice","model_sale_open_invoice","group_sale_user",1,1,1,0
+"access_sale_open_invoice_manager","sale.open.invoice","model_sale_open_invoice","group_sale_manager",1,1,1,1
+
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 6f9bcc52bb1..590a849ab9a 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -9,7 +9,6 @@
         <field name="name">Sale / Salesman</field>
     </record>
 
-
     <record model='ir.ui.menu' id='menu_action_shop_form'>
         <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
     </record>
@@ -22,7 +21,7 @@
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="sale_order_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="sale_order_line_comp_rule_group">
@@ -33,7 +32,7 @@
     <record model="ir.rule" id="sale_order_line_comp_rule">
         <field name="field_id" search="[('model','=','sale.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="sale_order_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 6141e90b83b..07c5ceea83d 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,12 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-from make_invoice import make_invoice
+#remaining make_invoice
+import sale_line_invoice
+import sale_make_invoice_advance
 
-import wizard_sale_line_invoice
-import make_invoice_advance
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
deleted file mode 100644
index eaa1fc4a14b..00000000000
--- a/addons/sale/wizard/make_invoice_advance.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-from osv import fields, osv
-from tools.translate import _
-
-form = """<?xml version="1.0"?>
-<form string="Advance Payment">
-    <field name="product_id"/>
-    <newline />
-    <field name="qtty"/>
-    <field name="amount"/>
-    <newline />
-</form>
-"""
-fields = {
-        'product_id': {'string':'Product', 'type':'many2one','relation':'product.product','required':True},
-        'amount': {'string':'Unit Price', 'type':'float', 'size':(16,2),'required':True},
-        'qtty': {'string':'Quantity', 'type':'float', 'size':(16,2),'required':True, 'default': lambda *a: 1},
-}
-
-form_msg = """<?xml version="1.0"?>
-<form string="Invoices">
-   <label string="You invoice has been successfully created !"/>
-</form>
-"""
-fields_msg = {}
-
-def _createInvoices(self, cr, uid, data, context={}):
-    list_inv = []
-    pool_obj = pooler.get_pool(cr.dbname)
-    obj_sale = pool_obj.get('sale.order')
-    data_sale = obj_sale.browse(cr,uid,data['ids'])
-    obj_lines = pool_obj.get('account.invoice.line')
-    for sale in data_sale:
-        address_contact = False
-        address_invoice = False
-        create_ids = []
-        ids_inv = []
-        if sale.order_policy == 'postpaid':
-            raise osv.except_osv(
-                _('Error'),
-                _("You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."))
-        val = obj_lines.product_id_change(cr, uid, [], data['form']['product_id'],uom = False, partner_id = sale.partner_id.id, fposition_id=sale.fiscal_position.id)
-        line_id =obj_lines.create(cr, uid, {
-            'name': val['value']['name'],
-            'account_id':val['value']['account_id'],
-            'price_unit': data['form']['amount'],
-            'quantity': data['form']['qtty'],
-            'discount': False,
-            'uos_id': val['value']['uos_id'],
-            'product_id':data['form']['product_id'],
-            'invoice_line_tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-            'account_analytic_id': sale.project_id and sale.project_id.id or False,
-            'note':'',
-        })
-        create_ids.append(line_id)
-        inv = {
-            'name': sale.name,
-            'origin': sale.name,
-            'type': 'out_invoice',
-            'reference': False,
-            'account_id': sale.partner_id.property_account_receivable.id,
-            'partner_id': sale.partner_id.id,
-            'address_invoice_id':sale.partner_invoice_id.id,
-            'address_contact_id':sale.partner_order_id.id,
-            'invoice_line': [(6,0,create_ids)],
-            'currency_id' :sale.pricelist_id.currency_id.id,
-            'comment': '',
-            'payment_term':sale.payment_term.id,
-            'fiscal_position': sale.partner_id.property_account_position.id
-            }
-        inv_obj = pool_obj.get('account.invoice')
-        inv_id = inv_obj.create(cr, uid, inv)
-
-        for inv in sale.invoice_ids:
-            ids_inv.append(inv.id)
-        ids_inv.append(inv_id)
-        obj_sale.write(cr,uid,sale.id,{'invoice_ids':[(6,0,ids_inv)]})
-        list_inv.append(inv_id)
-#
-# If invoice on picking: add the cost on the SO
-# If not, the advance will be deduced when generating the final invoice
-#
-        if sale.order_policy=='picking':
-            pool_obj.get('sale.order.line').create(cr, uid, {
-                'order_id': sale.id,
-                'name': val['value']['name'],
-                'price_unit': -data['form']['amount'],
-                'product_uom_qty': data['form']['qtty'],
-                'product_uos_qty': data['form']['qtty'],
-                'product_uos': val['value']['uos_id'],
-                'product_uom': val['value']['uos_id'],
-                'product_id':data['form']['product_id'],
-                'discount': False,
-                'tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-            }, context)
-    return {'invoice_ids':list_inv}
-
-class sale_advance_payment(wizard.interface):
-    def _open_invoice(self, cr, uid, data, context):
-        pool_obj = pooler.get_pool(cr.dbname)
-        mod_obj = pool_obj.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'])        
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-        return {
-            'domain': "[('id','in', ["+','.join(map(str,data['form']['invoice_ids']))+"])]",
-            'name': 'Invoices',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'views': [(False,'tree'),(resource_id,'form')],
-            'context': "{'type':'out_invoice'}",
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-        }
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form' ,   'arch' : form,'fields' : fields,'state' : [('end','Cancel','gtk-cancel'),('create','Create Advance Invoice','gtk-ok')]}
-        },
-        'create': {
-            'actions': [_createInvoices],
-            'result': {'type' : 'form' ,'arch' : form_msg,'fields' : fields_msg, 'state':[('end','Close','gtk-close'),('open','Open Advance Invoice','gtk-open')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type':'action', 'action':_open_invoice, 'state':'end'}
-        }
-    }
-
-sale_advance_payment("sale.advance_payment_inv")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
new file mode 100644
index 00000000000..4bf3074db54
--- /dev/null
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+import wizard
+import netsvc
+import ir
+import pooler
+
+class sale_order_line_make_invoice(osv.osv_memory):
+    _name = "sale.order.line.make.invoice"
+    _description = "Sale OrderLine Make_invoice"
+    _columns = {
+        'grouped': fields.boolean('Group the invoices'),
+    }
+    _default = {
+        'grouped' : lambda *a: False
+    }
+
+    def make_invoices(self, cr, uid, ids, context):
+        """ 
+             To make invoices.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs 
+             @param context: A standard dictionary 
+             
+             @return: A dictionary which of fields with values. 
+        
+        """        
+
+        res = False
+        invoices = {}
+
+    #TODO: merge with sale.py/make_invoice
+        def make_invoice(order, lines):
+            """ 
+                 To make invoices.
+                
+                 @param order: 
+                 @param lines: 
+                
+                 @return:  
+            
+            """            
+            a = order.partner_id.property_account_receivable.id
+            if order.partner_id and order.partner_id.property_payment_term.id:
+                pay_term = order.partner_id.property_payment_term.id
+            else:
+                pay_term = False
+            inv = {
+                'name': order.name,
+                'origin': order.name,
+                'type': 'out_invoice',
+                'reference': "P%dSO%d" % (order.partner_id.id, order.id),
+                'account_id': a,
+                'partner_id': order.partner_id.id,
+                'address_invoice_id': order.partner_invoice_id.id,
+                'address_contact_id': order.partner_invoice_id.id,
+                'invoice_line': [(6,0,lines)],
+                'currency_id' : order.pricelist_id.currency_id.id,
+                'comment': order.note,
+                'payment_term': pay_term,
+                'fiscal_position': order.partner_id.property_account_position.id
+            }
+            inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
+            return inv_id
+
+        sales_order_line_obj = self.pool.get('sale.order.line')
+        sales_order_obj = self.pool.get('sale.order')
+        wf_service = netsvc.LocalService('workflow')
+        for line in sales_order_line_obj.browse(cr,uid,context['active_ids']):
+            if (not line.invoiced) and (line.state not in ('draft','cancel')):
+                if not line.order_id.id in invoices:
+                    invoices[line.order_id.id] = []
+                line_id = sales_order_line_obj.invoice_line_create(cr, uid,
+                        [line.id])
+                for lid in line_id:
+                    invoices[line.order_id.id].append((line, lid))
+                sales_order_line_obj.write(cr, uid, [line.id],
+                        {'invoiced': True})
+            flag = True
+            data_sale = sales_order_obj.browse(cr,uid,line.order_id.id)
+            for line in data_sale.order_line:
+                if not line.invoiced:
+                    flag = False
+                    break
+            if flag:
+                wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
+                sales_order_obj.write(cr,uid,[line.order_id.id],{'state' : 'progress'})
+
+        for result in invoices.values():
+            order = result[0][0].order_id
+            il = map(lambda x: x[1], result)
+            res = make_invoice(order, il)
+            cr.execute('INSERT INTO sale_order_invoice_rel \
+                    (order_id,invoice_id) values (%s,%s)', (order.id, res))
+        return {}
+
+
+sale_order_line_make_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
new file mode 100644
index 00000000000..a9ea13ea900
--- /dev/null
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_order_line_make_invoice" model="ir.ui.view">
+            <field name="name">Sale OrderLine Make Invoice</field>
+            <field name="model">sale.order.line.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Create invoices">
+    			<separator colspan="4" string="Do you really want to create the invoices ?" />
+    			<field name="grouped" />
+             	<separator string="" colspan="6" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="makeInvoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+        <act_window name="Make Invoices"		    
+		    res_model="sale.order.line.make.invoice"
+		    src_model="sale.order.line"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_sale_order_line_make_invoice"/>		
+
+    </data>
+</openerp>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
new file mode 100644
index 00000000000..6c9ca17b836
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -0,0 +1,180 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import ir
+import netsvc
+import pooler
+import wizard
+
+
+class sale_advance_payment_inv(osv.osv_memory):
+    _name = "sale.advance.payment.inv"
+    _description = "Sale Advance Payment Invoice"
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'amount': fields.float('Unit Price', size=(16, 2), required=True),
+        'qtty': fields.float('Quantity', size=(16, 2), required=True),
+    }
+    _default = {
+        'qtty' : lambda *a: 1
+               }
+    def create_invoices(self, cr, uid, ids, context={}):
+        """ 
+             To create invoices.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """        
+        list_inv = []
+        obj_sale = self.pool.get('sale.order')
+        obj_lines = self.pool.get('account.invoice.line')
+        inv_obj = self.pool.get('account.invoice')
+        
+        for sale_adv_obj in self.browse(cr, uid, ids):
+            for sale in obj_sale.browse(cr, uid, context['active_ids']):
+                address_contact = False
+                address_invoice = False
+                create_ids = []
+                ids_inv = []
+                if sale.order_policy == 'postpaid':
+                    raise osv.except_osv(
+                        _('Error'),
+                        _("You cannot make an advance on a sale order \
+                             that is defined as 'Automatic Invoice after delivery'."))
+                val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
+                        uom = False, partner_id = sale.partner_id.id, fposition_id=sale.fiscal_position.id)
+                line_id =obj_lines.create(cr, uid, {
+                    'name': val['value']['name'],
+                    'account_id': val['value']['account_id'],
+                    'price_unit': sale_adv_obj.amount,
+                    'quantity': sale_adv_obj.qtty,
+                    'discount': False,
+                    'uos_id': val['value']['uos_id'],
+                    'product_id': sale_adv_obj.product_id.id,
+                    'invoice_line_tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    'account_analytic_id': sale.project_id.id or False,
+                    #'note':'',
+                })
+                create_ids.append(line_id)
+                inv = {
+                    'name': sale.name,
+                    'origin': sale.name,
+                    'type': 'out_invoice',
+                    'reference': False,
+                    'account_id': sale.partner_id.property_account_receivable.id,
+                    'partner_id': sale.partner_id.id,
+                    'address_invoice_id':sale.partner_invoice_id.id,
+                    'address_contact_id':sale.partner_order_id.id,
+                    'invoice_line': [(6, 0, create_ids)],
+                    'currency_id' :sale.pricelist_id.currency_id.id,
+                    'comment': '',
+                    'payment_term':sale.payment_term.id,
+                    'fiscal_position': sale.partner_id.property_account_position.id
+                    }
+                
+                inv_id = inv_obj.create(cr, uid, inv)
+
+                for inv in sale.invoice_ids:
+                    ids_inv.append(inv.id)
+                ids_inv.append(inv_id)
+                obj_sale.write(cr, uid, sale.id, {'invoice_ids':[(6, 0, ids_inv)]})
+                list_inv.append(inv_id)
+        #
+        # If invoice on picking: add the cost on the SO
+        # If not, the advance will be deduced when generating the final invoice
+        #
+                if sale.order_policy=='picking':
+                    self.pool.get('sale.order.line').create(cr, uid, {
+                        'order_id': sale.id,
+                        'name': val['value']['name'],
+                        'price_unit': -sale_adv_obj.amount,
+                        'product_uom_qty': sale_adv_obj.qtty,
+                        'product_uos_qty': sale_adv_obj.qtty,
+                        'product_uos': val['value']['uos_id'],
+                        'product_uom': val['value']['uos_id'],
+                        'product_id': sale_adv_obj.product_id.id,
+                        'discount': False,
+                        'tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    }, context)
+
+        return {#'invoice_ids':list_inv,
+                'name': 'Open Invoice',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'sale.open.invoice',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': "{'invoice_ids'=%s}" % (list_inv)
+                }
+
+sale_advance_payment_inv()
+
+class sale_open_invoice(osv.osv_memory):
+    _name = "sale.open.invoice"
+    _description = "Sale Open Invoice"
+    _columns = {
+    }
+
+    def open_invoice(self, cr, uid, ids, context):
+        """ 
+             To open invoice.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """        
+        mod_obj = self.pool.get('ir.model.data')
+        invoices = []
+        #TODO: Can not get invoice ids here
+        for advance_pay in self.browse(cr, uid, ids):
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            model_data_ids = mod_obj.search(cr, uid,
+                             [('model', '=', 'ir.ui.view'), ('name', '=', 'invoice_form')])
+            resource_id = mod_obj.read(cr, uid, model_data_ids,
+                                            fields=['res_id'])[0]['res_id']
+        return {
+#            'domain': "[('id','in', ["+','.join(map(str, invoices))+"])]", # TODO
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'views': [(False, 'tree'), (resource_id, 'form')],
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+         }
+sale_open_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
new file mode 100644
index 00000000000..5fc8b993921
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_advance_payment_inv" model="ir.ui.view">
+            <field name="name">Sale Advance Payment Invoive</field>
+            <field name="model">sale.advance.payment.inv</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Advance Payment">
+			    <field name="product_id"/>
+			    <newline />
+			    <field name="qtty"/>
+			    <field name="amount"/>
+			    <newline />
+             	<separator string="" colspan="4"/>
+             	<label string=""  colspan="2" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="create_invoices" string="Create Advance Invoice" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+
+        <act_window name="Advance Invoice"		    
+		    res_model="sale.advance.payment.inv"
+		    src_model="sale.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_sale_advance_payment_inv"/>	
+
+
+    	<record id="view_sale_open_invoice" model="ir.ui.view">
+            <field name="name">Open Invoice</field>
+            <field name="model">sale.open.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Invoices">
+             	<label string="You invoice has been successfully created!" />
+             	 <newline />
+             	<separator string="" colspan="4"/>
+             	<group colspan="4">
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+               	</group>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_open_invoice" model="ir.actions.act_window">
+            <field name="name">Open Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.open.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+    </data>
+</openerp>
diff --git a/addons/sale/wizard/wizard_sale_line_invoice.py b/addons/sale/wizard/wizard_sale_line_invoice.py
deleted file mode 100644
index 8e1e49ab22d..00000000000
--- a/addons/sale/wizard/wizard_sale_line_invoice.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import ir
-import pooler
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Do you really want to create the invoices ?" />
-    <field name="grouped" />
-</form>
-"""
-
-invoice_fields = {
-    'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda *a: False}
-}
-
-def _makeInvoices(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    res = False
-    invoices = {}
-
-    #TODO: merge with sale.py/make_invoice
-    def make_invoice(order, lines):
-        a = order.partner_id.property_account_receivable.id
-        if order.partner_id and order.partner_id.property_payment_term.id:
-            pay_term = order.partner_id.property_payment_term.id
-        else:
-            pay_term = False
-        inv = {
-            'name': order.name,
-            'origin': order.name,
-            'type': 'out_invoice',
-            'reference': "P%dSO%d" % (order.partner_id.id, order.id),
-            'account_id': a,
-            'partner_id': order.partner_id.id,
-            'address_invoice_id': order.partner_invoice_id.id,
-            'address_contact_id': order.partner_invoice_id.id,
-            'invoice_line': [(6,0,lines)],
-            'currency_id' : order.pricelist_id.currency_id.id,
-            'comment': order.note,
-            'payment_term': pay_term,
-            'fiscal_position': order.partner_id.property_account_position.id
-        }
-        inv_id = pool.get('account.invoice').create(cr, uid, inv)
-        return inv_id
-
-    for line in pool.get('sale.order.line').browse(cr,uid,data['ids']):
-        if (not line.invoiced) and (line.state not in ('draft','cancel')):
-            if not line.order_id.id in invoices:
-                invoices[line.order_id.id] = []
-            line_id = pool.get('sale.order.line').invoice_line_create(cr, uid,
-                    [line.id])
-            for lid in line_id:
-                invoices[line.order_id.id].append((line, lid))
-            pool.get('sale.order.line').write(cr, uid, [line.id],
-                    {'invoiced': True})
-        flag = True
-        data_sale = pool.get('sale.order').browse(cr,uid,line.order_id.id)
-        for line in data_sale.order_line:
-            if not line.invoiced:
-                flag = False
-                break
-        if flag:
-            wf_service = netsvc.LocalService('workflow')
-            wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
-            pool.get('sale.order').write(cr,uid,[line.order_id.id],{'state' : 'progress'})
-
-    for result in invoices.values():
-        order = result[0][0].order_id
-        il = map(lambda x: x[1], result)
-        res = make_invoice(order, il)
-        cr.execute('INSERT INTO sale_order_invoice_rel \
-                (order_id,invoice_id) values (%s,%s)', (order.id, res))
-    return {}
-
-
-class line_make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': invoice_form,
-                'fields': invoice_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('invoice', 'Create invoices')
-                ]
-            }
-        },
-        'invoice' : {
-            'actions' : [_makeInvoices],
-            'result' : {'type': 'state', 'state': 'end'}
-        },
-    }
-
-line_make_invoice("sale.order.line.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale_analytic_plans/__terp__.py b/addons/sale_analytic_plans/__terp__.py
index ef89b5743c3..c3e803fd4f6 100644
--- a/addons/sale_analytic_plans/__terp__.py
+++ b/addons/sale_analytic_plans/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/sale_analytic_plans/i18n/ar.po b/addons/sale_analytic_plans/i18n/ar.po
index 887575509bf..0724671a539 100644
--- a/addons/sale_analytic_plans/i18n/ar.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/bg.po b/addons/sale_analytic_plans/i18n/bg.po
index dfbf6cac4e7..5f32a57264e 100644
--- a/addons/sale_analytic_plans/i18n/bg.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/bs.po b/addons/sale_analytic_plans/i18n/bs.po
index b19e265f810..f66c5fbe9a4 100644
--- a/addons/sale_analytic_plans/i18n/bs.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ca.po b/addons/sale_analytic_plans/i18n/ca.po
index 3319a53a221..7af361ae6d3 100644
--- a/addons/sale_analytic_plans/i18n/ca.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/cs.po b/addons/sale_analytic_plans/i18n/cs.po
index d7be94dc1a7..5411f463d68 100644
--- a/addons/sale_analytic_plans/i18n/cs.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/da.po b/addons/sale_analytic_plans/i18n/da.po
index 6131b70194a..d50e5690511 100644
--- a/addons/sale_analytic_plans/i18n/da.po
+++ b/addons/sale_analytic_plans/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/de.po b/addons/sale_analytic_plans/i18n/de.po
index 66c10f0fa5c..8964366313f 100644
--- a/addons/sale_analytic_plans/i18n/de.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/el.po b/addons/sale_analytic_plans/i18n/el.po
index d0b68ccbdaa..4c0f767c790 100644
--- a/addons/sale_analytic_plans/i18n/el.po
+++ b/addons/sale_analytic_plans/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 416c21aa3da..30ed0f7e63a 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/es_AR.po b/addons/sale_analytic_plans/i18n/es_AR.po
index c6fe56165af..c308d071031 100644
--- a/addons/sale_analytic_plans/i18n/es_AR.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/et.po b/addons/sale_analytic_plans/i18n/et.po
index 29651080363..a5c565e4144 100644
--- a/addons/sale_analytic_plans/i18n/et.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/fr.po b/addons/sale_analytic_plans/i18n/fr.po
index 0c3dcdda851..e8409fa1a38 100644
--- a/addons/sale_analytic_plans/i18n/fr.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/gl.po b/addons/sale_analytic_plans/i18n/gl.po
index 886b6731046..b1268f52869 100644
--- a/addons/sale_analytic_plans/i18n/gl.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/hr.po b/addons/sale_analytic_plans/i18n/hr.po
index 6475f30efc1..a2210391f9c 100644
--- a/addons/sale_analytic_plans/i18n/hr.po
+++ b/addons/sale_analytic_plans/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale_analytic_plans
-#
+# * sale_analytic_plans
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-12-22 12:24+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 00:13+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -29,4 +30,4 @@ msgstr "Nevažeći XML za arhitekturu prikaza!"
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr "Upravljanje distribucijom prodajne analize"
+msgstr "Prodajna Analitika Upravljanja Distribucijom"
diff --git a/addons/sale_analytic_plans/i18n/hu.po b/addons/sale_analytic_plans/i18n/hu.po
index 887575509bf..0724671a539 100644
--- a/addons/sale_analytic_plans/i18n/hu.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/id.po b/addons/sale_analytic_plans/i18n/id.po
index 9ca6ff0af08..7aa182169ca 100644
--- a/addons/sale_analytic_plans/i18n/id.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index 74306fc9158..aee0e90d0a5 100644
--- a/addons/sale_analytic_plans/i18n/it.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ko.po b/addons/sale_analytic_plans/i18n/ko.po
index f3a2d4092c3..d3b6ee5b27d 100644
--- a/addons/sale_analytic_plans/i18n/ko.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/lt.po b/addons/sale_analytic_plans/i18n/lt.po
index 887575509bf..0724671a539 100644
--- a/addons/sale_analytic_plans/i18n/lt.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/nl.po b/addons/sale_analytic_plans/i18n/nl.po
index ff809bb2ecd..e3c90aae0bb 100644
--- a/addons/sale_analytic_plans/i18n/nl.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/nl_BE.po b/addons/sale_analytic_plans/i18n/nl_BE.po
index bedcbd1df2b..6ee7d711e41 100644
--- a/addons/sale_analytic_plans/i18n/nl_BE.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pl.po b/addons/sale_analytic_plans/i18n/pl.po
index 1c25cdc71a5..b490b1c7556 100644
--- a/addons/sale_analytic_plans/i18n/pl.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pt.po b/addons/sale_analytic_plans/i18n/pt.po
index c915fed182b..930b92b16ab 100644
--- a/addons/sale_analytic_plans/i18n/pt.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index 23b809a6acc..d3bd04e03dc 100644
--- a/addons/sale_analytic_plans/i18n/pt_BR.po
+++ b/addons/sale_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-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ro.po b/addons/sale_analytic_plans/i18n/ro.po
index d4ac85c6cd0..ab34c273ed5 100644
--- a/addons/sale_analytic_plans/i18n/ro.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index 08f72f2214e..659f7d5886b 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sk.po b/addons/sale_analytic_plans/i18n/sk.po
index b1cc3f24405..9663659edd3 100644
--- a/addons/sale_analytic_plans/i18n/sk.po
+++ b/addons/sale_analytic_plans/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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sl.po b/addons/sale_analytic_plans/i18n/sl.po
index 3596d68d957..42eb05b61ab 100644
--- a/addons/sale_analytic_plans/i18n/sl.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po
index 38823956c0d..2aff095c8d8 100644
--- a/addons/sale_analytic_plans/i18n/sv.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/tlh.po b/addons/sale_analytic_plans/i18n/tlh.po
index 511d41dd26c..40ee3b963da 100644
--- a/addons/sale_analytic_plans/i18n/tlh.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index baae4d21513..49660a04c35 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/uk.po b/addons/sale_analytic_plans/i18n/uk.po
index cd2a2726670..68e93133752 100644
--- a/addons/sale_analytic_plans/i18n/uk.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index 96170575bc5..5fe6ef70cfb 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.po
@@ -7,26 +7,26 @@ 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-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 10:14+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "辅助核算分配"
 
 #. module: sale_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr ""
+msgstr "销售辅助核算分配管理"
diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index 96170575bc5..e2ea53af282 100644
--- a/addons/sale_analytic_plans/i18n/zh_TW.po
+++ b/addons/sale_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 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_crm/i18n/ar.po b/addons/sale_crm/i18n/ar.po
index 9d36c0b449f..8d92711b395 100644
--- a/addons/sale_crm/i18n/ar.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/bg.po b/addons/sale_crm/i18n/bg.po
index fbc5974885a..a06d43e3246 100644
--- a/addons/sale_crm/i18n/bg.po
+++ b/addons/sale_crm/i18n/bg.po
@@ -7,24 +7,24 @@ 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-02-03 20:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-29 11:58+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
 msgid "Crm opportunity quotation"
-msgstr ""
+msgstr "CRM потенциална оферта"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
 msgid "Opportunity Analytic"
-msgstr ""
+msgstr "Анализ потенциални възможности"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
@@ -34,12 +34,12 @@ msgstr ""
 #. module: sale_crm
 #: wizard_button:sale_crm.make_case,init,create:0
 msgid "Create"
-msgstr "Създаване"
+msgstr "Създай"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "All at once"
-msgstr ""
+msgstr "Всичко наведнъж"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
@@ -59,7 +59,7 @@ msgstr "Аналтична сметка"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmquotation0
 msgid "Convert opportunity to quotation"
-msgstr ""
+msgstr "Превърни потенциална възможност в оферта"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,description:0
@@ -69,12 +69,12 @@ msgstr "Твоето действие"
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,picking_policy:0
 msgid "Packing Policy"
-msgstr ""
+msgstr "Политика на пакетиране"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,order:0
 msgid "Create Quote"
-msgstr ""
+msgstr "Изготви оферта"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
@@ -84,7 +84,7 @@ msgstr ""
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
 msgid "CRM Opportunity"
-msgstr ""
+msgstr "CRM потенциална възможност"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
@@ -94,12 +94,12 @@ msgstr ""
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity convert into quotation"
-msgstr ""
+msgstr "Превръщане на потенциална възможност в оферта"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Директна доставка"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
@@ -109,23 +109,25 @@ msgstr ""
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmquotation0
 msgid "Quotation"
-msgstr ""
+msgstr "Оферта"
 
 #. module: sale_crm
 #: view:crm.case:0
 #: wizard_view:crm.case.make_order,init:0
 msgid "Convert to Quote"
-msgstr ""
+msgstr "Превърни в оферта"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,close:0
 msgid "Check this to close the case after having created the sale order."
 msgstr ""
+"Отметнете тук за да приключите случая след като сте изготвили поръчка за "
+"продажба."
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Клиент"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
@@ -150,7 +152,7 @@ msgstr "Продукти"
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,close:0
 msgid "Close Case"
-msgstr ""
+msgstr "Приключване на случай"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
@@ -166,7 +168,7 @@ msgstr "Магазин"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmopportunity0
 msgid "The CRM Opportunity can lead to a quotation."
-msgstr ""
+msgstr "CRM потенциалната възможност може да доведе до оферта"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
@@ -187,12 +189,12 @@ msgstr "Описание на случай"
 #: wizard_field:crm.case.make_order,init,analytic_account:0
 #: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Аналитична сметка"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
 msgid "Make Quotation"
-msgstr ""
+msgstr "Изготви оферта"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,end:0
diff --git a/addons/sale_crm/i18n/bs.po b/addons/sale_crm/i18n/bs.po
index bd27177dfea..f5ffe81d0f2 100644
--- a/addons/sale_crm/i18n/bs.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/ca.po b/addons/sale_crm/i18n/ca.po
index d0477966716..95843817029 100644
--- a/addons/sale_crm/i18n/ca.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/cs.po b/addons/sale_crm/i18n/cs.po
index 9d36c0b449f..8d92711b395 100644
--- a/addons/sale_crm/i18n/cs.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po
index 55df309161b..2738ff50361 100644
--- a/addons/sale_crm/i18n/de.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/el.po b/addons/sale_crm/i18n/el.po
index 3597f7d6ea7..784614e9a7e 100644
--- a/addons/sale_crm/i18n/el.po
+++ b/addons/sale_crm/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 42a44279ccf..3e9cd9adeed 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/es_AR.po b/addons/sale_crm/i18n/es_AR.po
index d9db98de503..103e5ec5265 100644
--- a/addons/sale_crm/i18n/es_AR.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/et.po b/addons/sale_crm/i18n/et.po
index 6c27c83c48e..4095f636b24 100644
--- a/addons/sale_crm/i18n/et.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index 6ab9d3e98d3..1ac6d8527ed 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index 9d36c0b449f..b79b621c0ab 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale_crm
-#
+# * sale_crm
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 00:56+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
@@ -24,183 +25,185 @@ msgstr ""
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
 msgid "Opportunity Analytic"
-msgstr ""
+msgstr "Analitika prilike"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
 msgid "Use this partner if there is no partner on the case"
-msgstr ""
+msgstr "Koristi ovog partnera ako nema Partnera na ovom Slučaju"
 
 #. module: sale_crm
 #: wizard_button:sale_crm.make_case,init,create:0
 msgid "Create"
-msgstr ""
+msgstr "Stvori"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "All at once"
-msgstr ""
+msgstr "Sve od jednom"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
 msgid "Opportunity goes into the quotation"
-msgstr ""
+msgstr "Prilika ide prema Ponudi"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractanalytic0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analitic account"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmquotation0
 msgid "Convert opportunity to quotation"
-msgstr ""
+msgstr "Pretvori Priliku u Ponudu"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,description:0
 msgid "Your action"
-msgstr ""
+msgstr "Vaša radnja"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,picking_policy:0
 msgid "Packing Policy"
-msgstr ""
+msgstr "Načela Pakiranja"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,order:0
 msgid "Create Quote"
-msgstr ""
+msgstr "Kreiraj Ponudu"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
 msgid "Contract Volume (pricelist)"
-msgstr ""
+msgstr "Ukupan iznos Ugovora (Cjenik)"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
 msgid "CRM Opportunity"
-msgstr ""
+msgstr "CRM Prilika"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Sale CRM Stuff"
-msgstr ""
+msgstr "sa"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity convert into quotation"
-msgstr ""
+msgstr "Sale CRM Stuff"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Direktna isporuka"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity Quotation"
-msgstr ""
+msgstr "Ponuda Prilici"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmquotation0
 msgid "Quotation"
-msgstr ""
+msgstr "Ponuda"
 
 #. module: sale_crm
 #: view:crm.case:0
 #: wizard_view:crm.case.make_order,init:0
 msgid "Convert to Quote"
-msgstr ""
+msgstr "Pretvori u Ponudu"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,close:0
 msgid "Check this to close the case after having created the sale order."
 msgstr ""
+"Označite kako biste zaključili Slučaj nakon što je kreirana "
+"zaključnica/narudžba"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Stranka"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
 msgid "Opporunity convert to the Pricelist"
-msgstr ""
+msgstr "Opportunity convert to the Pricelist"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,user:0
 msgid "User Responsible"
-msgstr ""
+msgstr "Odgovorni korisnik"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractanalytic0
 msgid "Reflect the contract made with customer"
-msgstr ""
+msgstr "Razmotrite ugovor sa strankom"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,products:0
 msgid "Products"
-msgstr ""
+msgstr "Proizvodi"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,close:0
 msgid "Close Case"
-msgstr ""
+msgstr "Zaključi SLučaj"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
 #: wizard_view:sale_crm.make_case,init:0
 msgid "Make Case"
-msgstr ""
+msgstr "Kreiraj Slučaj"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Shop"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmopportunity0
 msgid "The CRM Opportunity can lead to a quotation."
-msgstr ""
+msgstr "Ova CRM Prilika može dovesti do Ponude."
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
 msgid "Opportunity Pricelist"
-msgstr ""
+msgstr "Cjenik za priliku"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractpricelist0
 msgid "Contract Pricelist"
-msgstr ""
+msgstr "Cjenik za Ugovor"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,name:0
 msgid "Case Description"
-msgstr ""
+msgstr "Opis Slučaja"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,analytic_account:0
 #: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitic account"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
 msgid "Make Quotation"
-msgstr ""
+msgstr "Napravi ponudu"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,end:0
 #: wizard_button:sale_crm.make_case,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,section:0
 msgid "Case Section"
-msgstr ""
+msgstr "Grupa Slučaja"
diff --git a/addons/sale_crm/i18n/hu.po b/addons/sale_crm/i18n/hu.po
index 9d36c0b449f..8d92711b395 100644
--- a/addons/sale_crm/i18n/hu.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/id.po b/addons/sale_crm/i18n/id.po
index 2cbd6d7491a..c19ddc760f2 100644
--- a/addons/sale_crm/i18n/id.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 74d5fc64a97..823cb8eb8e4 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/ko.po b/addons/sale_crm/i18n/ko.po
index 07db0f20eb9..93b8e6b4cab 100644
--- a/addons/sale_crm/i18n/ko.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/lt.po b/addons/sale_crm/i18n/lt.po
index b76590364d7..bb7015ccfa2 100644
--- a/addons/sale_crm/i18n/lt.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/nl.po b/addons/sale_crm/i18n/nl.po
index 330aa697b63..aa931fa0039 100644
--- a/addons/sale_crm/i18n/nl.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/nl_BE.po b/addons/sale_crm/i18n/nl_BE.po
index 369c469a30f..f282b7aa839 100644
--- a/addons/sale_crm/i18n/nl_BE.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index 0473ee7a890..d9b4739f199 100644
--- a/addons/sale_crm/i18n/pl.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/pt.po b/addons/sale_crm/i18n/pt.po
index ec5af95301a..45313da4f89 100644
--- a/addons/sale_crm/i18n/pt.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index 3d2286752da..45c7e1235b4 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/ro.po b/addons/sale_crm/i18n/ro.po
index 98fec0ca20e..ba7b939d9b7 100644
--- a/addons/sale_crm/i18n/ro.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index b594ba1fa0c..11315876a7a 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/sl.po b/addons/sale_crm/i18n/sl.po
index bee196e9578..b8172bf958f 100644
--- a/addons/sale_crm/i18n/sl.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/sv.po b/addons/sale_crm/i18n/sv.po
index 9aa9d306e67..2155f5d0ce3 100644
--- a/addons/sale_crm/i18n/sv.po
+++ b/addons/sale_crm/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-23 21:07+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/tlh.po b/addons/sale_crm/i18n/tlh.po
index c7c60ed449f..3d9ec366d22 100644
--- a/addons/sale_crm/i18n/tlh.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index 0790faac676..49b4fe6d64c 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/uk.po b/addons/sale_crm/i18n/uk.po
index 0c32acd0963..64781d06de4 100644
--- a/addons/sale_crm/i18n/uk.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index b1e5469afe4..a6cb575cca4 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -4,32 +4,32 @@
 #
 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-12-29 08:42+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:15+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
 msgid "Crm opportunity quotation"
-msgstr "客户管理系统商机报价"
+msgstr "CRM销售机会报价"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
 msgid "Opportunity Analytic"
-msgstr "商机分析"
+msgstr "销售机会分析"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
 msgid "Use this partner if there is no partner on the case"
-msgstr "如果案例中没有业务伙伴请使用这个业务伙伴"
+msgstr "如果没有业务伙伴用这业务伙伴"
 
 #. module: sale_crm
 #: wizard_button:sale_crm.make_case,init,create:0
@@ -39,17 +39,17 @@ msgstr "创建"
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "All at once"
-msgstr "全部一次性"
+msgstr "所有一齐"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
 msgid "Opportunity goes into the quotation"
-msgstr "商机转为报价"
+msgstr "销售机会转为报价"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractanalytic0
@@ -59,17 +59,17 @@ msgstr "分析科目"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmquotation0
 msgid "Convert opportunity to quotation"
-msgstr "转换商机为报价"
+msgstr "销售机会转为报价"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,description:0
 msgid "Your action"
-msgstr "您的方式"
+msgstr "你的行动"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,picking_policy:0
 msgid "Packing Policy"
-msgstr "出货方式"
+msgstr "包装方式"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,order:0
@@ -79,22 +79,22 @@ msgstr "创建报价"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
 msgid "Contract Volume (pricelist)"
-msgstr "合同交易额（价目表）"
+msgstr "合同交易额(价目表)"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
 msgid "CRM Opportunity"
-msgstr "客户关系管理商机"
+msgstr "CRM销售机会"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Sale CRM Stuff"
-msgstr "销售客户关系管理有关资料"
+msgstr "销售CRM"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity convert into quotation"
-msgstr "商机转化为报价"
+msgstr "销售机会转为报价"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
@@ -104,7 +104,7 @@ msgstr "直接送货"
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity Quotation"
-msgstr "商机报价"
+msgstr "销售机会报价"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmquotation0
@@ -120,7 +120,7 @@ msgstr "转为报价"
 #. module: sale_crm
 #: help:crm.case.make_order,init,close:0
 msgid "Check this to close the case after having created the sale order."
-msgstr "在这儿打勾以创建销售订单后关闭案例"
+msgstr "选择这结束的业务个案后创建销售订单"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,partner_id:0
@@ -130,7 +130,7 @@ msgstr "客户"
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
 msgid "Opporunity convert to the Pricelist"
-msgstr "商机转为价目表"
+msgstr "销售机会转为价目表"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,user:0
@@ -140,7 +140,7 @@ msgstr "负责的用户"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractanalytic0
 msgid "Reflect the contract made with customer"
-msgstr "反映与客户签订的协议"
+msgstr "带来客户合同"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,products:0
@@ -150,13 +150,13 @@ msgstr "产品"
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,close:0
 msgid "Close Case"
-msgstr "关闭案例"
+msgstr "结束业务个案"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
 #: wizard_view:sale_crm.make_case,init:0
 msgid "Make Case"
-msgstr "建立案例"
+msgstr "建立业务个案"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,shop_id:0
@@ -166,12 +166,12 @@ msgstr "商店"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmopportunity0
 msgid "The CRM Opportunity can lead to a quotation."
-msgstr "该客户关系管理商机能带来报价"
+msgstr "这CRM销售机会能带来报价"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
 msgid "Opportunity Pricelist"
-msgstr "商机价格表"
+msgstr "销售机会价格表"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractpricelist0
@@ -181,13 +181,13 @@ msgstr "合同价格表"
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,name:0
 msgid "Case Description"
-msgstr "案例说明"
+msgstr "业务个案说明"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,analytic_account:0
 #: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
@@ -203,4 +203,4 @@ msgstr "取消"
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,section:0
 msgid "Case Section"
-msgstr "案例组"
+msgstr "业务个案项"
diff --git a/addons/sale_crm/i18n/zh_TW.po b/addons/sale_crm/i18n/zh_TW.po
index 939cb11877a..99a1701c953 100644
--- a/addons/sale_crm/i18n/zh_TW.po
+++ b/addons/sale_crm/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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_delivery_report/i18n/ar.po b/addons/sale_delivery_report/i18n/ar.po
index a57144ab3ad..238fefe295f 100644
--- a/addons/sale_delivery_report/i18n/ar.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/bg.po b/addons/sale_delivery_report/i18n/bg.po
index dfd9728e72e..075d2c8a4e2 100644
--- a/addons/sale_delivery_report/i18n/bg.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/bs.po b/addons/sale_delivery_report/i18n/bs.po
index a57144ab3ad..238fefe295f 100644
--- a/addons/sale_delivery_report/i18n/bs.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/ca.po b/addons/sale_delivery_report/i18n/ca.po
index 1cce72fc859..2b7216fefd3 100644
--- a/addons/sale_delivery_report/i18n/ca.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/cs.po b/addons/sale_delivery_report/i18n/cs.po
index a57144ab3ad..238fefe295f 100644
--- a/addons/sale_delivery_report/i18n/cs.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/da.po b/addons/sale_delivery_report/i18n/da.po
index 88f4c23e826..b7c2ea0fcf6 100644
--- a/addons/sale_delivery_report/i18n/da.po
+++ b/addons/sale_delivery_report/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/de.po b/addons/sale_delivery_report/i18n/de.po
index a20b2675024..78bee143da3 100644
--- a/addons/sale_delivery_report/i18n/de.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/el.po b/addons/sale_delivery_report/i18n/el.po
index 5f5e09569e3..fa98419d0a1 100644
--- a/addons/sale_delivery_report/i18n/el.po
+++ b/addons/sale_delivery_report/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/sale_delivery_report/i18n/es.po b/addons/sale_delivery_report/i18n/es.po
index 4f08f407b98..146779a9529 100644
--- a/addons/sale_delivery_report/i18n/es.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/es_AR.po b/addons/sale_delivery_report/i18n/es_AR.po
index 84bb5acf14a..46d1ccc7063 100644
--- a/addons/sale_delivery_report/i18n/es_AR.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/et.po b/addons/sale_delivery_report/i18n/et.po
index be7e0d31bfb..868949ff283 100644
--- a/addons/sale_delivery_report/i18n/et.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/fr.po b/addons/sale_delivery_report/i18n/fr.po
index 720adca20cc..e639b683dfa 100644
--- a/addons/sale_delivery_report/i18n/fr.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/hr.po b/addons/sale_delivery_report/i18n/hr.po
index 807e39a0dc0..3d382810871 100644
--- a/addons/sale_delivery_report/i18n/hr.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/hu.po b/addons/sale_delivery_report/i18n/hu.po
index a57144ab3ad..238fefe295f 100644
--- a/addons/sale_delivery_report/i18n/hu.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/id.po b/addons/sale_delivery_report/i18n/id.po
index ae940380dd7..1e813038f19 100644
--- a/addons/sale_delivery_report/i18n/id.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/it.po b/addons/sale_delivery_report/i18n/it.po
index 0eb903da52c..a1b9d1bf6d0 100644
--- a/addons/sale_delivery_report/i18n/it.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/ko.po b/addons/sale_delivery_report/i18n/ko.po
index bdcbc97de80..a6afd7f7053 100644
--- a/addons/sale_delivery_report/i18n/ko.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/lt.po b/addons/sale_delivery_report/i18n/lt.po
index a57144ab3ad..238fefe295f 100644
--- a/addons/sale_delivery_report/i18n/lt.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/nl.po b/addons/sale_delivery_report/i18n/nl.po
index b0126e61394..fbe69bf4354 100644
--- a/addons/sale_delivery_report/i18n/nl.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/nl_BE.po b/addons/sale_delivery_report/i18n/nl_BE.po
index 872e3f87dd4..7826dcb456c 100644
--- a/addons/sale_delivery_report/i18n/nl_BE.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/pl.po b/addons/sale_delivery_report/i18n/pl.po
index 16d90fa2b89..be1b141f915 100644
--- a/addons/sale_delivery_report/i18n/pl.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/pt.po b/addons/sale_delivery_report/i18n/pt.po
index 62810a698e9..4d9709359e9 100644
--- a/addons/sale_delivery_report/i18n/pt.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/pt_BR.po b/addons/sale_delivery_report/i18n/pt_BR.po
index d72a79bd869..d54f216710e 100644
--- a/addons/sale_delivery_report/i18n/pt_BR.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/ro.po b/addons/sale_delivery_report/i18n/ro.po
index 144151fb5c2..fa35b07a1c9 100644
--- a/addons/sale_delivery_report/i18n/ro.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/ru.po b/addons/sale_delivery_report/i18n/ru.po
index ded0837e7fa..d64f24a48dc 100644
--- a/addons/sale_delivery_report/i18n/ru.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/sl.po b/addons/sale_delivery_report/i18n/sl.po
index 383c5be61b5..11a8d8f90d9 100644
--- a/addons/sale_delivery_report/i18n/sl.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/sv.po b/addons/sale_delivery_report/i18n/sv.po
index a57144ab3ad..e3b1bed55a7 100644
--- a/addons/sale_delivery_report/i18n/sv.po
+++ b/addons/sale_delivery_report/i18n/sv.po
@@ -7,29 +7,29 @@ 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-24 14:36+0000\n"
+"Last-Translator: Jeanette <jd@mobilasystem.se>\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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Order Date"
-msgstr ""
+msgstr "Orderdatum"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Order Ref."
-msgstr ""
+msgstr "Order Ref."
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Weight"
-msgstr ""
+msgstr "Vikt"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -39,17 +39,17 @@ msgstr ""
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Leveransorder:"
 
 #. module: sale_delivery_report
 #: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Leveransorder"
 
 #. module: sale_delivery_report
 #: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
 msgid "Print Delivery Order"
-msgstr ""
+msgstr "Skriv ut leveransorder"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -59,7 +59,7 @@ msgstr ""
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Fakturamottagare"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -74,4 +74,4 @@ msgstr ""
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Quantity"
-msgstr ""
+msgstr "Antal"
diff --git a/addons/sale_delivery_report/i18n/tlh.po b/addons/sale_delivery_report/i18n/tlh.po
index 6a386acc4fd..d7c3029a405 100644
--- a/addons/sale_delivery_report/i18n/tlh.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/tr.po b/addons/sale_delivery_report/i18n/tr.po
index d17bb21e7de..605f6ffa884 100644
--- a/addons/sale_delivery_report/i18n/tr.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/uk.po b/addons/sale_delivery_report/i18n/uk.po
index f3c197d2692..8ea3d7f7eac 100644
--- a/addons/sale_delivery_report/i18n/uk.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/zh_CN.po b/addons/sale_delivery_report/i18n/zh_CN.po
index 2e602af6e61..96b3ed18af0 100644
--- a/addons/sale_delivery_report/i18n/zh_CN.po
+++ b/addons/sale_delivery_report/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 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-12-29 08:02+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:16+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
@@ -24,7 +24,7 @@ msgstr "订单日期"
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Order Ref."
-msgstr "订单参照"
+msgstr "订单参考"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -34,7 +34,7 @@ msgstr "重量"
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Designation"
-msgstr "指名"
+msgstr "目标"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -59,7 +59,7 @@ msgstr "运送者"
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Invoiced to"
-msgstr "开发票至"
+msgstr "开票到"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -69,9 +69,12 @@ msgstr "批次"
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "运送日期"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Quantity"
 msgstr "数量"
+
+#~ msgid "Allows to print a delivery order."
+#~ msgstr "允许打印这送货单"
diff --git a/addons/sale_delivery_report/i18n/zh_TW.po b/addons/sale_delivery_report/i18n/zh_TW.po
index 5c189dcb257..2c6ebced747 100644
--- a/addons/sale_delivery_report/i18n/zh_TW.po
+++ b/addons/sale_delivery_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 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_journal/i18n/ar.po b/addons/sale_journal/i18n/ar.po
index f1268bfc055..01957ee71bc 100644
--- a/addons/sale_journal/i18n/ar.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index 0a23d504814..7d1feb36164 100644
--- a/addons/sale_journal/i18n/bg.po
+++ b/addons/sale_journal/i18n/bg.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-21 20:40+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\n"
+"PO-Revision-Date: 2010-03-29 11:39+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -358,42 +358,42 @@ msgstr "Код"
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Open Journal"
-msgstr ""
+msgstr "Отваряне на дневник"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Sales"
-msgstr ""
+msgstr "Продажби"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_picking_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
 #: view:sale_journal.picking.journal:0
 msgid "Packing Journal"
-msgstr ""
+msgstr "Дневник Опаковане"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 #: selection:sale_journal.sale.stats,state:0
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,picking_stats_ids:0
 msgid "Journal Stats"
-msgstr ""
+msgstr "Статистика на дневник"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Open"
-msgstr ""
+msgstr "Отвoри"
 
 #. module: sale_journal
 #: constraint:ir.model:0
@@ -412,23 +412,23 @@ msgstr "Продажби и поръчки"
 #: field:sale_journal.picking.journal,user_id:0
 #: field:sale_journal.sale.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Отговорник"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_my
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_my_open
 msgid "My Open Journals"
-msgstr ""
+msgstr "Моите отворени дневници"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
 msgid "Statistics on packing to invoice"
-msgstr ""
+msgstr "Статистика по \"пакетиране към фактура\""
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Cancel Sales"
-msgstr ""
+msgstr "Сторниране на продажби"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -436,30 +436,30 @@ msgstr ""
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr ""
+msgstr "Тип на фактурата"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "invoiced"
-msgstr ""
+msgstr "фактурирано"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "confirmed"
-msgstr ""
+msgstr "потвърдено"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
 msgid "Packing lists by Journal"
-msgstr ""
+msgstr "Опаковъчни списъци по дневник"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,quantity:0
 #: field:sale_journal.picking.stats,quantity:0
 #: field:sale_journal.sale.stats,quantity:0
 msgid "Quantities"
-msgstr ""
+msgstr "Количества"
 
 #. module: sale_journal
 #: field:sale.order,journal_id:0
@@ -471,13 +471,13 @@ msgstr ""
 #: field:sale_journal.sale.stats,journal_id:0
 #: field:stock.picking,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Дневник"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 #: field:sale_journal.invoice.type.stats,invoice_type_id:0
 msgid "Invoicing method"
-msgstr ""
+msgstr "Метод на фактуриране"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
@@ -491,64 +491,64 @@ msgstr "Този месец"
 #: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_menu
 #: view:sale_journal.sale.stats:0
 msgid "Sales by Journal"
-msgstr ""
+msgstr "Продажби по дневник"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoicing Methods"
-msgstr ""
+msgstr "Методи на фактуриране"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr ""
+msgstr "Негрупирани"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
 msgid "Packing to invoice"
-msgstr ""
+msgstr "Пакетиране към фактура"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Journal Information"
-msgstr ""
+msgstr "Информация за дневник"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
 msgid "Stats on packing by invoice method"
-msgstr ""
+msgstr "Статистика за пакетиране според начина на фактуруране"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 msgid "Invoice Types"
-msgstr ""
+msgstr "Видове фактури"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "States"
-msgstr ""
+msgstr "Състояния"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
 msgid "Packing by Journal"
-msgstr ""
+msgstr "Пакетиране по дневник"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Close Journal"
-msgstr ""
+msgstr "Затваряне на дневник"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
 msgid "Packing to Invoice"
-msgstr ""
+msgstr "Пакетиране към фактура"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
 msgid "Approved sales"
-msgstr ""
+msgstr "Одобрени продажби"
diff --git a/addons/sale_journal/i18n/bs.po b/addons/sale_journal/i18n/bs.po
index 2cb64a7ad85..5c5c349444e 100644
--- a/addons/sale_journal/i18n/bs.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/ca.po b/addons/sale_journal/i18n/ca.po
index 181059442b0..26b28934d9c 100644
--- a/addons/sale_journal/i18n/ca.po
+++ b/addons/sale_journal/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:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/cs.po b/addons/sale_journal/i18n/cs.po
index f1268bfc055..01957ee71bc 100644
--- a/addons/sale_journal/i18n/cs.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po
index 020b0ff01c2..42e526a1596 100644
--- a/addons/sale_journal/i18n/de.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index 70dc4ff747d..d6b498b2bdd 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/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:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/es_AR.po b/addons/sale_journal/i18n/es_AR.po
index d8c681a6be4..2d2b76c19da 100644
--- a/addons/sale_journal/i18n/es_AR.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/et.po b/addons/sale_journal/i18n/et.po
index ae078576501..f719ee9c079 100644
--- a/addons/sale_journal/i18n/et.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/fr.po b/addons/sale_journal/i18n/fr.po
index 019687d0126..a71c2f49b14 100644
--- a/addons/sale_journal/i18n/fr.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index f1268bfc055..d0f169efba7 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale_journal
-#
+# * sale_journal
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 00:49+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
@@ -25,192 +26,192 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
 msgid "Assigned packing"
-msgstr ""
+msgstr "Dodijeljeno pakiranje"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "assigned"
-msgstr ""
+msgstr "Dodijeljen"
 
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Raspored čekanja"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "to be invoiced"
-msgstr ""
+msgstr "Treba izdati račun"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
 #: view:sale_journal.sale.journal:0
 #: field:stock.picking,sale_journal_id:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Prodajni Pregled"
 
 #. module: sale_journal
 #: field:sale_journal.sale.journal,sale_stats_ids:0
 msgid "Sale Stats"
-msgstr ""
+msgstr "Prodajne statistike"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "waiting"
-msgstr ""
+msgstr "Čekanje"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi na Nacrt"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date:0
 #: field:sale_journal.sale.journal,date:0
 msgid "Journal date"
-msgstr ""
+msgstr "Datum Pregleda"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu
 msgid "Packing by Invoice Method"
-msgstr ""
+msgstr "Pakiranje prema načinu izrade Računa"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
 msgid "Packing Journals"
-msgstr ""
+msgstr "Pregledi Pakiranja"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my
 msgid "My open journals"
-msgstr ""
+msgstr "Moji otvoreni Pregledi"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,count:0
 #: field:sale_journal.picking.stats,count:0
 #: field:sale_journal.sale.stats,count:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# Linija"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open
 msgid "All Open Journals"
-msgstr ""
+msgstr "Svi otvoreni Pregledi"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr ""
+msgstr "Upravljanje prodajom i narudžbama prema Pregledu"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,price_average:0
 #: field:sale_journal.picking.stats,price_average:0
 #: field:sale_journal.sale.stats,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: sale_journal
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr ""
+msgstr "Grupirano"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,state:0
 #: field:sale_journal.picking.stats,state:0
 #: field:sale_journal.sale.journal,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_all
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_all_month
 msgid "All Months"
-msgstr ""
+msgstr "Svi mjeseci"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,price_total:0
 #: field:sale_journal.picking.stats,price_total:0
 #: field:sale_journal.sale.stats,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Ukupna cijena"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
 msgid "Packing journals"
-msgstr ""
+msgstr "Pregledi Pakiranja"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my
 msgid "My open packing journals"
-msgstr ""
+msgstr "Moji otvoreni Pregledi pakiranja"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_stats
 msgid "Sales Orders by Journal"
-msgstr ""
+msgstr "Prodajne narudžbe prema Pregledu"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_all
 msgid "Open journals"
-msgstr ""
+msgstr "Otvoreni Pregledi"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Packing"
-msgstr ""
+msgstr "Pakiranje"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and packing."
-msgstr ""
+msgstr "Tip Pregleda koji se koristi za prodaju i pakiranje."
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "None"
-msgstr ""
+msgstr "Nijedan"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
 msgid "Sales by journal (this month)"
-msgstr ""
+msgstr "Prodaje prema Pregledu (Ovaj mjesec)"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Ručni postupak u tijeku"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
@@ -218,159 +219,159 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
 msgid "Packing by journal"
-msgstr ""
+msgstr "Pakiranje prema Pregledu"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Cancel Packing"
-msgstr ""
+msgstr "Otkaži Pakiranje"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
 msgid "Confirmed packing"
-msgstr ""
+msgstr "Potvrđeno Pakiranje"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "In progress"
-msgstr ""
+msgstr "U Tijeku"
 
 #. module: sale_journal
 #: view:sale_journal.picking.stats:0
 msgid "Packing by journals"
-msgstr ""
+msgstr "Pakiranje prema Pregledima"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,name:0
 #: field:sale_journal.picking.stats,name:0
 #: field:sale_journal.sale.stats,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,invoice_state:0
 msgid "Invoice state"
-msgstr ""
+msgstr "Stanje računa"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
 #: view:sale_journal.invoice.type.stats:0
 msgid "Packing by invoice method"
-msgstr ""
+msgstr "Pakiranje prema načinu izrade Računa"
 
 #. module: sale_journal
 #: field:sale_journal.sale.stats,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Stanje Narudžbe"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Izuzetak kod Otpreme"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 #: field:sale_journal.picking.journal,note:0
 #: field:sale_journal.sale.journal,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Izuzetak u izdavanju Računa"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_validation:0
 #: field:sale_journal.sale.journal,date_validation:0
 msgid "Validation date"
-msgstr ""
+msgstr "Datum Vrednovanja"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
 msgid "Draft sales"
-msgstr ""
+msgstr "Skiciraj prodaje"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Ponuda"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal
 msgid "Sales Journals"
-msgstr ""
+msgstr "Prodajni Pregledi"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree
 msgid "sale_journal.invoice.type.tree"
-msgstr ""
+msgstr "sale_journal.invoice.type.tree"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Confirm Sales"
-msgstr ""
+msgstr "Potvrdi prodaje"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_created:0
 #: field:sale_journal.picking.journal,state:0
 #: field:sale_journal.sale.journal,date_created:0
 msgid "Creation date"
-msgstr ""
+msgstr "Datum stvaranja"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr ""
+msgstr "Način Izrade Računa"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,code:0
 #: field:sale_journal.sale.journal,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Open Journal"
-msgstr ""
+msgstr "Otvoreni Pregled"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Sales"
-msgstr ""
+msgstr "Prodaje"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_picking_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
 #: view:sale_journal.picking.journal:0
 msgid "Packing Journal"
-msgstr ""
+msgstr "Pregled Pakiranja"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
@@ -382,51 +383,52 @@ msgstr ""
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Poništi"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,picking_stats_ids:0
 msgid "Journal Stats"
-msgstr ""
+msgstr "Statistike Pregleda"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: sale_journal
 #: 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: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Prodaje i Kupnje"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,user_id:0
 #: field:sale_journal.sale.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_my
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_my_open
 msgid "My Open Journals"
-msgstr ""
+msgstr "Moji otvoreni Pregledi"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
 msgid "Statistics on packing to invoice"
-msgstr ""
+msgstr "Statistike vezane uz postupak od pakiranja do izdavanja Računa"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Cancel Sales"
-msgstr ""
+msgstr "Otkaži Prodaje"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -434,7 +436,7 @@ msgstr ""
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr ""
+msgstr "Tip Računa"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
@@ -445,19 +447,19 @@ msgstr ""
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "confirmed"
-msgstr ""
+msgstr "Potvrđen"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
 msgid "Packing lists by Journal"
-msgstr ""
+msgstr "Tovarne liste prema Pregledu"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,quantity:0
 #: field:sale_journal.picking.stats,quantity:0
 #: field:sale_journal.sale.stats,quantity:0
 msgid "Quantities"
-msgstr ""
+msgstr "Količine"
 
 #. module: sale_journal
 #: field:sale.order,journal_id:0
@@ -469,19 +471,19 @@ msgstr ""
 #: field:sale_journal.sale.stats,journal_id:0
 #: field:stock.picking,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Pregled"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 #: field:sale_journal.invoice.type.stats,invoice_type_id:0
 msgid "Invoicing method"
-msgstr ""
+msgstr "Način Izrade Računa"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_this_month
 msgid "This Month"
-msgstr ""
+msgstr "Ovaj mjesec"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales
@@ -489,64 +491,64 @@ msgstr ""
 #: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_menu
 #: view:sale_journal.sale.stats:0
 msgid "Sales by Journal"
-msgstr ""
+msgstr "Prodaje po Pregledu"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoicing Methods"
-msgstr ""
+msgstr "Načini Izrade Računa"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr ""
+msgstr "Nije grupirano"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
 msgid "Packing to invoice"
-msgstr ""
+msgstr "Od pakiranja do izrade Računa"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Journal Information"
-msgstr ""
+msgstr "Obavjest o Pregledu"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
 msgid "Stats on packing by invoice method"
-msgstr ""
+msgstr "Statistike o Pakiranju prema načinu izrade Računa"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 msgid "Invoice Types"
-msgstr ""
+msgstr "Tipovi Računa"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "States"
-msgstr ""
+msgstr "Stanja"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
 msgid "Packing by Journal"
-msgstr ""
+msgstr "Pakiranje prema Pregledu"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Close Journal"
-msgstr ""
+msgstr "Zatvori Pregled"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
 msgid "Packing to Invoice"
-msgstr ""
+msgstr "Od pakiranja do izrade Računa"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
 msgid "Approved sales"
-msgstr ""
+msgstr "Dozvoljene prodaje"
diff --git a/addons/sale_journal/i18n/hu.po b/addons/sale_journal/i18n/hu.po
index f1268bfc055..01957ee71bc 100644
--- a/addons/sale_journal/i18n/hu.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/id.po b/addons/sale_journal/i18n/id.po
index cea9340b4cc..bad29dcc5b8 100644
--- a/addons/sale_journal/i18n/id.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index d305a9f4997..abb7d4a66c6 100644
--- a/addons/sale_journal/i18n/it.po
+++ b/addons/sale_journal/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: 2009-09-16 11:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-18 10:48+0000\n"
+"Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -36,7 +36,7 @@ msgstr "assegnato"
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
diff --git a/addons/sale_journal/i18n/ko.po b/addons/sale_journal/i18n/ko.po
index e6f9da96773..1020ceb50c7 100644
--- a/addons/sale_journal/i18n/ko.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/lt.po b/addons/sale_journal/i18n/lt.po
index f1268bfc055..01957ee71bc 100644
--- a/addons/sale_journal/i18n/lt.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/nl.po b/addons/sale_journal/i18n/nl.po
index f416b64778e..f4e848f65e0 100644
--- a/addons/sale_journal/i18n/nl.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/nl_BE.po b/addons/sale_journal/i18n/nl_BE.po
index c1bef49b053..ce186e166a4 100644
--- a/addons/sale_journal/i18n/nl_BE.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index c70194772f1..88bd8ba3ef4 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index d3bf4939f85..c10bcd04f77 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index 2ded83d3f36..e46a310eaf5 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/ro.po b/addons/sale_journal/i18n/ro.po
index 9bb16ce5e70..8f5e90209ad 100644
--- a/addons/sale_journal/i18n/ro.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index 70ab1b5765b..16b3d24b038 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/sl.po b/addons/sale_journal/i18n/sl.po
index b9c9f2d83b5..8aa7bd306ff 100644
--- a/addons/sale_journal/i18n/sl.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po
index d4d54fc0145..bf63fd13e6f 100644
--- a/addons/sale_journal/i18n/sv.po
+++ b/addons/sale_journal/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-17 19:14+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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: sale_journal
diff --git a/addons/sale_journal/i18n/tlh.po b/addons/sale_journal/i18n/tlh.po
index 990b0b0f949..efb4b24defc 100644
--- a/addons/sale_journal/i18n/tlh.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index ee2517fa9cb..0a08dfc3468 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/uk.po b/addons/sale_journal/i18n/uk.po
index 3c079638791..37252a997c1 100644
--- a/addons/sale_journal/i18n/uk.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index 316d79d78a4..d36117ca116 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.po
@@ -4,56 +4,56 @@
 #
 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:57+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:18+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
 msgid "Monthly sales"
-msgstr "月销售"
+msgstr "每月销售"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
 msgid "Assigned packing"
-msgstr "已分配的分拣单"
+msgstr "指定的包装"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "assigned"
-msgstr "已分配"
+msgstr "已指定"
 
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Waiting Schedule"
-msgstr "等待日程"
+msgstr "等待日程表"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "to be invoiced"
-msgstr "需开发票"
+msgstr "要发票"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
 #: view:sale_journal.sale.journal:0
 #: field:stock.picking,sale_journal_id:0
 msgid "Sale Journal"
-msgstr "销售日记账"
+msgstr "销售分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.sale.journal,sale_stats_ids:0
@@ -70,25 +70,25 @@ msgstr "等待"
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Set to Draft"
-msgstr "设置为草稿"
+msgstr "设为草稿"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date:0
 #: field:sale_journal.sale.journal,date:0
 msgid "Journal date"
-msgstr "日记账日期"
+msgstr "分类帐日期"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu
 msgid "Packing by Invoice Method"
-msgstr "按发票方式排列分拣单"
+msgstr "按发票包装"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
 msgid "Packing Journals"
-msgstr "分拣单日记账"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
@@ -99,25 +99,25 @@ msgstr "备注"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my
 msgid "My open journals"
-msgstr "我的未结日记账"
+msgstr "我待处理的分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,count:0
 #: field:sale_journal.picking.stats,count:0
 #: field:sale_journal.sale.stats,count:0
 msgid "# of Lines"
-msgstr "# 行"
+msgstr "行号"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open
 msgid "All Open Journals"
-msgstr "所有未结日记账"
+msgstr "所有待处理的分类帐"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr "按日记账管理销售并送货"
+msgstr "管理销售和送货分类帐"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
@@ -130,17 +130,17 @@ msgstr "完成"
 #: field:sale_journal.picking.stats,price_average:0
 #: field:sale_journal.sale.stats,price_average:0
 msgid "Average Price"
-msgstr "均价"
+msgstr "平均价"
 
 #. module: sale_journal
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr "已分组"
+msgstr "组"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,state:0
@@ -160,52 +160,52 @@ msgstr "所有月份"
 #: field:sale_journal.picking.stats,price_total:0
 #: field:sale_journal.sale.stats,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "价格合计"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
 msgid "Packing journals"
-msgstr "分拣单日记账"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my
 msgid "My open packing journals"
-msgstr "我未结的分拣单日记账"
+msgstr "我待处理的包装分类帐"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_stats
 msgid "Sales Orders by Journal"
-msgstr "按日记账排列销售订单"
+msgstr "销售订单分类帐"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_all
 msgid "Open journals"
-msgstr "未结的日记账"
+msgstr "待处理分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Packing"
-msgstr "分拣单"
+msgstr "包装"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and packing."
-msgstr "该日记账类型用于销售和分拣"
+msgstr "这分类帐类型用于销售和包装"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "None"
-msgstr "无"
+msgstr "空"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
 msgid "Sales by journal (this month)"
-msgstr "按日记账排列销售（本月）"
+msgstr "销售分类帐(这月)"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
@@ -218,18 +218,18 @@ msgstr "手动进展"
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
 msgid "Packing by journal"
-msgstr "按日记账排列分拣单"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Cancel Packing"
-msgstr "取消分拣单"
+msgstr "取消包装"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
 msgid "Confirmed packing"
-msgstr "确认分拣单"
+msgstr "确认包装"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
@@ -239,7 +239,7 @@ msgstr "进展"
 #. module: sale_journal
 #: view:sale_journal.picking.stats:0
 msgid "Packing by journals"
-msgstr "按日记账排列分拣单"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,name:0
@@ -258,12 +258,12 @@ msgstr "发票状态"
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
 #: view:sale_journal.invoice.type.stats:0
 msgid "Packing by invoice method"
-msgstr "按发票方式排列分拣\""
+msgstr "按发票包装"
 
 #. module: sale_journal
 #: field:sale_journal.sale.stats,state:0
 msgid "Order State"
-msgstr "销售订单状态"
+msgstr "订单状态"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
@@ -309,7 +309,7 @@ msgstr "草稿"
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr "在职"
+msgstr "有效"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
@@ -324,7 +324,7 @@ msgstr "报价"
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal
 msgid "Sales Journals"
-msgstr "销售日记账"
+msgstr "销售分类帐"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree
@@ -334,7 +334,7 @@ msgstr "sale_journal.invoice.type.tree"
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Confirm Sales"
-msgstr "销售确认"
+msgstr "确认销售"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_created:0
@@ -346,19 +346,19 @@ msgstr "创建日期"
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr "发票方式"
+msgstr "开票方式"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,code:0
 #: field:sale_journal.sale.journal,code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Open Journal"
-msgstr "未结日记账"
+msgstr "待处理分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
@@ -370,7 +370,7 @@ msgstr "销售"
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
 #: view:sale_journal.picking.journal:0
 msgid "Packing Journal"
-msgstr "分拣日记账"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
@@ -387,41 +387,41 @@ msgstr "取消"
 #. module: sale_journal
 #: field:sale_journal.picking.journal,picking_stats_ids:0
 msgid "Journal Stats"
-msgstr "销售统计"
+msgstr "分类帐统计"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Open"
-msgstr "未结"
+msgstr "待处理"
 
 #. module: sale_journal
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,user_id:0
 #: field:sale_journal.sale.journal,user_id:0
 msgid "Responsible"
-msgstr "负责人"
+msgstr "有责任"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_my
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_my_open
 msgid "My Open Journals"
-msgstr "我的未结的日记账"
+msgstr "我待处理的分类帐"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
 msgid "Statistics on packing to invoice"
-msgstr "根据分拣单开发票统计"
+msgstr "统计包装到发票"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
@@ -439,18 +439,18 @@ msgstr "发票类型"
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "invoiced"
-msgstr "已开发票"
+msgstr "已开票"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "confirmed"
-msgstr "已确认"
+msgstr "确定"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
 msgid "Packing lists by Journal"
-msgstr "按日记账排列分拣单"
+msgstr "包装单分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,quantity:0
@@ -469,13 +469,13 @@ msgstr "数量"
 #: field:sale_journal.sale.stats,journal_id:0
 #: field:stock.picking,journal_id:0
 msgid "Journal"
-msgstr "日记帐"
+msgstr "分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 #: field:sale_journal.invoice.type.stats,invoice_type_id:0
 msgid "Invoicing method"
-msgstr "发票方式"
+msgstr "开票方式"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
@@ -489,38 +489,38 @@ msgstr "本月"
 #: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_menu
 #: view:sale_journal.sale.stats:0
 msgid "Sales by Journal"
-msgstr "按日记账排列销售"
+msgstr "销售分类帐"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoicing Methods"
-msgstr "发票方式"
+msgstr "开票方式"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr "未分组"
+msgstr "没分组"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
 msgid "Packing to invoice"
-msgstr "需开发票的分拣单"
+msgstr "包装到发票"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Journal Information"
-msgstr "日记账信息"
+msgstr "分类帐信息"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
 msgid "Stats on packing by invoice method"
-msgstr "按开票方式统计分拣单"
+msgstr "统计按发票包装"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 msgid "Invoice Types"
-msgstr "按发票方式排列分拣统计"
+msgstr "发票类型"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
@@ -533,20 +533,68 @@ msgstr "状态"
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
 msgid "Packing by Journal"
-msgstr "按日记账排列分拣单"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Close Journal"
-msgstr "关闭日记账"
+msgstr "关闭分类帐"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
 msgid "Packing to Invoice"
-msgstr "需开发票的分拣单"
+msgstr "包装到发票"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
 msgid "Approved sales"
-msgstr "已批准销售"
+msgstr "批准销售"
+
+#~ msgid ""
+#~ "\n"
+#~ "    The sale journal modules allows you to categorise your\n"
+#~ "    sales and deliveries (packing lists) between different journals.\n"
+#~ "    This module is very helpful for bigger companies that\n"
+#~ "    works by departments.\n"
+#~ "\n"
+#~ "    You can use journal for different purposes, some examples:\n"
+#~ "    * isolate sales of different departments\n"
+#~ "    * journals for deliveries by truck or by UPS\n"
+#~ "\n"
+#~ "    Journals have a responsible and evolves between different status:\n"
+#~ "    * draft, open, cancel, done.\n"
+#~ "\n"
+#~ "    Batch operations can be processed on the different journals to\n"
+#~ "    confirm all sales at once, to validate or invoice packing, ...\n"
+#~ "\n"
+#~ "    It also supports batch invoicing methods that can be configured by\n"
+#~ "    partners and sales orders, examples:\n"
+#~ "    * daily invoicing,\n"
+#~ "    * monthly invoicing, ...\n"
+#~ "\n"
+#~ "    Some statistics by journals are provided.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这销售分类帐模块,允许你在不同的分类帐中分类出\n"
+#~ "你的销售和送货(包装单)\n"
+#~ "\t这模块对大公司的\n"
+#~ "工作部门是非常有帮助的\n"
+#~ "\n"
+#~ "\t你能使用分类帐达到不同目的的,如:\n"
+#~ "\t*分开不同部门的销售\n"
+#~ "\t*跟踪用快递送货分类帐\n"
+#~ "\t\n"
+#~ "\t分类帐有不同的状态下:\n"
+#~ "              草稿,待处理,取消,完成\n"
+#~ "\t\n"
+#~ "在不同的分类帐批处理\n"
+#~ "一次确认所有销售，使生效或者发票,包装。。\n"
+#~ "\n"
+#~ "\t它还支持配置业务伙伴和销售订单的开票方式如:\n"
+#~ "        *每日开票\n"
+#~ "        *每月开票\n"
+#~ "\t\n"
+#~ "\t提供在一个会计期间的分类帐统计\n"
+#~ "    "
diff --git a/addons/sale_journal/i18n/zh_TW.po b/addons/sale_journal/i18n/zh_TW.po
index 6d1325c6088..ee516f71e7c 100644
--- a/addons/sale_journal/i18n/zh_TW.po
+++ b/addons/sale_journal/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: sale_journal
diff --git a/addons/scrum/i18n/ar.po b/addons/scrum/i18n/ar.po
index f0c7617394a..3819ae5064c 100644
--- a/addons/scrum/i18n/ar.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/bg.po b/addons/scrum/i18n/bg.po
index a7b86abf906..daf7b4dd90c 100644
--- a/addons/scrum/i18n/bg.po
+++ b/addons/scrum/i18n/bg.po
@@ -7,13 +7,13 @@ 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: 2010-02-16 20:35+0000\n"
+"PO-Revision-Date: 2010-03-29 11:28+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
@@ -29,7 +29,7 @@ msgstr "Име на среща"
 #. module: scrum
 #: model:process.transition,note:scrum.process_transition_backlogtask0
 msgid "From backlog create task."
-msgstr ""
+msgstr "Създай задача от \"недовършено\""
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task4
@@ -46,7 +46,7 @@ msgstr ""
 #. module: scrum
 #: model:process.node,note:scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
-msgstr ""
+msgstr "Създай задача от \"недовършено\""
 
 #. module: scrum
 #: constraint:ir.actions.act_window:0
diff --git a/addons/scrum/i18n/bs.po b/addons/scrum/i18n/bs.po
index 7c5b4bc7c0b..b3bdc2b0fee 100644
--- a/addons/scrum/i18n/bs.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/ca.po b/addons/scrum/i18n/ca.po
index 01e0b3c9547..ba517308466 100644
--- a/addons/scrum/i18n/ca.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/cs.po b/addons/scrum/i18n/cs.po
index 87bb1706b7a..ffce65308b1 100644
--- a/addons/scrum/i18n/cs.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/de.po b/addons/scrum/i18n/de.po
index b8e5c29ae6e..c1ffffd3063 100644
--- a/addons/scrum/i18n/de.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/es.po b/addons/scrum/i18n/es.po
index ff2af6147f5..88de279fd14 100644
--- a/addons/scrum/i18n/es.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/es_AR.po b/addons/scrum/i18n/es_AR.po
index 3c868359584..c2426d843a8 100644
--- a/addons/scrum/i18n/es_AR.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/et.po b/addons/scrum/i18n/et.po
index fbee1389e42..c8e02490495 100644
--- a/addons/scrum/i18n/et.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/fr.po b/addons/scrum/i18n/fr.po
index de6e81c75fc..1a5d4e470e4 100644
--- a/addons/scrum/i18n/fr.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/hr.po b/addons/scrum/i18n/hr.po
index cd77b548852..1ca82190795 100644
--- a/addons/scrum/i18n/hr.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/hu.po b/addons/scrum/i18n/hu.po
index cd77b548852..1ca82190795 100644
--- a/addons/scrum/i18n/hu.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/id.po b/addons/scrum/i18n/id.po
index 1c9f606e05f..38943b34163 100644
--- a/addons/scrum/i18n/id.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/it.po b/addons/scrum/i18n/it.po
index 1042cd1f7fa..a7e3acbac87 100644
--- a/addons/scrum/i18n/it.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index 50104996e1a..bf43af36bf3 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/lt.po b/addons/scrum/i18n/lt.po
index cd77b548852..1ca82190795 100644
--- a/addons/scrum/i18n/lt.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/nl.po b/addons/scrum/i18n/nl.po
index 40382cfd0dc..696a7f40670 100644
--- a/addons/scrum/i18n/nl.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/nl_BE.po b/addons/scrum/i18n/nl_BE.po
index b43ee9096e9..c8289a6cc81 100644
--- a/addons/scrum/i18n/nl_BE.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/pl.po b/addons/scrum/i18n/pl.po
index 3cffd12fc01..039cfdd9dd6 100644
--- a/addons/scrum/i18n/pl.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/pt.po b/addons/scrum/i18n/pt.po
index a36f3900819..947e72b93ef 100644
--- a/addons/scrum/i18n/pt.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/pt_BR.po b/addons/scrum/i18n/pt_BR.po
index f34edc42505..0304d17d46d 100644
--- a/addons/scrum/i18n/pt_BR.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/ro.po b/addons/scrum/i18n/ro.po
index cd77b548852..1ca82190795 100644
--- a/addons/scrum/i18n/ro.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/ru.po b/addons/scrum/i18n/ru.po
index 32667971ddf..1e7998733af 100644
--- a/addons/scrum/i18n/ru.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/sl.po b/addons/scrum/i18n/sl.po
index abafac512b4..86da0c659ee 100644
--- a/addons/scrum/i18n/sl.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/sv.po b/addons/scrum/i18n/sv.po
index d6c24ec289d..8b52251a815 100644
--- a/addons/scrum/i18n/sv.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/tlh.po b/addons/scrum/i18n/tlh.po
index 34bca275645..0cc726f0ac1 100644
--- a/addons/scrum/i18n/tlh.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/tr.po b/addons/scrum/i18n/tr.po
index 198f6c9d85e..d16ea1500c4 100644
--- a/addons/scrum/i18n/tr.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/uk.po b/addons/scrum/i18n/uk.po
index 1d07ed262f2..254e8987df8 100644
--- a/addons/scrum/i18n/uk.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/zh_CN.po b/addons/scrum/i18n/zh_CN.po
index c5a7e222f3e..04b36a9bc08 100644
--- a/addons/scrum/i18n/zh_CN.po
+++ b/addons/scrum/i18n/zh_CN.po
@@ -7,29 +7,29 @@ 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-11-26 02:10+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:28+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 msgid "Scrum Product backlog"
-msgstr "sc"
+msgstr "Scrum 的 Product backlog"
 
 #. module: scrum
 #: field:scrum.meeting,name:0
 msgid "Meeting Name"
-msgstr "会议主题"
+msgstr "会议名称"
 
 #. module: scrum
 #: model:process.transition,note:scrum.process_transition_backlogtask0
 msgid "From backlog create task."
-msgstr ""
+msgstr "从Backlog创建任务"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task4
@@ -41,49 +41,49 @@ msgstr "我的任务"
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
 msgid "My opened sprints (Product Owner)"
-msgstr "我进行中的冲刺（项目负责人）"
+msgstr "我待处理的sprints(产品负责人)"
 
 #. module: scrum
 #: model:process.node,note:scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
-msgstr ""
+msgstr "从backlogs创建任务"
 
 #. module: scrum
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中无效的模块名"
 
 #. module: scrum
 #: model:ir.module.module,shortdesc:scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr "Scrum，敏捷开发方法"
+msgstr "Scrum敏捷开发方法"
 
 #. module: scrum
 #: field:scrum.project,progress_rate:0
 msgid "Progress"
-msgstr "进度"
+msgstr "进行"
 
 #. module: scrum
 #: help:scrum.task,remaining_hours:0
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
-msgstr ""
+msgstr "总剩余时间,能重新估计任务接受者的周期"
 
 #. module: scrum
 #: field:scrum.project,child_id:0
 msgid "Subproject"
-msgstr "子项目"
+msgstr "子计划"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "What have you accomplished since yesterday ?"
-msgstr ""
+msgstr "昨天你干出什么成绩?"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
+msgstr "你的Sprint Backlob是否估计准确?"
 
 #. module: scrum
 #: field:scrum.project,members:0
@@ -93,40 +93,40 @@ msgstr "项目成员"
 #. module: scrum
 #: view:scrum.project:0
 msgid "Scrum Projects"
-msgstr "Scrum 项目列表"
+msgstr "Scrum项目"
 
 #. module: scrum
 #: field:scrum.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr "已委托的任务列表"
+msgstr "委任任务"
 
 #. module: scrum
 #: help:scrum.project,warn_header:0
 msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
-msgstr "任务关闭时通知客户的消息邮件的头"
+msgstr "在任务结束时发送给客户的电子邮件开头增加的头"
 
 #. module: scrum
 #: field:scrum.task,priority:0
 msgid "Importance"
-msgstr "优先级"
+msgstr "重要"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_task
 msgid "Scrum Task"
-msgstr "Scrum 任务"
+msgstr "Scrum任务"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.dblc_proj
 msgid "View project's backlog"
-msgstr ""
+msgstr "项目Backlog视图"
 
 #. module: scrum
 #: help:scrum.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
-msgstr "项目成员没有被任何统计计算所使用，而是仅仅为了记录信息。"
+msgstr "项目成员不使用任何计算只是为了显示"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
@@ -137,19 +137,19 @@ msgstr "非常紧急"
 #. module: scrum
 #: field:scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
-msgstr ""
+msgstr "Sprint回顾"
 
 #. module: scrum
 #: field:scrum.sprint,name:0
 msgid "Sprint Name"
-msgstr "冲刺主题"
+msgstr "Sprint名称"
 
 #. module: scrum
 #: help:scrum.task,planned_hours:0
 msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
-msgstr ""
+msgstr "任务估计时间通常由项目管理者在任务草稿状态下设定."
 
 #. module: scrum
 #: field:scrum.project,notes:0
@@ -174,23 +174,23 @@ msgstr "项目"
 msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
-msgstr "如果选中此字段，项目经理当他的团队完成每一个任务的时候将收到一个请求。"
+msgstr "如果选这项,团队将收到项目管理者对每个任务完成时间的要求"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 #: selection:scrum.task,state:0
 msgid "Cancelled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: scrum
 #: field:scrum.team,name:0
 msgid "Team Name"
-msgstr ""
+msgstr "团队名称"
 
 #. module: scrum
 #: field:scrum.project,warn_header:0
 msgid "Mail Header"
-msgstr "邮件头"
+msgstr "电子邮件头"
 
 #. module: scrum
 #: field:scrum.project,sprint_size:0
@@ -200,29 +200,29 @@ msgstr ""
 #. module: scrum
 #: field:scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr "结束时间"
+msgstr "终止日期"
 
 #. module: scrum
 #: help:scrum.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr "任务完成的工作时间合计"
+msgstr "任务工作完成的合计"
 
 #. module: scrum
 #: help:scrum.project,warn_customer:0
 msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
-msgstr ""
+msgstr "如果选中,用户将在任务结束时向客户发送一建议信息的电子邮件"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_task_open
 msgid "View sprint Tasks"
-msgstr "查看冲刺任务列表"
+msgstr "Sprint任务视图"
 
 #. module: scrum
 #: field:scrum.project,category_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task
@@ -233,7 +233,7 @@ msgstr "所有任务"
 #. module: scrum
 #: field:scrum.task,date_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "截止期限"
 
 #. module: scrum
 #: field:scrum.project,partner_id:0
@@ -246,17 +246,17 @@ msgstr "业务伙伴"
 #: field:scrum.sprint,planned_hours:0
 #: field:scrum.task,planned_hours:0
 msgid "Planned Hours"
-msgstr "计划小时数"
+msgstr "计划时间"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Template"
-msgstr "模版"
+msgstr "模板"
 
 #. module: scrum
 #: field:scrum.product.backlog,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "优先"
 
 #. module: scrum
 #: field:scrum.project,state:0
@@ -267,43 +267,43 @@ msgstr "状态"
 #. module: scrum
 #: help:scrum.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
+msgstr "关闭任务和所有任务的百分比"
 
 #. module: scrum
 #: help:scrum.project,notes:0
 msgid "Internal description of the project."
-msgstr "项目的内部说明"
+msgstr "项目内部说明"
 
 #. module: scrum
 #: field:scrum.sprint,meetings_id:0
 msgid "Daily Scrum"
-msgstr ""
+msgstr "每日Scrum"
 
 #. module: scrum
 #: help:scrum.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "计算方法：花费时间－剩余时间"
+msgstr "计算:花费的时间 + 剩余的时间"
 
 #. module: scrum
 #: field:scrum.task,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: scrum
 #: view:scrum.project:0
 msgid "Scrum Data"
-msgstr ""
+msgstr "Scrum数据"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "中"
 
 #. module: scrum
 #: field:scrum.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "总时间"
 
 #. module: scrum
 #: model:ir.ui.menu,name:scrum.next_id_67
@@ -313,40 +313,40 @@ msgstr ""
 #. module: scrum
 #: field:scrum.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "计划时间"
 
 #. module: scrum
 #: field:scrum.meeting,question_today:0
 msgid "Tasks for today"
-msgstr ""
+msgstr "今天任务"
 
 #. module: scrum
 #: field:scrum.meeting,question_yesterday:0
 msgid "Tasks since yesterday"
-msgstr ""
+msgstr "昨天到现在的任务"
 
 #. module: scrum
 #: field:scrum.project,date_start:0
 #: field:scrum.sprint,date_start:0
 #: field:scrum.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
 #: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
 msgid "Projects"
-msgstr ""
+msgstr "项目"
 
 #. module: scrum
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: scrum
 #: field:scrum.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "任务详情"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.dblc_proj2
@@ -356,32 +356,32 @@ msgstr "项目任务视图"
 #. module: scrum
 #: field:scrum.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "延迟时间"
 
 #. module: scrum
 #: field:scrum.project,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "联系"
 
 #. module: scrum
 #: field:scrum.project,tasks:0
 msgid "Scrum Tasks"
-msgstr ""
+msgstr "Scrum任务"
 
 #. module: scrum
 #: field:scrum.meeting,date:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "会议日期"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Retrospective"
-msgstr ""
+msgstr "回顾"
 
 #. module: scrum
 #: wizard_view:scrum.product.backlog.task.create,init:0
@@ -392,24 +392,24 @@ msgstr "创建任务"
 #. module: scrum
 #: field:scrum.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "进度(%)"
 
 #. module: scrum
 #: help:scrum.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "计算:花费的时间/总时间"
 
 #. module: scrum
 #: field:scrum.project,scrum:0
 #: field:scrum.task,scrum:0
 msgid "Is Scrum"
-msgstr ""
+msgstr "是Scrum"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
 #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
 msgid "Draft Backlogs"
-msgstr ""
+msgstr "Backlogs草稿"
 
 #. module: scrum
 #: field:scrum.sprint,backlog_ids:0
@@ -420,7 +420,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:scrum.action_view_task6
 #: model:ir.ui.menu,name:scrum.menu_action_view_task6
 msgid "Opened tasks"
-msgstr ""
+msgstr "待处理任务"
 
 #. module: scrum
 #: field:scrum.meeting,question_blocks:0
@@ -430,12 +430,12 @@ msgstr ""
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Optionnal Info"
-msgstr ""
+msgstr "选项信息"
 
 #. module: scrum
 #: help:scrum.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
+msgstr "这项目所有相关任务的总时间合计"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_sprint
@@ -447,89 +447,89 @@ msgstr ""
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Review"
-msgstr ""
+msgstr "复审"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
 msgid "My opened sprints (Scrum Master)"
-msgstr ""
+msgstr "我待处理的Sprint(团队主管)"
 
 #. module: scrum
 #: field:scrum.product.backlog,note:0
 msgid "Note"
-msgstr ""
+msgstr "备注"
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
 #: selection:scrum.sprint,state:0
 #: selection:scrum.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task5
 #: model:ir.ui.menu,name:scrum.menu_tasks_yours
 msgid "My opened tasks"
-msgstr ""
+msgstr "我待处理的任务"
 
 #. module: scrum
 #: field:scrum.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "项目主管"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 #: selection:scrum.task,state:0
 msgid "Pending"
-msgstr ""
+msgstr "未决"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Is there anything blocking you ?"
-msgstr ""
+msgstr "有什么阻碍了你?"
 
 #. module: scrum
 #: field:scrum.product.backlog,state:0
 #: field:scrum.sprint,state:0
 #: field:scrum.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
 msgid "Opened Sprints"
-msgstr ""
+msgstr "待处理的Sprints"
 
 #. module: scrum
 #: field:scrum.project,effective_hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "时间花费"
 
 #. module: scrum
 #: field:scrum.project,complete_name:0
 #: field:scrum.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "项目名称"
 
 #. module: scrum
 #: field:scrum.project,product_owner_id:0
 #: field:scrum.sprint,product_owner_id:0
 msgid "Product Owner"
-msgstr ""
+msgstr "产品负责人"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
 msgid "My Sprints (Scrum Master)"
-msgstr ""
+msgstr "我的Sprints(Scrum主管)"
 
 #. module: scrum
 #: model:process.node,name:scrum.process_node_productbacklog0
@@ -546,100 +546,100 @@ msgstr ""
 #. module: scrum
 #: field:scrum.product.backlog,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: scrum
 #: field:scrum.product.backlog,active:0
 #: field:scrum.project,active:0
 #: field:scrum.task,active:0
 msgid "Active"
-msgstr ""
+msgstr "有效"
 
 #. module: scrum
 #: help:scrum.task,delay_hours:0
 msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
-msgstr ""
+msgstr "计算:总时间 - 估计时间.它给项目管理者一个估计时间和实际时间的差异"
 
 #. module: scrum
 #: field:scrum.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "时间箱"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
 msgid "Draft Sprints"
-msgstr ""
+msgstr "Sprints草稿"
 
 #. module: scrum
 #: field:scrum.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "工作时间"
 
 #. module: scrum
 #: field:scrum.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "工作完成"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
-msgstr ""
+msgstr "Sprint Backlog视图"
 
 #. module: scrum
 #: field:scrum.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "委托给"
 
 #. module: scrum
 #: field:scrum.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "关闭日期"
 
 #. module: scrum
 #: field:scrum.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "分配给"
 
 #. module: scrum
 #: field:scrum.meeting,question_backlog:0
 msgid "Backlog Accurate"
-msgstr ""
+msgstr "Blacklog正确"
 
 #. module: scrum
 #: help:scrum.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
+msgstr "这项目所有相关任务花费时间的合计"
 
 #. module: scrum
 #: help:scrum.task,project_id:0
 msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
-msgstr ""
+msgstr "如果项目名字有[?],这意味着项目没有链接的辅助核算项"
 
 #. module: scrum
 #: help:scrum.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
+msgstr "这项目所有相关任务计划时间的合计"
 
 #. module: scrum
 #: field:scrum.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "警告业务伙伴"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
 msgid "My Sprints (Product Owner)"
-msgstr ""
+msgstr "我的Sprints(产品负责人)"
 
 #. module: scrum
 #: field:scrum.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "任务摘要"
 
 #. module: scrum
 #: help:scrum.project,category_id:0
@@ -647,7 +647,7 @@ msgid ""
 "Link this project to an analytic account if you need financial management on "
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
-msgstr ""
+msgstr "如果你需要项目财务管理链接到项目辅助核算项.它能连接到项目的预算,计划,成本和收益分析,项目时间表等."
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
@@ -655,7 +655,7 @@ msgstr ""
 #: selection:scrum.sprint,state:0
 #: selection:scrum.task,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: scrum
 #: wizard_button:scrum.product.backlog.task.create,init,end:0
@@ -666,7 +666,7 @@ msgstr "取消"
 #: selection:scrum.product.backlog,state:0
 #: selection:scrum.sprint,state:0
 msgid "Open"
-msgstr ""
+msgstr "打开"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
@@ -675,78 +675,78 @@ msgstr ""
 #: view:scrum.sprint:0
 #: field:scrum.sprint,effective_hours:0
 msgid "Effective hours"
-msgstr ""
+msgstr "有效时间"
 
 #. module: scrum
 #: field:scrum.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "警告消息"
 
 #. module: scrum
 #: selection:scrum.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "进展"
 
 #. module: scrum
 #: field:scrum.sprint,review:0
 msgid "Sprint Review"
-msgstr ""
+msgstr "Sprint复审"
 
 #. module: scrum
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须以x_开头并且不很含有特殊的字符"
 
 #. module: scrum
 #: field:scrum.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "剩余时间"
 
 #. module: scrum
 #: field:scrum.task,parent_id:0
 msgid "Parent Task"
-msgstr ""
+msgstr "上级任务"
 
 #. module: scrum
 #: field:scrum.product.backlog,name:0
 msgid "Feature"
-msgstr ""
+msgstr "特征"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "非常低"
 
 #. module: scrum
 #: help:scrum.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "时间表工作时间调整甘特图报表"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
 msgid "Sprints Done"
-msgstr ""
+msgstr "Sprints完成"
 
 #. module: scrum
 #: model:process.transition,name:scrum.process_transition_backlogtask0
 msgid "Backlog Task"
-msgstr ""
+msgstr "Backlog任务"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 #: view:scrum.project:0
 #: view:scrum.sprint:0
 msgid "Planned hours"
-msgstr ""
+msgstr "计划时间"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_scrum_project_form
 #: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
 msgid "Edit Projects"
-msgstr ""
+msgstr "编辑项目"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_meeting_form
@@ -754,120 +754,120 @@ msgstr ""
 #: model:ir.ui.menu,name:scrum.menu_action_meeting_form
 #: view:scrum.meeting:0
 msgid "Scrum Meeting"
-msgstr ""
+msgstr "Scrum会议"
 
 #. module: scrum
 #: field:scrum.task,description:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "紧急"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Daily Meetings"
-msgstr ""
+msgstr "每日会议"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "What are you working on today ?"
-msgstr ""
+msgstr "今天你要干什么工作?"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "运行"
 
 #. module: scrum
 #: field:scrum.product.backlog,progress:0
 #: field:scrum.sprint,progress:0
 msgid "Progress (0-100)"
-msgstr ""
+msgstr "进度(0 - 100)"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_team
 msgid "Scrum Team"
-msgstr ""
+msgstr "Scrum团队"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_project
 #: field:scrum.product.backlog,project_id:0
 msgid "Scrum Project"
-msgstr ""
+msgstr "Scrum项目"
 
 #. module: scrum
 #: field:scrum.project,parent_id:0
 msgid "Parent project"
-msgstr ""
+msgstr "上级项目"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Sprint Info"
-msgstr ""
+msgstr "Sprint信息"
 
 #. module: scrum
 #: field:scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
-msgstr ""
+msgstr "Scrum主管"
 
 #. module: scrum
 #: field:scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "任务详情"
 
 #. module: scrum
 #: field:scrum.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "时间花费"
 
 #. module: scrum
 #: field:scrum.task,context_id:0
 msgid "Context"
-msgstr ""
+msgstr "上下文"
 
 #. module: scrum
 #: field:scrum.task,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "总时间"
 
 #. module: scrum
 #: field:scrum.team,users_id:0
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: scrum
 #: field:scrum.product.backlog,sequence:0
 #: field:scrum.project,priority:0
 #: field:scrum.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: scrum
 #: help:scrum.project,warn_footer:0
 msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
-msgstr ""
+msgstr "任务关闭时发送给客户警告电子邮件增加的页脚"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
 #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
 msgid "Opened Backlogs"
-msgstr ""
+msgstr "待处理的Backlogs"
 
 #. module: scrum
 #: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
 msgid "Created tasks"
-msgstr ""
+msgstr "创建任务"
 
 #. module: scrum
 #: constraint:scrum.project:0
 msgid "Error ! You can not create recursive projects."
-msgstr ""
+msgstr "错误!你不能创建递归的项目"
 
 #. module: scrum
 #: wizard_field:scrum.product.backlog.task.create,init,user_id:0
@@ -885,9 +885,9 @@ msgstr ""
 #. module: scrum
 #: field:scrum.project,date_end:0
 msgid "Expected End"
-msgstr ""
+msgstr "即将结束"
 
 #. module: scrum
 #: field:scrum.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "电子邮件页脚"
diff --git a/addons/scrum/i18n/zh_TW.po b/addons/scrum/i18n/zh_TW.po
index 1b4c697ad4b..d8c08882107 100644
--- a/addons/scrum/i18n/zh_TW.po
+++ b/addons/scrum/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:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/wizard/assign_backlog_to_sprint.py b/addons/scrum/wizard/assign_backlog_to_sprint.py
index 35c2852325b..d9805f374e9 100644
--- a/addons/scrum/wizard/assign_backlog_to_sprint.py
+++ b/addons/scrum/wizard/assign_backlog_to_sprint.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -48,21 +48,20 @@ bts_fields = {
 def _assign_sprint(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     backlog_obj = pool.get('scrum.product.backlog')
-    task = pool.get('project.task') 
-    
-    state_open=data['form']['state_open']
+    task = pool.get('project.task')
+    state_open = data['form']['state_open']
     convert_to_task = data['form']['convert_to_task']
-    
-    for backlog in backlog_obj.browse(cr, uid, data['ids']):
-        backlog_obj.write(cr, uid, backlog.id, {'sprint_id':data['form']['sprint_id']})
+    for backlog in backlog_obj.browse(cr, uid, data['ids'], context=context):
+        backlog_obj.write(cr, uid, backlog.id, {'sprint_id':data['form']['sprint_id']}, context=context)
         if convert_to_task:
             task.create(cr, uid, {
                 'product_backlog_id': backlog.id,
                 'name': backlog.name,
                 'description': backlog.note,
                 'project_id': backlog.project_id.id,
-                'user_id': (backlog.user_id and backlog.user_id.id) or uid,
-                'planned_hours': backlog.planned_hours
+                'user_id': False,
+                'planned_hours':backlog.planned_hours,
+                'remaining_hours':backlog.expected_hours,
             })
         if state_open:
             if backlog.state == "draft":
diff --git a/addons/scrum/wizard/backlog_to_task.py b/addons/scrum/wizard/backlog_to_task.py
index 65795906765..631fed686b8 100644
--- a/addons/scrum/wizard/backlog_to_task.py
+++ b/addons/scrum/wizard/backlog_to_task.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -34,10 +34,10 @@ btt_fields = {
     'user_id' : {'string':'Assign To', 'type':'many2one', 'relation':'res.users'},
 }
 
-def _do_create(self, cr, uid, data, context):
+def _do_create(self, cr, uid, data, context={}):
     pool = pooler.get_pool(cr.dbname)
-    backlogs = pool.get('scrum.product.backlog').browse(cr, uid, data['ids'])
-    mod_obj = pool.get('ir.model.data') 
+    backlogs = pool.get('scrum.product.backlog').browse(cr, uid, data['ids'], context=context)
+    mod_obj = pool.get('ir.model.data')
     result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
     id = mod_obj.read(cr, uid, result, ['res_id'])
     ids = []
@@ -48,19 +48,20 @@ def _do_create(self, cr, uid, data, context):
             'name': backlog.name,
             'description': backlog.note,
             'project_id': backlog.project_id.id,
-            'user_id': data['form']['user_id'] or (backlog.user_id and backlog.user_id.id) or uid,
-            'planned_hours': backlog.planned_hours
+            'user_id': data['form']['user_id'] or False,
+            'planned_hours': backlog.planned_hours,
+            'remaining_hours':backlog.expected_hours,
         }))
-
     value = {
         'domain': "[('product_backlog_id','in',["+','.join(map(str,data['ids']))+"])]",
         'name': 'Open Backlog Tasks',
+        'res_id': ids,
         'view_type': 'form',
         'view_mode': 'tree,form',
         'res_model': 'project.task',
         'view_id': False,
         'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']
+        'search_view_id': id['res_id'],
     }
     return value
 
diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index d728efbf2fe..9cc33351689 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,20 +15,15 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 from stock import *
 import partner
 import product
-
 import report
 import wizard
-import report_stock
-
-import stock_wizard
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 8081c4b6738..459a2faaf84 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -41,18 +41,30 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
-        "stock_workflow.xml",
         "stock_data.xml",
+        "wizard/stock_move_view.xml",
+        "wizard/stock_partial_picking_view.xml",
+        "wizard/stock_partial_move_view.xml",
+        "wizard/stock_inventory_set_stock_zero_view.xml",
+        "wizard/stock_fill_inventory_view.xml",
+        "wizard/stock_invoice_onshipping_view.xml",
+        "wizard/stock_inventory_merge_view.xml",
+        "wizard/stock_location_product_view.xml",
+        "wizard/stock_inventory_line_split_view.xml",
+        "wizard/stock_change_standard_price_view.xml",
+        "wizard/stock_picking_make_view.xml",
+        "wizard/stock_traceability_view.xml",
+        "stock_workflow.xml",
         "stock_incoterms.xml",
-        "stock_wizard.xml",
-        "stock_wizard_view.xml", 
+        "stock_wizard.xml",        
         "stock_view.xml",
         "stock_report.xml",
         "stock_sequence.xml",
         "product_data.xml",
         "product_view.xml",
         "partner_view.xml",
-        "report_stock_view.xml",
+        "report/report_stock_view.xml",
+        "report/report_stock_picking_view.xml",
         "security/stock_security.xml",
         "security/ir.model.access.csv",
     ],
diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po
index b8749b91f69..c32aae58624 100644
--- a/addons/stock/i18n/ar.po
+++ b/addons/stock/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index c832e9fc3bf..853beecd170 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index e1a87b95fc4..530754279e0 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index c39b670ecc7..e20316adf60 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/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:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index b07a13d9082..70ff0fc66e2 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index d30efde9c5b..2140d01d74b 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index 4eeaac056d9..d352ae5e37b 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "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 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 2c49d783a08..bf1080ef69c 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index 27da795aec8..b4b1359fbb0 100644
--- a/addons/stock/i18n/es_AR.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index 4938a409b04..056a948e921 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index 6a6ef949665..a078048d952 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -25,27 +25,27 @@ msgstr "LIFO"
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr ""
+msgstr "Ketjutettu paikka jos kiinteä"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
-msgstr ""
+msgstr "STOCK_SAVE"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_15
 msgid "Sub Products"
-msgstr ""
+msgstr "Alituotteet"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-account"
-msgstr ""
+msgstr "terp-account"
 
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -56,17 +56,17 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_ASCENDING"
-msgstr ""
+msgstr "STOCK_SORT_ASCENDING"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision"
-msgstr "Tarkistus"
+msgstr "Revisio"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_FORWARD"
-msgstr ""
+msgstr "STOCK_MEDIA_FORWARD"
 
 #. module: stock
 #: rml:lot.location:0
@@ -76,209 +76,209 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_100"
-msgstr ""
+msgstr "STOCK_ZOOM_100"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "UoM"
-msgstr ""
+msgstr "Mittayksikkö"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.return_picking
 msgid "Return packing"
-msgstr ""
+msgstr "Paluupakkaus"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
 msgid "Stock journal"
-msgstr ""
+msgstr "Varastopäiväkirja"
 
 #. module: stock
 #: wizard_view:stock.fill_inventory,init:0
 msgid "Fill Inventory for specific location"
-msgstr ""
+msgstr "Täytä varastoluettelo määritetylle paikalle"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr ""
+msgstr "Pakkauslista"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Amount"
-msgstr ""
+msgstr "Summa"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr ""
+msgstr "Vastaanotetut tuotteet"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr ""
+msgstr "Saapuvat tuotteet"
 
 #. module: stock
 #: field:stock.picking,name:0
 #: field:stock.tracking,serial:0
 msgid "Reference"
-msgstr ""
+msgstr "Viite"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,group:0
 msgid "Group by partner"
-msgstr ""
+msgstr "Ryhmä kumppanittain"
 
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Kumppani"
 
 #. module: stock
 #: help:product.product,track_incoming:0
 msgid "Force to use a Production Lot during receptions"
-msgstr ""
+msgstr "Pakota käyttämään tuotantoerää vastaanotossa"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 #: field:stock.move,move_history_ids2:0
 msgid "Move History"
-msgstr ""
+msgstr "Siirrä historia"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Production lot"
-msgstr ""
+msgstr "Tuotantoerä"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NEW"
-msgstr ""
+msgstr "STOCK_NEW"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CANCEL"
-msgstr ""
+msgstr "STOCK_CANCEL"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr ""
+msgstr "Sisäinen paikka"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT"
-msgstr ""
+msgstr "STOCK_PRINT"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "State"
-msgstr ""
+msgstr "Tila"
 
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr ""
+msgstr "Todellinen varasto"
 
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr ""
+msgstr "Mittayksikkö"
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
-msgstr ""
+msgstr "Saatavilla"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Make Parcel"
-msgstr ""
+msgstr "Tee paketti"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr ""
+msgstr "Pakkauksen tulos"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
-msgstr ""
+msgstr "STOCK_QUIT"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr ""
+msgstr "Lähtevien paikka"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_TOP"
-msgstr ""
+msgstr "STOCK_GOTO_TOP"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ABOUT"
-msgstr ""
+msgstr "STOCK_ABOUT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-hr"
-msgstr ""
+msgstr "terp-hr"
 
 #. module: stock
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr ""
+msgstr "Paikan tyyppi"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-purchase"
-msgstr ""
+msgstr "terp-purchase"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND"
-msgstr ""
+msgstr "STOCK_DND"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Sent"
-msgstr ""
+msgstr "Lähetetyt tuotteet"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_FIRST"
-msgstr ""
+msgstr "STOCK_GOTO_FIRST"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 msgid "Internal Moves"
-msgstr ""
+msgstr "Sisäiset siirrot"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr ""
+msgstr "Paketointi"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr ""
+msgstr "Tilaus (Lähde)"
 
 #. module: stock
 #: rml:lot.location:0
@@ -291,117 +291,117 @@ msgstr ""
 #: view:stock.location:0
 #: field:stock.location,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Lisätiedot"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Asiakashyvitys"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FLOPPY"
-msgstr ""
+msgstr "STOCK_FLOPPY"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr ""
+msgstr "Tuotantoerien revisiot"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock location"
-msgstr ""
+msgstr "Varastopaikka"
 
 #. module: stock
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
 msgid "Location Name"
-msgstr ""
+msgstr "Paikan nimi"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNINDENT"
-msgstr ""
+msgstr "STOCK_UNINDENT"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Move Information"
-msgstr ""
+msgstr "Siirtotiedot"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr ""
+msgstr "Ei vastaanotetut tuotteet"
 
 #. module: stock
 #: field:stock.inventory,state:0
 #: field:stock.move,state:0
 #: field:stock.picking,state:0
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
 msgid "Customers"
-msgstr ""
+msgstr "Asiakkaat"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDERLINE"
-msgstr ""
+msgstr "STOCK_UNDERLINE"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Siirron rivit"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
 msgid "Include all childs for the location"
-msgstr ""
+msgstr "Sisällytä kaikki alemmat tälle paikalle"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr ""
+msgstr "Hankinnan paikka"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 msgid "Production Lots"
-msgstr ""
+msgstr "Tuotantoerät"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Recipient"
-msgstr ""
+msgstr "Vastaanottaja"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.track_line
 msgid "Track line"
-msgstr ""
+msgstr "Seurannan rivi"
 
 #. module: stock
 #: field:stock.location,child_ids:0
 msgid "Contains"
-msgstr ""
+msgstr "Sisältää"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_BOLD"
-msgstr ""
+msgstr "STOCK_BOLD"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
-msgstr ""
+msgstr "terp-graph"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PREFERENCES"
-msgstr ""
+msgstr "STOCK_PREFERENCES"
 
 #. module: stock
 #: rml:lot.location:0
@@ -410,93 +410,93 @@ msgstr ""
 #: rml:stock.picking.list:0
 #: field:stock.report.prodlots,name:0
 msgid "Quantity"
-msgstr ""
+msgstr "Määrä"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Now"
-msgstr ""
+msgstr "Käsittele nyt"
 
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Paikan osoite"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr ""
+msgstr "Tuotantoerää käytetään antamaan tuotannolle sarjanumero"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_13
 msgid "Stock Level 1"
-msgstr ""
+msgstr "Varaston taso 1"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_REWIND"
-msgstr ""
+msgstr "STOCK_MEDIA_REWIND"
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr ""
+msgstr "Saapuvien paikka"
 
 #. module: stock
 #: view:res.partner:0
 msgid "Stock Properties"
-msgstr ""
+msgstr "Varaston ominaisuudet"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr ""
+msgstr "Suorita keräily"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr ""
+msgstr "Hankinnat"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Suppliers"
-msgstr ""
+msgstr "IT-toimittajat"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form3
 #: model:ir.ui.menu,name:stock.menu_action_move_form3
 msgid "Draft Moves"
-msgstr ""
+msgstr "Luonnossiirrot"
 
 #. module: stock
 #: field:report.stock.lines.date,product_id:0
 msgid "Product Id"
-msgstr ""
+msgstr "Tuotekoodi"
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Myynti ja hankinta"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Asiakaslasku"
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr ""
+msgstr "Inventaarion paikka"
 
 #. module: stock
 #: help:product.product,track_production:0
 msgid "Force to use a Production Lot during production order"
-msgstr ""
+msgstr "Pakota käyttämään tuotantoerää tuotantotilauksessa"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CUT"
-msgstr ""
+msgstr "STOCK_CUT"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -505,94 +505,97 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "when you do an inventory"
 msgstr ""
+"Tuotteelle käytetään tässä määritettyä varaston lähdepaikkaa oletuksen "
+"asemasta luotaessa varastonsiirtoja inventaariota varten"
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
 msgid "This account will be used to value the output stock"
-msgstr ""
+msgstr "Tätä tiliä käytetään lähtevän varaston arvottamiseen"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_FIT"
-msgstr ""
+msgstr "STOCK_ZOOM_FIT"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
 msgid ""
 "This journal will be used for the accounting move generated by stock move"
 msgstr ""
+"Tätä päiväkirjaa käytetään varastonsiirtojen luomille kirjanpitomerkinnöille"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
 #: model:ir.ui.menu,name:stock.menu_picking_calendar_delivery
 msgid "Calendar of Deliveries"
-msgstr ""
+msgstr "Toimituskalenteri"
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incomming Lots"
-msgstr ""
+msgstr "Saapuvien erien seuranta"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr ""
+msgstr "Varasto paikoittain"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE_AS"
-msgstr ""
+msgstr "STOCK_SAVE_AS"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr ""
+msgstr "Varastoraportti tuotantoerien perusteella"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr ""
+msgstr "Näennäinen varasto"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr ""
+msgstr "Näkymä"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_ERROR"
-msgstr ""
+msgstr "STOCK_DIALOG_ERROR"
 
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Vasen ylempi"
 
 #. module: stock
 #: field:report.stock.lines.date,create_date:0
 msgid "Latest Date of Inventory"
-msgstr ""
+msgstr "Edellisen inventaarion pvm."
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDEX"
-msgstr ""
+msgstr "STOCK_INDEX"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_BOTTOM"
-msgstr ""
+msgstr "STOCK_GOTO_BOTTOM"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr ""
+msgstr "Uusi vastaanoton pakkaus"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,quantity:0
 msgid "Quantity per lot"
-msgstr ""
+msgstr "Määrä per erä"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form2
@@ -600,57 +603,57 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Varastosiirrot"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr ""
+msgstr "Tuotannon paikka"
 
 #. module: stock
 #: field:stock.move,tracking_id:0
 msgid "Tracking Lot"
-msgstr ""
+msgstr "Seurannan erä"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_FORWARD"
-msgstr ""
+msgstr "STOCK_GO_FORWARD"
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Tekijä"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDELETE"
-msgstr ""
+msgstr "STOCK_UNDELETE"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EXECUTE"
-msgstr ""
+msgstr "STOCK_EXECUTE"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_QUESTION"
-msgstr ""
+msgstr "STOCK_DIALOG_QUESTION"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr ""
+msgstr "Manuaalinen toimenpide"
 
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr ""
+msgstr "Valmis pvm."
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Expected Shipping Date"
-msgstr ""
+msgstr "Odotettu toimituspäivä"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -660,63 +663,63 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
-msgstr ""
+msgstr "Seuranta / snro"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_FONT"
-msgstr ""
+msgstr "STOCK_SELECT_FONT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PASTE"
-msgstr ""
+msgstr "STOCK_PASTE"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr ""
+msgstr "Kumppanien paikat"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr ""
+msgstr "Seurantaerä on koodi joka annetaan logistiselle yksikölle / lavalle"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking Number"
-msgstr ""
+msgstr "Seurantanumero"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
 msgid "European Customers"
-msgstr ""
+msgstr "Eurooppalaiset asiakkaat"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-stock"
-msgstr ""
+msgstr "terp-stock"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr ""
+msgstr "Pakkauslista:"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_RECORD"
-msgstr ""
+msgstr "STOCK_MEDIA_RECORD"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Kalenterinäkymä"
 
 #. module: stock
 #: wizard_field:stock.location.products,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Mistä"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -726,28 +729,28 @@ msgstr ""
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Non Assigned Products:"
-msgstr ""
+msgstr "Ei luovutetut tuotteet:"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "Laskunhallinta"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr ""
+msgstr "Tuotantoerän revisiot"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Packing Done"
-msgstr ""
+msgstr "Pakkaus valmis"
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "Odottaa"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree2
@@ -755,272 +758,272 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr ""
+msgstr "Pakkaukset saatavilla"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
 #: view:stock.warehouse:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Varastorakennus"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-report"
-msgstr ""
+msgstr "terp-report"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr ""
+msgstr "Yleiset IT-toimittajat"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Location Content (With children)"
-msgstr ""
+msgstr "Paikan sisältö (alempineen)"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FILE"
-msgstr ""
+msgstr "STOCK_FILE"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr ""
+msgstr "Varastorivin koodi"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EDIT"
-msgstr ""
+msgstr "STOCK_EDIT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CONNECT"
-msgstr ""
+msgstr "STOCK_CONNECT"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_all
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr ""
+msgstr "Packing"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_DOWN"
-msgstr ""
+msgstr "STOCK_GO_DOWN"
 
 #. module: stock
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr ""
+msgstr "Asiakkaan paikka"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OK"
-msgstr ""
+msgstr "STOCK_OK"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr ""
+msgstr "Uusi sisäinen pakkaus"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "General Informations"
-msgstr ""
+msgstr "Yleiset tiedot"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "None"
-msgstr ""
+msgstr "Ei mitään"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3
 #: model:ir.actions.wizard,name:stock.action2
 #: model:ir.actions.wizard,name:stock.action_lot4
 msgid "Downstream traceability"
-msgstr ""
+msgstr "Lähtevien seuranta"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Finished products"
-msgstr ""
+msgstr "Valmiit tuoteet"
 
 #. module: stock
 #: field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr ""
+msgstr "Ylempi paikka"
 
 #. module: stock
 #: field:stock.inventory,date:0
 msgid "Date create"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: stock
 #: wizard_button:inventory.merge.stock.zero,init,merge:0
 msgid "Set to Zero"
-msgstr ""
+msgstr "Aseta nollaksi"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 msgid "All Stock Moves"
-msgstr ""
+msgstr "Kaikki varastonsiirrot"
 
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr ""
+msgstr "Toimittajien paikat"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HELP"
-msgstr ""
+msgstr "STOCK_HELP"
 
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Kiireellinen"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid "This account will be used to value the input stock"
-msgstr ""
+msgstr "Tätä tiliä käytetään saapuvan varaston arvottamiseen"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_INFO"
-msgstr ""
+msgstr "STOCK_DIALOG_INFO"
 
 #. module: stock
 #: field:stock.move,date:0
 #: field:stock.tracking,date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr ""
+msgstr "Lähetetään tavarat"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Availability"
-msgstr ""
+msgstr "Peru saatavuus"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
-msgstr ""
+msgstr "Luodut siirrot"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_BACK"
-msgstr ""
+msgstr "STOCK_GO_BACK"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "Tullaan laskuttamaan"
 
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr ""
+msgstr "Vastaavat paikkatiedot"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_FILL"
-msgstr ""
+msgstr "STOCK_JUSTIFY_FILL"
 
 #. module: stock
 #: view:stock.move:0
 #: field:stock.move,date_planned:0
 msgid "Date"
-msgstr ""
+msgstr "Päivämäärä"
 
 #. module: stock
 #: view:product.product:0
 msgid "Stocks"
-msgstr ""
+msgstr "Varastot"
 
 #. module: stock
 #: field:stock.location,allocation_method:0
 msgid "Allocation Method"
-msgstr ""
+msgstr "Allokaation tyyppi"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-administration"
-msgstr ""
+msgstr "terp-administration"
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr ""
+msgstr "Paikan varasto"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_APPLY"
-msgstr ""
+msgstr "STOCK_APPLY"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr ""
+msgstr "Pakkaus on tehty onnistuneesti!"
 
 #. module: stock
 #: field:stock.move,address_id:0
 #: field:stock.picking.move.wizard,address_id:0
 msgid "Dest. Address"
-msgstr ""
+msgstr "Kohteen osoite"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 msgid "Periodical Inventory"
-msgstr ""
+msgstr "Jaksoittainen inventaario"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-crm"
-msgstr ""
+msgstr "terp-crm"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_STRIKETHROUGH"
-msgstr ""
+msgstr "STOCK_STRIKETHROUGH"
 
 #. module: stock
 #: rml:lot.stock.overview_all:0
 #: field:stock.incoterms,code:0
 msgid "Code"
-msgstr ""
+msgstr "Koodi"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-partner"
-msgstr ""
+msgstr "terp-partner"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_draft
 msgid "Draft Periodical Inventories"
-msgstr ""
+msgstr "Luonnos jaksoittaiset inventaariot"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,end:0
@@ -1037,13 +1040,13 @@ msgstr ""
 #: view:stock.picking.move.wizard:0
 #: wizard_button:stock.return.picking,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
-msgstr ""
+msgstr "Jaa tuotantoeriin"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory
@@ -1051,39 +1054,39 @@ msgstr ""
 #: field:stock.inventory.line,inventory_id:0
 #: selection:stock.location,usage:0
 msgid "Inventory"
-msgstr ""
+msgstr "Inventaario"
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
-msgstr ""
+msgstr "Tiedot"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MISSING_IMAGE"
-msgstr ""
+msgstr "STOCK_MISSING_IMAGE"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SPELL_CHECK"
-msgstr ""
+msgstr "STOCK_SPELL_CHECK"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_tracking
 msgid "Stock Tracking Lots"
-msgstr ""
+msgstr "Varaston seurantaerät"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 #: field:stock.move,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Yksikköhinta"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Later"
-msgstr ""
+msgstr "Käsittele myöhemmin"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
@@ -1091,37 +1094,39 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
 msgstr ""
+"Kun vastaanotat tavaraa kumppanilta käytetään tässä määritettyä lähdepaikkaa "
+"oletuksen asemasta"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr ""
+msgstr "Omistajan osoite"
 
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Oikea ylempi"
 
 #. module: stock
 #: field:stock.picking,origin:0
 msgid "Origin Reference"
-msgstr ""
+msgstr "Lähdeviite"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form4
 #: model:ir.ui.menu,name:stock.menu_action_move_form4
 msgid "Available Moves"
-msgstr ""
+msgstr "Mahdolliset siirrot"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HARDDISK"
-msgstr ""
+msgstr "STOCK_HARDDISK"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr ""
+msgstr "Liittyvä keräily"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1129,220 +1134,220 @@ msgstr ""
 #: field:stock.picking.move.wizard,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Stock Inventory Lines"
-msgstr ""
+msgstr "Varaston inventaarion rivit"
 
 #. module: stock
 #: wizard_button:stock.location.products,init,open:0
 msgid "Open Products"
-msgstr ""
+msgstr "Avaa tuotteet"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Packing List"
-msgstr ""
+msgstr "Saapuva pakkauslista"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 #: field:stock.move,picking_id:0
 msgid "Packing List"
-msgstr ""
+msgstr "Pakkauslista"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COPY"
-msgstr ""
+msgstr "STOCK_COPY"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Toimittajan hyvitys"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Varastonsiirto"
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
 #: field:product.template,property_stock_account_output:0
 msgid "Stock Output Account"
-msgstr ""
+msgstr "Lähtevän varaston tili"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr ""
+msgstr "Automaattinen ei lisätä porrasta"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "Stock Location Analysis"
-msgstr ""
+msgstr "Varaston paikka-analyysi"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CDROM"
-msgstr ""
+msgstr "STOCK_CDROM"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not from Packing"
-msgstr ""
+msgstr "Ei pakkauksesta"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr ""
+msgstr "Ketjutetut paikat"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory loss"
-msgstr ""
+msgstr "Varastohävikki"
 
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Ref"
-msgstr ""
+msgstr "Sisäinen viite"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REFRESH"
-msgstr ""
+msgstr "STOCK_REFRESH"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_STOP"
-msgstr ""
+msgstr "STOCK_STOP"
 
 #. module: stock
 #: wizard_view:stock.move.track,init:0
 msgid "Tracking a move"
-msgstr ""
+msgstr "Seuraa siirtoa"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND_AND_REPLACE"
-msgstr ""
+msgstr "STOCK_FIND_AND_REPLACE"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Validate"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_WARNING"
-msgstr ""
+msgstr "STOCK_DIALOG_WARNING"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_IN"
-msgstr ""
+msgstr "STOCK_ZOOM_IN"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CONVERT"
-msgstr ""
+msgstr "STOCK_CONVERT"
 
 #. module: stock
 #: field:stock.move,note:0
 #: view:stock.picking:0
 #: field:stock.picking,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Huomautukset"
 
 #. module: stock
 #: field:stock.picking,move_lines:0
 #: field:stock.picking.move.wizard,move_ids:0
 msgid "Move lines"
-msgstr ""
+msgstr "Siirron rivit"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Value"
-msgstr ""
+msgstr "Arvo"
 
 #. module: stock
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Lähetyksen tyyppi"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
 msgid "Products"
-msgstr ""
+msgstr "Tuotteet"
 
 #. module: stock
 #: field:stock.picking,move_type:0
 msgid "Delivery Method"
-msgstr ""
+msgstr "Toimitustapa"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
 msgid "Partial packing"
-msgstr ""
+msgstr "Osittainen pakkaus"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-calendar"
-msgstr ""
+msgstr "terp-calendar"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ITALIC"
-msgstr ""
+msgstr "STOCK_ITALIC"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_YES"
-msgstr ""
+msgstr "STOCK_YES"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
 msgid "Fill From Unreceived Products"
-msgstr ""
+msgstr "Täytä ei-vastaanotetuista tuotteista"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Dest. Move"
-msgstr ""
+msgstr "Kohde siirto"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_new
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
 msgid "New Periodical Inventory"
-msgstr ""
+msgstr "Uusi jaksoittainen inventaario"
 
 #. module: stock
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr ""
+msgstr "Revisiot"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
 msgid "FIFO"
-msgstr ""
+msgstr "FIFO"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
 #: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery
 msgid "Delivery Orders to Process"
-msgstr ""
+msgstr "Lähetys"
 
 #. module: stock
 #: field:stock.move,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteetti"
 
 #. module: stock
 #: wizard_field:inventory.merge.stock.zero,init,location_id:0
@@ -1356,12 +1361,12 @@ msgstr ""
 #: rml:stock.picking.list:0
 #: field:stock.report.prodlots,location_id:0
 msgid "Location"
-msgstr ""
+msgstr "Paikka"
 
 #. module: stock
 #: field:stock.picking,invoice_state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Laskun tila"
 
 #. module: stock
 #: rml:lot.location:0
@@ -1371,17 +1376,17 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_LEFT"
-msgstr ""
+msgstr "STOCK_JUSTIFY_LEFT"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr ""
+msgstr "Peruuta inventaario"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Future Stock Forecast"
-msgstr ""
+msgstr "Tulevan varaston ennuste"
 
 #. module: stock
 #: model:ir.module.module,description:stock.module_meta_information
@@ -1404,195 +1409,195 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr ""
+msgstr "Kiinteä paikka"
 
 #. module: stock
 #: 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: stock
 #: field:stock.picking,min_date:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Suunniteltu päivämäärä"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Lähtevät tuotteet"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COLOR_PICKER"
-msgstr ""
+msgstr "STOCK_COLOR_PICKER"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_lot_location
 msgid "Lots by location"
-msgstr ""
+msgstr "Erät paikoittain"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DELETE"
-msgstr ""
+msgstr "STOCK_DELETE"
 
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr ""
+msgstr "Varastopäiväkirja"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLEAR"
-msgstr ""
+msgstr "STOCK_CLEAR"
 
 #. module: stock
 #: field:stock.production.lot,date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Luontipäivä"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr ""
+msgstr "Hankinta"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "Maxtor toimittajat"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr ""
+msgstr "Pakota saatavuus"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "View Stock of Products"
-msgstr ""
+msgstr "Näytä tuotteiden varasto"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mrp"
-msgstr ""
+msgstr "terp-mrp"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
 msgid "Future Delivery Orders"
-msgstr ""
+msgstr "Tulevat toimitustilaukset"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_UP"
-msgstr ""
+msgstr "STOCK_GO_UP"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_DESCENDING"
-msgstr ""
+msgstr "STOCK_SORT_DESCENDING"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 msgid "Tracking Lots"
-msgstr ""
+msgstr "Seurantaerät"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
 msgid "Yes"
-msgstr ""
+msgstr "Kyllä"
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr ""
+msgstr "Tavaraluettelot"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HOME"
-msgstr ""
+msgstr "STOCK_HOME"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PROPERTIES"
-msgstr ""
+msgstr "STOCK_PROPERTIES"
 
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Todellinen varasto"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_fill_inventory
 #: wizard_view:stock.fill_inventory,init:0
 #: wizard_button:stock.fill_inventory,init,fill_inventory:0
 msgid "Fill Inventory"
-msgstr ""
+msgstr "Täytä varastolista"
 
 #. module: stock
 #: wizard_view:stock.invoice_onshipping,init:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Luo laskut"
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
-msgstr ""
+msgstr "Revision pvm."
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Lot"
-msgstr ""
+msgstr "Erä"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stock to Zero"
-msgstr ""
+msgstr "Aseta varasto nollaan"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
-msgstr ""
+msgstr "Määrä (myyntiyksikköä)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr ""
+msgstr "Käsiteltävä pakkaus"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_STOP"
-msgstr ""
+msgstr "STOCK_MEDIA_STOP"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr ""
+msgstr "Aseta saataville"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.make_picking
 #: wizard_view:stock.picking.make,init:0
 msgid "Make packing"
-msgstr ""
+msgstr "Tee pakkaus"
 
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order"
-msgstr ""
+msgstr "Jälkitoimitus"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND_MULTIPLE"
-msgstr ""
+msgstr "STOCK_DND_MULTIPLE"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REMOVE"
-msgstr ""
+msgstr "STOCK_REMOVE"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -1600,12 +1605,12 @@ msgstr ""
 #: field:stock.picking,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
-msgstr ""
+msgstr "Ominaisuudet"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -1613,7 +1618,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_incoterms_tree
 #: view:stock.incoterms:0
 msgid "Incoterms"
-msgstr ""
+msgstr "INCOTERMS"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -1624,121 +1629,121 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr ""
+msgstr "STOCK_DIALOG_AUTHENTICATION"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_OUT"
-msgstr ""
+msgstr "STOCK_ZOOM_OUT"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr ""
+msgstr "Seurannan etuliite"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
 msgid "Nearest"
-msgstr ""
+msgstr "Lähin"
 
 #. module: stock
 #: wizard_field:stock.location.products,init,to_date:0
 msgid "To"
-msgstr ""
+msgstr "päättyen"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr ""
+msgstr "Revision nimi"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_COLOR"
-msgstr ""
+msgstr "STOCK_SELECT_COLOR"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Confirm Inventory"
-msgstr ""
+msgstr "Hyväksy inventaario"
 
 #. module: stock
 #: view:product.category:0
 msgid "Accounting Stock Properties"
-msgstr ""
+msgstr "Varaston kirjanpidon ominaisuudet"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NO"
-msgstr ""
+msgstr "STOCK_NO"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_workshop
 msgid "Workshop"
-msgstr ""
+msgstr "Työpaja"
 
 #. module: stock
 #: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr ""
+msgstr "Näennäiset paikat"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REDO"
-msgstr ""
+msgstr "STOCK_REDO"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Tiny sprl"
-msgstr ""
+msgstr "Tiny sprl"
 
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
-msgstr ""
+msgstr "Valmis pvm."
 
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Ei kiireellinen"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLOSE"
-msgstr ""
+msgstr "STOCK_CLOSE"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
 msgid "Warehouses"
-msgstr ""
+msgstr "Varastorakennukset"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
-msgstr ""
+msgstr "Pakota käyttämään tuotantoerää toimituksissa"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Split move lines in two"
-msgstr ""
+msgstr "Jaa siirtorivi kahteen"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,journal_id:0
 msgid "Destination Journal"
-msgstr ""
+msgstr "Kohde päiväkirja"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
 #: model:stock.location,name:stock.stock_location_stock
 msgid "Stock"
-msgstr ""
+msgstr "Varasto"
 
 #. module: stock
 #: rml:lot.location:0
@@ -1749,129 +1754,129 @@ msgstr ""
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Tuote"
 
 #. module: stock
 #: wizard_button:stock.return.picking,init,return:0
 msgid "Return"
-msgstr ""
+msgstr "Palauta"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Packing"
-msgstr ""
+msgstr "Automaattipakkaus"
 
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "Tuotteen myyntiyksikkö"
 
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
-msgstr ""
+msgstr "Korkeus (Z)"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
 #: field:stock.move,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Tuotteen mittayksikkö"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Variants"
-msgstr ""
+msgstr "Variaatiot"
 
 #. module: stock
 #: field:stock.location,posx:0
 msgid "Corridor (X)"
-msgstr ""
+msgstr "Käytävä (X)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
 msgid "Suppliers"
-msgstr ""
+msgstr "Toimittajat"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUMP_TO"
-msgstr ""
+msgstr "STOCK_JUMP_TO"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-tools"
-msgstr ""
+msgstr "terp-tools"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 msgid "Location Overview"
-msgstr ""
+msgstr "Paikan yleiskuva"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.location_product
 msgid "Products by Location"
-msgstr ""
+msgstr "Tuotteet paikoittain"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDO"
-msgstr ""
+msgstr "STOCK_UNDO"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.move_split
 msgid "Split move line"
-msgstr ""
+msgstr "Jaa siirron rivi"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-sale"
-msgstr ""
+msgstr "terp-sale"
 
 #. module: stock
 #: field:stock.production.lot,name:0
 msgid "Serial"
-msgstr ""
+msgstr "Sarjanumero"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ADD"
-msgstr ""
+msgstr "STOCK_ADD"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chained Delay (days)"
-msgstr ""
+msgstr "Ketjun viive (päivää)"
 
 #. module: stock
 #: field:stock.move,location_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Lähteen paikka"
 
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Kirjanpidon merkinnät"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
-msgstr ""
+msgstr "STOCK_MEDIA_PAUSE"
 
 #. module: stock
 #: view:product.product:0
 msgid "Lots"
-msgstr ""
+msgstr "Erät"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
-msgstr ""
+msgstr "Kaikki kerralla"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outging Lots"
-msgstr ""
+msgstr "Seuraa lähteviä eriä"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -1879,22 +1884,22 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
-msgstr ""
+msgstr "Tavaraluetteloiden pvm."
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
-msgstr ""
+msgstr "STOCK_PRINT_PREVIEW"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND"
-msgstr ""
+msgstr "STOCK_FIND"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr ""
+msgstr "Erän tavaraluettelo"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1905,79 +1910,85 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Tätä käytetään vain jos olet valinnut ketjutetun paikkatyypin.\n"
+"\"Automaattinen siirto\" luo varastonsiirron nykyisen jälkeen, ja se "
+"hyväksytään automaattisesti. \"Manuaalinen toimenpide\" tarkoittaa että "
+"käyttäjän on hyväksyttävä siirto. Jos valitset \"Automaattinen ei lisätä "
+"porrasta\", alkuperäisen siirron paikka korvataan."
 
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Icon"
 
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Tracking"
-msgstr ""
+msgstr "Seuranta"
 
 #. module: stock
 #: wizard_button:stock.move.track,init,track:0
 #: wizard_button:stock.picking.make,init,make:0
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
 msgid ""
 "This account will be used, instead of the default one, to value input stock"
 msgstr ""
+"Tätä tiliä käytetään oletuksen asemasta saapuvan varaston arvottamiseen"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr ""
+msgstr "Ei-eurooppalaiset asiakkat"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Components"
-msgstr ""
+msgstr "Komponentit"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
 msgid "Do you want to merge theses inventories ?"
-msgstr ""
+msgstr "Haluatko yhdistää nämä tavaraluettelot?"
 
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Planned Date"
-msgstr ""
+msgstr "Max. arvioitu pvm."
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr ""
+msgstr "Kirjattu inventaario"
 
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr ""
+msgstr "Tavaroita otetaan"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr ""
+msgstr "Varaston paikkatiedot"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr ""
+msgstr "STOCK_MEDIA_PLAY"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree_delivery
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Toimitustilaukset"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr ""
+msgstr "STOCK_OPEN"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -1985,86 +1996,89 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
+"Tätä varastopaikkaa käytetään oletuksen asemasta kohdepaikkana kun lähetät "
+"tavaraa tälle kumppanille"
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr ""
+msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Confirm"
-msgstr ""
+msgstr "Vahvista"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Check Availability"
-msgstr ""
+msgstr "Tarkista saatavuus"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory
 msgid "Merge inventories"
-msgstr ""
+msgstr "Yhdistä tavaraluettelot"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Stock Locations Structure"
-msgstr ""
+msgstr "Varaston paikkojen rakenne"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DISCONNECT"
-msgstr ""
+msgstr "STOCK_DISCONNECT"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
 msgid ""
 "This account will be used, instead of the default one, to value output stock"
 msgstr ""
+"Tätä tiliä käytetään oletuksen asemasta lähtevän varaston arvottamiseen"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr ""
+msgstr "Vahvista (älä käsittele nyt)"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves Tracked"
-msgstr ""
+msgstr "Seurattavat siirrot"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr ""
+msgstr "Raportointi"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
 #: wizard_button:stock.invoice_onshipping,init,create_invoice:0
 msgid "Create invoice"
-msgstr ""
+msgstr "Luo lasku"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr ""
+msgstr "STOCK_NETWORK"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguraatio"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr ""
+msgstr "terp-project"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2073,44 +2087,44 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
 #: view:stock.report.prodlots:0
 msgid "Stock by Lots"
-msgstr ""
+msgstr "Varasto erinä"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr ""
+msgstr "Automaattinen hyväksyntä"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic Move"
-msgstr ""
+msgstr "Automaattinen siirto"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr ""
+msgstr "Näennäinen varasto"
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Peruttu"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
-msgstr ""
+msgstr "STOCK_GOTO_LAST"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Laskutettu"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr ""
+msgstr "STOCK_DIRECTORY"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -2119,28 +2133,30 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "by production orders"
 msgstr ""
+"Tuotteelle käytetään tässä määritettyä varaston lähdepaikka oletuksen "
+"asemasta luotaessa varastonsiirtoja tuotantotilauksia varten"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Lisää"
 
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Internal"
-msgstr ""
+msgstr "Sisäinen"
 
 #. module: stock
 #: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr ""
+msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2148,52 +2164,52 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr ""
+msgstr "Pakkaus vahvistettu odottaa saatavuutta"
 
 #. module: stock
 #: field:stock.location,posy:0
 msgid "Shelves (Y)"
-msgstr ""
+msgstr "Hyllyt (Y)"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
 msgid "Set Stock to 0"
-msgstr ""
+msgstr "Aseta varasto 0"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localisation"
-msgstr ""
+msgstr "Paikallistaminen"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Do you want to set stocks to zero ?"
-msgstr ""
+msgstr "Haluatko asettaa varastot nolliksi?"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Suora toimitus"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr ""
+msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Production Lots"
-msgstr ""
+msgstr "Seuraa tuotantoeriä"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Split in Two"
-msgstr ""
+msgstr "Jaa kahteen"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr ""
+msgstr "Tulevat varastonsiirrot"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -2202,40 +2218,42 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "by procurements"
 msgstr ""
+"Tuotteelle käytetään tässä määritettyä varaston lähdepaikkaa oletuksen "
+"asemasta luotaessa varastonsiirtoja hankintoja varten"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
 msgid "stock.picking.move.wizard"
-msgstr ""
+msgstr "stock.picking.move.wizard"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
 #: field:stock.move,prodlot_id:0
 #: view:stock.production.lot:0
 msgid "Production Lot"
-msgstr ""
+msgstr "Tuotantoerä"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability
 #: model:ir.ui.menu,name:stock.next_id_62
 msgid "Traceability"
-msgstr ""
+msgstr "Seuranta"
 
 #. module: stock
 #: field:stock.picking,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Tilaus pvm."
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Toimittajan lasku"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
 msgid "Locations"
-msgstr ""
+msgstr "Paikkatiedot"
 
 #. module: stock
 #: help:stock.move,date_planned:0
@@ -2247,144 +2265,140 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "General Information"
-msgstr ""
+msgstr "Yleistiedot"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr ""
+msgstr "terp-product"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,end2,end:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Print Item Labels"
-msgstr ""
+msgstr "Tulosta tuotelaput"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Moves"
-msgstr ""
+msgstr "Siirrot"
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Kohdepaikka"
 
 #. module: stock
 #: wizard_button:stock.move.split,init,split:0
 msgid "Split"
-msgstr ""
+msgstr "Jaa"
 
 #. module: stock
 #: field:stock.location,account_id:0
 msgid "Inventory Account"
-msgstr ""
+msgstr "Inventaariotili"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stocks to Zero"
-msgstr ""
+msgstr "Aseta varastot nolliksi"
 
 #. module: stock
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
-msgstr ""
+msgstr "Tuotanto"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability_low
 msgid "Low Level"
-msgstr ""
+msgstr "Matala taso"
 
 #. module: stock
 #: rml:stock.picking.list:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDENT"
-msgstr ""
+msgstr "STOCK_INDENT"
 
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Delivery"
-msgstr ""
+msgstr "Toimitus"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
 #: model:ir.actions.wizard,name:stock.action4
 #: model:ir.actions.wizard,name:stock.action_lot2
 msgid "Upstream traceability"
-msgstr ""
+msgstr "Tulevien seuranta"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 msgid "Stock Input Account"
-msgstr ""
+msgstr "Saapuvan varaston tili"
 
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr ""
+msgstr "Ketjutettu paikkatyyppi"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Customer"
-msgstr ""
+msgstr "Asiakas"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree_3
 #: model:ir.ui.menu,name:stock.menu_action_location_tree_3
 msgid "Locations' Values"
-msgstr ""
+msgstr "Paikkojen arvot"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr ""
+msgstr "Lähtevä"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr ""
+msgstr "STOCK_JUSTIFY_RIGHT"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory line"
-msgstr ""
+msgstr "Varastoluettelon rivi"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Others info"
-msgstr ""
+msgstr "Muut tiedot"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr ""
+msgstr "STOCK_MEDIA_NEXT"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Move State"
-msgstr ""
+msgstr "Siirron tila"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr ""
+msgstr "Aineelliset paikat"
 
 #~ msgid "Stock Management"
 #~ msgstr "Varastonhallinta"
-
-#, python-format
-#~ msgid "Futur Stock"
-#~ msgstr "Tuleva varasto"
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index a8230d8bcfb..07036f64c31 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -7,20 +7,15 @@ 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-17 10:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-25 14:13+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: stock
-#: model:ir.actions.wizard,name:stock.return_picking
-msgid "Return packing"
-msgstr "Retour de livraison"
-
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
@@ -104,6 +99,11 @@ msgstr "STOCK_ZOOM_100"
 msgid "UoM"
 msgstr "UdM"
 
+#. module: stock
+#: model:ir.actions.wizard,name:stock.return_picking
+msgid "Return packing"
+msgstr "Colisage en retour"
+
 #. module: stock
 #: field:product.category,property_stock_journal:0
 msgid "Stock journal"
@@ -682,7 +682,7 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
-msgstr "Tracer N° Série"
+msgstr "Suivi/N° de série"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1094,7 +1094,7 @@ msgstr "STOCK_SPELL_CHECK"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_tracking
 msgid "Stock Tracking Lots"
-msgstr "Stock suivi par lot"
+msgstr "Lot de suivi de stock"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -1251,7 +1251,7 @@ msgstr "STOCK_STOP"
 #. module: stock
 #: wizard_view:stock.move.track,init:0
 msgid "Tracking a move"
-msgstr "Tracer un mouvement"
+msgstr "Suivi de mouvement"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1525,7 +1525,7 @@ msgstr "STOCK_SORT_DESCENDING"
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 msgid "Tracking Lots"
-msgstr "Tracer les lots"
+msgstr "Lots de suivi"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
@@ -1656,7 +1656,7 @@ msgstr "STOCK_ZOOM_OUT"
 #. module: stock
 #: wizard_field:stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr "Préfix du Suivi"
+msgstr "Préfix du suivi"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index 97612c2234d..9a2b6c6fc0b 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index 075f04de2c2..ee6c0a08046 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index 616615c07e1..d83696e1270 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 87c26e2b6fb..bb1a268d130 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index 9759bd2b96f..f953c35596d 100644
--- a/addons/stock/i18n/ko.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index dfd90f22f60..6d4f0ddc311 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index ec9bab40170..0aa3bd7f523 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index c4fa7645e8f..ff5a77b3a3b 100644
--- a/addons/stock/i18n/nl_BE.po
+++ b/addons/stock/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 824e5a0b01c..4f20753cf2e 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index a7fbfc88ea4..b7545341407 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 19d49bd480e..a1923cf2128 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index fcd4b43832d..30fb980da93 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 6cf8a262bac..6d3d70f20fc 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 84fbcb11afd..de0b55a3b71 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 0ee8799e10c..4706da4d2df 100644
--- a/addons/stock/i18n/sr.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 748521b7691..6cc9edaf29d 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index d6db33207b5..75aec9ca36c 100644
--- a/addons/stock/i18n/th.po
+++ b/addons/stock/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-11 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index 36b604862b6..926f5db4071 100644
--- a/addons/stock/i18n/tlh.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index bb3c422d784..53ea44f15b7 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index 2ade489512c..69b8104ee67 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 81ad9e5bb0b..070834195e5 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/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-08 03:56+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-29 01:06+0000\n"
+"Last-Translator: digitalsatori <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -24,7 +24,7 @@ msgstr "后进先出"
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "连接货位若固定连接"
+msgstr "固定连锁库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -34,7 +34,7 @@ msgstr "STOCK_SAVE"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_15
 msgid "Sub Products"
-msgstr "副产品"
+msgstr "子产品"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -44,7 +44,7 @@ msgstr "terp-account"
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在动作定义使用了无效的模型名称。"
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -70,7 +70,7 @@ msgstr "STOCK_MEDIA_FORWARD"
 #. module: stock
 #: rml:lot.location:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -86,24 +86,24 @@ msgstr "计量单位"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.return_picking
 msgid "Return packing"
-msgstr "退回挑选"
+msgstr "退货"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
 msgid "Stock journal"
-msgstr "库存流水账"
+msgstr "库存分类帐"
 
 #. module: stock
 #: wizard_view:stock.fill_inventory,init:0
 msgid "Fill Inventory for specific location"
-msgstr "在特定位置填充库存"
+msgstr "填写具体库位盘存"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr "装箱单"
+msgstr "分拣单"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -114,13 +114,13 @@ msgstr "金额"
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr "已收货品"
+msgstr "已收到的货品"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "进来的产品列表"
+msgstr "入库货品"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -141,13 +141,13 @@ msgstr "业务伙伴"
 #. module: stock
 #: help:product.product,track_incoming:0
 msgid "Force to use a Production Lot during receptions"
-msgstr "收货时强制指定产品批号"
+msgstr "接收强制的生产批次"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 #: field:stock.move,move_history_ids2:0
 msgid "Move History"
-msgstr "移动历史记录"
+msgstr "库存移动记录"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -169,7 +169,7 @@ msgstr "STOCK_CANCEL"
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "内部地点"
+msgstr "内部库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -201,47 +201,47 @@ msgstr "可用"
 #. module: stock
 #: view:stock.move:0
 msgid "Make Parcel"
-msgstr "打包裹"
+msgstr "打小包"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr "创建分拣单结果"
+msgstr "包装结果"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
-msgstr "STOCK_QUIT"
+msgstr "退出"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "出库位置"
+msgstr "库位出"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_TOP"
-msgstr "STOCK_GOTO_TOP"
+msgstr "顶"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ABOUT"
-msgstr "STOCK_ABOUT"
+msgstr "关于"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-hr"
-msgstr "terp-hr"
+msgstr "人力资源"
 
 #. module: stock
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr "货位类型"
+msgstr "库位类型"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-purchase"
-msgstr "terp-purchase"
+msgstr "采购"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -256,12 +256,12 @@ msgstr "["
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Sent"
-msgstr "已发出货品"
+msgstr "产品发出"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+msgstr "开始"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
@@ -272,7 +272,7 @@ msgstr "内部调拨"
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "装箱"
+msgstr "包装"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -284,7 +284,7 @@ msgstr "订单(来源)"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr "总计："
+msgstr "总计:"
 
 #. module: stock
 #: view:stock.location:0
@@ -295,33 +295,33 @@ msgstr "附加信息"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr "客户退款"
+msgstr "客户退货"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FLOPPY"
-msgstr "STOCK_FLOPPY"
+msgstr "软驱"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr "生产批次修订"
+msgstr "生产批次修改"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock location"
-msgstr "库存货位"
+msgstr "库存库位"
 
 #. module: stock
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
 msgid "Location Name"
-msgstr "货位名称"
+msgstr "库位名称"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNINDENT"
-msgstr "STOCK_UNINDENT"
+msgstr "不缩进"
 
 #. module: stock
 #: view:stock.move:0
@@ -332,7 +332,7 @@ msgstr "调拨信息"
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr "未接收货品"
+msgstr "未接收产品"
 
 #. module: stock
 #: field:stock.inventory,state:0
@@ -344,27 +344,27 @@ msgstr "状态"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
 msgid "Customers"
-msgstr "客户列表"
+msgstr "客户"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDERLINE"
-msgstr "STOCK_UNDERLINE"
+msgstr "下划线"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr "调拨明细"
+msgstr "调拨线路"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
 msgid "Include all childs for the location"
-msgstr "包含所有货位子项"
+msgstr "包括所有库位子项"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "采购地点"
+msgstr "产品需求库位"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@ -375,7 +375,7 @@ msgstr "生产批次"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Recipient"
-msgstr "接收方"
+msgstr "接收"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.track_line
@@ -385,22 +385,22 @@ msgstr "跟踪明细"
 #. module: stock
 #: field:stock.location,child_ids:0
 msgid "Contains"
-msgstr "包含"
+msgstr "含"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_BOLD"
-msgstr "STOCK_BOLD"
+msgstr "粗体"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
-msgstr "terp-graph"
+msgstr "图像"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PREFERENCES"
-msgstr "STOCK_PREFERENCES"
+msgstr "偏爱"
 
 #. module: stock
 #: rml:lot.location:0
@@ -419,12 +419,12 @@ msgstr "现在处理"
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "货位地址"
+msgstr "库位地址"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr "生产批次是标记在产品上的序列号"
+msgstr "生产批次是生产的一个序列号"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_13
@@ -434,12 +434,12 @@ msgstr "库存层1"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_REWIND"
-msgstr "STOCK_MEDIA_REWIND"
+msgstr "倒回"
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr "入库位置"
+msgstr "库位进"
 
 #. module: stock
 #: view:res.partner:0
@@ -449,12 +449,12 @@ msgstr "库存属性"
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr "进行挑选"
+msgstr "建立领料/提货"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr "采购"
+msgstr "产品需求"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
@@ -470,12 +470,12 @@ msgstr "调拨草稿"
 #. module: stock
 #: field:report.stock.lines.date,product_id:0
 msgid "Product Id"
-msgstr "产品标识符"
+msgstr "产品ID"
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -485,17 +485,17 @@ msgstr "客户发票"
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "存货地点"
+msgstr "盘存库位"
 
 #. module: stock
 #: help:product.product,track_production:0
 msgid "Force to use a Production Lot during production order"
-msgstr "在生产订单中强制使用生产批次"
+msgstr "生产单强制的生产批次"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CUT"
-msgstr "STOCK_CUT"
+msgstr "剪贴"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -503,23 +503,23 @@ msgid ""
 "For the current product (template), this stock location will be used, "
 "instead of the default one, as the source location for stock moves generated "
 "when you do an inventory"
-msgstr "对于当前货品(模板)系统库存盘点时应用该库存货位作为调拨的源货位而不是默认的货位。"
+msgstr "对于当前产品(模板)该库存库位默认作为库存盘点时库存调拨的源库位."
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
 msgid "This account will be used to value the output stock"
-msgstr "用于评估出产库存的帐目"
+msgstr "用于记录出库价值科目"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_FIT"
-msgstr "STOCK_ZOOM_FIT"
+msgstr "放大到适合"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
 msgid ""
 "This journal will be used for the accounting move generated by stock move"
-msgstr "用于记录库存调拨产生的会计调拨的流水帐"
+msgstr "用于记录库存调拨产生的会计变动."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
@@ -530,17 +530,17 @@ msgstr "送货日程表"
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incomming Lots"
-msgstr "跟踪进来批次"
+msgstr "跟踪进入库批次"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr "按货位库存"
+msgstr "库存库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE_AS"
-msgstr "STOCK_SAVE_AS"
+msgstr "另存到"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
@@ -560,7 +560,7 @@ msgstr "视图"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_ERROR"
-msgstr "STOCK_DIALOG_ERROR"
+msgstr "错误"
 
 #. module: stock
 #: field:stock.location,parent_left:0
@@ -575,18 +575,18 @@ msgstr "最近盘存日期"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDEX"
-msgstr "STOCK_INDEX"
+msgstr "索引"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_BOTTOM"
-msgstr "STOCK_GOTO_BOTTOM"
+msgstr "底"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr "新收货分拣单"
+msgstr "新接收的包装"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,quantity:0
@@ -604,7 +604,7 @@ msgstr "库存调拨"
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "生产地点"
+msgstr "生产库位"
 
 #. module: stock
 #: field:stock.move,tracking_id:0
@@ -614,27 +614,27 @@ msgstr "跟踪批次"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_FORWARD"
-msgstr "STOCK_GO_FORWARD"
+msgstr "向前"
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr "作者"
+msgstr "建立者"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDELETE"
-msgstr "未删除"
+msgstr "恢复"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EXECUTE"
-msgstr "STOCK_EXECUTE"
+msgstr "执行"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_QUESTION"
-msgstr "STOCK_DIALOG_QUESTION"
+msgstr "疑问"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -654,33 +654,33 @@ msgstr "预计运送日期"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "运输地址"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
-msgstr "跟踪号（序列号）"
+msgstr "跟踪号/序号"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_FONT"
-msgstr "STOCK_SELECT_FONT"
+msgstr "选择字体"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PASTE"
-msgstr "STOCK_PASTE"
+msgstr "粘贴"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "业务伙伴货位"
+msgstr "业务伙伴库位"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr "跟踪批次是放在物流单位/托盘上的编码"
+msgstr "跟踪批次是代码将放入逻辑单位/托板"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -700,17 +700,17 @@ msgstr "库存"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr "分拣单:"
+msgstr "包装单:"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_RECORD"
-msgstr "STOCK_MEDIA_RECORD"
+msgstr "记录"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr "日历视图"
+msgstr "日程表视图"
 
 #. module: stock
 #: wizard_field:stock.location.products,init,from_date:0
@@ -725,22 +725,22 @@ msgstr "重量"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Non Assigned Products:"
-msgstr "未分配货品"
+msgstr "没指定产品"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Invoice Control"
-msgstr "发票管理"
+msgstr "发票控制"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr "生产批次修订"
+msgstr "生产批次次修订"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Packing Done"
-msgstr "创建分拣单完成"
+msgstr "打包装完成"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -754,7 +754,7 @@ msgstr "等待中"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr "可用分拣单"
+msgstr "可包装"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -765,7 +765,7 @@ msgstr "仓库"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-report"
-msgstr "terp-report"
+msgstr "报表"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,type:0
@@ -780,56 +780,56 @@ msgstr "一般IT供应商"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Location Content (With children)"
-msgstr "货位存量（包子项）"
+msgstr "货物内容(子库位)"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FILE"
-msgstr "STOCK_FILE"
+msgstr "文件"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr "盘存明细标识符"
+msgstr "盘存明细ID"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EDIT"
-msgstr "STOCK_EDIT"
+msgstr "编辑"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CONNECT"
-msgstr "STOCK_CONNECT"
+msgstr "连接"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_all
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr "分拣单"
+msgstr "包装"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_DOWN"
-msgstr "STOCK_GO_DOWN"
+msgstr "向下"
 
 #. module: stock
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "客户地点"
+msgstr "客户库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OK"
-msgstr "STOCK_OK"
+msgstr "好"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr "新内部分拣单"
+msgstr "新的内部包装"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -856,7 +856,7 @@ msgstr "成品"
 #. module: stock
 #: field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr "上级地址"
+msgstr "业务伙伴库位"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -866,7 +866,7 @@ msgstr "创建日期"
 #. module: stock
 #: wizard_button:inventory.merge.stock.zero,init,merge:0
 msgid "Set to Zero"
-msgstr "设为零"
+msgstr "设为0"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -876,18 +876,18 @@ msgstr "所有库存调拨"
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构"
+msgstr "无效XML视图结构!"
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr "供货商地点"
+msgstr "供货商库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HELP"
-msgstr "STOCK_HELP"
+msgstr "帮助"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -897,12 +897,12 @@ msgstr "紧急"
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid "This account will be used to value the input stock"
-msgstr "用于估价入库的帐目"
+msgstr "用于记录入库的价值科目"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_INFO"
-msgstr "STOCK_DIALOG_INFO"
+msgstr "信息"
 
 #. module: stock
 #: field:stock.move,date:0
@@ -928,23 +928,23 @@ msgstr "已创建存货调拨"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_BACK"
-msgstr "STOCK_GO_BACK"
+msgstr "后退"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr "将开票"
+msgstr "要开票"
 
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr "对方货位属性"
+msgstr "对应库位属性"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_FILL"
-msgstr "STOCK_JUSTIFY_FILL"
+msgstr "两端对齐"
 
 #. module: stock
 #: view:stock.move:0
@@ -965,22 +965,22 @@ msgstr "分配方法"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-administration"
-msgstr "管理"
+msgstr "管理员"
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "位置库存"
+msgstr "库位库存"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_APPLY"
-msgstr "STOCK_APPLY"
+msgstr "应用"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr "这分挑选创建成功!"
+msgstr "这包装创建成功!"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -997,23 +997,23 @@ msgstr "定期盘存"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-crm"
-msgstr "terp-crm"
+msgstr "客户关系管理"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_STRIKETHROUGH"
-msgstr "STOCK_STRIKETHROUGH"
+msgstr "加删除线"
 
 #. module: stock
 #: rml:lot.stock.overview_all:0
 #: field:stock.incoterms,code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-partner"
-msgstr "terp-partner"
+msgstr "业务伙伴"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
@@ -1060,12 +1060,12 @@ msgstr "信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MISSING_IMAGE"
-msgstr "STOCK_MISSING_IMAGE"
+msgstr "图像"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SPELL_CHECK"
-msgstr "STOCK_SPELL_CHECK"
+msgstr "检查"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_tracking
@@ -1082,19 +1082,19 @@ msgstr "单价"
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Later"
-msgstr "稍后处理"
+msgstr "最后处理"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
-msgstr "该货位将作为您接收业务伙伴货品的来源而不是默认的货位"
+msgstr "默认作为你接收业务伙伴产品的来源库位"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr "所有者地址"
+msgstr "拥有者地址"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -1104,23 +1104,23 @@ msgstr "右父项"
 #. module: stock
 #: field:stock.picking,origin:0
 msgid "Origin Reference"
-msgstr "来源引用"
+msgstr "来源参考"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form4
 #: model:ir.ui.menu,name:stock.menu_action_move_form4
 msgid "Available Moves"
-msgstr "可移动"
+msgstr "可调拨"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HARDDISK"
-msgstr "STOCK_HARDDISK"
+msgstr "硬盘"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "相关运货清单"
+msgstr "相关领料/提货"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1128,7 +1128,7 @@ msgstr "相关运货清单"
 #: field:stock.picking.move.wizard,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr "名称"
+msgstr "3"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -1138,7 +1138,7 @@ msgstr "库存盘存明细"
 #. module: stock
 #: wizard_button:stock.location.products,init,open:0
 msgid "Open Products"
-msgstr "打开货品"
+msgstr "待处理产品"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -1148,23 +1148,23 @@ msgstr "]"
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Packing List"
-msgstr "输入分拣单"
+msgstr "接收包装单"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 #: field:stock.move,picking_id:0
 msgid "Packing List"
-msgstr "分拣单"
+msgstr "包装单"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COPY"
-msgstr "STOCK_COPY"
+msgstr "复制"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr "供应商退款"
+msgstr "供应商退货"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1175,32 +1175,32 @@ msgstr "库存调拨"
 #: field:product.category,property_stock_account_output_categ:0
 #: field:product.template,property_stock_account_output:0
 msgid "Stock Output Account"
-msgstr "出库帐目"
+msgstr "出库科目"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "自动无步骤增加"
+msgstr "自动没步骤增加"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "Stock Location Analysis"
-msgstr "库存货位分析"
+msgstr "库存库位分析"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CDROM"
-msgstr "STOCK_CDROM"
+msgstr "光驱"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not from Packing"
-msgstr "不是根据分拣单"
+msgstr "不是来自包装"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr "连锁货位"
+msgstr "连锁库位"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
@@ -1210,71 +1210,71 @@ msgstr "盘存损失"
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Ref"
-msgstr "内部引用"
+msgstr "内部参考"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REFRESH"
-msgstr "刷新"
+msgstr "恢复"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_STOP"
-msgstr "STOCK_STOP"
+msgstr "停止"
 
 #. module: stock
 #: wizard_view:stock.move.track,init:0
 msgid "Tracking a move"
-msgstr "跟踪货品移动"
+msgstr "跟踪调拨"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND_AND_REPLACE"
-msgstr "STOCK_FIND_AND_REPLACE"
+msgstr "替换"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_WARNING"
-msgstr "STOCK_DIALOG_WARNING"
+msgstr "警告"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_IN"
-msgstr "STOCK_ZOOM_IN"
+msgstr "缩小"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CONVERT"
-msgstr "STOCK_CONVERT"
+msgstr "修改"
 
 #. module: stock
 #: field:stock.move,note:0
 #: view:stock.picking:0
 #: field:stock.picking,note:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: stock
 #: field:stock.picking,move_lines:0
 #: field:stock.picking.move.wizard,move_ids:0
 msgid "Move lines"
-msgstr "货运明细"
+msgstr "调拨明细"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Value"
-msgstr "价值"
+msgstr "值"
 
 #. module: stock
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr "货运类型"
+msgstr "运送类型"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -1289,27 +1289,27 @@ msgstr "交货方式"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
 msgid "Partial packing"
-msgstr "分批出货分拣"
+msgstr "部分包装"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-calendar"
-msgstr "terp-calendar"
+msgstr "日程表"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
+msgstr "斜体"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_YES"
-msgstr "STOCK_YES"
+msgstr "是"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
 msgid "Fill From Unreceived Products"
-msgstr "由未接收的货品填充"
+msgstr "填充未接收的产品"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -1320,12 +1320,12 @@ msgstr "调拨目的点"
 #: model:ir.actions.act_window,name:stock.action_inventory_form_new
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
 msgid "New Periodical Inventory"
-msgstr "新定期盘存"
+msgstr "新的定期盘存"
 
 #. module: stock
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr "修订记录"
+msgstr "修改"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -1336,7 +1336,7 @@ msgstr "先进先出"
 #: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
 #: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery
 msgid "Delivery Orders to Process"
-msgstr "未处理送货单"
+msgstr "处理送货单"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -1355,7 +1355,7 @@ msgstr "优先级"
 #: rml:stock.picking.list:0
 #: field:stock.report.prodlots,location_id:0
 msgid "Location"
-msgstr "货位"
+msgstr "库位"
 
 #. module: stock
 #: field:stock.picking,invoice_state:0
@@ -1370,12 +1370,12 @@ msgstr "单位"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_LEFT"
-msgstr "STOCK_JUSTIFY_LEFT"
+msgstr "左对齐"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr "取消盘点"
+msgstr "取消盘存"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -1414,13 +1414,13 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr "固定货位"
+msgstr "固定库位"
 
 #. module: stock
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: stock
 #: field:stock.picking,min_date:0
@@ -1431,32 +1431,32 @@ msgstr "计划日期"
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr "发出货品"
+msgstr "发出的产品"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COLOR_PICKER"
-msgstr "STOCK_COLOR_PICKER"
+msgstr "颜色包"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_lot_location
 msgid "Lots by location"
-msgstr "按货位批次"
+msgstr "库位批次"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DELETE"
-msgstr "STOCK_DELETE"
+msgstr "删除"
 
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr "库存日记帐"
+msgstr "库存分类帐"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLEAR"
-msgstr "STOCK_CLEAR"
+msgstr "清空"
 
 #. module: stock
 #: field:stock.production.lot,date:0
@@ -1466,12 +1466,12 @@ msgstr "创建日期"
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "需求单"
+msgstr "产品需求"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr "Maxtor 供应商"
+msgstr "Maxtor供应商"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1481,28 +1481,28 @@ msgstr "强制可用"
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "View Stock of Products"
-msgstr "视察货品库存"
+msgstr "产品库存视图"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mrp"
-msgstr "terp-mrp"
+msgstr "生产资源计划"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
 msgid "Future Delivery Orders"
-msgstr "计划送货单"
+msgstr "未来的送货单"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_UP"
-msgstr "STOCK_GO_UP"
+msgstr "向上"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
+msgstr "降序"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
@@ -1513,27 +1513,27 @@ msgstr "跟踪批次"
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
 msgid "Yes"
-msgstr "确定"
+msgstr "是"
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr "库存"
+msgstr "库存清单"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HOME"
-msgstr "STOCK_HOME"
+msgstr "首页"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PROPERTIES"
-msgstr "STOCK_PROPERTIES"
+msgstr "属性"
 
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr "实际库存"
+msgstr "实时库存"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_fill_inventory
@@ -1550,7 +1550,7 @@ msgstr "创建发票"
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
-msgstr "修订日期"
+msgstr "修改日期"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -1560,23 +1560,23 @@ msgstr "批次"
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stock to Zero"
-msgstr "设库存为零"
+msgstr "设库存为0"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
-msgstr "数量（销售计量单位）"
+msgstr "数量(销售单位)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr "未处理分拣单"
+msgstr "包装处理"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_STOP"
-msgstr "STOCK_MEDIA_STOP"
+msgstr "停止"
 
 #. module: stock
 #: view:stock.move:0
@@ -1597,7 +1597,7 @@ msgstr "拖欠订单"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND_MULTIPLE"
-msgstr "STOCK_DND_MULTIPLE"
+msgstr "倍数"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1610,7 +1610,7 @@ msgstr "移除"
 #: field:stock.picking,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: stock
 #: view:product.template:0
@@ -1629,17 +1629,17 @@ msgstr "贸易术语"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr "STOCK_DIALOG_AUTHENTICATION"
+msgstr "确定"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_OUT"
-msgstr "STOCK_ZOOM_OUT"
+msgstr "放大"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,tracking_prefix:0
@@ -1654,22 +1654,22 @@ msgstr "最近"
 #. module: stock
 #: wizard_field:stock.location.products,init,to_date:0
 msgid "To"
-msgstr "至"
+msgstr "到"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr "修订名称"
+msgstr "修改名称"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_COLOR"
-msgstr "STOCK_SELECT_COLOR"
+msgstr "选择颜色"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Confirm Inventory"
-msgstr "盘点审核"
+msgstr "库存确定"
 
 #. module: stock
 #: view:product.category:0
@@ -1679,12 +1679,12 @@ msgstr "会计库存属性"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NO"
-msgstr "STOCK_NO"
+msgstr "否"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_workshop
 msgid "Workshop"
-msgstr "车间"
+msgstr "工厂"
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -1696,12 +1696,12 @@ msgstr "完成"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr "虚拟货位"
+msgstr "虚拟库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
+msgstr "重做"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -1721,7 +1721,7 @@ msgstr "不紧急"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLOSE"
-msgstr "STOCK_CLOSE"
+msgstr "关闭"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -1732,7 +1732,7 @@ msgstr "仓库"
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
-msgstr "交货时强制用生产批次"
+msgstr "送货强制的生产批次"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1742,7 +1742,7 @@ msgstr "把调拨明细线分为两部分"
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,journal_id:0
 msgid "Destination Journal"
-msgstr "目标日记帐"
+msgstr "目标分类帐"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
@@ -1764,7 +1764,7 @@ msgstr "产品"
 #. module: stock
 #: wizard_button:stock.return.picking,init,return:0
 msgid "Return"
-msgstr "返回"
+msgstr "退回"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
@@ -1774,7 +1774,7 @@ msgstr "自动创建分拣单"
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "产品销售计量单位"
+msgstr "产品销售单位"
 
 #. module: stock
 #: field:stock.location,posz:0
@@ -1791,7 +1791,7 @@ msgstr "产品计量单位"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Variants"
-msgstr "变体"
+msgstr "系列型号"
 
 #. module: stock
 #: field:stock.location,posx:0
@@ -1806,27 +1806,27 @@ msgstr "供应商"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUMP_TO"
-msgstr "STOCK_JUMP_TO"
+msgstr "跳到"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-tools"
-msgstr "terp-tools"
+msgstr "工具"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 msgid "Location Overview"
-msgstr "货位概述"
+msgstr "库位概述"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.location_product
 msgid "Products by Location"
-msgstr "按货位产品"
+msgstr "产品库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDO"
-msgstr "STOCK_UNDO"
+msgstr "取消"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.move_split
@@ -1836,7 +1836,7 @@ msgstr "分割调拨明细"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-sale"
-msgstr "terp-sale"
+msgstr "销售"
 
 #. module: stock
 #: field:stock.production.lot,name:0
@@ -1846,7 +1846,7 @@ msgstr "序号"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ADD"
-msgstr "STOCK_ADD"
+msgstr "增加"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1861,12 +1861,12 @@ msgstr "源货位"
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr "会计分录"
+msgstr "凭证"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
-msgstr "STOCK_MEDIA_PAUSE"
+msgstr "暂停"
 
 #. module: stock
 #: view:product.product:0
@@ -1876,7 +1876,7 @@ msgstr "批次"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
-msgstr "一次全部"
+msgstr "所有一起"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -1894,17 +1894,17 @@ msgstr "盘存日期"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
-msgstr "STOCK_PRINT_PREVIEW"
+msgstr "打印预览"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND"
-msgstr "STOCK_FIND"
+msgstr "查找"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr "批次盘库"
+msgstr "盘存明细"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1915,8 +1915,7 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"这仅用于如果您选择连锁货位类型\n"
-"'自动调拨'将在现有的以后创建一个新自动被审核的库存调拨。'手动操作'库存调拨需要人为审核。'自动无增加步骤'货位是取代原始调拨用的货位。"
+"如果你选择链式库位这是唯一的.'自动调拨'将创建一个库存调拨后当前这个将自动确认.'手动操作'库存调拨需要人手确认.'自动不增加'库位式取代调拨来源."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -1938,7 +1937,7 @@ msgstr "确定"
 #: help:product.template,property_stock_account_input:0
 msgid ""
 "This account will be used, instead of the default one, to value input stock"
-msgstr "这帐目将取代默认帐目使用，以评估入库库存"
+msgstr "默认作为记录入库值科目"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -1948,12 +1947,12 @@ msgstr "非欧洲客户"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Components"
-msgstr "组件"
+msgstr "零部件"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
 msgid "Do you want to merge theses inventories ?"
-msgstr "您是否想合并盘存？"
+msgstr "你真的要合并库存?"
 
 #. module: stock
 #: field:stock.picking,max_date:0
@@ -1973,12 +1972,12 @@ msgstr "收货"
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr "库存货位"
+msgstr "库存库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr "STOCK_MEDIA_PLAY"
+msgstr "播放"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -1989,25 +1988,25 @@ msgstr "送货单"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr "STOCK_OPEN"
+msgstr "打开"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
-msgstr "发送货物到这个业务伙伴时，该货位将代替默认货位使用。"
+msgstr "默认作为你发送货物到业务伙伴的目标库位."
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
-msgstr "已审核"
+msgstr "确定"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "STOCK_MEDIA_PREVIOUS"
+msgstr "前一个"
 
 #. module: stock
 #: view:stock.move:0
@@ -2017,7 +2016,7 @@ msgstr "确认"
 #. module: stock
 #: view:stock.picking:0
 msgid "Check Availability"
-msgstr "检查有效"
+msgstr "检查可用"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
@@ -2029,23 +2028,23 @@ msgstr "合并盘存"
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Stock Locations Structure"
-msgstr "库存货位结构"
+msgstr "库存库位结构"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DISCONNECT"
-msgstr "未连接"
+msgstr "分拆"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
 msgid ""
 "This account will be used, instead of the default one, to value output stock"
-msgstr "该帐目将会取代默认帐目使用，用来评估出库库存"
+msgstr "默认作为记录出库值科目"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr "确认（现在无进程）"
+msgstr "确认(现在没处理进程)"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
@@ -2055,7 +2054,7 @@ msgstr "调拨跟踪"
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
@@ -2066,7 +2065,7 @@ msgstr "创建发票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr "STOCK_NETWORK"
+msgstr "网络"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -2076,7 +2075,7 @@ msgstr "设置"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr "terp-project"
+msgstr "项目"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2085,12 +2084,12 @@ msgstr "terp-project"
 #: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
 #: view:stock.report.prodlots:0
 msgid "Stock by Lots"
-msgstr "按批次库存"
+msgstr "库存批次"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "自动审核"
+msgstr "自动验证"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -2107,12 +2106,12 @@ msgstr "虚拟库存值"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
-msgstr "STOCK_GOTO_LAST"
+msgstr "最后"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -2122,7 +2121,7 @@ msgstr "已开票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr "STOCK_DIRECTORY"
+msgstr "目录"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -2130,12 +2129,12 @@ msgid ""
 "For the current product (template), this stock location will be used, "
 "instead of the default one, as the source location for stock moves generated "
 "by production orders"
-msgstr "对于现有货品(模板)，该库存货位取代默认货位作为生产时库存调拨的源货位。"
+msgstr "对于当前产品(模板)该库存库位默认作为你生产时库存调拨的源库位."
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Add"
-msgstr "添加"
+msgstr "增加"
 
 #. module: stock
 #: selection:stock.picking,type:0
@@ -2152,7 +2151,7 @@ msgstr "草稿"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr "STOCK_JUSTIFY_CENTER"
+msgstr "居中"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2160,7 +2159,7 @@ msgstr "STOCK_JUSTIFY_CENTER"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr "确认分拣单等待可用"
+msgstr "确认包装等待可用"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -2170,27 +2169,27 @@ msgstr "架子（Y）"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
 msgid "Set Stock to 0"
-msgstr "设置库存为零"
+msgstr "设库存为0"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localisation"
-msgstr "本地化"
+msgstr "本地"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Do you want to set stocks to zero ?"
-msgstr "您是否想设库存为零？"
+msgstr "你真的设库存为0?"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Direct Delivery"
-msgstr "直接交货"
+msgstr "直接送货"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr "STOCK_REVERT_TO_SAVED"
+msgstr "恢复到保存"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -2200,12 +2199,12 @@ msgstr "跟踪生产批次"
 #. module: stock
 #: view:stock.picking:0
 msgid "Split in Two"
-msgstr "分为两部分"
+msgstr "分割两个"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr "计划库存调拨"
+msgstr "未来库存调拨"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -2213,12 +2212,12 @@ msgid ""
 "For the current product (template), this stock location will be used, "
 "instead of the default one, as the source location for stock moves generated "
 "by procurements"
-msgstr "对于现有货品(模板)，该库存货将位取代默认货位作为由采购产生库存调拨的源货位"
+msgstr "对于当前产品(模板)该库存库位默认作为产品需求的库存调拨源库位."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
 msgid "stock.picking.move.wizard"
-msgstr "stock.picking.move.wizard"
+msgstr "库存.领料/提货.调拨.向导"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -2236,7 +2235,7 @@ msgstr "可追踪"
 #. module: stock
 #: field:stock.picking,date:0
 msgid "Date Order"
-msgstr "订单日期"
+msgstr "订购日期"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -2247,14 +2246,14 @@ msgstr "供应商发票"
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
 msgid "Locations"
-msgstr "货位"
+msgstr "库位"
 
 #. module: stock
 #: help:stock.move,date_planned:0
 msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
-msgstr "产品移动预定日期或者实际日期如已经完成"
+msgstr "如果调拨完成.产品调拨的预定日期或实际日期"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2264,7 +2263,7 @@ msgstr "一般信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr "terp-product"
+msgstr "产品"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,end2,end:0
@@ -2274,18 +2273,18 @@ msgstr "关闭"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Print Item Labels"
-msgstr "打印货品标签"
+msgstr "打印产品标签"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Moves"
-msgstr "调拨列表"
+msgstr "调拨"
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr "目标地点"
+msgstr "目标库位"
 
 #. module: stock
 #: wizard_button:stock.move.split,init,split:0
@@ -2295,12 +2294,12 @@ msgstr "分割"
 #. module: stock
 #: field:stock.location,account_id:0
 msgid "Inventory Account"
-msgstr "库存账号"
+msgstr "盘存科目"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stocks to Zero"
-msgstr "设库存为零"
+msgstr "设库存为0"
 
 #. module: stock
 #: model:stock.location,name:stock.location_production
@@ -2311,7 +2310,7 @@ msgstr "生产"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability_low
 msgid "Low Level"
-msgstr "低层"
+msgstr "底层"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -2327,7 +2326,7 @@ msgstr "缩进"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Delivery"
-msgstr "交货"
+msgstr "送货"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
@@ -2345,7 +2344,7 @@ msgstr "入库科目"
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr "连锁货位类型"
+msgstr "连锁库位类型"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2356,17 +2355,17 @@ msgstr "客户"
 #: model:ir.actions.act_window,name:stock.action_location_tree_3
 #: model:ir.ui.menu,name:stock.menu_action_location_tree_3
 msgid "Locations' Values"
-msgstr "货位值"
+msgstr "库位值"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr "输出"
+msgstr "发出"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "STOCK_JUSTIFY_RIGHT"
+msgstr "右对齐"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
@@ -2376,12 +2375,12 @@ msgstr "盘存明细"
 #. module: stock
 #: view:stock.picking:0
 msgid "Others info"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr "STOCK_MEDIA_NEXT"
+msgstr "下一个"
 
 #. module: stock
 #: view:stock.move:0
@@ -2392,4 +2391,34 @@ msgstr "调拨状态"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr "实体货位"
+msgstr "物理库位"
+
+#~ msgid "Stock Management"
+#~ msgstr "库存管理"
+
+#~ msgid ""
+#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
+#~ "structured stock locations.\n"
+#~ "Thanks to the double entry management, the inventory controlling is powerful "
+#~ "and flexible:\n"
+#~ "* Moves history and planning,\n"
+#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
+#~ "* Stock valuation (standard or average price, ...)\n"
+#~ "* Robustness faced with Inventory differences\n"
+#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
+#~ "* Bar code supported\n"
+#~ "* Rapid detection of mistakes through double entry system\n"
+#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+#~ "    "
+#~ msgstr ""
+#~ "系统库存管理模块能管理多仓库多和结构化仓库库位\n"
+#~ "\t使用复式记录管理提供灵活和强大库存控制:\n"
+#~ "\t*调拨历史和计划\n"
+#~ "\t*不同的库存管理方法(FIFO, LIFO, ...)\n"
+#~ "\t*存货估计(标准和平均估价)\n"
+#~ "\t*自动重开单规则(库存级别,jit)\n"
+#~ "\t*存货清单不同的鲁棒性\n"
+#~ "\t*条码支持\n"
+#~ "\t*通过复式录入系统实现快速检测错误\n"
+#~ "\t*跟踪能力(上游,下游,产品批号,序列号)\n"
+#~ "    "
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 6c91342e3da..29330d00afb 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 3e789fa7ecd..d771815a4d4 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -24,7 +24,127 @@ from tools.translate import _
 
 
 class product_product(osv.osv):
-    _inherit = "product.product"
+    _inherit = "product.product"    
+
+    def do_change_standard_price(self, cr, uid, ids, datas, context={}):
+        """ 
+             Changes the Standard Price of Product. 
+             And creates an account move accordingly.
+            
+             @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 datas : dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """        
+        location_obj = self.pool.get('stock.location')
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')                        
+
+        new_price = datas.get('new_price', 0.0)
+        stock_output_acc = datas.get('stock_output_account', False)
+        stock_input_acc = datas.get('stock_input_account', False)
+        journal_id = datas.get('stock_journal', False)
+
+        move_ids = []        
+        for rec_id in ids:
+            loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
+            for location in location_obj.browse(cr, uid, loc_ids):
+                c = context.copy()
+                c.update({
+                    'location': location.id,
+                    'compute_child': False
+                })           
+                
+                product = self.browse(cr, uid, rec_id, context=c)
+                qty = product.qty_available
+                diff = product.standard_price - new_price 
+                assert diff, _("Could not find any difference between standard price and new price!")
+                if qty:
+                    location_account = location.account_id and location.account_id.id or False
+                    company_id = location.company_id and location.company_id.id or False                    
+                    assert location_account, _('Inventory Account is not specified for Location: %s' % (location.name))
+                    assert company_id, _('Company is not specified in Location')
+                    #
+                    # Accounting Entries
+                    #
+                    if not journal_id:
+                        journal_id = product.categ_id.property_stock_journal and product.categ_id.property_stock_journal.id or False
+                    if not journal_id:
+                        raise osv.except_osv(_('Error!'),
+                            _('There is no journal defined '\
+                                'on the product category: "%s" (id: %d)') % \
+                                (product.categ_id.name,
+                                    product.categ_id.id,))
+                    move_id = move_obj.create(cr, uid, {
+                                'journal_id': journal_id, 
+                                'company_id': company_id
+                                }) 
+                    
+                    move_ids.append(move_id)
+
+
+                    if diff > 0:
+                        if not stock_input_acc:
+                            stock_input_acc = product.product_tmpl_id.\
+                                property_stock_account_input.id
+                        if not stock_input_acc:
+                            stock_input_acc = product.categ_id.\
+                                    property_stock_account_input_categ.id
+                        if not stock_input_acc:
+                            raise osv.except_osv(_('Error!'),
+                                    _('There is no stock input account defined ' \
+                                            'for this product: "%s" (id: %d)') % \
+                                            (product.name,
+                                                product.id,))
+                        amount_diff = qty * diff        
+                        move_line_obj.create(cr, uid, {
+                                    'name': product.name,
+                                    'account_id': stock_input_acc,
+                                    'debit': amount_diff,
+                                    'move_id': move_id,
+                                    })
+                        move_line_obj.create(cr, uid, {
+                                    'name': location.name,
+                                    'account_id': location_account,
+                                    'credit': amount_diff,
+                                    'move_id': move_id
+                                    })
+                    elif diff < 0: 
+                        if not stock_output_acc:
+                            stock_output_acc = product.product_tmpl_id.\
+                                property_stock_account_output.id
+                        if not stock_output_acc:
+                            stock_output_acc = product.categ_id.\
+                                    property_stock_account_output_categ.id
+                        if not stock_output_acc:
+                            raise osv.except_osv(_('Error!'),
+                                    _('There is no stock output account defined ' \
+                                            'for this product: "%s" (id: %d)') % \
+                                            (product.name,
+                                                product.id,))
+                        amount_diff = qty * -diff
+                        move_line_obj.create(cr, uid, {
+                                    'name': product.name,
+                                    'account_id': stock_output_acc,
+                                    'credit': amount_diff,
+                                    'move_id': move_id
+                                    })
+                        move_line_obj.create(cr, uid, {
+                                    'name': location.name,
+                                    'account_id': location_account,
+                                    'debit': amount_diff,
+                                    'move_id': move_id
+                                    })                   
+                
+            self.write(cr, uid, rec_id, {'standard_price': new_price})
+
+        return move_ids
+
     def view_header_get(self, cr, user, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
         if res: return res
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 9f9dd4b6ec2..d027465c34d 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -54,6 +54,20 @@
             </field>
         </record>
 
+		<record id="view_product_standard_price_form" model="ir.ui.view">
+            <field name="name">product.product.standard.price.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+				<field name="standard_price" position="replace">
+					<group col="4" colspan="2">
+						<field name="standard_price" readonly="True"/>
+						<button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
+	           		</group>
+	           	</field>
+	        </field>
+	    </record>
 
         <record id="view_normal_property_acc_form" model="ir.ui.view">
             <field name="name">product.normal.stock.acc.property.form.inherit</field>
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 5bad46baa07..6e0bc044d3e 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,6 +26,8 @@ import ups
 import picking
 import lot_overview
 import lot_overview_all
+import report_stock
+import report_stock_picking
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/report_stock.py b/addons/stock/report/report_stock.py
similarity index 100%
rename from addons/stock/report_stock.py
rename to addons/stock/report/report_stock.py
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
new file mode 100644
index 00000000000..2fe450d60de
--- /dev/null
+++ b/addons/stock/report/report_stock_picking.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields,osv
+import tools
+
+class report_stock_picking(osv.osv):
+    _name = "report.stock.picking"
+    _description = "Stock Picking Report"
+    _auto = False
+    _columns = {
+        'name': fields.char('Year',size=64,required=False, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+        'reference': fields.char('Reference', size=64, select=True),
+        'nbr': fields.integer('# of Orders', readonly=True),
+        'origin': fields.char('Origin', size=64),
+        'order_date':fields.date('Order Date'),
+        'state': fields.selection([('draft', 'Draft'),('auto', 'Waiting'),('confirmed', 'Confirmed'),('assigned', 'Available'),('done', 'Done'),('cancel', 'Cancelled')], 'State'),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True),
+        'address_id': fields.many2one('res.partner.address', 'Partner'),
+        'expected_date': fields.date('Expected Date'),
+
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_stock_picking')
+        cr.execute("""
+            create or replace view report_stock_picking as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.name as reference,
+                    c.origin,
+                    c.state,
+                    c.type,
+                    c.address_id,
+                    to_date(to_char(c.date, 'MM-dd-YYYY'),'MM-dd-YYYY') as order_date,
+                    to_date(to_char(c.min_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as expected_date,
+                    count(*) as nbr
+                from
+                    stock_picking c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),c.name,c.origin,c.date,c.state,c.type,c.address_id,c.min_date
+            )""")
+report_stock_picking()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
new file mode 100644
index 00000000000..f2d4bfe4507
--- /dev/null
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Stock Picking Report
+	-->
+
+        <record id="view_report_report_stock_picking_tree" model="ir.ui.view">
+            <field name="name">report.stock.picking.tree</field>
+            <field name="model">report.stock.picking</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+               <tree string="Picking">
+					<field name="reference" />
+					<field name="address_id" />
+					<field name="origin" />
+					<field name="order_date" />
+					<field name="type" />
+					<field name="nbr" string="#Picking" />
+					<field name="state" invisible="1"/>
+					<field name="order_date" invisible="1"/>
+					<field name="expected_date" invisible="1"/>
+					<field name="name" invisible="1"/>
+					<field name="month" invisible="1"/>
+				</tree>
+            </field>
+        </record>
+        <record id="view_report_report_stock_picking_form" model="ir.ui.view">
+            <field name="name">report.stock.picking.form</field>
+            <field name="model">report.stock.picking</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Picking">
+            		<field name="name" />
+					<field name="month"/>
+                   	<field name="reference" />
+                </form>
+            </field>
+        </record>
+
+        <record id="view_report_report_stock_picking_graph" model="ir.ui.view">
+            <field name="name">report.stock.picking.graph</field>
+            <field name="model">report.stock.picking</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Picking" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_report_stock_picking_filter" model="ir.ui.view">
+            <field name="name">report.stock.picking.select</field>
+            <field name="model">report.stock.picking</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search">
+                  <group col="16" colspan="6">
+                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" default="1" />
+						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
+                        <separator orientation="vertical"/>
+  						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
+  						<filter string="Order Date" icon="terp-stock" domain="[('order_date',=,time.strftime('%%m/%%d/%%Y'))]"  />
+  						<filter string="Expected Date" icon="terp-hr" domain="[('expected_date',=,time.strftime('%%m/%%d/%%Y'))]"/>
+						<separator orientation="vertical"/>
+						<field name="reference" />
+						<field name="origin" />
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Extended options..." colspan="4" col="5">
+                        <filter icon="terp-sale"
+                    		string="Sending Goods"
+                    		domain="[('type','=','out')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Getting Goods"
+                    		domain="[('type','=','in')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Internal"
+                    		domain="[('type','=','internal')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Delivery"
+                    		domain="[('type','=','delivery')]"/>
+                    </group>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="5">
+                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                    	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
+                    	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+        <record id="action_report_report_stock_picking" model="ir.actions.act_window">
+            <field name="name">Picking</field>
+            <field name="res_model">report.stock.picking</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="view_id" ref="view_report_report_stock_picking_tree"/>
+            <field name="search_view_id" ref="view_report_report_stock_picking_filter"/>
+        </record>
+
+       	<record model="ir.actions.act_window.view" id="action_report_report_stock_picking_tree">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_report_report_stock_picking_tree"/>
+	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
+	    </record>
+
+        <record model="ir.actions.act_window.view" id="action_report_report_stock_picking_graph">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">graph</field>
+	        <field name="view_id" ref="view_report_report_stock_picking_graph"/>
+	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
+	    </record>
+
+        <menuitem name="Picking" action="action_report_report_stock_picking" id="menu_report_report_stock_pickings_tree" parent="next_id_61"/>
+
+  </data>
+</openerp>
+
diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
similarity index 98%
rename from addons/stock/report_stock_view.xml
rename to addons/stock/report/report_stock_view.xml
index 21f7d91a806..21b8a0a2f4e 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -12,10 +12,12 @@
                         <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" default="1" />
                         <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
                         <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
+                        
                         <separator orientation="vertical"/>
                         <field name="location_id" select="1" />
                         <field name="product_id" select="1" />
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="Location" icon="terp-stock" domain="[]"  context="{'group_by':'location_id'}"/>
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
@@ -152,7 +154,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_line_date">
-            <field name="name">Latest Inventory Date by Product</field>
+            <field name="name">Latest Inventories Dates by Product</field>
             <field name="res_model">report.stock.lines.date</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index eea058ebde1..8e7db1c068b 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -22,4 +22,16 @@
 "access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
 "access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,0,0,0
 "access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,0,0,0
-"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0
\ No newline at end of file
+"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0"access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,0,0,0
+"access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,0,0,0
+"access_stock_move_track","stock.move.track","model_stock_move_track","stock.group_stock_user",1,0,0,0
+"access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
+"access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,0,0,0
+"access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,0,0,0
+"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0
+"access_stock_inventory_set_stock_zero","stock.inventory.set.stock.zero","model_stock_inventory_set_stock_zero","stock.group_stock_user",1,0,0,0
+"access_stock_fill_inventory","stock.fill.inventory","model_stock_fill_inventory","stock.group_stock_user",1,0,0,0
+"access_stock_inventory_line_split","stock.inventory.line.split","model_stock_inventory_line_split","stock.group_stock_user",1,0,0,0
+"access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,0,0,0
+"access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,0,0,0
+"access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,0,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 2d91d958957..1ea74cea1ef 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -25,14 +25,14 @@
         <field name="global" eval="True"/>
      </record>
      <record model="ir.rule" id="stock_picking_rule">
-		<field model="ir.model.fields" name="field_id" search="[('model','=','stock.picking'),('name','=','company_id')]"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
+        <field model="ir.model.fields" name="field_id" search="[('model','=','stock.picking'),('name','=','company_id')]"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','=',False)]</field>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
         <field name="rule_group" ref="stock_picking_rule_group"/>
      </record>
 
-	<record model="ir.rule.group" id="stock_warehouse_comp_rule_group">
+    <record model="ir.rule.group" id="stock_warehouse_comp_rule_group">
         <field name="name">Warehouse multi-company</field>
         <field name="model_id" ref="model_stock_warehouse"/>
         <field name="global" eval="True"/>
@@ -41,7 +41,7 @@
     <record model="ir.rule" id="stock_warehouse_comp_rule">
         <field name="field_id" search="[('model','=','stock.warehouse'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_warehouse_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="stock_location_comp_rule_group">
@@ -52,7 +52,7 @@
     <record model="ir.rule" id="stock_location_comp_rule">
         <field name="field_id" search="[('model','=','stock.location'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_location_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
      <record model="ir.rule.group" id="stock_move_rule_group">
@@ -61,10 +61,10 @@
         <field name="global" eval="True"/>
      </record>
      <record model="ir.rule" id="stock_move_rule">
-      	<field model="ir.model.fields" name="field_id" search="[('model','=','stock.move'),('name','=','company_id')]"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
-		<field name="operator">child_of</field>
-   	    <field name="operand">user.company_id.id</field>
+        <field model="ir.model.fields" name="field_id" search="[('model','=','stock.move'),('name','=','company_id')]"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
         <field name="rule_group" ref="stock_move_rule_group"/>
      </record>
 
@@ -76,7 +76,7 @@
     <record model="ir.rule" id="stock_inventory_line_comp_rule">
         <field name="field_id" search="[('model','=','stock.inventory.line'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_inventory_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record model="ir.rule.group" id="stock_inventory_comp_rule_group">
@@ -87,7 +87,7 @@
     <record model="ir.rule" id="stock_inventory_comp_rule">
         <field name="field_id" search="[('model','=','stock.inventory'),('name','=','company_id')]" model="ir.model.fields"/>
         <field name="rule_group" ref="stock_inventory_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">[('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 </data>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a403c141be4..94fab1dacec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -122,8 +122,13 @@ class stock_location(osv.osv):
             for r in result:
                 c = (context or {}).copy()
                 c['location'] = id
-                product = self.pool.get('product.product').read(cr, uid, r['product_id'], [field_to_read, pricetype.field], context=c)
-                final_value += (product[field_to_read] * product[pricetype.field])
+                product = self.pool.get('product.product').read(cr, uid, r['product_id'], [field_to_read], context=c)
+                # Compute the amount_unit in right currency
+
+                context['currency_id']=self.pool.get('res.users').browse(cr,uid,uid).company_id.currency_id.id
+                amount_unit=self.pool.get('product.product').browse(cr,uid,r['product_id']).price_get(pricetype.field, context)[r['product_id']]
+
+                final_value += (product[field_to_read] * amount_unit)
         return final_value
 
     def _product_value(self, cr, uid, ids, field_names, arg, context={}):
@@ -223,7 +228,8 @@ class stock_location(osv.osv):
         # Take the user company and pricetype
         price_type_id=self.pool.get('res.users').browse(cr,uid,uid).company_id.property_valuation_price_type.id
         pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)
-        
+        context['currency_id']=self.pool.get('res.users').browse(cr,uid,uid).company_id.currency_id.id
+
         if not product_ids:
             product_ids = product_obj.search(cr, uid, [])
 
@@ -254,10 +260,10 @@ class stock_location(osv.osv):
                         continue
                     product = products_by_id[product_id]
                     quantity_total += qty[product_id]
-                    
+
                     # Compute based on pricetype
                     # Choose the right filed standard_price to read
-                    amount_unit=product.price_get(pricetype.field, context)[product.id] 
+                    amount_unit=product.price_get(pricetype.field, context)[product.id]
                     price = qty[product_id] * amount_unit
                     # price = qty[product_id] * product.standard_price
 
@@ -486,6 +492,7 @@ class stock_picking(osv.osv):
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+        'delivery_line':fields.one2many('stock.delivery', 'picking_id', 'Delivery lines', readonly=True),
         'auto_picking': fields.boolean('Auto-Picking'),
         'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
         'invoice_state': fields.selection([
@@ -536,16 +543,18 @@ class stock_picking(osv.osv):
         # TODO: Check locations to see if in the same location ?
         return True
 
-    def button_confirm(self, cr, uid, ids, *args):
-        for id in ids:
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking', id, 'button_confirm', cr)
-        self.force_assign(cr, uid, ids, *args)
-        return True
+#    def button_confirm(self, cr, uid, ids, *args):
+#        for id in ids:
+#            wf_service = netsvc.LocalService("workflow")
+#            wf_service.trg_validate(uid, 'stock.picking', id, 'button_confirm', cr)
+#        self.force_assign(cr, uid, ids, *args)
+#        return True
 
     def action_assign(self, cr, uid, ids, *args):
         for pick in self.browse(cr, uid, ids):
             move_ids = [x.id for x in pick.move_lines if x.state == 'confirmed']
+            if not move_ids:
+                raise osv.except_osv(_('Warning !'),_('Not Available. Moves are not confirmed.'))
             self.pool.get('stock.move').action_assign(cr, uid, move_ids)
         return True
 
@@ -640,43 +649,48 @@ class stock_picking(osv.osv):
                         context=context)
         return True
 
-    def get_currency_id(self, cursor, user, picking):
+    def get_currency_id(self, cr, uid, picking):
         return False
 
-    def _get_payment_term(self, cursor, user, picking):
+    def _get_payment_term(self, cr, uid, picking):
         '''Return {'contact': address, 'invoice': address} for invoice'''
         partner_obj = self.pool.get('res.partner')
         partner = picking.address_id.partner_id
         return partner.property_payment_term and partner.property_payment_term.id or False
 
-    def _get_address_invoice(self, cursor, user, picking):
+    def _get_address_invoice(self, cr, uid, picking):
         '''Return {'contact': address, 'invoice': address} for invoice'''
         partner_obj = self.pool.get('res.partner')
         partner = picking.address_id.partner_id
 
-        return partner_obj.address_get(cursor, user, [partner.id],
+        return partner_obj.address_get(cr, uid, [partner.id],
                 ['contact', 'invoice'])
 
-    def _get_comment_invoice(self, cursor, user, picking):
+    def _get_comment_invoice(self, cr, uid, picking):
         '''Return comment string for invoice'''
         return picking.note or ''
 
-    def _get_price_unit_invoice(self, cursor, user, move_line, type):
+    def _get_price_unit_invoice(self, cr, uid, move_line, type, context=None):
         '''Return the price unit for the move line'''
+        if context is None:
+            context = {}
+
         if type in ('in_invoice', 'in_refund'):
             # Take the user company and pricetype
-            price_type_id=self.pool.get('res.users').browse(cr,users,users).company_id.property_valuation_price_type.id
-            pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)            
-            amount_unit=move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id] 
+            price_type_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.property_valuation_price_type.id
+            pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id)
+            context['currency_id'] = move_line.company_id.currency_id.id
+
+            amount_unit = move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id]
             return amount_unit
         else:
             return move_line.product_id.list_price
 
-    def _get_discount_invoice(self, cursor, user, move_line):
+    def _get_discount_invoice(self, cr, uid, move_line):
         '''Return the discount for the move line'''
         return 0.0
 
-    def _get_taxes_invoice(self, cursor, user, move_line, type):
+    def _get_taxes_invoice(self, cr, uid, move_line, type):
         '''Return taxes ids for the move line'''
         if type in ('in_invoice', 'in_refund'):
             taxes = move_line.product_id.supplier_taxes_id
@@ -685,34 +699,37 @@ class stock_picking(osv.osv):
 
         if move_line.picking_id and move_line.picking_id.address_id and move_line.picking_id.address_id.partner_id:
             return self.pool.get('account.fiscal.position').map_tax(
-                cursor,
-                user,
+                cr,
+                uid,
                 move_line.picking_id.address_id.partner_id.property_account_position,
                 taxes
             )
         else:
             return map(lambda x: x.id, taxes)
 
-    def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
+    def _get_account_analytic_invoice(self, cr, uid, picking, move_line):
         return False
 
-    def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
+    def _invoice_line_hook(self, cr, uid, move_line, invoice_line_id):
         '''Call after the creation of the invoice line'''
         return
 
-    def _invoice_hook(self, cursor, user, picking, invoice_id):
+    def _invoice_hook(self, cr, uid, picking, invoice_id):
         '''Call after the creation of the invoice'''
         return
 
-    def action_invoice_create(self, cursor, user, ids, journal_id=False,
+    def action_invoice_create(self, cr, uid, ids, journal_id=False,
             group=False, type='out_invoice', context=None):
         '''Return ids of created invoices for the pickings'''
+        if context is None:
+            context = {}
+
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
         invoices_group = {}
         res = {}
 
-        for picking in self.browse(cursor, user, ids, context=context):
+        for picking in self.browse(cr, uid, ids, context=context):
             if picking.invoice_state != '2binvoiced':
                 continue
             payment_term_id = False
@@ -723,24 +740,24 @@ class stock_picking(osv.osv):
 
             if type in ('out_invoice', 'out_refund'):
                 account_id = partner.property_account_receivable.id
-                payment_term_id = self._get_payment_term(cursor, user, picking)
+                payment_term_id = self._get_payment_term(cr, uid, picking)
             else:
                 account_id = partner.property_account_payable.id
 
             address_contact_id, address_invoice_id = \
-                    self._get_address_invoice(cursor, user, picking).values()
+                    self._get_address_invoice(cr, uid, picking).values()
 
-            comment = self._get_comment_invoice(cursor, user, picking)
+            comment = self._get_comment_invoice(cr, uid, picking)
             if group and partner.id in invoices_group:
                 invoice_id = invoices_group[partner.id]
-                invoice = invoice_obj.browse(cursor, user, invoice_id)
+                invoice = invoice_obj.browse(cr, uid, invoice_id)
                 invoice_vals = {
                     'name': (invoice.name or '') + ', ' + (picking.name or ''),
                     'origin': (invoice.origin or '') + ', ' + (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
                     'comment': (comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
                     'date_invoice':context.get('date_inv',False)
                 }
-                invoice_obj.write(cursor, user, [invoice_id], invoice_vals, context=context)
+                invoice_obj.write(cr, uid, [invoice_id], invoice_vals, context=context)
             else:
                 invoice_vals = {
                     'name': picking.name,
@@ -756,12 +773,12 @@ class stock_picking(osv.osv):
                     'date_invoice': context.get('date_inv',False),
                     'company_id': picking.company_id.id,
                     }
-                cur_id = self.get_currency_id(cursor, user, picking)
+                cur_id = self.get_currency_id(cr, uid, picking)
                 if cur_id:
                     invoice_vals['currency_id'] = cur_id
                 if journal_id:
                     invoice_vals['journal_id'] = journal_id
-                invoice_id = invoice_obj.create(cursor, user, invoice_vals,
+                invoice_id = invoice_obj.create(cr, uid, invoice_vals,
                         context=context)
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id
@@ -787,26 +804,25 @@ class stock_picking(osv.osv):
                         account_id = move_line.product_id.categ_id.\
                                 property_account_expense_categ.id
 
-                price_unit = self._get_price_unit_invoice(cursor, user,
+                price_unit = self._get_price_unit_invoice(cr, uid,
                         move_line, type)
-                discount = self._get_discount_invoice(cursor, user, move_line)
-                tax_ids = self._get_taxes_invoice(cursor, user, move_line, type)
-                account_analytic_id = self._get_account_analytic_invoice(cursor,
-                        user, picking, move_line)
+                discount = self._get_discount_invoice(cr, uid, move_line)
+                tax_ids = self._get_taxes_invoice(cr, uid, move_line, type)
+                account_analytic_id = self._get_account_analytic_invoice(cr, uid, picking, move_line)
 
                 #set UoS if it's a sale and the picking doesn't have one
                 uos_id = move_line.product_uos and move_line.product_uos.id or False
                 if not uos_id and type in ('out_invoice', 'out_refund'):
                     uos_id = move_line.product_uom.id
 
-                account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
+                account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
                 notes = False
                 if move_line.sale_line_id:
                     notes = move_line.sale_line_id.notes
                 elif move_line.purchase_line_id:
                     notes = move_line.purchase_line_id.notes
 
-                invoice_line_id = invoice_line_obj.create(cursor, user, {
+                invoice_line_id = invoice_line_obj.create(cr, uid, {
                     'name': name,
                     'origin': origin,
                     'invoice_id': invoice_id,
@@ -820,15 +836,15 @@ class stock_picking(osv.osv):
                     'account_analytic_id': account_analytic_id,
                     'note': notes,
                     }, context=context)
-                self._invoice_line_hook(cursor, user, move_line, invoice_line_id)
+                self._invoice_line_hook(cr, uid, move_line, invoice_line_id)
 
-            invoice_obj.button_compute(cursor, user, [invoice_id], context=context,
+            invoice_obj.button_compute(cr, uid, [invoice_id], context=context,
                     set_total=(type in ('in_invoice', 'in_refund')))
-            self.write(cursor, user, [picking.id], {
+            self.write(cr, uid, [picking.id], {
                 'invoice_state': 'invoiced',
                 }, context=context)
-            self._invoice_hook(cursor, user, picking, invoice_id)
-        self.write(cursor, user, res.keys(), {
+            self._invoice_hook(cr, uid, picking, invoice_id)
+        self.write(cr, uid, res.keys(), {
             'invoice_state': 'invoiced',
             }, context=context)
         return res
@@ -854,6 +870,150 @@ class stock_picking(osv.osv):
                 continue
         return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
+    def do_partial(self, cr, uid, ids, partial_datas, context={}):
+        """
+        @ partial_datas : dict. contain details of partial picking
+                          like partner_id, address_id, delivery_date, delivery moves with product_id, product_qty, uom
+        """
+        res = {}
+        move_obj = self.pool.get('stock.move')
+        delivery_obj = self.pool.get('stock.delivery')
+        product_obj = self.pool.get('product.product')
+        currency_obj = self.pool.get('res.currency')
+        users_obj = self.pool.get('res.users')
+        uom_obj = self.pool.get('product.uom')
+        price_type_obj = self.pool.get('product.price.type')
+        sequence_obj = self.pool.get('ir.sequence')
+        wf_service = netsvc.LocalService("workflow")
+        partner_id = partial_datas.get('partner_id', False)
+        address_id = partial_datas.get('address_id', False)
+        delivery_date = partial_datas.get('delivery_date', False)
+        for pick in self.browse(cr, uid, ids, context=context):
+            new_picking = None
+            new_moves = []
+
+            complete, too_many, too_few = [], [], []
+            move_product_qty = {}
+            for move in pick.move_lines:
+                if move.state in ('done', 'cancel'):
+                    continue
+                partial_data = partial_datas.get('move%s'%(move.id), False)
+                assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
+                product_qty = partial_data.get('product_qty',0.0)
+                move_product_qty[move.id] = product_qty
+                product_uom = partial_data.get('product_uom',False)
+                product_price = partial_data.get('product_price',0.0)
+                product_currency = partial_data.get('product_currency',False)
+                if move.product_qty == product_qty:
+                    complete.append(move)
+                elif move.product_qty > product_qty:
+                    too_few.append(move)
+                else:
+                    too_many.append(move)
+
+                # Average price computation
+                if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
+                    product = product_obj.browse(cr, uid, move.product_id.id)
+                    user = users_obj.browse(cr, uid, uid)
+                    context['currency_id'] = move.company_id.currency_id.id
+                    qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
+                    pricetype = False
+                    if user.company_id.property_valuation_price_type:
+                        pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
+                    if pricetype and qty > 0:
+                        new_price = currency_obj.compute(cr, uid, product_currency,
+                                user.company_id.currency_id.id, product_price)
+                        new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
+                                product.uom_id.id)
+                        if product.qty_available <= 0:
+                            new_std_price = new_price
+                        else:
+                            # Get the standard price
+                            amount_unit = product.price_get(pricetype.field, context)[product.id]
+                            new_std_price = ((amount_unit * product.qty_available)\
+                                + (new_price * qty))/(product.qty_available + qty)
+
+                        # Write the field according to price type field
+                        product_obj.write(cr, uid, [product.id],
+                                {pricetype.field: new_std_price})
+                        move_obj.write(cr, uid, [move.id], {'price_unit': new_price})
+
+
+            for move in too_few:
+                product_qty = move_product_qty[move.id]
+                if not new_picking:
+
+                    new_picking = self.copy(cr, uid, pick.id,
+                            {
+                                'name': sequence_obj.get(cr, uid, 'stock.picking.%s'%(pick.type)),
+                                'move_lines' : [],
+                                'state':'draft',
+                            })
+                if product_qty != 0:
+
+                    new_obj = move_obj.copy(cr, uid, move.id,
+                        {
+                            'product_qty' : product_qty,
+                            'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                            'picking_id' : new_picking,
+                            'state': 'assigned',
+                            'move_dest_id': False,
+                            'price_unit': move.price_unit,
+                        })
+
+                move_obj.write(cr, uid, [move.id],
+                        {
+                            'product_qty' : move.product_qty - product_qty,
+                            'product_uos_qty':move.product_qty - product_qty, #TODO: put correct uos_qty
+
+                        })
+
+            if new_picking:
+                move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
+                for move in too_many:
+                    product_qty = move_product_qty[move.id]
+                    move_obj.write(cr, uid, [move.id],
+                            {
+                                'product_qty' : product_qty,
+                                'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                                'picking_id': new_picking,
+                            })
+            else:
+                for move in too_many:
+                    product_qty = move_product_qty[move.id]
+                    move_obj.write(cr, uid, [move.id],
+                            {
+                                'product_qty': product_qty,
+                                'product_uos_qty': product_qty #TODO: put correct uos_qty
+                            })
+
+            # At first we confirm the new picking (if necessary)
+            if new_picking:
+                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
+            # Then we finish the good picking
+            if new_picking:
+                self.write(cr, uid, [pick.id], {'backorder_id': new_picking})
+                self.action_move(cr, uid, [new_picking])
+                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
+                wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+                delivered_pack_id = new_picking
+            else:
+                self.action_move(cr, uid, [pick.id])
+                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
+                delivered_pack_id = pick.id
+
+            delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context)
+            delivery_id = delivery_obj.create(cr, uid, {
+                'name':  delivered_pack.name,
+                'partner_id': partner_id,
+                'address_id': address_id,
+                'date': delivery_date,
+                'picking_id' :  pick.id,
+                'move_delivered' : [(6,0, map(lambda x:x.id, delivered_pack.move_lines))]
+            }, context=context)
+            res[pick.id] = {'delivered_picking': delivered_pack.id or False}
+        return res
+
 stock_picking()
 
 
@@ -952,6 +1112,22 @@ class stock_production_lot_revision(osv.osv):
 
 stock_production_lot_revision()
 
+class stock_delivery(osv.osv):
+
+    """ Tracability of partialdeliveries """
+
+    _name = "stock.delivery"
+    _description = "Delivery"
+    _columns = {
+        'name': fields.char('Name', size=60, required=True),
+        'date': fields.datetime('Date', required=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', required=True),
+        'address_id': fields.many2one('res.partner.address', 'Address', required=True),
+        'move_delivered':fields.one2many('stock.move', 'delivered_id', 'Move Delivered'),
+        'picking_id': fields.many2one('stock.picking', 'Picking list'),
+
+    }
+stock_delivery()
 # ----------------------------------------------------
 # Move
 # ----------------------------------------------------
@@ -1035,6 +1211,8 @@ class stock_move(osv.osv):
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
         'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
+        'delivered_id': fields.many2one('stock.delivery', 'Product delivered'),
+        'scraped': fields.boolean('Scraped'),
     }
     _constraints = [
         (_check_tracking,
@@ -1071,6 +1249,7 @@ class stock_move(osv.osv):
         'location_dest_id': _default_location_destination,
         'state': lambda *a: 'draft',
         'priority': lambda *a: '1',
+        'scraped' : lambda *a:False,
         'product_qty': lambda *a: 1.0,
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -1146,13 +1325,13 @@ class stock_move(osv.osv):
         product = self.pool.get('product.product').browse(cr, uid, [prod_id], context=ctx)[0]
         uos_id  = product.uos_id and product.uos_id.id or False
         result = {
-            'name': product.partner_ref,
             'product_uom': product.uom_id.id,
             'product_uos': uos_id,
             'product_qty': 1.00,
             'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty']
         }
-
+        if not ids:
+            result['name'] = product.partner_ref
         if loc_id:
             result['location_id'] = loc_id
         if loc_dest_id:
@@ -1383,12 +1562,12 @@ class stock_move(osv.osv):
                     # Base computation on valuation price type
                     else:
                         company_id=move.company_id.id
-                        
+                        context['currency_id']=move.company_id.currency_id.id
                         pricetype=self.pool.get('product.price.type').browse(cr,uid,move.company_id.property_valuation_price_type.id)
                         amount_unit=move.product_id.price_get(pricetype.field, context)[move.product_id.id]
                         amount=amount_unit * q or 1.0
                         # amount = q * move.product_id.standard_price
-                    
+
                     partner_id = False
                     if move.picking_id:
                         partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
@@ -1434,31 +1613,76 @@ class stock_move(osv.osv):
                 raise osv.except_osv(_('UserError'),
                         _('You can only delete draft moves.'))
         return super(stock_move, self).unlink(
-            cr, uid, ids, context=context)    
+            cr, uid, ids, context=context)
 
     def _create_lot(self, cr, uid, ids, product_id, prefix=False):
         prodlot_obj = self.pool.get('stock.production.lot')
         ir_sequence_obj = self.pool.get('ir.sequence')
         sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
         if not sequence:
-            raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+            raise osv.except_osv(_('Error!'), _('No production sequence defined'))
         prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix': prefix}, {'product_id': product_id})
-        prodlot = prodlot_obj.browse(cr, uid, prodlot_id) 
+        prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
         ref = ','.join(map(lambda x:str(x),ids))
         if prodlot.ref:
-            ref = '%s, %s' % (prodlot.ref, ref) 
+            ref = '%s, %s' % (prodlot.ref, ref)
         prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
         return prodlot_id
 
-    def split_lines(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
-        
+
+    def action_scrap(self, cr, uid, ids, quantity, location_id, context=None):
+        '''
+        Move the scrap/damaged product into scrap location
+
+        @ param cr: the database cursor
+        @ param uid: the user id
+        @ param ids: ids of stock move object to be scraped
+        @ param quantity : specify scrap qty
+        @ param location_id : specify scrap location
+        @ param context: context arguments
+
+        @ return: Scraped lines
+        '''
+        if quantity <= 0:
+            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
+        res = []
+        for move in self.browse(cr, uid, ids, context=context):
+            move_qty = move.product_qty
+            uos_qty = quantity / move_qty * move.product_uos_qty
+            default_val = {
+                    'product_qty': quantity,
+                    'product_uos_qty': uos_qty,
+                    'state': move.state,
+                    'scraped' : True,
+                    'location_dest_id': location_id
+                }
+            new_move = self.copy(cr, uid, move.id, default_val)
+            #self.write(cr, uid, [new_move], {'move_history_ids':[(4,move.id)]}) #TODO : to track scrap moves
+            res += [new_move]
+        self.action_done(cr, uid, res)
+        return res
+
+    def action_split(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
+        '''
+        Split Stock Move lines into production lot which specified split by quantity.
+
+        @ param cr: the database cursor
+        @ param uid: the user id
+        @ param ids: ids of stock move object to be splited
+        @ param split_by_qty : specify split by qty
+        @ param prefix : specify prefix of production lot
+        @ param with_lot : if true, prodcution lot will assign for split line otherwise not.
+        @ param context: context arguments
+
+        @ return: splited move lines
+        '''
 
         if quantity <= 0:
             raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
 
         res = []
 
-        for move in self.browse(cr, uid, ids):            
+        for move in self.browse(cr, uid, ids):
             if split_by_qty <= 0 or quantity == 0:
                 return res
 
@@ -1470,8 +1694,8 @@ class stock_move(osv.osv):
             update_val = {
                 'product_qty': split_by_qty,
                 'product_uos_qty': uos_qty,
-            }                         
-            for idx in range(int(quantity//split_by_qty)):                 
+            }
+            for idx in range(int(quantity//split_by_qty)):
                 if not idx and move.product_qty<=quantity:
                     current_move = move.id
                 else:
@@ -1481,93 +1705,223 @@ class stock_move(osv.osv):
                     update_val['prodlot_id'] = self._create_lot(cr, uid, [current_move], move.product_id.id)
 
                 self.write(cr, uid, [current_move], update_val)
-        
-            
-            if quantity_rest > 0:    
-                idx = int(quantity//split_by_qty)            
+
+
+            if quantity_rest > 0:
+                idx = int(quantity//split_by_qty)
                 update_val['product_qty'] = quantity_rest
-                update_val['product_uos_qty'] = uos_qty_rest    
-                if not idx and move.product_qty<=quantity:        
-                    current_move = move.id                    
+                update_val['product_uos_qty'] = uos_qty_rest
+                if not idx and move.product_qty<=quantity:
+                    current_move = move.id
                 else:
-                    current_move = self.copy(cr, uid, move.id, {'state': move.state}) 
-                                                    
+                    current_move = self.copy(cr, uid, move.id, {'state': move.state})
+
                 res.append(current_move)
-                 
-                
-                if with_lot:             
+
+
+                if with_lot:
                     update_val['prodlot_id'] = self._create_lot(cr, uid, [current_move], move.product_id.id)
 
                 self.write(cr, uid, [current_move], update_val)
-        return res    
+        return res
 
-    def consume_moves(self, cr, uid, ids, quantity, location_id=False, location_dest_id=False, consume=True, context=None):        
+    def action_consume(self, cr, uid, ids, quantity, location_id=False,  context=None):
+        '''
+        Consumed product with specific quatity from specific source location
+
+        @ param cr: the database cursor
+        @ param uid: the user id
+        @ param ids: ids of stock move object to be consumed
+        @ param quantity : specify consume quantity
+        @ param location_id : specify source location
+        @ param context: context arguments
+
+        @ return: Consumed lines
+        '''
         if not context:
             context = {}
-                
+
         if quantity <= 0:
             raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
 
-        res = []       
-        for move in self.browse(cr, uid, ids, context=context):            
+        res = []
+        for move in self.browse(cr, uid, ids, context=context):
             move_qty = move.product_qty
             quantity_rest = move.product_qty
 
-            quantity_rest -= quantity            
+            quantity_rest -= quantity
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             if quantity_rest <= 0:
-                quantity_rest = 0 
+                quantity_rest = 0
                 uos_qty_rest = 0
                 quantity = move.product_qty
- 
+
             uos_qty = quantity / move_qty * move.product_uos_qty
 
-            if quantity_rest > 0:  
+            if quantity_rest > 0:
                 default_val = {
-                    'product_qty': quantity, 
-                    'product_uos_qty': uos_qty, 
-                    'state': move.state, 
+                    'product_qty': quantity,
+                    'product_uos_qty': uos_qty,
+                    'state': move.state,
+                    'location_id': location_id
                 }
-                if location_dest_id:
-                   default_val.update({'location_dest_id': location_dest_id}) 
-                if location_id:
-                   default_val.update({'location_id': location_id}) 
-                
                 if move.product_id.track_production and location_id:
-                    res += self.split_lines(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
+                    # IF product has checked track for production lot, move lines will be split by 1
+                    res += self.action_split(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
                 else:
                     current_move = self.copy(cr, uid, move.id, default_val)
                     res += [current_move]
 
-                update_val = {}                                  
+                update_val = {}
                 update_val['product_qty'] = quantity_rest
-                update_val['product_uos_qty'] = uos_qty_rest                          
-                self.write(cr, uid, [move.id], update_val) 
+                update_val['product_uos_qty'] = uos_qty_rest
+                self.write(cr, uid, [move.id], update_val)
 
-            else: 
-                quantity_rest = quantity    
+            else:
+                quantity_rest = quantity
                 uos_qty_rest =  uos_qty
-                
+
                 if move.product_id.track_production and location_id:
                     res += self.split_lines(cr, uid, [move.id], quantity_rest, split_by_qty=1, context=context)
-                else:                     
-                    res += [move.id] 
-                    update_val = {}                                  
-                    update_val['product_qty'] = quantity_rest
-                    update_val['product_uos_qty'] = uos_qty_rest
-                    if location_dest_id:
-                       update_val.update({'location_dest_id': location_dest_id}) 
-                    if location_id:
-                       update_val.update({'location_id': location_id}) 
+                else:
+                    res += [move.id]
+                    update_val = {
+                        'product_qty' : quantity_rest,
+                        'product_uos_qty' : uos_qty_rest,
+                        'location_id': location_id
+                    }
 
                     self.write(cr, uid, [move.id], update_val)
 
-        if consume:
-            self.action_done(cr, uid, res)        
+        self.action_done(cr, uid, res)
         return res
 
-    def scrap_moves(self, cr, uid, ids, quantity, location_dest_id, context=None):
-        return self.consume_moves(cr, uid, ids, quantity, location_id=False, location_dest_id=location_dest_id, consume=False, context=context)
+    def do_partial(self, cr, uid, ids, partial_datas, context={}):
+        """
+        @ partial_datas : dict. contain details of partial picking
+                          like partner_id, address_id, delivery_date, delivery moves with product_id, product_qty, uom
+        """
+        res = {}
+        picking_obj = self.pool.get('stock.picking')
+        delivery_obj = self.pool.get('stock.delivery')
+        product_obj = self.pool.get('product.product')
+        currency_obj = self.pool.get('res.currency')
+        users_obj = self.pool.get('res.users')
+        uom_obj = self.pool.get('product.uom')
+        price_type_obj = self.pool.get('product.price.type')
+        sequence_obj = self.pool.get('ir.sequence')
+        wf_service = netsvc.LocalService("workflow")
+        partner_id = partial_datas.get('partner_id', False)
+        address_id = partial_datas.get('address_id', False)
+        delivery_date = partial_datas.get('delivery_date', False)
+
+        new_moves = []
+
+        complete, too_many, too_few = [], [], []
+        move_product_qty = {}
+        for move in self.browse(cr, uid, ids, context=context):
+            if move.state in ('done', 'cancel'):
+                continue
+            partial_data = partial_datas.get('move%s'%(move.id), False)
+            assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
+            product_qty = partial_data.get('product_qty',0.0)
+            move_product_qty[move.id] = product_qty
+            product_uom = partial_data.get('product_uom',False)
+            product_price = partial_data.get('product_price',0.0)
+            product_currency = partial_data.get('product_currency',False)
+            if move.product_qty == product_qty:
+                complete.append(move)
+            elif move.product_qty > product_qty:
+                too_few.append(move)
+            else:
+                too_many.append(move)
+
+            # Average price computation
+            if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
+                product = product_obj.browse(cr, uid, move.product_id.id)
+                user = users_obj.browse(cr, uid, uid)
+                context['currency_id'] = move.company_id.currency_id.id
+                qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
+                pricetype = False
+                if user.company_id.property_valuation_price_type:
+                    pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
+                if pricetype and qty > 0:
+                    new_price = currency_obj.compute(cr, uid, product_currency,
+                            user.company_id.currency_id.id, product_price)
+                    new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
+                            product.uom_id.id)
+                    if product.qty_available <= 0:
+                        new_std_price = new_price
+                    else:
+                        # Get the standard price
+                        amount_unit = product.price_get(pricetype.field, context)[product.id]
+                        new_std_price = ((amount_unit * product.qty_available)\
+                            + (new_price * qty))/(product.qty_available + qty)
+
+                    # Write the field according to price type field
+                    product_obj.write(cr, uid, [product.id],
+                            {pricetype.field: new_std_price})
+                    self.write(cr, uid, [move.id], {'price_unit': new_price})
+
+        for move in too_few:
+            product_qty = move_product_qty[move.id]
+            if product_qty != 0:
+                new_move = self.copy(cr, uid, move.id,
+                    {
+                        'product_qty' : product_qty,
+                        'product_uos_qty': product_qty,
+                        'picking_id' : move.picking_id.id,
+                        'state': 'assigned',
+                        'move_dest_id': False,
+                        'price_unit': move.price_unit,
+                    })
+                complete.append(self.browse(cr, uid, new_move))
+            self.write(cr, uid, move.id,
+                    {
+                        'product_qty' : move.product_qty - product_qty,
+                        'product_uos_qty':move.product_qty - product_qty,
+                    })
+
+
+        for move in too_many:
+            self.write(cr, uid, move.id,
+                    {
+                        'product_qty': product_qty,
+                        'product_uos_qty': product_qty
+                    })
+            complete.append(move)
+
+        for move in complete:
+            self.action_done(cr, uid, [move.id])
+
+            # TOCHECK : Done picking if all moves are done
+            cr.execute("""
+                SELECT move.id FROM stock_picking pick
+                RIGHT JOIN stock_move move ON move.picking_id = pick.id AND move.state = %s
+                WHERE pick.id = %s""",
+                        ('done', move.picking_id.id))
+            res = cr.fetchall()
+            if len(res) == len(move.picking_id.move_lines):
+                picking_obj.action_move(cr, uid, [move.picking_id.id])
+                wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
+
+        ref = {}
+        done_move_ids = []
+        for move in complete:
+            done_move_ids.append(move.id)
+            if move.picking_id.id not in ref:
+                delivery_id = delivery_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'address_id': address_id,
+                    'date': delivery_date,
+                    'name' : move.picking_id.name,
+                    'picking_id':  move.picking_id.id
+                }, context=context)
+                ref[move.picking_id.id] = delivery_id
+            delivery_obj.write(cr, uid, ref[move.picking_id.id], {
+                'move_delivered' : [(4,move.id)]
+            })
+        return done_move_ids
 
 stock_move()
 
@@ -1590,16 +1944,18 @@ class stock_inventory(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c)
     }
 
-    #
-    # Update to support tracking
-    #
+
+    def _inventory_line_hook(self, cr, uid, inventory_line, move_vals):
+        '''Creates a stock move from an inventory line'''
+        return self.pool.get('stock.move').create(cr, uid, move_vals)
+
     def action_done(self, cr, uid, ids, context=None):
         for inv in self.browse(cr, uid, ids):
             move_ids = []
             move_line = []
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
-                
+
                 # price = line.product_id.standard_price or 0.0
                 amount = self.pool.get('stock.location')._product_get(cr, uid, line.location_id.id, [pid], {'uom': line.product_uom.id})[pid]
                 change = line.product_qty - amount
@@ -1632,7 +1988,7 @@ class stock_inventory(osv.osv):
                             'prodlot_id': lot_id,
                             'product_qty': line.product_qty
                         })
-                    move_ids.append(self.pool.get('stock.move').create(cr, uid, value))
+                    move_ids.append(self._inventory_line_hook(cr, uid, line, value))
             if len(move_ids):
                 self.pool.get('stock.move').action_done(cr, uid, move_ids,
                         context=context)
@@ -1664,8 +2020,10 @@ class stock_inventory_line(osv.osv):
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_qty': fields.float('Quantity'),
         'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
-        'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]")
+        'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
+        'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
     }
+
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False):
         if not product:
             return {}
@@ -1738,7 +2096,6 @@ class stock_picking_move_wizard(osv.osv_memory):
                 if line.picking_id:
                     picking_obj.write(cr, uid, [line.picking_id.id], {'move_lines': [(1, line.id, {'picking_id': act['picking_id']})]})
                     picking_obj.write(cr, uid, [act['picking_id']], {'move_lines': [(1, line.id, {'picking_id': act['picking_id']})]})
-                    cr.commit()
                     old_picking = picking_obj.read(cr, uid, [line.picking_id.id])[0]
                     if not len(old_picking['move_lines']):
                         picking_obj.write(cr, uid, [old_picking['id']], {'state': 'done'})
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index d72106eead6..7b8d9eb13b3 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
-
-
-<!--        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" xml="stock/report/picking.xml" xsl="stock/report/picking.xsl"/>-->
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
-
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml"/>
-
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
-
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/>
-
     </data>
 </openerp>
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index d002b62ae83..9c5083d13b4 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -2,18 +2,59 @@
 <openerp>
     <data noupdate="1">
         <!--
-    Sequences for pickings
+    Sequence types for pickings
     -->
 
-        <record id="seq_type_picking" model="ir.sequence.type">
-            <field name="name">Picking</field>
-            <field name="code">stock.picking</field>
+        <record id="seq_type_picking_in" model="ir.sequence.type">
+            <field name="name">Picking IN</field>
+            <field name="code">stock.picking.in</field>
+        </record>
+        
+        <record id="seq_type_picking_out" model="ir.sequence.type">
+            <field name="name">Picking OUT</field>
+            <field name="code">stock.picking.out</field>
+        </record>
+        
+        <record id="seq_type_picking_internal" model="ir.sequence.type">
+            <field name="name">Picking INT</field>
+            <field name="code">stock.picking.internal</field>
         </record>
 
-        <record id="seq_picking" model="ir.sequence">
-            <field name="name">Picking</field>
-            <field name="code">stock.picking</field>
-            <field name="prefix">PACK</field>
+        <record id="seq_type_picking_delivery" model="ir.sequence.type">
+            <field name="name">Picking Delivery</field>
+            <field name="code">stock.picking.delivery</field>
+        </record>
+
+		<!--
+    		Sequences for pickings
+    	-->
+
+        <record id="seq_picking_in" model="ir.sequence">
+            <field name="name">Picking IN</field>
+            <field name="code">stock.picking.in</field>
+            <field name="prefix">IN/</field>
+            <field name="padding">5</field>
+        </record>
+        
+        <record id="seq_picking_out" model="ir.sequence">
+            <field name="name">Picking OUT</field>
+            <field name="code">stock.picking.out</field>
+            <field name="prefix">OUT/</field>
+            <field name="padding">5</field>
+        </record>
+        
+        <record id="seq_picking_internal" model="ir.sequence">
+            <field name="name">Picking INT</field>
+            <field name="code">stock.picking.internal</field>
+            <field name="prefix">INT/</field>
+            <field name="padding">5</field>
+        </record>
+
+        <record id="seq_picking_delivery" model="ir.sequence">
+            <field name="name">Picking DLV</field>
+            <field name="code">stock.picking.delivery</field>
+            <field name="prefix">DLV/</field>
+            <field name="padding">5</field>
         </record>
 
         <!--
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3cada5cbb6d..2335b66cbad 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -4,7 +4,7 @@
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
-   		<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
+        <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
 
@@ -18,6 +18,9 @@
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
+                    <button name="%(stock.action_view_stock_inventory_line_split)d"
+                            string="Split inventory lines"
+                            type="action" icon="gtk-justify-fill"/>                    
                     <field name="location_id"/>
                 </tree>
             </field>
@@ -32,8 +35,10 @@
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
-                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-                    <button name="%(split_inventory_lots)d" string="Split Inventory Lines" type="action" icon="gtk-justify-fill"/>
+                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>                  
+                        <button name="%(stock.action_view_stock_inventory_line_split)d"
+                            string="Split inventory lines"
+                            type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
@@ -50,6 +55,7 @@
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </search>
+
             </field>
         </record>
 
@@ -64,6 +70,7 @@
                     <field name="state"/>
                 </tree>
             </field>
+
         </record>
         <record id="view_inventory_form" model="ir.ui.view">
             <field name="name">stock.inventory.form</field>
@@ -83,17 +90,22 @@
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id"/>
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                                <field name="state" invisible="1"/>
+                                <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                    string="Split inventory lines"
+                                    type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
                             <form string="Inventory Lines">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                                <field name="prod_lot_id"/>
                                 <group colspan="2" col="3">
-	                                <field name="prod_lot_id"/>
-	                                <button name="%(split_inventory_lots)d" string="Split in Production Lots" type="action" icon="gtk-justify-fill"/>
+                                    <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                        string="Split inventory lines"
+                                        type="action" icon="gtk-justify-fill"/>
                                 </group>
-
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
@@ -106,6 +118,7 @@
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
                         <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                     </group>
+
                 </form>
             </field>
         </record>
@@ -138,7 +151,7 @@
                     <field name="name" select="1"/>
                     <field name="serial" select="1"/>
                     <field name="date" select="1"/>
-                    <field name="active" />
+                    <field name="active" select="1"/>
                 </form>
             </field>
         </record>
@@ -259,6 +272,7 @@
                         <field name="product_id" select="1"/>
                         <field name="date" select="1"/>
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
@@ -266,7 +280,6 @@
             </field>
         </record>
 
-
         <record id="action_production_lot_form" model="ir.actions.act_window">
             <field name="name">Production Lots</field>
             <field name="type">ir.actions.act_window</field>
@@ -325,31 +338,31 @@
             </field>
         </record>
 
-        <wizard
+        <!--wizard
             id="action_lot2"
             model="stock.production.lot"
             name="stock.traceability.lot.upstream"
-            string="Upstream traceability"/>
+            string="Upstream traceability"/-->
 
-        <wizard
+        <!--wizard
             id="action_lot4"
             model="stock.production.lot"
             name="stock.traceability.lot.downstream"
-            string="Downstream traceability"/>
+            string="Downstream traceability"/-->
 
-        <wizard
+        <!--wizard
             id="action4"
             model="stock.tracking"
             name="stock.traceability.upstream"
-            string="Upstream traceability"/>
+            string="Upstream traceability"/-->
 
-        <wizard
+        <!--wizard
             id="action2"
             model="stock.tracking"
             name="stock.traceability.downstream"
-            string="Downstream traceability"/>
+            string="Downstream traceability"/-->
 
-        <record id="action3" model="ir.actions.act_window">
+        <!--record id="action3" model="ir.actions.act_window">
             <field name="name">Downstream traceability</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.move</field>
@@ -378,7 +391,7 @@
             <field name="name">Upstream traceability</field>
             <field eval="'ir.actions.act_window,'+str(action5)" name="value"/>
             <field eval="True" name="object"/>
-        </record>
+        </record-->
 
         <record id="view_location_form" model="ir.ui.view">
             <field name="name">stock.location.form</field>
@@ -413,6 +426,7 @@
                 </form>
             </field>
         </record>
+        
         <record id="view_location_tree2" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
@@ -524,7 +538,7 @@
             <field name="auto_refresh" eval="1"/>
             <field name="target">new</field>
             <field name="context">{'action_id': active_id}</field>
-        </record>    	
+        </record>
 
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
@@ -551,7 +565,7 @@
                     <field name="date"/>
                     <field name="min_date"/>
                     <field name="state"/>
-                    <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.   Do you want to continue?"/>
                 </tree>
             </field>
@@ -571,6 +585,18 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <button name="%(act_stock_make_picking_wizard)d" 
+                            states="confirmed,assigned" 
+                            string="Make Picking" 
+                            type="action" 
+                            icon="gtk-go-forward"
+                            help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                            states="done" 
+                            string="Return Picking" 
+                            type="action"
+                            icon="gtk-go-back" 
+                            help="Return Picking" colspan="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -585,55 +611,55 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                        name="%(stock.track_line)d"
+                                        string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+
+                                    <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-convert" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />                                       
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="2"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="2"/>
-		                                    <newline/>
-		                                    <label/>
-		                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="2"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="2"/>
+                                            <newline/>
+                                            <label/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -646,7 +672,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-apply"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-apply"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -661,12 +687,11 @@
                             <newline/>
                             <field name="move_type"/>
                         </page>
-                    </notebook>
+                    </notebook>                    
                 </form>
             </field>
         </record>
 
-
         <record id="view_stock_picking_filter" model="ir.ui.view">
             <field name="name">stock.picking.list.select</field>
             <field name="model">stock.picking</field>
@@ -683,7 +708,8 @@
                         <field name="location_dest_id" select="1"/>
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
-                    </group>
+                    </group>  
+                    <newline/>                   
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -706,7 +732,7 @@
                     <field name="date" select="1"/>
                     <field name="min_date" select="1"/>
                     <field name="state" select="1"/>
-                    <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Delivery"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Delivery"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
             </field>
@@ -726,6 +752,18 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <button name="%(act_stock_make_picking_wizard)d" 
+                                states="assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -740,50 +778,49 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-convert" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="2"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="2"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -796,7 +833,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -811,7 +848,7 @@
                             <field name="date_done" select="2"/>
                             <field name="move_type"/>
                         </page>
-                    </notebook>
+                    </notebook>                    
                 </form>
             </field>
         </record>
@@ -831,7 +868,8 @@
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
                         <field name="origin" select="1"/>
-                    </group>
+                    </group> 
+                    <newline/>                    
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -888,11 +926,8 @@
                     <field name="min_date"/>
                     <field name="invoice_state"/>
                     <field name="state"/>
-                    <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.    Do you want to continue?"/>
-                    <button name="%(wizard_invoice_onshipping)d" states="done" string="Invoice" type="action" 
-                    			icon="gtk-execute" help="Create invoice" 
-                    			attrs="{'invisible': [('invoice_state', '!=', '2binvoiced')]}" />
                 </tree>
             </field>
         </record>
@@ -911,6 +946,18 @@
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <button name="%(act_stock_make_picking_wizard)d" 
+                                states="assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -925,53 +972,53 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="state"/> 
+                                    <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
- 										<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="1"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <label/>
-		                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
-		                                    </group>
-                                    	</page>
-                                		<page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
-								</form>
+                                    <notebook colspan="4">
+                                         <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="1"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <label/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                </form>
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
@@ -983,10 +1030,13 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
+                        <page string="Delivery Info">
+                            <field colspan="4" name="delivery_line" nolabel="1"/>
+                        </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
@@ -1003,25 +1053,26 @@
             </field>
         </record>
 
-		<record id="view_picking_out_search" model="ir.ui.view">
+        <record id="view_picking_out_search" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
             <field name="model">stock.picking</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking list">
-                	<group col="8" colspan="4">
+                    <group col="8" colspan="4">
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
                         <field name="company_id" select="1" widget="selection"/>
-                   </group>
-                    <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
+                   </group>   
+                    <newline/>                 
+                    <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>
+                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -1053,7 +1104,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree"/>
         </record>
-<!--        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>-->
+        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="5"/>
 
         <record id="view_picking_in_tree" model="ir.ui.view">
             <field name="name">stock.picking.in.tree</field>
@@ -1069,7 +1120,7 @@
                     <field name="min_date"/>
                     <field name="invoice_state"/>
                     <field name="state"/>
-                    <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-ok" help="Receive products"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-ok" help="Receive products"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
@@ -1090,6 +1141,18 @@
                         <field name="invoice_state" select="2" string="Invoice Control"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <button name="%(act_stock_make_picking_wizard)d" 
+                                states="confirmed,assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -1102,50 +1165,49 @@
                                     <field name="prodlot_id"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
-                                </tree>                                
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button name="%(stock.move_scrap)d"
+				                    	string="Scrap Products" type="action"
+				                    	icon="gtk-convert" context="{'scrap': True}"
+				                    	states="draft,waiting,confirmed,assigned" />
+                                </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field groups="base.group_extended" name="date_planned"/>
-		                                    <newline/>
-		                                    <newline/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <newline/>
-		                                    <field name="prodlot_id" select="1"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <newline/>
-		                                    <label/>
-		                                    <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field groups="base.group_extended" name="date_planned"/>
+                                            <newline/>
+                                            <newline/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <newline/>
+                                            <field name="prodlot_id" select="1"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <newline/>
+                                            <label/>
+                                            <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
                                                     <field name="move_stock_return_history" nolabel="1"/>
                                                 </page>
                                             </notebook>
@@ -1161,10 +1223,13 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
+                        <page string="Delivery Info">
+                            <field colspan="4" name="delivery_line" nolabel="1"/>
+                        </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
@@ -1187,7 +1252,8 @@
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company" />
-                    </group>
+                    </group>  
+                    <newline/>                   
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
@@ -1240,7 +1306,8 @@
                         <field name="name" select="1"/>
                         <field name="origin" select="1"/>
                         <field name="company_id" select="1" widget="selection"/>
-                    </group>
+                    </group>  
+                    <newline/>                   
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
@@ -1278,7 +1345,7 @@
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
-                    <field name="state"/>                    
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -1297,6 +1364,7 @@
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Move Information"/>
                                 <field name="name" select="2"/>
+								<field name="delivered_id"/>                                
                                 <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
                                 <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom" select="2"/>
@@ -1317,17 +1385,17 @@
                                 <field name="date"/>
                                 <field name="date_planned"/>
                                 <field name="priority"/>
-                            </group> 
+                            </group>
 
                             <group colspan="2" col="4">
-                                <separator string="Tracability" colspan="4" />
+                                <separator string="Traceability" colspan="4" />
                                 <field name="tracking_id" select="1" colspan="4" />
                                 <field name="prodlot_id" select="2"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                 <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill" colspan="2" />
-                            </group> 
+                            </group>
                         </page>
                         <page string="Return Picking History">
                             <field name="move_stock_return_history" nolabel="1"/>
@@ -1359,7 +1427,8 @@
                         <field name="location_id" select="1"/>
                         <field name="location_dest_id" select="1"/>
                         <field name="product_id" select="1"/>
-                    </group>
+                    </group> 
+                    <newline/>                    
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
@@ -1398,11 +1467,11 @@
         </record>
         <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_stock_warehouse_mgmt" sequence="3"/>
 
-	    ====================================
+        ====================================
         Reception Picking (By Stock Move)
         ====================================
 
-	    <record id="view_move_tree_reception_picking" model="ir.ui.view">
+        <record id="view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.tree2</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
@@ -1410,7 +1479,7 @@
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel','done');black:state not in ('cancel','done')" string="Moves">
                     <field name="picking_id" string="Reference"/>
-                    <field name="origin" string="Purchase Order"/>
+                    <field name="origin" string="Latest Requisition"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
@@ -1419,89 +1488,91 @@
                     <field name="date_planned"/>
                     <field name="backorder_id"/>
                     <field name="state"/>
-                    <button name="%(partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
+                    <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
                     <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
 
-	    <record id="view_move_form_reception_picking" model="ir.ui.view">
+        <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>
             <field name="model">stock.move</field>
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Moves">
-                	<notebook colspan="4">
-                		<page string="General Information">
-		                    <separator colspan="4" string="Move Information"/>
-		                    <field name="location_id" select="1"/>
-		                    <field name="location_dest_id" select="1"/>
-		                    <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
-		                    <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                    <field name="product_uom" select="2"/>
-		                    <field name="product_uos" select="2"/>
-		                    <field colspan="4" name="name" select="2"/>
-		                    <field name="date"/>
-		                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-		                    <field name="date_planned"/>
-		                    <field name="priority"/>
-		                    <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
-		                    <newline/>
-		                    <field name="picking_id" select="2"/>
-		                    <newline/>
-		                    <field name="prodlot_id" select="2"
-		                        context="{'location_id':location_id, 'product_id':product_id}"
-		                        domain="[('product_id','=?',product_id)]"
-		                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                    <field name="tracking_id" select="2"/>
-		                    <newline/>
-		                    <label/>
-		                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                    <separator colspan="4" string="Move State"/>
-		                    <field name="state" select="1"/>
-		                    <group col="5" colspan="2">
-		                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-		                        <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-		                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="%(partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
-		                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
-		                    </group>
-		                </page>
-		                <page string="Return Picking History">
-							<field name="move_stock_return_history" nolabel="1"/>
- 						</page>
-		            </notebook>
+                    <notebook colspan="4">
+                        <page string="General Information">
+                            <separator colspan="4" string="Move Information"/>
+                            <field name="delivered_id"/>
+                            <field name="location_id" select="1"/>
+                            <field name="location_dest_id" select="1"/>
+                            <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                            <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                            <field name="product_uom" select="2"/>
+                            <field name="product_uos" select="2"/>
+                            <field colspan="4" name="name" select="2"/>
+                            <field name="date"/>
+                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                            <field name="date_planned"/>
+                            <field name="priority"/>
+                            <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
+                            <newline/>
+                            <field name="picking_id" select="2"/>
+                            <newline/>
+                            <field name="prodlot_id" select="2"
+                                context="{'location_id':location_id, 'product_id':product_id}"
+                                domain="[('product_id','=?',product_id)]"
+                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                            <field name="tracking_id" select="2"/>
+                            <newline/>
+                            <label/>
+                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            <separator colspan="4" string="Move State"/>
+                            <field name="state" select="1"/>
+                            <group col="5" colspan="2">
+                                <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                                <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                                <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="%(action_partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
+                                <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                            </group>
+                        </page>
+                        <page string="Return Picking History">
+                            <field name="move_stock_return_history" nolabel="1"/>
+                         </page>
+                    </notebook>
                 </form>
             </field>
         </record>
 
-	    <record id="view_move_search_reception_picking" model="ir.ui.view">
+        <record id="view_move_search_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.search2</field>
             <field name="model">stock.move</field>
             <field name="type">search</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-            	<search string="Stock Moves">
-            		<group col="8" colspan="4">
-	            		<filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" default="1" help="Stock to be received"/>
-	            		<filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
-	            		<filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
-	            		<separator orientation="vertical"/>
-                        <field name="origin" string="Purchase Order" select="1"/>
-	            		<field name="partner_id" string="Supplier" select="1"/>
-	                    <field name="product_id"/>
+                <search string="Stock Moves">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" default="1" help="Stock to be received"/>
+                        <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
+                        <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
+                        <separator orientation="vertical"/>
+                        <field name="origin" string="Latest Requisition" select="1"/>
+                        <field name="partner_id" string="Supplier" select="1"/>
+                        <field name="product_id"/>
+                    </group>   
+                    <newline/>                 
+                    <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
                     </group>
-                    <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-						<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>
-            	</search>
+                </search>
             </field>
         </record>
 
-    	<record id="action_reception_picking_move" model="ir.actions.act_window">
+        <record id="action_reception_picking_move" model="ir.actions.act_window">
             <field name="name">Incoming Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
@@ -1513,17 +1584,17 @@
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_move_tree_reception_picking"/>
-	        <field name="act_window_id" ref="action_reception_picking_move"/>
-	    </record>
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_tree_reception_picking"/>
+            <field name="act_window_id" ref="action_reception_picking_move"/>
+        </record>
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="view_move_form_reception_picking"/>
-	        <field name="act_window_id" ref="action_reception_picking_move"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_move_form_reception_picking"/>
+            <field name="act_window_id" ref="action_reception_picking_move"/>
+        </record>
 <!--        <menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_warehouse_mgmt" sequence="4"/>-->
 
 
@@ -1606,82 +1677,132 @@
             <field name="key2">tree_but_open</field>
             <field name="model">stock.location</field>
             <field name="name">Open Products</field>
-            <field eval="'ir.actions.wizard,%d'%ref('location_product')" name="value"/>
+            <field eval="'ir.actions.act_window,%d'%action_view_stock_location_product" name="value"/>
             <field eval="True" name="object"/>
         </record>  
 
-		<!-- Graph Views -->
-		<!--  Products To Received Vs Planned -->
-		<record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
-	        <field name="name">Products To Received</field>
-	        <field name="model">report.products.to.received.planned</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-		        <tree string="Products To Received" >
-		            <field name="qty" />
-		            <field name="planned_qty" />
-		            <field name="date"/>
-		        </tree>
-	        </field>
-	    </record>
+        <!-- Graph Views -->
+        <!--  Products To Received Vs Planned -->
+        <record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
+            <field name="name">Products To Received</field>
+            <field name="model">report.products.to.received.planned</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products To Received" >
+                    <field name="qty" />
+                    <field name="planned_qty" />
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_move_graph_reception_picking">
-	        <field name="name">Products To Received</field>
-	        <field name="model">report.products.to.received.planned</field>
-	        <field name="type">graph</field>
-	        <field name="arch" type="xml">
-	        <graph string="Products To Received" type="bar" orientation="vertical">
-				<field name="date"/>
-	            <field name="qty" operator="+"/>
-	            <field name="planned_qty" operator="+"/>
-	        </graph>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_move_graph_reception_picking">
+            <field name="name">Products To Received</field>
+            <field name="model">report.products.to.received.planned</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+            <graph string="Products To Received" type="bar" orientation="vertical">
+                <field name="date"/>
+                <field name="qty" operator="+"/>
+                <field name="planned_qty" operator="+"/>
+            </graph>
+            </field>
+        </record>
 
-	    <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
-	        <field name="name">Number of Products to receive Vs planned</field>
-	        <field name="res_model">report.products.to.received.planned</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="view_id" ref="view_move_graph_reception_picking"/>
-	    </record>
+        <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
+            <field name="name">Number of Products to receive Vs planned</field>
+            <field name="res_model">report.products.to.received.planned</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_move_graph_reception_picking"/>
+        </record>
 
-		<!--  Delivery Product Vs Planned -->
-		<record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
-	        <field name="name">Delivery Products</field>
-	        <field name="model">report.delivery.products.planned</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-		        <tree string="Products To Received" >
-		            <field name="qty" />
-		            <field name="planned_qty" />
-		            <field name="date"/>
-		        </tree>
-	        </field>
-	    </record>
+        <!--  Delivery Product Vs Planned -->
+        <record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
+            <field name="name">Delivery Products</field>
+            <field name="model">report.delivery.products.planned</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products To Received" >
+                    <field name="qty" />
+                    <field name="planned_qty" />
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
-	        <field name="name">Delivery Products</field>
-	        <field name="model">report.delivery.products.planned</field>
-	        <field name="type">graph</field>
-	        <field name="arch" type="xml">
-	        <graph string="Products To Received" type="bar" orientation="vertical">
-	        	<field name="date"/>
-	            <field name="qty" operator="+"/>
-	            <field name="planned_qty" operator="+"/>
-	        </graph>
-	        </field>
-	    </record>
-
-	    <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
-	        <field name="name">Delivery Products Vs Planned</field>
-	        <field name="res_model">report.delivery.products.planned</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
-	    </record>
+        <record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
+            <field name="name">Delivery Products</field>
+            <field name="model">report.delivery.products.planned</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+            <graph string="Products To Received" type="bar" orientation="vertical">
+                <field name="date"/>
+                <field name="qty" operator="+"/>
+                <field name="planned_qty" operator="+"/>
+            </graph>
+            </field>
+        </record>
 
+        <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
+            <field name="name">Delivery Products Vs Planned</field>
+            <field name="res_model">report.delivery.products.planned</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
+        </record>
+          <!-- Product Delivered  -->
+        <record id="view_stock_delivery_form" model="ir.ui.view">
+            <field name="name">stock.delivery.from</field>
+            <field name="model">stock.delivery</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Product">
+                		<field name="name"/>
+	                    <field name="date"/>
+	                    <field name="partner_id"/>
+	                    <field name="address_id"/>
+	                    <field name="picking_id"/>
+	                    <separator string="Product Delivered Information" colspan="4" />
+	                    <field name="move_delivered" colspan="4" nolabel="1" widget="one2many" mode="tree,form">
+	                       <tree string="Stock Moves" editable="top">
+			                    <field name="picking_id" string="Reference"/>
+			                    <field name="origin" string="Latest Requisition"/>
+			                    <field name="partner_id" string="Supplier"/>
+			                    <field name="product_id"/>
+			                    <field name="product_qty" />
+			                    <field name="product_uom" string="UOM"/>
+			                    <field name="prodlot_id" string="Lot"/>
+		            		</tree>
+	           			</field> 
+                </form>
+            </field>
+        </record>
+        <record id="view_stock_delivery_tree" model="ir.ui.view">
+            <field name="name">stock.delivery.tree</field>
+            <field name="model">stock.delivery</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Delivered Product">	
+                	<field name="name"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="address_id"/>
+                </tree>
+            </field>
+        </record>
+	    
+    	<record id="action_stock_delivery" model="ir.actions.act_window">
+            <field name="name">Delivered Products</field>
+            <field name="res_model">stock.delivery</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>            
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_stock_delivery_tree"/>
+        </record>        
+		
+		<menuitem action="action_stock_delivery" id="menu_action_picking_all" parent="menu_traceability" sequence="4"/>
     </data>
 </openerp>
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 5db1269d42c..4ead149d2b0 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -12,72 +12,23 @@
             model="stock.picking"
             multi="True"
             name="stock.move.split"
-            string="Split move line"/>
+            string="Split move line"/>       
+
+		
+
+	    <wizard
+	        id="return_picking"
+	        model="stock.picking"
+	        menu="False"
+			keyword="client_action_multi"
+	        name="stock.return.picking"
+	        string="Return picking"/>	
 
         <wizard
-            id="partial_picking"
-            model="stock.picking"
+            id="split_inventory_lots"
+            model="stock.inventory.line"
             multi="True"
-            name="stock.partial_picking"
-            string="Partial picking"/>
-
-	<wizard
-            id="partial_move"
-            model="stock.move"
-            multi="True"
-            name="stock.partial_move"
-            string="Partial Move"/>
-
-    <wizard
-        id="split_inventory_lots"
-        model="stock.inventory.line"
-        multi="True"
-        name="stock.inventory.line.split"
-        string="Split inventory lines"/>
-
-    <wizard id="make_picking" model="stock.picking" multi="True" name="stock.picking.make" string="Make picking"/>
-
-    <wizard
-        id="return_picking"
-        model="stock.picking"
-        name="stock.return.picking"
-        string="Return picking"/>
-
-    <wizard
-        id="wizard_invoice_onshipping"
-        keyword="client_action_multi"
-        model="stock.picking"
-        name="stock.invoice_onshipping"
-        string="Create invoice"/>
-
-    <wizard
-        string="Set Stock to 0"
-        model="stock.inventory"
-        name="inventory.merge.stock.zero"
-        keyword="client_action_multi"
-        id="wizard_merge_inventory_zero"/>
-
-    <wizard
-        string="Merge inventories"
-        model="stock.inventory"
-        name="inventory.merge"
-        keyword="client_action_multi"
-        multi="True"
-        id="wizard_merge_inventory"/>
-
-    <wizard
-        string="Fill Inventory"
-        model="stock.inventory"
-        name="stock.fill_inventory"
-        keyword="client_action_multi"
-        id="wizard_fill_inventory"
-    />
-
-    <wizard
-        id="location_product"
-        model="stock.location"
-        name="stock.location.products"
-        string="Products by Location"/>
-            
-   </data>        
+            name="stock.inventory.line.split"
+            string="Split inventory lines"/>    
+   </data>
 </openerp>
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 6a15449a151..7c87212571c 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,24 +15,25 @@
 #    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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import stock_traceability
-import wizard_partial_picking
-import wizard_partial_move
-import wizard_picking_make
+import stock_move   
+import stock_partial_picking
+import stock_partial_move
+import stock_picking_make
 import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
 import wizard_ups
-import wizard_invoice_onshipping
-import wizard_location_product
-import wizard_inventory
-import wizard_split_inventory_lots
-import inventory_merge_zero
-import inventory_merge
-
+import stock_inventory_merge
+import stock_inventory_set_stock_zero
+import stock_fill_inventory
+import stock_inventory_line_split
+import stock_invoice_onshipping
+import stock_location_product
+import stock_change_standard_price
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/inventory_merge.py b/addons/stock/wizard/inventory_merge.py
deleted file mode 100644
index 7be8eb2b3e3..00000000000
--- a/addons/stock/wizard/inventory_merge.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-import wizard
-import pooler
-from tools.translate import _
-
-
-_form = """<?xml version="1.0"?>
-<form string="Merge inventories">
-    <separator colspan="4" string="Merge inventories" />
-    <label string="Do you want to merge theses inventories ?"/>
-</form>
-"""
-
-
-def do_merge(self, cr, uid, data, context):
-
-    invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
-    invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-
-    invent_lines = {}
-
-    if len(data['ids']) < 2:
-        raise wizard.except_wizard(_('Warning'),
-            _('Please select at least two inventories.'))
-
-
-
-    for inventory in invent_obj.browse(cr, uid, data['ids'], context=context):
-        if inventory.state == "done":
-            raise wizard.except_wizard(_('Warning'),
-                _('Merging is only allowed on draft inventories.'))
-
-        for line in inventory.inventory_line_id:
-            key = (line.location_id.id, line.product_id.id, line.product_uom.id)
-            if key in invent_lines:
-                invent_lines[key] += line.product_qty
-            else:
-                invent_lines[key] = line.product_qty
-
-
-    new_invent = invent_obj.create(cr, uid, {
-        'name': 'Merged inventory'
-        }, context=context)
-
-    for key, quantity in invent_lines.items():
-        invent_line_obj.create(cr, uid, {
-            'inventory_id': new_invent,
-            'location_id': key[0],
-            'product_id': key[1],
-            'product_uom': key[2],
-            'product_qty': quantity,
-            })
-
-    return {}
-
-
-class merge_inventory(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : _form,
-                    'fields' : {},
-                    'state' : [('end', 'Cancel', 'gtk-cancel'),
-                               ('merge', 'Yes', 'gtk-apply', True) ]}
-        },
-        'merge' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                        'action': do_merge,
-                        'state' : 'end'}
-        },
-    }
-merge_inventory("inventory.merge")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/inventory_merge_zero.py b/addons/stock/wizard/inventory_merge_zero.py
deleted file mode 100644
index 3aa2b1e9fd9..00000000000
--- a/addons/stock/wizard/inventory_merge_zero.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import wizard
-import pooler
-from tools.translate import _
-
-
-_form = """<?xml version="1.0"?>
-<form string="Set Stock to Zero">
-    <separator colspan="4" string="Set Stocks to Zero" />
-    <field name="location_id"/>
-    <newline/>
-    <label colspan="4" string="Do you want to set stocks to zero ?"/>
-</form>
-"""
-_inventory_fields = {
-    'location_id' : {
-        'string':'Location',
-        'type':'many2one',
-        'relation':'stock.location',
-        'required':True
-        }
-}
-
-
-def do_merge(self, cr, uid, data, context):
-    invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
-    invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-    prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
-
-    if len(data['ids']) <> 1:
-        raise wizard.except_wizard(_('Warning'),
-                                   _('Please select one and only one inventory !'))
-
-    loc = str(data['form']['location_id'])
-
-    cr.execute('select distinct location_id,product_id from stock_inventory_line where inventory_id=%s', (data['ids'][0],))
-    inv = cr.fetchall()
-    cr.execute('select distinct product_id from stock_move where location_dest_id=%s or location_id=%s',(loc,loc,))
-    stock = cr.fetchall()
-    for s in stock:
-        if (loc,s[0]) not in inv:
-            p = prod_obj.browse(cr, uid, s[0])
-            invent_line_obj.create(cr, uid, {
-                'inventory_id': data['ids'][0],
-                'location_id': loc,
-                'product_id': s[0],
-                'product_uom': p.uom_id.id,
-                'product_qty': 0.0,
-                })
-    return {}
-
-
-class merge_inventory(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : _form,
-                    'fields' : _inventory_fields,
-                    'state' : [('end', 'Cancel', 'gtk-cancel'),
-                               ('merge', 'Set to Zero', 'gtk-apply', True) ]}
-        },
-        'merge' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                        'action': do_merge,
-                        'state' : 'end'}
-        },
-    }
-merge_inventory("inventory.merge.stock.zero")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
new file mode 100644
index 00000000000..8e2ec5f555e
--- /dev/null
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -0,0 +1,115 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class change_standard_price(osv.osv_memory):
+    _name = "stock.change.standard.price"
+    _description = "Change Standard Price"
+    _columns = {
+            'new_price': fields.float('Price', required=True),
+            'stock_account_input':fields.many2one('account.account', 'Stock Input Account'),
+            'stock_account_output':fields.many2one('account.account', 'Stock Output Account'),
+            'stock_journal':fields.many2one('account.journal', 'Stock journal', required=True),            
+            'enable_stock_in_out_acc':fields.boolean('Enable Related Account',),
+    }
+    
+    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. 
+        
+        """ 
+        product_obj = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
+        res = super(change_standard_price, self).default_get(cr, uid, fields, context=context)   
+        
+        stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False 
+        if not stock_input_acc:
+            stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
+        
+        stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
+        if not stock_output_acc:
+            stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
+
+        price = product_obj.standard_price
+        journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
+        
+        if 'new_price' in fields:
+            res.update({'new_price': price})
+        if 'stock_account_input' in fields:
+            res.update({'stock_account_input': stock_input_acc})         
+        if 'stock_account_output' in fields:
+            res.update({'stock_account_output': stock_output_acc})         
+        if 'stock_journal' in fields:
+            res.update({'stock_journal': journal_id})  
+        if 'enable_stock_in_out_acc' in fields:
+            res.update({'enable_stock_in_out_acc': True})              
+                 
+                     
+        return res
+    
+    def onchange_price(self, cr, uid, ids, new_price, context = {}):
+        product_obj = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
+        price = product_obj.standard_price
+        diff = price - new_price
+        if diff > 0 : 
+            return {'value' : {'enable_stock_in_out_acc':True}}
+        else :
+            return {'value' : {'enable_stock_in_out_acc':False}}
+        
+    def change_price(self, cr, uid, ids, context):
+        """ 
+             Changes the Standard Price of Product. 
+             And creates an account move accordingly.
+            
+             @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:  
+        
+        """
+        rec_id = context and context.get('active_id', False)
+        assert rec_id, _('Active ID is not set in Context')
+        prod_obj = self.pool.get('product.product')
+        res = self.browse(cr, uid, ids)        
+        datas = {
+            'new_price' : res[0].new_price,
+            'stock_output_account' : res[0].stock_account_output.id,
+            'stock_input_account' : res[0].stock_account_input.id,
+            'stock_journal' : res[0].stock_journal.id
+        }
+        prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
+        return {}        
+
+change_standard_price()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
new file mode 100644
index 00000000000..ffca108390d
--- /dev/null
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+   		<record id="view_change_standard_price" model="ir.ui.view">
+            <field name="name">Change Standard Price</field>
+            <field name="model">stock.change.standard.price</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Change Standard Price">
+             		<field name="new_price"/>              		
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+              		<group col="2" colspan="2">                        
+	              		<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+	              		<button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
+              		</group>
+              </form>
+            </field>
+		</record>
+
+		<record id="action_view_change_standard_price" model="ir.actions.act_window">
+            <field name="name">Change Standard Price</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.change.standard.price</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_change_standard_price"/>
+            <field name="target">new</field>            
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
new file mode 100644
index 00000000000..c96638c8d52
--- /dev/null
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+
+class stock_fill_inventory(osv.osv_memory):
+    _name = "stock.fill.inventory"
+    _description = "Fill Inventory"
+    _columns = {
+            'location_id': fields.many2one('stock.location', 'Location', required=True),
+            'recursive': fields.boolean("Include all childs for the location"),
+            }
+
+    def fill_inventory(self, cr, uid, ids, context):
+        """ 
+             To fill stock inventory according to products available in the selected locations..
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """        
+        inventory_line_obj = self.pool.get('stock.inventory.line')
+        location_obj = self.pool.get('stock.location')
+        product_obj = self.pool.get('product.product')
+        stock_location_obj = self.pool.get('stock.location')
+        for fill_inventory in self.browse(cr, uid, ids):
+            res = {}
+            res_location = {}
+            if fill_inventory.recursive :
+                location_ids = location_obj.search(cr, uid, [('location_id',
+                                 'child_of', fill_inventory.location_id.id)])
+                for location in location_ids :
+                    res = location_obj._product_get(cr, uid, location)
+                    res_location[location] = res
+            else:
+                context.update({'compute_child': False})
+                res = location_obj._product_get(cr, uid,
+                            fill_inventory.location_id.id, context=context)
+                res_location[fill_inventory.location_id.id] = res
+
+                product_ids = []
+                for location in res_location.keys():
+                    res = res_location[location]
+                    for product_id in res.keys():
+                        prod = product_obj.browse(cr, uid, [product_id])[0]
+                        uom = prod.uom_id.id
+                        context.update({'uom': uom})
+                        amount = stock_location_obj._product_get(cr, uid,
+                                 location, [product_id], context=context)[product_id]
+
+                        if(amount):
+                            line_ids=inventory_line_obj.search(cr, uid,
+                                [('inventory_id', '=', context['active_ids']),
+                                 ('location_id', '=', location),
+                                 ('product_id', '=', product_id),
+                                 ('product_uom', '=', uom),
+                                ('product_qty', '=', amount)])
+                            if not len(line_ids):
+                                inventory_line = {'inventory_id': context['active_ids'][0],
+                                                'location_id': location,
+                                                'product_id': product_id,
+                                                'product_uom': uom,
+                                                'product_qty': amount}
+                                inventory_line_obj.create(cr, uid, inventory_line)
+                            product_ids.append(product_id)
+
+                if(len(product_ids) == 0):
+                    raise osv.except_osv(_('Message !'), _('No product in this location.'))
+        return {}
+
+stock_fill_inventory()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
new file mode 100644
index 00000000000..ef95a3bf447
--- /dev/null
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+   		<record id="view_stock_fill_inventory" model="ir.ui.view">
+            <field name="name">Fill Inventory</field>
+            <field name="model">stock.fill.inventory</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Fill Inventory">
+             		<separator string="Fill Inventory for specific location" colspan="4" />
+                	<field name="location_id"/>
+                	<newline/>
+                	<field name="recursive"/>
+    				<newline/>
+        	        <separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+            	    <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+         <act_window name="Fill Inventory"		    
+		    res_model="stock.fill.inventory"
+		    src_model="stock.inventory"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_stock_fill_inventory"/>	
+
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
new file mode 100644
index 00000000000..9fe71582c7f
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_inventory_line_split(osv.osv_memory):
+    _inherit = "stock.move.split"
+    _name = "stock.inventory.line.split"
+    _description = "Split inventory lines"
+
+    
+    def default_get(self, cr, uid, fields, context):
+        """ 
+             To check the availability of production lot. 
+            
+             @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. 
+        
+        """        
+        record_id = context and context.get('active_id',False)
+        res = super(stock_inventory_line_split, self).default_get(cr, uid, fields, context=context)
+        line=  self.pool.get('stock.inventory.line').browse(cr, uid, record_id)        
+        if 'product_id' in fields:
+            res.update({'product_id':line.product_id.id})       
+        return res
+    
+    def split(self, cr, uid, ids, line_ids, context=None):
+        """ 
+             To split stock inventory lines according to production lot
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param line_ids: the ID or list of IDs of inventory lines we want to split
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """                    
+        prodlot_obj = self.pool.get('stock.production.lot')
+        ir_sequence_obj = self.pool.get('ir.sequence')
+        line_obj = self.pool.get('stock.inventory.line')
+        new_line = []        
+        for data in self.browse(cr, uid, ids):
+            for inv_line in line_obj.browse(cr, uid, line_ids):
+                line_qty = inv_line.product_qty
+                quantity_rest = inv_line.product_qty                
+                new_line = []                            
+                for line in data.line_ids:
+                    quantity = line.quantity
+                    
+
+                    if quantity <= 0 or line_qty == 0:
+                        continue
+                    quantity_rest -= quantity                    
+                    if quantity_rest <= 0:
+                        quantity_rest = quantity
+                        break
+                    default_val = {
+                        'product_qty': quantity,                         
+                    }
+                    current_line = line_obj.copy(cr, uid, inv_line.id, default_val)
+                    new_line.append(current_line)
+                    prodlot_id = False
+                    if line.use_exist and line.name:
+                        prodlot_id = prodlot_obj.search(cr, uid, [('prefix','=',line.name),('product_id','=',data.product_id.id)])
+                        if prodlot_id:
+                            prodlot_id = prodlot_id[0]                    
+                    if not prodlot_id:
+                        sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+                        prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix' : line.name}, 
+                                                 {'product_id': data.product_id.id})                    
+                    line_obj.write(cr, uid, [current_line], {'prod_lot_id': prodlot_id})
+                    prodlot = prodlot_obj.browse(cr, uid, prodlot_id)                    
+                    
+                    update_val = {}
+                    if quantity_rest > 0:                        
+                        update_val['product_qty'] = quantity_rest                                            
+                        line_obj.write(cr, uid, [inv_line.id], update_val)
+
+                    
+        return new_line
+stock_inventory_line_split()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
new file mode 100644
index 00000000000..42b8a4648da
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+            <record id="view_stock_inventory_line_split" model="ir.ui.view">
+                <field name="name">Split inventory lines</field>
+                <field name="model">stock.inventory.line.split</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Split inventory lines in lots">
+	                	<field name="product_id" colspan="4" readonly="1"/>
+	                	<newline/>
+	                	<field name="line_ids" colspan="4" nolabel="1">
+	                		<tree string="Lots Number" editable="top">
+	                			<field name="name" string="Lots"/>
+	                			<field name="quantity" />
+                                <field name="use_exist" />
+	                		</tree>
+	                		<form string="Lots Number">
+	                			<field name="name" string="Lots"/>
+	                			<field name="quantity" />
+                                <field name="use_exist" />
+	                		</form>
+	                	</field>
+	                	<separator string="" colspan="4" />
+	                	<label string="" colspan="2" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="split_lot" string="Ok"
+	                		type="object" icon="gtk-ok" />
+	                </form>
+	            </field>
+	        </record>	        
+     	
+
+		<record id="action_view_stock_inventory_line_split" model="ir.actions.act_window">
+            <field name="name">Split inventory lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory.line.split</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
new file mode 100644
index 00000000000..1c11ad8e2ad
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_inventory_merge(osv.osv_memory):
+    _name = "stock.inventory.merge"
+    _description = "Merge Inventory"
+    _columns = {
+           
+            }
+
+    def do_merge(self, cr, uid, ids, context):
+        """ 
+             To merge selected Inventories.
+            
+             @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: 
+        
+        """ 
+        invent_obj = self.pool.get('stock.inventory')
+        invent_line_obj = self.pool.get('stock.inventory.line')
+
+        invent_lines = {}
+
+        if len(context['active_ids']) < 2:
+            raise osv.except_osv(_('Warning'),
+            _('Please select at least two inventories.'))
+
+        for inventory in invent_obj.browse(cr, uid, context['active_ids'], context=context):
+            if inventory.state == "done":
+                raise osv.except_osv(_('Warning'),
+                _('Merging is only allowed on draft inventories.'))
+
+            for line in inventory.inventory_line_id:
+                key = (line.location_id.id, line.product_id.id, line.product_uom.id)
+                if key in invent_lines:
+                    invent_lines[key] += line.product_qty
+                else:
+                    invent_lines[key] = line.product_qty
+
+
+        new_invent = invent_obj.create(cr, uid, {
+            'name': 'Merged inventory'
+            }, context=context)
+
+        for key, quantity in invent_lines.items():
+            invent_line_obj.create(cr, uid, {
+                'inventory_id': new_invent,
+                'location_id': key[0],
+                'product_id': key[1],
+                'product_uom': key[2],
+                'product_qty': quantity,
+                })
+
+        return {}
+
+stock_inventory_merge()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
new file mode 100644
index 00000000000..e8af34c0c71
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+	
+		<record id="name_form" model="ir.ui.view">
+		        <field name="name">stock.inventory.merge.form</field>
+		        <field name="model">stock.inventory.merge</field>
+		        <field name="type">form</field>
+		        <field name="arch" type="xml">
+		              <form string="Merge inventories">
+				    <separator colspan="4" string="Merge inventories" />
+				    <label string="Do you want to merge theses inventories ?"/>
+				<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+				<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>				
+				</form>
+			</field>
+		</record>
+		 <act_window name="Merge inventories"		    
+			res_model="stock.inventory.merge"
+			src_model="stock.inventory"
+			view_mode="form"
+			target="new"        
+			key2="client_action_multi"    
+			id="action_view_stock_merge_inventories"/>	
+		
+	</data>
+</openerp>
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
new file mode 100644
index 00000000000..63296b69875
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+
+class inventory_set_stock_zero(osv.osv_memory):
+    _name = "stock.inventory.set.stock.zero"
+    _description = "Set Stock to 0"
+    _columns = {
+            'location_id': fields.many2one('stock.location', 'Location', required=True), 
+            }
+    
+    def do_merge(self, cr, uid, ids, context):
+        """ 
+             To set stock to Zero 
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """            
+        invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
+        invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
+        prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
+    
+        if len(context['active_ids']) <> 1:
+            raise osv.except_osv(_('Warning'), 
+                                       _('Please select one and only one inventory !'))
+        for id in ids:
+            datas = self.read(cr, uid, id)
+            loc = str(datas['location_id'])
+        
+            cr.execute('select distinct location_id,product_id \
+                        from stock_inventory_line \
+                        where inventory_id=%s', (context['active_id'],))
+            inv = cr.fetchall()
+            cr.execute('select distinct product_id from stock_move where \
+                        location_dest_id=%s or location_id=%s', (loc, loc,))
+            stock = cr.fetchall()
+            for s in stock:
+                if (loc, s[0]) not in inv:
+                    p = prod_obj.browse(cr, uid, s[0])
+                    invent_line_obj.create(cr, uid, {
+                        'inventory_id': context['active_id'], 
+                        'location_id': loc, 
+                        'product_id': s[0], 
+                        'product_uom': p.uom_id.id, 
+                        'product_qty': 0.0, 
+                        })
+        return {}
+
+inventory_set_stock_zero()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
new file mode 100644
index 00000000000..0ee84d2045d
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_inventory_set_stock_zero" model="ir.ui.view">
+            <field name="name">Set Stock to Zero</field>
+            <field name="model">stock.inventory.set.stock.zero</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Set Stock to Zero">
+             		<separator string="Set Stocks to Zero" colspan="4" />
+                	<field name="location_id"/>
+    				<newline/>
+    				<label colspan="4" string="Do you want to set stocks to zero ?"/>
+        	        <separator string="" colspan="4" />
+					<button special="cancel" icon='gtk-cancel' string="Cancel" />
+            	    <button name="do_merge" string="Set Stock to Zero" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+        <act_window name="Set Stock to Zero"		    
+		    res_model="stock.inventory.set.stock.zero"
+		    src_model="stock.inventory"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_inventory_set_stock_zero"/>			
+        
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
new file mode 100644
index 00000000000..22e48631f8b
--- /dev/null
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.misc import UpdateableStr, UpdateableDict
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_invoice_onshipping(osv.osv_memory):
+    _name = "stock.invoice.onshipping"
+    _description = "Stock Invoice Onshipping"
+    _columns = {
+            'journal_id': fields.many2one('account.journal', 'Destination Journal', required=True),
+            'group': fields.boolean("Group by partner"),
+            'type': fields.selection([('out_invoice', 'Customer Invoice'),
+                        ('in_invoice', 'Supplier Invoice'),
+                        ('out_refund', 'Customer Refund'),
+                        ('in_refund', 'Supplier Refund')] , 'Type', required=True),
+            'invoice_date': fields.date('Invoiced date'),
+            }
+
+    def _get_type(self, cr, uid, context):
+        """ 
+             To get invoice type
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: invoice type
+        
+        """                
+        picking_obj = self.pool.get('stock.picking')
+        usage = 'customer'
+        pick = picking_obj.browse(cr, uid, context['active_id'])
+        if pick.invoice_state == 'invoiced':
+            raise osv.except_osv(_('UserError'), _('Invoice is already created.'))
+        if pick.invoice_state == 'none':
+            raise osv.except_osv(_('UserError'), _('Invoice cannot be created from Picking.'))
+        if pick.move_lines:
+            usage = pick.move_lines[0].location_id.usage
+
+        if pick.type == 'out' and usage == 'supplier':
+            type = 'in_refund'
+        elif pick.type == 'out' and usage == 'customer':
+            type = 'out_invoice'
+        elif pick.type == 'in' and usage == 'supplier':
+            type = 'in_invoice'
+        elif pick.type == 'in' and usage == 'customer':
+            type = 'out_refund'
+        else:
+            type = 'out_invoice'
+        return type
+
+    _defaults = {
+            'type': _get_type,
+        }
+
+    def create_invoice(self, cr, uid, ids, context):
+        """ 
+             To create invoice
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: invoice ids 
+        
+        """        
+        result = []
+        picking_obj = self.pool.get('stock.picking')
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
+            if context.get('new_picking', False):
+                onshipdata_obj[id] = onshipdata_obj.new_picking
+                onshipdata_obj[ids] = onshipdata_obj.new_picking
+
+            type = onshipdata_obj['type']
+            context['date_inv'] = onshipdata_obj['invoice_date']
+            res = picking_obj.action_invoice_create(cr, uid,context['active_ids'],
+                  journal_id = onshipdata_obj['journal_id'],
+                  group=onshipdata_obj['group'],
+                  type=type,
+                  context=context)
+            invoice_ids = res.values()
+            if not invoice_ids:
+                raise  osv.except_osv(_('Error'), _('Invoice is not created'))
+
+            if type == 'out_invoice':
+                xml_id = 'action_invoice_tree1'
+            elif 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'])
+            result = act_obj.read(cr, uid, id['res_id'])
+            result['res_id'] = invoice_ids
+            return result
+
+stock_invoice_onshipping()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
new file mode 100644
index 00000000000..62689019af0
--- /dev/null
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_stock_invoice_onshipping" model="ir.ui.view">
+            <field name="name">Stock Invoice Onshipping</field>
+            <field name="model">stock.invoice.onshipping</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Create invoices">
+					<separator colspan="4" string="Create invoices" />
+    				<field name="journal_id"/>
+    				<newline/>
+					<field name="group"/>
+					<newline/>
+					<field name="type"/>
+					<newline/>
+					<field name="invoice_date" />
+			   	    <separator string="" colspan="4" />
+					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+			       	<button name="create_invoice" string="Create Invoices" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+        <act_window name="Create Invoice"		    
+		    res_model="stock.invoice.onshipping"
+		    src_model="stock.picking"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_stock_invoice_onshipping"/>		
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
new file mode 100755
index 00000000000..d3ee334bac0
--- /dev/null
+++ b/addons/stock/wizard/stock_location_product.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class stock_location_product(osv.osv_memory):
+    _name = "stock.location.product"
+    _description = "Products by Location"
+    _columns = {
+                'from_date': fields.datetime('From'), 
+                'to_date': fields.datetime('To'), 
+    }
+
+    def action_open_window(self, cr, uid, ids, context):
+        """ 
+             To open location wise product information specific to given duration
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: invoice type
+        
+        """                
+        mod_obj = self.pool.get('ir.model.data')
+        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
+            return {
+                    'name': False, 
+                    'view_type': 'form', 
+                    'view_mode': 'tree,form', 
+                    'res_model': 'product.product', 
+                    'type': 'ir.actions.act_window', 
+                    'context': {'location': context['active_id'], 
+                           'from_date': location_obj['from_date'], 
+                           'to_date': location_obj['to_date']}, 
+                    'domain': [('type', '<>', 'service')], 
+            }
+
+stock_location_product()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
new file mode 100644
index 00000000000..518bc6eab35
--- /dev/null
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_stock_location_product" model="ir.ui.view">
+            <field name="name">Products by Location</field>
+            <field name="model">stock.location.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               <form string="View Stock of Products">
+        			<separator string="Stock Location Analysis" colspan="4"/>
+       				<field name="from_date" colspan="4"/>
+       				<newline/>
+       				<field name="to_date" colspan="4"/>
+       				<newline/>
+       				<label string=""/>
+       				<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
+        			<separator string="" colspan="4" />
+        			<label string=""/>
+					<button special="cancel" string="Cancel" icon="gtk-cancel" />
+           	    	<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
+    			</form>
+            </field>
+		</record>
+
+
+        <act_window name="Products by Location"		    
+		    res_model="stock.location.product"
+		    src_model="stock.location"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_stock_location_product"/>			
+    </data>
+</openerp>
diff --git a/addons/stock/stock_wizard.py b/addons/stock/wizard/stock_move.py
similarity index 63%
rename from addons/stock/stock_wizard.py
rename to addons/stock/wizard/stock_move.py
index 548375db199..500b0bdc372 100644
--- a/addons/stock/stock_wizard.py
+++ b/addons/stock/wizard/stock_move.py
@@ -36,6 +36,18 @@ class stock_move_track(osv.osv_memory):
                  }
     
     def track_lines(self, cr, uid, ids, context={}):
+        """ 
+             To track stock moves lines
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """                
         datas = self.read(cr, uid, ids)[0]
         move_obj = self.pool.get('stock.move')
         move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
@@ -52,36 +64,50 @@ class stock_move_consume(osv.osv_memory):
         'product_qty': fields.float('Quantity', required=True), 
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 
         'location_id': fields.many2one('stock.location', 'Location', required=True)
-              }
+    }
 
-    def _get_product_id(self, cr, uid, context):
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             Get default values
+            
+             @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 default value 
+             @param context: A standard dictionary 
+             
+             @return: default values of fields
+        
+        """
+        res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)        
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_id.id
-    
-    def _get_product_qty(self, cr, uid, context):
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_qty
-    
-    def _get_product_uom(self, cr, uid, context):
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_uom.id
-    
-    def _get_location_id(self, cr, uid, context):
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.location_id.id
-    
-    _defaults = {
-                 'product_id': _get_product_id, 
-                 'product_qty': _get_product_qty, 
-                 'product_uom': _get_product_uom, 
-                 'location_id': _get_location_id
-                 }
-
+        if 'product_id' in fields:
+            res.update({'product_id': move.product_id.id})     
+        if 'product_uom' in fields:
+            res.update({'product_uom': move.product_uom.id})    
+        if 'product_qty' in fields:
+            res.update({'product_qty': move.product_qty})    
+        if 'location_id' in fields:
+            res.update({'location_id': move.location_id.id})
+        return res   
+            
     def do_move_consume(self, cr, uid, ids, context={}):
+        """ 
+             To move consumed products
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """              
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):            
-            move_obj.consume_moves(cr, uid, move_ids, 
+            move_obj.action_consume(cr, uid, move_ids, 
                              data['product_qty'], data['location_id'], 
                              context=context)
         return {}
@@ -99,10 +125,22 @@ class stock_move_scrap(osv.osv_memory):
     }
 
     def move_scrap(self, cr, uid, ids, context={}):
+        """ 
+             To move scraped products
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """              
         move_obj = self.pool.get('stock.move')        
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
-            move_obj.scrap_moves(cr, uid, move_ids, 
+            move_obj.action_scrap(cr, uid, move_ids, 
                              data['product_qty'], data['location_id'], 
                              context=context)
         return {}
@@ -114,24 +152,60 @@ class split_in_production_lot(osv.osv_memory):
     _name = "stock.move.split"
     _description = "Split in Production lots"
     
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             Get default values
+            
+             @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 default value 
+             @param context: A standard dictionary 
+             
+             @return: default values of fields
+        
+        """
+        
+        res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)        
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)  
+        if 'product_id' in fields:
+            res.update({'product_id': move.product_id.id})  
+        return res
+    
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Lots Number')
      }
-    
-    def _get_product_id(self, cr, uid, context):
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        return move.product_id.id
-    
-    _defaults = {
-                 'product_id': _get_product_id, 
-                 }
-
     def split_lot(self, cr, uid, ids, context=None):
+        """ 
+             To split a lot
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """                    
         self.split(cr, uid, ids, context.get('active_ids'), context=context)
         return {}
 
     def split(self, cr, uid, ids, move_ids, context=None):
+        """ 
+             To split stock moves into production lot
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: the ID or list of IDs if we want more than one 
+             @param move_ids: the ID or list of IDs of stock move we want to split
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """                    
         prodlot_obj = self.pool.get('stock.production.lot')
         ir_sequence_obj = self.pool.get('ir.sequence')
         move_obj = self.pool.get('stock.move')
@@ -172,7 +246,7 @@ class split_in_production_lot(osv.osv_memory):
                                                  {'product_id': move.product_id.id})                    
                     move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id})
                     prodlot = prodlot_obj.browse(cr, uid, prodlot_id) 
-                    ref = '%d' % (current_move)
+                    ref = '%d' % (move.id)
                     if prodlot.ref:
                         ref = '%s, %s' % (prodlot.ref, ref) 
                     prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
@@ -182,8 +256,6 @@ class split_in_production_lot(osv.osv_memory):
                         update_val['product_qty'] = quantity_rest
                         update_val['product_uos_qty'] = uos_qty_rest                          
                         move_obj.write(cr, uid, [move.id], update_val)
-
-                    
         return new_move
 split_in_production_lot()
 
diff --git a/addons/stock/stock_wizard_view.xml b/addons/stock/wizard/stock_move_view.xml
similarity index 100%
rename from addons/stock/stock_wizard_view.xml
rename to addons/stock/wizard/stock_move_view.xml
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
new file mode 100644
index 00000000000..bf8d1058aa2
--- /dev/null
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -0,0 +1,217 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import netsvc
+import pooler
+import time
+
+class stock_partial_move(osv.osv_memory):
+    _name = "stock.partial.move"    
+    _description = "Partial Move"    
+    _columns = {
+                'date': fields.datetime('Date', required=True),
+                'partner_id': fields.many2one('res.partner',string="Partner", required=True),
+                'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
+                               
+     }
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
+        move_obj = self.pool.get('stock.move')        
+        if not context:
+            context={}
+        moveids = []
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
+            if m.state in ('done', 'cancel'):
+                continue
+            if 'move%s_product_id'%(m.id) not in self._columns:
+                self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
+            if 'move%s_product_qty'%(m.id) not in self._columns:
+                self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+            if 'move%s_product_uom'%(m.id) not in self._columns:
+                self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                if 'move%s_product_price'%(m.id) not in self._columns:
+                    self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                if 'move%s_product_currency'%(m.id) not in self._columns:
+                    self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+        return res   
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        move_obj = self.pool.get('stock.move')
+        move_ids = context.get('active_ids', False)                
+        move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
+        _moves_arch_lst = """<form string="Deliver Products">
+                        <separator colspan="4" string="Delivery Information"/>
+                    	<field name="date" colspan="4" />
+                    	<field name="partner_id"/>
+                    	<field name="address_id"/>
+                    	<newline/>
+                        <separator colspan="4" string="Move Detail"/>
+                    	"""
+        _moves_fields = result['fields']
+        if move_ids and view_type in ['form']:            
+            for m in move_obj.browse(cr, uid, move_ids, context):                
+                if m.state in ('done', 'cancel'):
+                    continue
+                _moves_fields.update({
+                    'move%s_product_id'%(m.id)  : {
+                                'string': _('Product'),
+                                'type' : 'many2one', 
+                                'relation': 'product.product', 
+                                'required' : True, 
+                                'readonly' : True,                                    
+                                },
+                    'move%s_product_qty'%(m.id) : {
+                                'string': _('Quantity'),
+                                'type' : 'float',
+                                'required': True,                                    
+                                },
+                    'move%s_product_uom'%(m.id) : {
+                                'string': _('Product UOM'),
+                                'type' : 'many2one', 
+                                'relation': 'product.uom', 
+                                'required' : True, 
+                                'readonly' : True,                                    
+                                }
+                })                
+                
+                _moves_arch_lst += """
+                    <group colspan="4" col="10">
+                    <field name="move%s_product_id" nolabel="1"/>
+                    <field name="move%s_product_qty" string="Qty" />
+                    <field name="move%s_product_uom" nolabel="1" />
+                """%(m.id, m.id, m.id)
+                if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):                        
+                    _moves_fields.update({
+                        'move%s_product_price'%(m.id) : {
+                                'string': _('Price'),
+                                'type' : 'float',
+                                },
+                        'move%s_product_currency'%(m.id): {
+                                'string': _('Currency'),
+                                'type' : 'float',      
+                                'type' : 'many2one', 
+                                'relation': 'res.currency',                                    
+                                }
+                    })
+                    _moves_arch_lst += """
+                        <field name="move%s_product_price" />
+                        <field name="move%s_product_currency" nolabel="1"/>
+                    """%(m.id, m.id)
+                _moves_arch_lst += """
+                    </group>
+                    """
+        _moves_arch_lst += """
+                <separator string="" colspan="4" />
+                <label string="" colspan="2"/>
+                <group col="2" colspan="2">
+        		<button icon='gtk-cancel' special="cancel"
+        			string="_Cancel" />
+        		<button name="do_partial" string="_Deliver"
+        			colspan="1" type="object" icon="gtk-apply" />
+        	</group>                	
+        </form>"""
+        result['arch'] = _moves_arch_lst
+        result['fields'] = _moves_fields           
+        return result
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             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(stock_partial_move, self).default_get(cr, uid, fields, context=context)
+        move_obj = self.pool.get('stock.move')        
+        if not context:
+            context={}
+        moveids = []
+        if 'date' in fields:
+            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
+            if m.state in ('done', 'cancel'):
+                continue
+            if 'move%s_product_id'%(m.id) in fields:
+                res['move%s_product_id'%(m.id)] = m.product_id.id
+            if 'move%s_product_qty'%(m.id) in fields:
+                res['move%s_product_qty'%(m.id)] = m.product_qty
+            if 'move%s_product_uom'%(m.id) in fields:
+                res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                price = 0
+                if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+                    price = m.purchase_line_id.price_unit
+
+                currency = False
+                if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
+                    currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
+    
+                if 'move%s_product_price'%(m.id) in fields:
+                    res['move%s_product_price'%(m.id)] = price
+                if 'move%s_product_currency'%(m.id) in fields:
+                    res['move%s_product_currency'%(m.id)] = currency
+        return res   
+
+    def do_partial(self, cr, uid, ids, context):    
+        move_obj = self.pool.get('stock.move')    
+        move_ids = context.get('active_ids', False)
+        partial = self.browse(cr, uid, ids[0], context)
+        partial_datas = {
+            'partner_id' : partial.partner_id and partial.partner_id.id or False,
+            'address_id' : partial.address_id and partial.address_id.id or False,
+            'delivery_date' : partial.date         
+        }
+        for m in move_obj.browse(cr, uid, move_ids):            
+            if m.state in ('done', 'cancel'):
+                continue
+            partial_datas['move%s'%(m.id)] = {
+                'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
+                'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+                'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+            }
+
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):   
+                partial_datas['move%s'%(m.id)].update({             
+                    'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+                    'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
+                })  
+        
+        res = move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
+        return {}
+ 
+stock_partial_move()    
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
new file mode 100644
index 00000000000..30b7f3fca0e
--- /dev/null
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>	
+
+        <record id="view_stock_partial_move" model="ir.ui.view">
+            <field name="name">Delivery Product</field>
+            <field name="model">stock.partial.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Delivery Product">
+             		
+             </form>
+            </field>
+		</record>
+
+        <act_window name="Delivery Product"		    
+		    res_model="stock.partial.move"
+		    src_model="stock.move"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_partial_move"/>		    	  		
+
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
new file mode 100644
index 00000000000..eba095718cd
--- /dev/null
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -0,0 +1,235 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import netsvc
+import pooler
+import time
+
+class stock_partial_picking(osv.osv_memory):
+    _name = "stock.partial.picking"
+    _description = "Partial Picking"
+    _columns = {
+                'date': fields.datetime('Date', required=True),
+                'partner_id': fields.many2one('res.partner',string="Partner", required=True),
+                'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
+                               
+     }
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(stock_partial_picking, self).view_init(cr, uid, fields_list, context=context)
+        pick_obj = self.pool.get('stock.picking')        
+        if not context:
+            context={}
+        moveids = []
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):            
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                if 'move%s_product_id'%(m.id) not in self._columns:
+                    self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
+                if 'move%s_product_qty'%(m.id) not in self._columns:
+                    self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
+                if 'move%s_product_uom'%(m.id) not in self._columns:
+                    self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+                    if 'move%s_product_price'%(m.id) not in self._columns:
+                        self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                    if 'move%s_product_currency'%(m.id) not in self._columns:
+                        self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+        return res   
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        pick_obj = self.pool.get('stock.picking')
+        picking_ids = context.get('active_ids', False) 
+        picking_ids = pick_obj.search(cr, uid, [('id', 'in', picking_ids)])               
+        _moves_arch_lst = """<form string="Deliver Products">
+                        <separator colspan="4" string="Delivery Information"/>
+                    	<field name="date" colspan="4" />
+                    	<field name="partner_id"/>
+                    	<field name="address_id"/>
+                    	<newline/>
+                        <separator colspan="4" string="Move Detail"/>
+                    	"""
+        _moves_fields = result['fields']
+        if picking_ids and view_type in ['form']:
+            for pick in pick_obj.browse(cr, uid, picking_ids, context):
+                for m in pick.move_lines:
+                    if m.state in ('done', 'cancel'):
+                        continue
+                    _moves_fields.update({
+                        'move%s_product_id'%(m.id)  : {
+                                    'string': _('Product'),
+                                    'type' : 'many2one', 
+                                    'relation': 'product.product', 
+                                    'required' : True, 
+                                    'readonly' : True,                                    
+                                    },
+                        'move%s_product_qty'%(m.id) : {
+                                    'string': _('Quantity'),
+                                    'type' : 'float',
+                                    'required': True,                                    
+                                    },
+                        'move%s_product_uom'%(m.id) : {
+                                    'string': _('Product UOM'),
+                                    'type' : 'many2one', 
+                                    'relation': 'product.uom', 
+                                    'required' : True, 
+                                    'readonly' : True,                                    
+                                    }
+                    })                
+                    
+                    _moves_arch_lst += """
+                        <group colspan="4" col="10">
+                        <field name="move%s_product_id" nolabel="1"/>
+                        <field name="move%s_product_qty" string="Qty" />
+                        <field name="move%s_product_uom" nolabel="1" />
+                    """%(m.id, m.id, m.id)
+                    if (pick.type == 'in') and (m.product_id.cost_method == 'average'):                        
+                        _moves_fields.update({
+                            'move%s_product_price'%(m.id) : {
+                                    'string': _('Price'),
+                                    'type' : 'float',
+                                    },
+                            'move%s_product_currency'%(m.id): {
+                                    'string': _('Currency'),
+                                    'type' : 'float',      
+                                    'type' : 'many2one', 
+                                    'relation': 'res.currency',                                    
+                                    }
+                        })
+                        _moves_arch_lst += """
+                            <field name="move%s_product_price" />
+                            <field name="move%s_product_currency" nolabel="1"/>
+                        """%(m.id, m.id)
+                    _moves_arch_lst += """
+                        </group>
+                        """
+        _moves_arch_lst += """
+                <separator string="" colspan="4" />
+                <label string="" colspan="2"/>
+                <group col="2" colspan="2">
+        		<button icon='gtk-cancel' special="cancel"
+        			string="_Cancel" />
+        		<button name="do_partial" string="_Deliver"
+        			colspan="1" type="object" icon="gtk-apply" />
+        	</group>                	
+        </form>"""
+        result['arch'] = _moves_arch_lst
+        result['fields'] = _moves_fields           
+        return result
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ 
+             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(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        pick_obj = self.pool.get('stock.picking')        
+        if not context:
+            context={}
+        moveids = []
+        if 'date' in fields:
+            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            if 'partner_id' in fields:
+                res.update({'partner_id': pick.address_id.partner_id.id})                
+            if 'address_id' in fields:
+                res.update({'address_id': pick.address_id.id})            
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                if 'move%s_product_id'%(m.id) in fields:
+                    res['move%s_product_id'%(m.id)] = m.product_id.id
+                if 'move%s_product_qty'%(m.id) in fields:
+                    res['move%s_product_qty'%(m.id)] = m.product_qty
+                if 'move%s_product_uom'%(m.id) in fields:
+                    res['move%s_product_uom'%(m.id)] = m.product_uom.id
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
+                    price = 0
+                    if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
+                        price = m.purchase_line_id.price_unit
+
+                    currency = False
+                    if hasattr(pick, 'purchase_id') and pick.purchase_id:
+                        currency = pick.purchase_id.pricelist_id.currency_id.id
+        
+                    if 'move%s_product_price'%(m.id) in fields:
+                        res['move%s_product_price'%(m.id)] = price
+                    if 'move%s_product_currency'%(m.id) in fields:
+                        res['move%s_product_currency'%(m.id)] = currency
+        return res   
+
+    def do_partial(self, cr, uid, ids, context):    
+        pick_obj = self.pool.get('stock.picking')    
+        picking_ids = context.get('active_ids', False)
+        partial = self.browse(cr, uid, ids[0], context)
+        partial_datas = {
+            'partner_id' : partial.partner_id and partial.partner_id.id or False,
+            'address_id' : partial.address_id and partial.address_id.id or False,
+            'delivery_date' : partial.date         
+        }
+        for pick in pick_obj.browse(cr, uid, picking_ids):
+            for m in pick.move_lines:
+                if m.state in ('done', 'cancel'):
+                    continue
+                partial_datas['move%s'%(m.id)] = {
+                    'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
+                    'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
+                    'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+                }
+
+                if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
+                    partial_datas['move%s'%(m.id)].update({             
+                        'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
+                        'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
+                    })          
+        res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+        return {}
+ 
+stock_partial_picking()    
+
+
+
+#_moves_arch_end = '''<?xml version="1.0"?>
+#<form string="Picking result">
+#    <label string="The picking has been successfully made !" colspan="4"/>
+#    <field name="back_order_notification" colspan="4" nolabel="1"/>
+#</form>'''
+
+#_moves_fields_end = {
+#    'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True}
+#                     }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
new file mode 100644
index 00000000000..2f901b9884d
--- /dev/null
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>		    	
+  		<record id="action_partial_picking" model="ir.actions.act_window">
+            <field name="name">Making Picking</field>
+  			<field name="res_model">stock.partial.picking</field>                        
+            <field name="view_type">form</field>            
+           	<field name="view_mode">form</field>            
+            <field name="target">new</field>
+        </record>	
+
+    </data>
+</openerp>
diff --git a/addons/stock/wizard/stock_picking_make.py b/addons/stock/wizard/stock_picking_make.py
new file mode 100644
index 00000000000..9d26595f00e
--- /dev/null
+++ b/addons/stock/wizard/stock_picking_make.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import netsvc
+
+class stock_picking_make(osv.osv_memory):
+    _name = 'stock.picking.make'
+    _description = "Make Picking"
+    
+    _columns = {
+        'picking_ids': fields.many2many('stock.picking', 'stock_picking_ids', 'parent_id', 'child_id', 'Pickings'),
+    }
+
+    def default_get(self, cursor, user, 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(stock_picking_make, self).default_get(cursor, user, fields, context=context)
+        record_ids = context and context.get('active_ids',False) or False
+        if record_ids:
+            picking_obj = self.pool.get('stock.picking')
+            picking_ids = picking_obj.search(cursor, user, [
+                ('id', 'in', record_ids),
+                ('state', '<>', 'done'),
+                ('state', '<>', 'cancel')], context=context)
+            res['picking_ids'] = picking_ids
+        return res
+    
+    def make_packing(self, cursor, user, ids, context):
+        """ 
+         Make Picking.
+         @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. 
+        """ 
+        record_ids = context and context.get('active_ids',False) or False
+        wkf_service = netsvc.LocalService('workflow')
+        picking_obj = self.pool.get('stock.picking')
+        data = self.read(cursor, user, ids[0])
+        pick_ids = data['picking_ids']
+        picking_obj.force_assign(cursor, user, pick_ids)
+        picking_obj.action_move(cursor, user, pick_ids)
+        for picking_id in ids:
+            wkf_service.trg_validate(user, 'stock.picking', picking_id,
+                    'button_done', cursor)
+        return {}
+
+stock_picking_make()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_picking_make_view.xml b/addons/stock/wizard/stock_picking_make_view.xml
new file mode 100644
index 00000000000..fa77042c5d8
--- /dev/null
+++ b/addons/stock/wizard/stock_picking_make_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+	    <record id="view_stock_make_picking_wizard" model="ir.ui.view">
+            <field name="name">Make Picking</field>
+            <field name="model">stock.picking.make</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Make Picking">
+				    <field name="picking_ids" nolabel="1" colspan="4"
+				        width="600" height="300"/>
+                	<separator string="" colspan="4" />
+                	<button icon='gtk-cancel' special="cancel"
+                		string="Cancel" />
+                	<button name="make_packing" string="Ok"
+                		type="object" icon="gtk-apply" />
+                </form>
+            </field>
+        </record>
+        
+        <record id="act_stock_make_picking_wizard" model="ir.actions.act_window">
+            <field name="name">Make Picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.picking.make</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+	</data>
+</openerp>
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 58cc26a3224..120fa658b1c 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -23,63 +23,91 @@ import wizard
 import netsvc
 import time
 import pooler
-
 from osv import osv
 
-def action_traceability(type='move_history_ids', field='tracking_id'):
-    def open_tab(self, cr, uid, data, context):
-        obj = pooler.get_pool(cr.dbname).get('stock.move')
-        ids = obj.search(cr, uid, [(field, 'in', data['ids'])])
-        cr.execute('select id from ir_ui_view where model=%s and field_parent=%s and type=%s', ('stock.move', type, 'tree'))
+class action_traceability(osv.osv_memory):
+    """ 
+    This class defines a function action_traceability for wizard
+
+    """
+    _name = "action.traceability"
+    _description = "Action traceability "
+     
+    def action_traceability(self, cr, uid, ids, context={}):
+        """ 
+             It traces the information of a product
+            
+             @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: A dictionary of values
+        
+        """
+        type1 = context['type'] or 'move_history_ids'
+        field = context['field'] or 'tracking_id'
+        obj = self.pool.get('stock.move')
+        ids = obj.search(cr, uid, [(field, 'in',context['active_ids'])])
+        cr.execute('select id from ir_ui_view where model=%s and field_parent=%s and type=%s', ('stock.move', type1, 'tree'))
         view_id = cr.fetchone()[0]
         value = {
             'domain': "[('id','in',["+','.join(map(str, ids))+"])]",
-            'name': ((type=='move_history_ids') and 'Upstream Traceability') or 'Downstream Traceability',
+            'name': ((type1=='move_history_ids') and 'Upstream Traceability') or 'Downstream Traceability',
             'view_type': 'tree',
             'res_model': 'stock.move',
-            'field_parent': type,
+            'field_parent': type1,
             'view_id': (view_id,'View'),
             'type': 'ir.actions.act_window'
-        }
+            }
         return value
-    return open_tab
+   
+action_traceability()
 
-class wiz_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': action_traceability('move_history_ids2'), 'state':'end'}
-        }
-    }
-wiz_journal('stock.traceability.downstream')
+class stock_traceability_downstream(osv.osv_memory):
+    """
+    This class is defined for Stock traceability downstream wizard
 
-class wiz_journal2(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': action_traceability(), 'state':'end'}
-        }
-    }
-wiz_journal2('stock.traceability.upstream')
+    """
+    _name = "stock.traceability.downstream"
+    _inherit = "action.traceability"
+    _description = "Stock traceability downstream"
+   
+stock_traceability_downstream()
 
-class wiz_journal3(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': action_traceability(field='prodlot_id'), 'state':'end'}
-        }
-    }
-wiz_journal3('stock.traceability.lot.upstream')
+class stock_traceability_upstream(osv.osv_memory):
+    """
+    This class is defined for Stock traceability upstream wizard
 
-class wiz_journal4(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': action_traceability('move_history_ids2', 'prodlot_id'), 'state':'end'}
-        }
-    }
-wiz_journal4('stock.traceability.lot.downstream')
+    """
+    _name = "stock.traceability.upstream"
+    _inherit = "action.traceability"
+    _description = "Stock traceability upstream"
+   
+stock_traceability_upstream()
 
+class stock_traceability_lot_upstream(osv.osv_memory):
+    """
+    This class is defined for Stock traceability lot upstream wizard
+
+    """
+    _name = "stock.traceability.lot.upstream"
+    _inherit = "action.traceability"
+    _description = "Stock traceability lot upstream"
+
+stock_traceability_lot_upstream()
+
+class stock_traceability_lot_downstream(osv.osv_memory):
+    """
+    This class is defined for Stock traceability lot downstream wizard
+
+    """
+    _name = "stock.traceability.lot.downstream"
+    _inherit = "action.traceability"
+    _description = "Stock traceability lot downstream"
+
+stock_traceability_lot_downstream()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/stock_traceability_view.xml b/addons/stock/wizard/stock_traceability_view.xml
new file mode 100644
index 00000000000..4a1f6b11b25
--- /dev/null
+++ b/addons/stock/wizard/stock_traceability_view.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+<!-- =========stock.traceability.downstream================= -->
+
+            <record id="view_stock_traceability_downstream" model="ir.ui.view">
+                <field name="name">Stock traceability downstream</field>
+                <field name="model">stock.traceability.downstream</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Downstream traceability">
+	                	
+	                	<label string="It will give information about the stock of a product as per the Tracking Lot" colspan="2" />
+				<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="action_traceability" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2','field': ''}"/>
+	                	
+	                </form>
+	            </field>
+	        </record>	        
+     	
+	<act_window name="Downstream traceability"		    
+		res_model="stock.traceability.downstream"
+		src_model="stock.tracking"
+		view_mode="form"
+		target="new"        
+		key2="client_action_multi"    
+		id="action_view_stock_traceability_downstream"/>
+
+<!-- =========stock.traceability.upstream================= -->
+
+  <record id="view_stock_traceability_upstream" model="ir.ui.view">
+                <field name="name">Stock traceability upstream</field>
+                <field name="model">stock.traceability.upstream</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Upstream traceability">
+	                	
+	                	<label string="It will give information about the stock of a product as per the Tracking Lot" colspan="2" />
+				<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="action_traceability" string="Upstream traceability" type="object" context="{'type': '','field': ''}"/>
+	                	
+	                </form>
+	            </field>
+	        </record>	        
+     	
+	<act_window name="Upstream traceability"		    
+		res_model="stock.traceability.upstream"
+		src_model="stock.tracking"
+		view_mode="form"
+		target="new"        
+		key2="client_action_multi"    
+		id="action_view_stock_traceability_upstream"/>
+
+<!-- =========stock.traceability.lot.upstream================= -->
+
+<record id="view_stock_traceability_lot_upstream" model="ir.ui.view">
+                <field name="name">Stock traceability lot upstream</field>
+                <field name="model">stock.traceability.lot.upstream</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Stock traceability lot upstream">
+	                	
+	                	<label string="It will give information about the stock of a product as per the Production Lot" colspan="2" />
+				<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="action_traceability" string="Upstream traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}"/>
+	                	
+	                </form>
+	            </field>
+	        </record>	        
+     	
+	<act_window name="Upstream traceability"		    
+		res_model="stock.traceability.lot.upstream"
+		src_model="stock.production.lot"
+		view_mode="form"
+		target="new"        
+		key2="client_action_multi"    
+		id="action_view_stock_traceability_lot_upstream"/>
+
+<!-- =========stock.traceability.lot.downstream================= -->
+
+<record id="view_stock_traceability_lot_downstream" model="ir.ui.view">
+                <field name="name">Stock traceability lot downstream</field>
+                <field name="model">stock.traceability.lot.downstream</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Stock traceability lot downstream">
+	                	
+	                	<label string="It will give information about the stock of a product as per the Production Lot" colspan="2" />
+				<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="action_traceability" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
+	                	
+	                </form>
+	            </field>
+	        </record>	        
+     	
+	<act_window name="Downstream traceability"		    
+		res_model="stock.traceability.lot.downstream"
+		src_model="stock.production.lot"
+		view_mode="form"
+		target="new"        
+		key2="client_action_multi"    
+		id="action_view_stock_traceability_lot_downstream"/>
+
+	</data>
+</openerp>
+
diff --git a/addons/stock/wizard/wizard_inventory.py b/addons/stock/wizard/wizard_inventory.py
deleted file mode 100644
index 42345353866..00000000000
--- a/addons/stock/wizard/wizard_inventory.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import ir
-import pooler
-from osv.osv import except_osv
-from osv import fields,osv
-import netsvc
-from tools.translate import _
-
-inventory_form = """<?xml version="1.0"?>
-<form string="Fill Inventory">
-    <separator colspan="4" string="Fill Inventory for specific location" />
-    <field name="location_id"/>
-    <newline/>
-    <field name="recursive"/>
-    <newline/>
-
-</form>
-"""
-
-inventory_fields = {
-    'location_id' : {
-        'string':'Location',
-        'type':'many2one',
-        'relation':'stock.location',
-        'required':True
-    },
-    'recursive' : {'string':'Include all childs for the location', 'type':'boolean'}
-}
-
-
-
-def _fill_inventory(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    inventory_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-    location_obj = pooler.get_pool(cr.dbname).get('stock.location')
-    res={}
-    res_location={}
-    if data['form']['recursive'] :
-        location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', [data['form']['location_id']])])
-        for location in location_ids :
-            res=location_obj._product_get(cr, uid, location)
-            res_location[location]=res
-    else:
-        context.update({'compute_child':False})
-        res=location_obj._product_get(cr, uid, data['form']['location_id'],context=context)
-        res_location[data['form']['location_id']]=res
-
-    product_ids=[]
-    for location in res_location.keys():
-        res=res_location[location]
-        for product_id in res.keys():
-            #product_ids.append(product_id)
-            prod = pool.get('product.product').browse(cr, uid, [product_id])[0]
-            uom = prod.uom_id.id
-            context.update({'uom': uom})
-            amount=pool.get('stock.location')._product_get(cr, uid, location, [product_id], context=context)[product_id]
-
-            if(amount):
-                line_ids=inventory_line_obj.search(cr,uid,[('inventory_id','=',data['id']),('location_id','=',location),('product_id','=',product_id),('product_uom','=',uom),('product_qty','=',amount)])
-                if not len(line_ids):
-                    inventory_line={'inventory_id':data['id'],'location_id':location,'product_id':product_id,'product_uom':uom,'product_qty':amount}
-                    inventory_line_obj.create(cr, uid, inventory_line)
-                product_ids.append(product_id)
-
-    if(len(product_ids)==0):
-        raise wizard.except_wizard(_('Message !'), _('No product in this location.'))
-    return {}
-
-
-
-class fill_inventory(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : inventory_form,
-                    'fields' : inventory_fields,
-                    'state' : [('end', 'Cancel', 'gtk-cancel'),('fill_inventory', 'Fill Inventory', 'gtk-apply', True) ]}
-        },
-        'fill_inventory' : {
-            'actions' : [],
-            'result' : {'type' : 'action', 'action': _fill_inventory, 'state' : 'end'}
-        },
-    }
-fill_inventory("stock.fill_inventory")
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
deleted file mode 100644
index 22cdbc97e70..00000000000
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.translate import _
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Create invoices" />
-    <field name="journal_id"/>
-    <newline/>
-    <field name="group"/>
-    <newline/>
-    <field name="type"/>
-    <newline/>
-    <field name="invoice_date" />
-</form>
-"""
-
-invoice_fields = {
-    'journal_id': {
-        'string': 'Destination Journal',
-        'type': 'many2one',
-        'relation': 'account.journal',
-        'required': True
-    },
-    'group': {
-        'string': 'Group by partner',
-        'type': 'boolean'
-    },
-    'type': {
-        'string': 'Type',
-        'type': 'selection',
-        'selection': [],
-        'required': True
-    },
-    'invoice_date': {'string': 'Invoiced date', 'type':'date' }
-}
-
-
-def _get_type(obj, cr, uid, data, context):
-    picking_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    usage = 'customer'
-    pick = picking_obj.browse(cr, uid, data['id'], context)
-    if pick.invoice_state == 'invoiced':
-        raise wizard.except_wizard(_('UserError'), _('Invoice is already created.'))
-    if pick.invoice_state == 'none':
-        raise wizard.except_wizard(_('UserError'), _('Invoice cannot be created from Picking.'))
-
-    if pick.move_lines:
-        usage = pick.move_lines[0].location_id.usage
-
-    if pick.type =='out':
-        invoice_fields['type']['selection'] = [
-            ('out_invoice', 'Customer Invoice'),
-            ('in_refund', 'Supplier Refund'),
-            ]
-    elif pick.type =='in':
-        invoice_fields['type']['selection'] = [
-            ('in_invoice', 'Supplier Invoice'),
-            ('out_refund', 'Customer Refund'),
-            ]
-    else:
-        invoice_fields['type']['selection']=[
-            ('out_invoice', 'Customer Invoice'),
-            ('in_invoice', 'Supplier Invoice'),
-            ('out_refund', 'Customer Refund'),
-            ('in_refund', 'Supplier Refund'),
-            ]
-
-    if pick.type == 'out' and usage == 'supplier':
-        type = 'in_refund'
-    elif pick.type == 'out' and usage == 'customer':
-        type = 'out_invoice'
-    elif pick.type == 'in' and usage == 'supplier':
-        type = 'in_invoice'
-    elif pick.type == 'in' and usage == 'customer':
-        type = 'out_refund'
-    else:
-        type = 'out_invoice'
-    return {'type': type}
-
-
-def _create_invoice(obj, cr, uid, data, context):
-    if data['form'].get('new_picking', False):
-        data['id'] = data['form']['new_picking']
-        data['ids'] = [data['form']['new_picking']]
-    pool = pooler.get_pool(cr.dbname)
-    picking_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    mod_obj = pool.get('ir.model.data')
-    act_obj = pool.get('ir.actions.act_window')
-
-    type = data['form']['type']
-
-    context['date_inv'] = data['form']['invoice_date']
-    res = picking_obj.action_invoice_create(cr, uid, data['ids'],
-            journal_id = data['form']['journal_id'], group=data['form']['group'],
-            type=type, context= context)
-
-    invoice_ids = res.values()
-    if not invoice_ids:
-        raise  wizard.except_wizard(_('Error'), _('Invoice is not created'))
-
-    if type == 'out_invoice':
-        xml_id = 'action_invoice_tree1'
-    elif 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'])
-    result = act_obj.read(cr, uid, id['res_id'])
-    result['res_id'] = invoice_ids
-    return result
-
-
-class make_invoice_onshipping(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_type],
-            'result': {
-                'type': 'form',
-                'arch': invoice_form,
-                'fields': invoice_fields,
-                'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('create_invoice', 'Create invoice', 'gtk-apply', True)
-                ]
-            }
-        },
-        'create_invoice': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _create_invoice,
-                'state': 'end'
-            }
-        },
-    }
-
-make_invoice_onshipping("stock.invoice_onshipping")
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
deleted file mode 100755
index c423c426832..00000000000
--- a/addons/stock/wizard/wizard_location_product.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-def _action_open_window(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname) 
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
-    id = mod_obj.read(cr, uid, result, ['res_id'])          
-    return {
-        'name': False,
-        'view_type': 'form',
-        "view_mode": 'tree,form',
-        'res_model': 'product.product',
-        'type': 'ir.actions.act_window',
-        'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
-        'domain':[('type','<>','service')],
-        'search_view_id': id['res_id'] 
-    }
-
-
-class product_by_location(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Stock of Products">
-        <separator string="Stock Location Analysis" colspan="4"/>
-        <field name="from_date"/>
-        <newline/>
-        <field name="to_date"/>
-        <newline/>
-        <label string=""/>
-        <label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
-    </form>'''
-    form1_fields = {
-             'from_date': {
-                'string': 'From',
-                'type': 'datetime',
-        },
-             'to_date': {
-                'string': 'To',
-                'type': 'datetime',
-        },
-    }
-
-    states = {
-      'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel', 'gtk-cancel'),('open', 'Open Products', 'gtk-apply', True)]}
-        },
-    'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-product_by_location('stock.location.products')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/wizard_partial_move.py b/addons/stock/wizard/wizard_partial_move.py
deleted file mode 100644
index 928d96461c8..00000000000
--- a/addons/stock/wizard/wizard_partial_move.py
+++ /dev/null
@@ -1,220 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import netsvc
-from tools.misc import UpdateableStr, UpdateableDict
-import pooler
-
-import wizard
-from osv import osv
-import tools
-from tools.translate import _
-
-_moves_arch = UpdateableStr()
-_moves_fields = UpdateableDict()
-
-_moves_arch_end = '''<?xml version="1.0"?>
-<form string="Picking result">
-    <label string="Move(s) have been successfully Done !" colspan="4"/>    
-</form>'''
-
-def make_default(val):
-    def fct(uid, data, state):
-        return val
-    return fct
-
-def _to_xml(s):
-    return (s or '').replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
-
-def _get_moves(self, cr, uid, data, context):
-    move_obj = pooler.get_pool(cr.dbname).get('stock.move')
-    move_lines = move_obj.browse(cr, uid, data['ids'], context)
-    res = {}
-
-    _moves_fields.clear()
-    _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Partial Stock Moves">']
-
-    for move in move_lines:
-        quantity = move.product_qty
-        if move.state != 'assigned':
-            quantity = 0
-
-        _moves_arch_lst.append('<field name="move%s" />' % (move.id,))
-        _moves_fields['move%s' % move.id] = {
-                'string': _to_xml(move.name),
-                'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
-
-        if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
-            price = 0
-            if hasattr(move, 'purchase_line_id') and move.purchase_line_id:
-                price = move.purchase_line_id.price_unit
-
-            currency = 0
-            if hasattr(move.picking_id, 'purchase_id') and move.picking_id.purchase_id:
-                currency = move.picking_id.purchase_id.pricelist_id.currency_id.id
-
-            _moves_arch_lst.append('<group col="6"><field name="uom%s" nolabel="1"/>\
-                    <field name="price%s"/>' % (move.id, move.id,))
-
-            _moves_fields['price%s' % move.id] = {'string': 'Unit Price',
-                    'type': 'float', 'required': True, 'default': make_default(price)}
-
-            _moves_fields['uom%s' % move.id] = {'string': 'UOM', 'type': 'many2one',
-                    'relation': 'product.uom', 'required': True,
-                    'default': make_default(move.product_uom.id)}
-
-            _moves_arch_lst.append('<field name="currency%d" nolabel="1"/></group>' % (move.id,))
-            _moves_fields['currency%s' % m.id] = {'string': 'Currency',
-                    'type': 'many2one', 'relation': 'res.currency',
-                    'required': True, 'default': make_default(currency)}
-
-        _moves_arch_lst.append('<newline/>')
-        res.setdefault('moves', []).append(move.id)
-
-    _moves_arch_lst.append('</form>')
-    _moves_arch.string = '\n'.join(_moves_arch_lst)
-    return res
-
-def _do_split(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    move_obj = pool.get('stock.move')
-    pick_obj = pool.get('stock.picking')
-    product_obj = pool.get('product.product')
-    currency_obj = pool.get('res.currency')
-    users_obj = pool.get('res.users')
-    uom_obj = pool.get('product.uom')
-    move_lines = move_obj.browse(cr, uid, data['ids'])
-    wf_service = netsvc.LocalService("workflow")
-    complete, too_few, too_many = [], [], []
-    for move in move_lines:        
-        states = []
-    
-        if move.product_qty == data['form']['move%s' % move.id]:
-            complete.append(move)
-        elif move.product_qty > data['form']['move%s' % move.id]:
-            too_few.append(move)
-        else:
-            too_many.append(move)        
-        # Average price computation
-        if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
-            product = move.product_id
-            user = users_obj.browse(cr, uid, uid)
-            qty = data['form']['move%s' % move.id]
-            uom = data['form']['uom%s' % move.id]
-            price = data['form']['price%s' % move.id]
-            currency = data['form']['currency%s' % move.id]
-
-            qty = uom_obj._compute_qty(cr, uid, uom, qty, product.uom_id.id)
-            pricetype=pool.get('product.price.type').browse(cr,uid,user.company_id.property_valuation_price_type.id)
-            
-            if (qty > 0):
-                new_price = currency_obj.compute(cr, uid, currency,
-                        user.company_id.currency_id.id, price)
-                new_price = uom_obj._compute_price(cr, uid, uom, new_price,
-                        product.uom_id.id)
-                if product.qty_available<=0:
-                    new_std_price = new_price
-                else:
-                    # Get the standard price
-                    amount_unit=product.price_get(pricetype.field, context)[product.id]
-                    new_std_price = ((amount_unit * product.qty_available)\
-                        + (new_price * qty))/(product.qty_available + qty)
-
-                product_obj.write(cr, uid, [product.id],
-                        {pricetype.field: new_std_price})
-                move_obj.write(cr, uid, move.id, {'price_unit': new_price})        
-
-    for move in too_few:        
-        if data['form']['move%s' % move.id] != 0:
-            new_move = move_obj.copy(cr, uid, move.id,
-                {
-                    'product_qty' : data['form']['move%s' % move.id],
-                    'product_uos_qty':data['form']['move%s' % move.id],
-                    'picking_id' : move.picking_id.id,
-                    'state': 'assigned',
-                    'move_dest_id': False,
-                    'price_unit': move.price_unit,
-                })
-            complete.append(move_obj.browse(cr, uid, new_move))
-        move_obj.write(cr, uid, move.id,
-                {
-                    'product_qty' : move.product_qty - data['form']['move%s' % move.id],
-                    'product_uos_qty':move.product_qty - data['form']['move%s' % move.id],
-                })
-        
-    
-    for move in too_many:
-        move_obj.write(cr, uid, move.id,
-                {
-                    'product_qty': data['form']['move%s' % move.id],
-                    'product_uos_qty': data['form']['move%s' % move.id]
-                })
-        complete.append(move) 
-
-    for move in complete:
-        move_obj.action_done(cr, uid, [move.id])
-
-        # TOCHECK : Done picking if all moves are done
-        cr.execute('select move.id from stock_picking pick \
-                    right join stock_move move on move.picking_id = pick.id and move.state = ''%s'' where pick.id = %s',
-                    ('done', move.picking_id.id))
-        res = cr.fetchall()        
-        if len(res) == len(move.picking_id.move_lines):                       
-            pick_obj.action_move(cr, uid, [move.picking_id.id])            
-            wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
-
-    return {}
-
-
-
-class partial_move(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [ _get_moves ],
-            'result': {'type': 'form', 'arch': _moves_arch, 'fields': _moves_fields,
-                'state' : (
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('split', 'Partial', 'gtk-apply', True)
-                )
-            },
-        },
-        'split': {
-            'actions': [ _do_split ],
-            'result': {'type': 'state', 'state': 'end2'},
-        },
-        'end2': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _moves_arch_end,
-                'fields': {},
-                'state': (
-                    ('end', 'Close'),
-                )
-            },
-        },
-    }
-
-partial_move('stock.partial_move')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
deleted file mode 100644
index bb0c72dff02..00000000000
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ /dev/null
@@ -1,251 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import netsvc
-from tools.misc import UpdateableStr, UpdateableDict
-import pooler
-
-import wizard
-from osv import osv
-import tools
-from tools.translate import _
-
-_moves_arch = UpdateableStr()
-_moves_fields = UpdateableDict()
-
-_moves_arch_end = '''<?xml version="1.0"?>
-<form string="Picking result">
-    <label string="The picking has been successfully made !" colspan="4"/>
-    <field name="back_order_notification" colspan="4" nolabel="1"/>
-</form>'''
-_moves_fields_end = {
-    'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True}
-                     }
-
-def make_default(val):
-    def fct(uid, data, state):
-        return val
-    return fct
-
-def _to_xml(s):
-    return (s or '').replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
-
-def _get_moves(self, cr, uid, data, context):
-    pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    pick = pick_obj.browse(cr, uid, [data['id']], context)[0]
-    res = {}
-
-    _moves_fields.clear()
-    _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
-
-    for m in pick.move_lines:
-        if m.state in ('done', 'cancel'):
-            continue
-        quantity = m.product_qty
-        if m.state!='assigned':
-            quantity = 0
-
-        _moves_arch_lst.append('<field name="move%s" />' % (m.id,))
-        _moves_fields['move%s' % m.id] = {
-                'string': _to_xml(m.name),
-                'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
-
-        if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
-            price=0
-            if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
-                price=m.purchase_line_id.price_unit
-
-            currency=0
-            if hasattr(pick, 'purchase_id') and pick.purchase_id:
-                currency=pick.purchase_id.pricelist_id.currency_id.id
-
-            _moves_arch_lst.append('<group col="6"><field name="uom%s" nolabel="1"/>\
-                    <field name="price%s"/>' % (m.id,m.id,))
-
-            _moves_fields['price%s' % m.id] = {'string': 'Unit Price',
-                    'type': 'float', 'required': True, 'default': make_default(price)}
-
-            _moves_fields['uom%s' % m.id] = {'string': 'UOM', 'type': 'many2one',
-                    'relation': 'product.uom', 'required': True,
-                    'default': make_default(m.product_uom.id)}
-
-            _moves_arch_lst.append('<field name="currency%d" nolabel="1"/></group>' % (m.id,))
-            _moves_fields['currency%s' % m.id] = {'string': 'Currency',
-                    'type': 'many2one', 'relation': 'res.currency',
-                    'required': True, 'default': make_default(currency)}
-
-        _moves_arch_lst.append('<newline/>')
-        res.setdefault('moves', []).append(m.id)
-
-    _moves_arch_lst.append('</form>')
-    _moves_arch.string = '\n'.join(_moves_arch_lst)
-    return res
-
-def _do_split(self, cr, uid, data, context):
-    move_obj = pooler.get_pool(cr.dbname).get('stock.move')
-    pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    pick = pick_obj.browse(cr, uid, [data['id']])[0]
-    new_picking = None
-    new_moves = []
-
-    complete, too_many, too_few = [], [], []
-    pool = pooler.get_pool(cr.dbname)
-    for move in move_obj.browse(cr, uid, data['form'].get('moves',[])):
-        if move.product_qty == data['form']['move%s' % move.id]:
-            complete.append(move)
-        elif move.product_qty > data['form']['move%s' % move.id]:
-            too_few.append(move)
-        else:
-            too_many.append(move)
-
-        # Average price computation
-        if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
-            product_obj = pool.get('product.product')
-            currency_obj = pool.get('res.currency')
-            users_obj = pool.get('res.users')
-            uom_obj = pool.get('product.uom')
-
-            product = product_obj.browse(cr, uid, [move.product_id.id])[0]
-            user = users_obj.browse(cr, uid, [uid])[0]
-
-            qty = data['form']['move%s' % move.id]
-            uom = data['form']['uom%s' % move.id]
-            price = data['form']['price%s' % move.id]
-            currency = data['form']['currency%s' % move.id]
-
-            qty = uom_obj._compute_qty(cr, uid, uom, qty, product.uom_id.id)
-            pricetype=pool.get('product.price.type').browse(cr,uid,user.company_id.property_valuation_price_type.id)
-            if (qty > 0):
-                new_price = currency_obj.compute(cr, uid, currency,
-                        user.company_id.currency_id.id, price)
-                new_price = uom_obj._compute_price(cr, uid, uom, new_price,
-                        product.uom_id.id)
-                if product.qty_available<=0:
-                    new_std_price = new_price
-                else:
-                    # Get the standard price
-                    amount_unit=product.price_get(pricetype.field, context)[product.id]
-                    new_std_price = ((amount_unit * product.qty_available)\
-                        + (new_price * qty))/(product.qty_available + qty)
-                        
-                # Write the field according to price type field
-                product_obj.write(cr, uid, [product.id],
-                        {pricetype.field: new_std_price})
-                move_obj.write(cr, uid, [move.id], {'price_unit': new_price})
-
-    for move in too_few:
-        if not new_picking:
-
-            new_picking = pick_obj.copy(cr, uid, pick.id,
-                    {
-                        'name': pool.get('ir.sequence').get(cr, uid, 'stock.picking'),
-                        'move_lines' : [],
-                        'state':'draft',
-                    })
-        if data['form']['move%s' % move.id] != 0:
-            new_obj = move_obj.copy(cr, uid, move.id,
-                {
-                    'product_qty' : data['form']['move%s' % move.id],
-                    'product_uos_qty':data['form']['move%s' % move.id],
-                    'picking_id' : new_picking,
-                    'state': 'assigned',
-                    'move_dest_id': False,
-                    'price_unit': move.price_unit,
-                })
-        move_obj.write(cr, uid, [move.id],
-                {
-                    'product_qty' : move.product_qty - data['form']['move%s' % move.id],
-                    'product_uos_qty':move.product_qty - data['form']['move%s' % move.id],
-                })
-
-    if new_picking:
-        move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
-        for move in too_many:
-            move_obj.write(cr, uid, [move.id],
-                    {
-                        'product_qty' : data['form']['move%s' % move.id],
-                        'product_uos_qty': data['form']['move%s' % move.id],
-                        'picking_id': new_picking,
-                    })
-    else:
-        for move in too_many:
-            move_obj.write(cr, uid, [move.id],
-                    {
-                        'product_qty': data['form']['move%s' % move.id],
-                        'product_uos_qty': data['form']['move%s' % move.id]
-                    })
-
-    # At first we confirm the new picking (if necessary)
-    wf_service = netsvc.LocalService("workflow")
-    if new_picking:
-        wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
-    # Then we finish the good picking
-    if new_picking:
-        pick_obj.write(cr, uid, [pick.id], {'backorder_id': new_picking})
-        pick_obj.action_move(cr, uid, [new_picking])
-        wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
-        wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
-    else:
-        pick_obj.action_move(cr, uid, [pick.id])
-        wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
-    bo_name = ''
-    if new_picking:
-        bo_name = pick_obj.read(cr, uid, [new_picking], ['name'])[0]['name']
-    return {'new_picking':new_picking or False, 'back_order':bo_name}
-
-def _get_default(self, cr, uid, data, context):
-    if data['form']['back_order']:
-        data['form']['back_order_notification'] = _('Back Order %s Assigned to this Picking.') % (tools.ustr(data['form']['back_order']),)
-    return data['form']
-
-class partial_picking(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [ _get_moves ],
-            'result': {'type': 'form', 'arch': _moves_arch, 'fields': _moves_fields,
-                'state' : (
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('split', 'Make Picking', 'gtk-apply', True)
-                )
-            },
-        },
-        'split': {
-            'actions': [ _do_split ],
-            'result': {'type': 'state', 'state': 'end2'},
-        },
-        'end2': {
-            'actions': [ _get_default ],
-            'result': {'type': 'form', 'arch': _moves_arch_end,
-                'fields': _moves_fields_end,
-                'state': (
-                    ('end', 'Close'),
-                )
-            },
-        },
-    }
-
-partial_picking('stock.partial_picking')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/wizard_picking_make.py b/addons/stock/wizard/wizard_picking_make.py
deleted file mode 100644
index df4c9f63e8d..00000000000
--- a/addons/stock/wizard/wizard_picking_make.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import netsvc
-
-ARCH = '''<?xml version="1.0"?>
-<form string="Make picking">
-    <field name="pickings" nolabel="1" colspan="4"
-        width="600" height="300"/>
-</form>'''
-
-FIELDS = {
-    'pickings': {
-        'string': 'Picking',
-        'type': 'one2many',
-        'relation': 'stock.picking',
-        'readonly': True,
-    },
-}
-
-def _get_value(obj, cursor, user, data, context):
-    pool = pooler.get_pool(cursor.dbname)
-    picking_obj = pool.get('stock.picking')
-
-    picking_ids = picking_obj.search(cursor, user, [
-        ('id', 'in', data['ids']),
-        ('state', '<>', 'done'),
-        ('state', '<>', 'cancel')], context=context)
-    return {'pickings': picking_ids}
-
-def _make_packing(obj, cursor, user, data, context):
-    wkf_service = netsvc.LocalService('workflow')
-    pool = pooler.get_pool(cursor.dbname)
-    picking_obj = pool.get('stock.picking')
-    ids = [x[1] for x in data['form']['pickings']]
-
-    picking_obj.force_assign(cursor, user, ids)
-    picking_obj.action_move(cursor, user, ids)
-    for picking_id in ids:
-        wkf_service.trg_validate(user, 'stock.picking', picking_id,
-                'button_done', cursor)
-    return {}
-
-class stock_picking_make(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_value],
-            'result': {
-                'type': 'form',
-                'arch': ARCH,
-                'fields': FIELDS,
-                'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('make', 'Ok', 'gtk-apply', True)
-                ],
-            },
-        },
-        'make': {
-            'actions': [_make_packing],
-            'result': {
-                'type': 'state',
-                'state':'end',
-            },
-        },
-    }
-
-stock_picking_make('stock.picking.make')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/wizard_split_inventory_lots.py b/addons/stock/wizard/wizard_split_inventory_lots.py
deleted file mode 100644
index 92963f0b145..00000000000
--- a/addons/stock/wizard/wizard_split_inventory_lots.py
+++ /dev/null
@@ -1,98 +0,0 @@
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.translate import _
-
-inv_form = '''<?xml version="1.0"?>
-<form string="Split Inventory Line">
- <field name="prefix"/>
- <newline/>
- <field name="quantity"/>
-</form>
-'''
-inv_fields = {
-        'prefix': {
-            'string': 'Prefix',
-            'type': 'char',
-            'size': 64,
-        },
-        'quantity': {
-            'string': 'Quantity per lot',
-            'type': 'float',
-            'default': 1,
-        }
-}
-
-def _check_production_lot(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    inv_obj = pool.get('stock.inventory.line').browse(cr, uid, data['id'])
-    if not inv_obj.prod_lot_id:
-        raise wizard.except_wizard(_('Caution!'), _('Before splitting the inventory lines, make sure the production lot is assigned to this product.'))
-    return data['form']
-
-def _split_lines(self, cr, uid, data, context):
-    inv_id = data['id']
-
-    pool = pooler.get_pool(cr.dbname)
-    inv_line_obj = pool.get('stock.inventory.line')
-    prodlot_obj = pool.get('stock.production.lot')
-
-    ir_sequence_obj = pool.get('ir.sequence')
-
-    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-    if not sequence:
-        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
-    if data['form']['prefix']:
-        sequence=data['form']['prefix']+'/'+(sequence or '')
-        
-    inv = inv_line_obj.browse(cr, uid, [inv_id])[0]
-    quantity=data['form']['quantity']
-    prodlot_obj.write(cr, uid, inv.prod_lot_id.id, {'name':sequence})
-    
-    if quantity <= 0 or inv.product_qty == 0:
-        return {}
-
-    quantity_rest = inv.product_qty%quantity
-
-    update_val = {
-        'product_qty': quantity,
-    }
-
-    new_line = []
-    for idx in range(int(inv.product_qty//quantity)):
-        if idx:
-            current_line = inv_line_obj.copy(cr, uid, inv.id, {'prod_lot_id': inv.prod_lot_id.id})
-            new_line.append(current_line)
-        else:
-            current_line = inv.id
-        inv_line_obj.write(cr, uid, [current_line], update_val)
-    
-    if quantity_rest > 0:
-        idx = int(inv.product_qty//quantity)
-        update_val['product_qty']=quantity_rest
-        
-        if idx:
-            current_line = inv_line_obj.copy(cr, uid, inv.id, {'prod_lot_id': inv.prod_lot_id.id})
-            new_line.append(current_line)
-        else:
-            current_line = inv.id
-        inv_line_obj.write(cr, uid, [current_line], update_val)
-        
-    return {}
-
-class wizard_split_inventory_lots(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_check_production_lot],
-            'result': {'type': 'form', 'arch': inv_form, 'fields': inv_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('split', 'Ok', 'gtk-apply', True)]},
-            },
-        'split': {
-            'actions': [_split_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_split_inventory_lots('stock.inventory.line.split')
\ No newline at end of file
diff --git a/addons/stock_invoice_directly/i18n/ar.po b/addons/stock_invoice_directly/i18n/ar.po
index c5eeb925844..c865f35462a 100644
--- a/addons/stock_invoice_directly/i18n/ar.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/bg.po b/addons/stock_invoice_directly/i18n/bg.po
index 19c7ed8bd85..c32536822cd 100644
--- a/addons/stock_invoice_directly/i18n/bg.po
+++ b/addons/stock_invoice_directly/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/bs.po b/addons/stock_invoice_directly/i18n/bs.po
index 31280a06114..e56ad1f9bf4 100644
--- a/addons/stock_invoice_directly/i18n/bs.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/ca.po b/addons/stock_invoice_directly/i18n/ca.po
index 429e7e233d7..719d6ecd461 100644
--- a/addons/stock_invoice_directly/i18n/ca.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/cs.po b/addons/stock_invoice_directly/i18n/cs.po
index 9de00b516f6..4d7d231da28 100644
--- a/addons/stock_invoice_directly/i18n/cs.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po
index 7dc503de076..50d2fdf5f5d 100644
--- a/addons/stock_invoice_directly/i18n/da.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/de.po b/addons/stock_invoice_directly/i18n/de.po
index 8c1c5b721d5..2e0815bc243 100644
--- a/addons/stock_invoice_directly/i18n/de.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/el.po b/addons/stock_invoice_directly/i18n/el.po
index 8eaa9b9f88a..04c9ab10717 100644
--- a/addons/stock_invoice_directly/i18n/el.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index 300f7c2af18..078b9b2ae4e 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/es_AR.po b/addons/stock_invoice_directly/i18n/es_AR.po
index c35c4d0e5d9..16f46c259f2 100644
--- a/addons/stock_invoice_directly/i18n/es_AR.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/et.po b/addons/stock_invoice_directly/i18n/et.po
index 0a78d6dde27..d9817e5cefb 100644
--- a/addons/stock_invoice_directly/i18n/et.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/fr.po b/addons/stock_invoice_directly/i18n/fr.po
index b288c036b81..d9f45d04bbc 100644
--- a/addons/stock_invoice_directly/i18n/fr.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/gl.po b/addons/stock_invoice_directly/i18n/gl.po
index 26d6652035d..bddbe522b9f 100644
--- a/addons/stock_invoice_directly/i18n/gl.po
+++ b/addons/stock_invoice_directly/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/hr.po b/addons/stock_invoice_directly/i18n/hr.po
index 3a1ec155953..e692c2f4c81 100644
--- a/addons/stock_invoice_directly/i18n/hr.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/hu.po b/addons/stock_invoice_directly/i18n/hu.po
index c5eeb925844..c865f35462a 100644
--- a/addons/stock_invoice_directly/i18n/hu.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/id.po b/addons/stock_invoice_directly/i18n/id.po
index a7ec5160e34..f9e7652ea93 100644
--- a/addons/stock_invoice_directly/i18n/id.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/it.po b/addons/stock_invoice_directly/i18n/it.po
index c5eeb925844..c865f35462a 100644
--- a/addons/stock_invoice_directly/i18n/it.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/ko.po b/addons/stock_invoice_directly/i18n/ko.po
index 333e4c0b146..96ac4d3652c 100644
--- a/addons/stock_invoice_directly/i18n/ko.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/lt.po b/addons/stock_invoice_directly/i18n/lt.po
index c5eeb925844..c865f35462a 100644
--- a/addons/stock_invoice_directly/i18n/lt.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/nl.po b/addons/stock_invoice_directly/i18n/nl.po
index d066134f3fd..e159dd6b4f2 100644
--- a/addons/stock_invoice_directly/i18n/nl.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/nl_BE.po b/addons/stock_invoice_directly/i18n/nl_BE.po
index 4a0a9ce1aea..3d473a99e06 100644
--- a/addons/stock_invoice_directly/i18n/nl_BE.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/pl.po b/addons/stock_invoice_directly/i18n/pl.po
index 6be4118efbb..38da0f68b07 100644
--- a/addons/stock_invoice_directly/i18n/pl.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/pt.po b/addons/stock_invoice_directly/i18n/pt.po
index c5eeb925844..c865f35462a 100644
--- a/addons/stock_invoice_directly/i18n/pt.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/pt_BR.po b/addons/stock_invoice_directly/i18n/pt_BR.po
index 055da60cd64..3e9c0d43768 100644
--- a/addons/stock_invoice_directly/i18n/pt_BR.po
+++ b/addons/stock_invoice_directly/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 12:46+0000\n"
-"Last-Translator: Aldo Giovani <aldogiovani@gmail.com>\n"
+"PO-Revision-Date: 2010-03-24 01:13+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Composição direta da Fatura"
diff --git a/addons/stock_invoice_directly/i18n/ro.po b/addons/stock_invoice_directly/i18n/ro.po
index 59e5f784cf4..7c74a37bf11 100644
--- a/addons/stock_invoice_directly/i18n/ro.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index c5eeb925844..c865f35462a 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/sl.po b/addons/stock_invoice_directly/i18n/sl.po
index ee8905d0bcf..a229402a268 100644
--- a/addons/stock_invoice_directly/i18n/sl.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/sr.po b/addons/stock_invoice_directly/i18n/sr.po
index f0b6866c934..6288a441873 100644
--- a/addons/stock_invoice_directly/i18n/sr.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/sv.po b/addons/stock_invoice_directly/i18n/sv.po
index c5eeb925844..c865f35462a 100644
--- a/addons/stock_invoice_directly/i18n/sv.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index e03c0f64526..50e1f63e40b 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/uk.po b/addons/stock_invoice_directly/i18n/uk.po
index b0870d743d0..a7bccec01f6 100644
--- a/addons/stock_invoice_directly/i18n/uk.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index 36300abd89d..54e5a6726a0 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.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: 2010-01-08 03:54+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr "直接为分拣单开票"
+msgstr "发票直接分包"
diff --git a/addons/stock_invoice_directly/i18n/zh_TW.po b/addons/stock_invoice_directly/i18n/zh_TW.po
index c5eeb925844..c865f35462a 100644
--- a/addons/stock_invoice_directly/i18n/zh_TW.po
+++ b/addons/stock_invoice_directly/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: stock_invoice_directly
diff --git a/addons/stock_location/i18n/ar.po b/addons/stock_location/i18n/ar.po
index 3c7c2abd32c..7afae20036c 100644
--- a/addons/stock_location/i18n/ar.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/bg.po b/addons/stock_location/i18n/bg.po
index 91b286d0e8c..f4bb04a4dab 100644
--- a/addons/stock_location/i18n/bg.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/bs.po b/addons/stock_location/i18n/bs.po
index 63817fd9316..0e20f8a8677 100644
--- a/addons/stock_location/i18n/bs.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po
index 7f1f4ebdb54..5ff5f8de5b0 100644
--- a/addons/stock_location/i18n/ca.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po
index 6d13223495f..ae272934c2c 100644
--- a/addons/stock_location/i18n/cs.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po
index 97ab72b1504..f2979f1baf4 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po
index 1fc6ac69da8..98ecab1b0dd 100644
--- a/addons/stock_location/i18n/el.po
+++ b/addons/stock_location/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 2308168b7cc..775bb2a9112 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po
index e7226a70ee2..b0833c93024 100644
--- a/addons/stock_location/i18n/es_AR.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po
index 41b912f96d2..4c0fc759520 100644
--- a/addons/stock_location/i18n/et.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po
index 38aad43a723..51b060e7c34 100644
--- a/addons/stock_location/i18n/fr.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/hr.po b/addons/stock_location/i18n/hr.po
index 76ac6a2645b..b9c11ada97e 100644
--- a/addons/stock_location/i18n/hr.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po
index a487389e16b..32e60ae4365 100644
--- a/addons/stock_location/i18n/hu.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/id.po b/addons/stock_location/i18n/id.po
index 239d5ad36ba..215e8e9a66f 100644
--- a/addons/stock_location/i18n/id.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po
index d633efc3d74..c5caf60bcfa 100644
--- a/addons/stock_location/i18n/it.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po
index 2eba355df25..79371a69a1e 100644
--- a/addons/stock_location/i18n/ko.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po
index 7ae0d931a15..12c89fc3575 100644
--- a/addons/stock_location/i18n/lt.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/nl.po b/addons/stock_location/i18n/nl.po
index bab62bb2f95..60a23f3e2c9 100644
--- a/addons/stock_location/i18n/nl.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po
index 97f39fc60fa..f166a10d5c1 100644
--- a/addons/stock_location/i18n/nl_BE.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po
index e2f3229aee5..ba4ab973fa4 100644
--- a/addons/stock_location/i18n/pl.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po
index d3fb37bf635..b1f561fc0fc 100644
--- a/addons/stock_location/i18n/pt.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po
index f8a67a513e2..2f3279a1106 100644
--- a/addons/stock_location/i18n/pt_BR.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po
index 3c7c2abd32c..7afae20036c 100644
--- a/addons/stock_location/i18n/ro.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index edfb2a95da0..1e65997772f 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po
index 8f1c8408757..4520d154544 100644
--- a/addons/stock_location/i18n/sl.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/sv.po b/addons/stock_location/i18n/sv.po
index 2226ee9e6e3..a9ac43474c7 100644
--- a/addons/stock_location/i18n/sv.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/tlh.po b/addons/stock_location/i18n/tlh.po
index 4cd7d98395c..a6d55522808 100644
--- a/addons/stock_location/i18n/tlh.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index af42914e47a..2e551eb20d5 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po
index fa2fc826314..9b7b62dd798 100644
--- a/addons/stock_location/i18n/uk.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index 3c30cf1f6d7..5221e0f26ce 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -4,59 +4,59 @@
 #
 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:54+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:30+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
 msgid "Number of days to do this transition"
-msgstr "可过渡天数"
+msgstr "转换要的天数"
 
 #. module: stock_location
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Stock Location Paths"
-msgstr "库存位置路径"
+msgstr "库存库位路径"
 
 #. module: stock_location
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr "自动无步骤增加"
+msgstr "自动没步骤增加"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
 msgid ""
 "These rules set the right path of the product in the whole location tree."
-msgstr "这些规则确定整个区域中正确的货品路径"
+msgstr "这些规则确定了库位树正确的产品路径"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr "源货位"
+msgstr "源库位"
 
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
 msgid "Destination Location"
-msgstr "目标货位"
+msgstr "目标库位"
 
 #. module: stock_location
 #: field:stock.location.path,auto:0
@@ -67,7 +67,7 @@ msgstr "自动调拨"
 #. module: stock_location
 #: field:stock.location.path,product_id:0
 msgid "Products"
-msgstr "货品"
+msgstr "产品"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -77,7 +77,7 @@ msgstr "手动操作"
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
 msgid "stock.location.path"
-msgstr "stock.location.path"
+msgstr "库存.库位.路径"
 
 #. module: stock_location
 #: help:stock.location.path,auto:0
@@ -89,8 +89,7 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"这些规则确定了货位树的货品路径。\n"
-"‘自动调拨’值将在现有库存调拨后创建一个新自动验证的库存调拨。‘手动操作’这库存调拨要工人验证。采用‘自动无步骤增加’则原调拨的货位被取代。"
+"这些规则确定了库位树正确的产品路径.‘自动调拨’将创建库存调拨后当前将自动验证.‘手动操作’这库存调拨要工人验证.‘自动没增加步骤’库位是取代原来的"
 
 #. module: stock_location
 #: field:stock.location.path,name:0
@@ -102,14 +101,40 @@ msgstr "操作"
 #: field:product.product,path_ids:0
 #: view:stock.location.path:0
 msgid "Location Paths"
-msgstr "货位路径"
+msgstr "库位路径"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr "延期（天）"
+msgstr "延期(天)"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Procurement & Locations"
-msgstr "需求与货位"
+msgstr "产品需求&库位"
+
+#~ msgid ""
+#~ "\n"
+#~ "Manages product's path in locations.\n"
+#~ "\n"
+#~ "This module may be useful for different purposes:\n"
+#~ "* Manages the product in his whole manufacturing chain\n"
+#~ "* Manages different default locations by products\n"
+#~ "* Define paths within the warehouse to route products based on operations:\n"
+#~ "   - Quality Control\n"
+#~ "   - After Sales Services\n"
+#~ "   - Supplier Return\n"
+#~ "* Manage products to be rent.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "管理产品的库位路径\n"
+#~ "\n"
+#~ " 这模块可能有不同的目的:\n"
+#~ "\t*在整个工业链管理产品\n"
+#~ "\t*基于运营为产品定义仓库的路径\n"
+#~ "\t- 质量控制\n"
+#~ "\t- 售后服务\n"
+#~ "\t- 供应退货\n"
+#~ "\t*管理产品免租\n"
+#~ "    "
diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po
index e4e4c2ffa3d..b539d6aff84 100644
--- a/addons/stock_location/i18n/zh_TW.po
+++ b/addons/stock_location/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: stock_location
diff --git a/addons/stock_no_autopicking/i18n/ar.po b/addons/stock_no_autopicking/i18n/ar.po
index 92d61f55a83..cb04287635e 100644
--- a/addons/stock_no_autopicking/i18n/ar.po
+++ b/addons/stock_no_autopicking/i18n/ar.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-01-13 23:50+0000\n"
-"Last-Translator: AhmedQatar <Unknown>\n"
+"Last-Translator: Ahmed Mohammed <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/bg.po b/addons/stock_no_autopicking/i18n/bg.po
index 07fe091c998..93247d12ffa 100644
--- a/addons/stock_no_autopicking/i18n/bg.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/bs.po b/addons/stock_no_autopicking/i18n/bs.po
index 783b196cbc3..75c4d262e1c 100644
--- a/addons/stock_no_autopicking/i18n/bs.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/ca.po b/addons/stock_no_autopicking/i18n/ca.po
index c2a96071a5b..c00313cd399 100644
--- a/addons/stock_no_autopicking/i18n/ca.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/cs.po b/addons/stock_no_autopicking/i18n/cs.po
index 77221d74bfa..7847394fae7 100644
--- a/addons/stock_no_autopicking/i18n/cs.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/da.po b/addons/stock_no_autopicking/i18n/da.po
index 690d4a76e04..deb59d54348 100644
--- a/addons/stock_no_autopicking/i18n/da.po
+++ b/addons/stock_no_autopicking/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:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/de.po b/addons/stock_no_autopicking/i18n/de.po
index 3a23ad68b96..81ac10d5294 100644
--- a/addons/stock_no_autopicking/i18n/de.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/el.po b/addons/stock_no_autopicking/i18n/el.po
index 794cd738d3a..7460ac5f878 100644
--- a/addons/stock_no_autopicking/i18n/el.po
+++ b/addons/stock_no_autopicking/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/stock_no_autopicking/i18n/es.po b/addons/stock_no_autopicking/i18n/es.po
index 3b2b92abd88..8990f99d7b5 100644
--- a/addons/stock_no_autopicking/i18n/es.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/es_AR.po b/addons/stock_no_autopicking/i18n/es_AR.po
index bd0870ffb40..af32bb4f499 100644
--- a/addons/stock_no_autopicking/i18n/es_AR.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/et.po b/addons/stock_no_autopicking/i18n/et.po
index 458e77c0314..2fafc927f1a 100644
--- a/addons/stock_no_autopicking/i18n/et.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/fr.po b/addons/stock_no_autopicking/i18n/fr.po
index 65819d25ab5..af3e2218d69 100644
--- a/addons/stock_no_autopicking/i18n/fr.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/gl.po b/addons/stock_no_autopicking/i18n/gl.po
index a48e80f7d65..5f4efa050ce 100644
--- a/addons/stock_no_autopicking/i18n/gl.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/hr.po b/addons/stock_no_autopicking/i18n/hr.po
index cb5b7db184d..848007211df 100644
--- a/addons/stock_no_autopicking/i18n/hr.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/hu.po b/addons/stock_no_autopicking/i18n/hu.po
index c448436afd9..2ea9686518e 100644
--- a/addons/stock_no_autopicking/i18n/hu.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/id.po b/addons/stock_no_autopicking/i18n/id.po
index 3e93ec3f0b6..41a79148326 100644
--- a/addons/stock_no_autopicking/i18n/id.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/it.po b/addons/stock_no_autopicking/i18n/it.po
index d0c0fd7142a..564dd1c9d67 100644
--- a/addons/stock_no_autopicking/i18n/it.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/ko.po b/addons/stock_no_autopicking/i18n/ko.po
index ad73b04538c..00ebeab629d 100644
--- a/addons/stock_no_autopicking/i18n/ko.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/lt.po b/addons/stock_no_autopicking/i18n/lt.po
index c448436afd9..2ea9686518e 100644
--- a/addons/stock_no_autopicking/i18n/lt.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/nl.po b/addons/stock_no_autopicking/i18n/nl.po
index e3245a8c7ef..a4e408dbecd 100644
--- a/addons/stock_no_autopicking/i18n/nl.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/nl_BE.po b/addons/stock_no_autopicking/i18n/nl_BE.po
index 46173066dfa..abc1d386b46 100644
--- a/addons/stock_no_autopicking/i18n/nl_BE.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/pl.po b/addons/stock_no_autopicking/i18n/pl.po
index 814c6fb5697..e2adf967cda 100644
--- a/addons/stock_no_autopicking/i18n/pl.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/pt.po b/addons/stock_no_autopicking/i18n/pt.po
index 9d531b6f8f2..18affd463d0 100644
--- a/addons/stock_no_autopicking/i18n/pt.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/pt_BR.po b/addons/stock_no_autopicking/i18n/pt_BR.po
index 720c51627a6..4eca7cd627d 100644
--- a/addons/stock_no_autopicking/i18n/pt_BR.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/ro.po b/addons/stock_no_autopicking/i18n/ro.po
index e9a59036786..ad5c0ba0f39 100644
--- a/addons/stock_no_autopicking/i18n/ro.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/ru.po b/addons/stock_no_autopicking/i18n/ru.po
index ead672ea158..3b2d947a3b7 100644
--- a/addons/stock_no_autopicking/i18n/ru.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/sl.po b/addons/stock_no_autopicking/i18n/sl.po
index 5639c861618..1229cddb84c 100644
--- a/addons/stock_no_autopicking/i18n/sl.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/sv.po b/addons/stock_no_autopicking/i18n/sv.po
index fb3031054ad..9c7af9b3964 100644
--- a/addons/stock_no_autopicking/i18n/sv.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/tlh.po b/addons/stock_no_autopicking/i18n/tlh.po
index bf7bd29a9b2..54178aa5aad 100644
--- a/addons/stock_no_autopicking/i18n/tlh.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 259cae4b1be..9e41c50c090 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/uk.po b/addons/stock_no_autopicking/i18n/uk.po
index fa19deb17de..7a1e3c81619 100644
--- a/addons/stock_no_autopicking/i18n/uk.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index 8d3c5085e79..95a60490b51 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.po
@@ -7,31 +7,31 @@ 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: 2010-01-08 03:58+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:30+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr "自动分拣"
+msgstr "自动分包"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr "为生产单的原始物料自动分拣"
+msgstr "为生产原料单自动分包"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr ""
+msgstr "库存没自动分包"
diff --git a/addons/stock_no_autopicking/i18n/zh_TW.po b/addons/stock_no_autopicking/i18n/zh_TW.po
index 79cbcf21259..eee86550cc8 100644
--- a/addons/stock_no_autopicking/i18n/zh_TW.po
+++ b/addons/stock_no_autopicking/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: stock_no_autopicking
diff --git a/addons/report_mrp/__init__.py b/addons/stock_planning/__init__.py
similarity index 90%
rename from addons/report_mrp/__init__.py
rename to addons/stock_planning/__init__.py
index cac56f5f3bf..f0fea471a21 100644
--- a/addons/report_mrp/__init__.py
+++ b/addons/stock_planning/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,7 +18,7 @@
 #
 ##############################################################################
 
-import report_mrp
+import stock_planning
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock_planning/__terp__.py b/addons/stock_planning/__terp__.py
new file mode 100644
index 00000000000..1ff4e8d0b10
--- /dev/null
+++ b/addons/stock_planning/__terp__.py
@@ -0,0 +1,146 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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 <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name":"Master Procurement Schedule",
+    "version":"1.1",
+    "author":"Tiny and Grzegorz Grzelak (Cirrus)",
+    "category":"Custom",
+    "depends":["hr","stock","sale"],
+    "description": """
+This module is based on original Tiny module stock_planning version 1.0 of the same name Master Procurement Schedule.
+
+Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules).
+
+Terms used in the module:
+- Stock and Sales Period - is the time (between Start Date and End Date) for which you plan Stock and Sales Forecast and make Procurement Planning. 
+- Stock and Sales Forecast - is the quantity of products you plan to sell in the Period.
+- Stock Planning - is the quantity of products you plan to purchase or produce for the Period.
+
+Because we have another module sale_forecast which uses terms "Sales Forecast" and "Planning" as amount values we will use terms "Stock and Sales Forecast" and "Stock Planning" to emphasize that we use quantity values. 
+
+Activity with this module is divided to three steps:
+- Creating Periods. Mandatory step.
+- Creating Sale Forecasts and entering quantities to them. Optional step but useful for farther planning.
+- Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period.
+
+Periods
+=======
+You have two menu items for Periods in "Sales Management - Configuration". There are:
+- "Create Sales Periods" - Which automates creating daily, weekly or monthly periods.
+- "Stock and sales Periods" - Which allows to create any type of periods, change the dates and change the State of period.
+
+Creating periods is the first step you have to do to use modules features. You can create custom periods using "New" button in "Stock and Sales Periods" form or view but it is recommended to use automating tool.
+
+Remarks:
+- These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system.
+- Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods.
+- When periods are created automatically their start and finish dates are with with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. 
+- If you use overlapping periods for the same product, warehouse and company results can be unpredictable.
+- If current date doesn't belong to any period or you have holes between periods results can be unpredictable.
+
+Sales Forecasts
+===============
+You have few menus for Sales forecast in "Sales Management - Sales Forecasts".
+- "Create Sales Forecasts for Sales Periods" - which automates creating forecasts lines according to some parameters.
+- "Sales Forecasts" - few menus for working with forecasts lists and forms.
+
+Menu "Create Sales Forecasts for Sales Periods" creates Forecasts for products from selected Category, for selected Period and for selected Warehouse. It is an option "Copy Last Forecast" to copy forecast and other settings of period before this one to created one.
+
+Remarks:
+- This tool doesn't create lines if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast if relevant lines exists you have to do it manually using menus described bellow.
+- When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse. 
+- When you choose "Copy Last Forecast" created line takes quantity and some settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. If there are few your forecasts for period before this one (it is possible) system takes one of them (no rule which of them).
+
+
+Menus "Sales Forecasts"
+On "Sales Forecast" form mainly you have to enter a forecast quantity in "Product Quantity". Farther calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click "Validate" button but it is not mandatory.
+
+Instead of forecast quantity you can enter amount of forecast sales in field "Product Amount". System will count quantity from amount according to Sale price of the Product.
+
+All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of "Calculate Planning" button.
+
+To find proper value for Sale Forecast you can use "Sales History" table for this product. You have to enter parameters to the top and left of this table and system will count sale quantities according to these parameters. So you can select fe. your department (at the top) then (to the left): last period, period before last and period year ago.
+
+Remarks:
+
+
+Procurement Planning
+====================
+Menu for Planning you can find in "Warehouse - Stock Planning".
+- "Create Stock Planning Lines" - allows you to automate creating planning lines according to some parameters.
+- "Master Procurement Scheduler" - is the most important menu of the module which allows to create procurement.
+
+As Sales forecast is phase of planning sales. The Procurement Planning (Planning) is the phase of scheduling Purchasing or Producing. You can create Procurement Planning quickly using tool from menu "Create Stock Planning Lines", then you can review created planning and make procurement using menu "Master Procurement Schedule".
+
+Menu "Create Stock Planning Lines" allows you to create quickly Planning lines for products from selected Category, for selected Period, and for selected Warehouse. When you check option "All Products with Forecast" system creates lines for all products having forecast for selected Period and Warehouse. Selected Category will be ignored in this case.
+
+Under menu "Master Procurement Scheduler" you can generally change the values "Planned Out" and "Planned In" to observe the field "Stock Simulation" and decide if this value would be accurate for end of the Period. 
+"Planned Out" can be based on "Warehouse Forecast" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast. 
+"Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to make stock as indicated in "Stock Simulation" at the and of Period. You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box "Stock Location Only".
+
+If after few tries you decide that you found correct quantities for "Planned Out" and "Planned In" and you are satisfied with end of period stock calculated in "Stock Simulation" you can click "Procure Incoming Left" button to procure quantity of field "Incoming Left" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse. 
+
+If you don't want to Produce or Buy the product but just pick calculated quantity from another warehouse you can click "Supply from Another Warehouse" (instead of "Procure Incoming Left"). System creates pick list with move from selected source Warehouse to calculated Warehouse (as destination). You can also decide if this pick should be done from Stock or Output location of source warehouse. Destination location (Stock or Input) of destination warehouse will be used as set for "Procure Incoming Left". 
+
+To see proper quantities in fields "Confirmed In", "Confirmed Out", "Confirmed In Before", "Planned Out Before" and "Stock Simulation" you have to click button "Calculate Planning".
+
+All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of "Calculate Planning" button.
+
+How Stock Simulation field is calculated:
+Generally Stock Simulation shows the stock for end of the calculated period according to some planned or confirmed stock moves. Calculation always starts with quantity of real stock of beginning of current period. Then calculation adds or subtracts quantities of calculated period or periods before calculated.
+When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows:
+Stock Simulation = 
+	Stock of beginning of current Period
+	- Planned Out 
+	+ Planned In
+
+When you calculate period next to current:
+Stock Simulation = 
+	Stock of beginning of current Period
+	- Planned Out of current Period 
+	+ Confirmed In of current Period  (incl. Already In)
+	- Planned Out of calculated Period 
+	+ Planned In of calculated Period .
+
+As you see calculated Period is taken the same way like in case above. But calculation of current Period are made a little bit different. First you should note that system takes for current Period only Confirmed In moves. It means that you have to make planning and procurement for current Period before this calculation (for Period next to current). 
+
+When you calculate Period ahead:
+Stock Simulation = 
+	Stock of beginning of current Period 
+	- Sum of Planned Out of Periods before calculated 
+	+ Sum of Confirmed In of Periods before calculated (incl. Already In) 
+	- Planned Out of calculated Period 
+	+ Planned In of calculated Period.
+
+Periods before calculated means periods starting from current till period before calculated.
+
+Remarks:
+- Remember to make planning for all periods before calculated because omitting these quantities and procurements can cause wrong suggestions for procurements few periods ahead.
+- If you made planning few periods ahead and you find that real Confirmed Out is bigger than Planned Out in some periods before you can repeat Planning and make another procurement. You should do it in the same planning line. If you create another planning line the suggestions can be wrong.
+- When you wish to work with different periods for some part of products define two kinds of periods (fe. Weekly and Monthly) and use them for different products. Example: If you use always Weekly periods for Products A, and Monthly periods for Products B your all calculations will work correctly. You can also use different kind of periods for the same products from different warehouse or companies. But you cannot use overlapping periods for the same product, warehouse and company because results can be unpredictable. The same apply to Forecasts lines.
+""",
+    "demo_xml":[],
+    "update_xml":["security/ir.model.access.csv","stock_planning_view.xml"],
+    "active": False,
+    "installable": True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
new file mode 100644
index 00000000000..b0ee2853b87
--- /dev/null
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_stock_planning","stock.planning","model_stock_planning","stock.group_stock_user",1,1,1,1
+"access_stock_period_create_lines","stock.period.createlines","model_stock_period_createlines","stock.group_stock_user",1,1,1,1
+"access_stock_period","stock.period","model_stock_period","stock.group_stock_user",1,1,1,1
+"access_stock_sale_forecast_createlines","stock.sale.forecast.createlines","model_stock_sale_forecast_createlines","stock.group_stock_user",1,1,1,1
+"access_stock_sale_forecast","stock.sale.forecast","model_stock_sale_forecast","stock.group_stock_user",1,1,1,1
+"access_stock_planning_createlines","stock.planning.createlines","model_stock_planning_createlines","stock.group_stock_user",1,1,1,1
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
new file mode 100644
index 00000000000..fa0bec2f5b1
--- /dev/null
+++ b/addons/stock_planning/stock_planning.py
@@ -0,0 +1,1009 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+import pooler
+from tools import config
+import time
+import netsvc
+import math
+import mx.DateTime
+from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+from tools.translate import _
+
+def rounding(fl, round_value):
+    if not round_value:
+        return fl
+    return round(fl / round_value) * round_value
+
+
+# Object creating periods quickly
+# changed that stop_date is created with hour 23:59:00 when it was 00:00:00 stop date was excluded from period
+class stock_period_createlines(osv.osv_memory):
+    _name = "stock.period.createlines"
+
+    def _get_new_period_start(self,cr,uid,context={}):
+        cr.execute("select max(date_stop) from stock_period")
+        result=cr.fetchone()
+        last_date = result and result[0] or False
+        if last_date:
+            period_start = mx.DateTime.strptime(last_date,"%Y-%m-%d %H:%M:%S")+ RelativeDateTime(days=1)
+            period_start = period_start - RelativeDateTime(hours=period_start.hour, minutes=period_start.minute, seconds=period_start.second)
+        else:
+            period_start = mx.DateTime.today()
+        return period_start.strftime('%Y-%m-%d')
+   
+
+    _columns = {
+        'name': fields.char('Period Name', size=64),
+        'date_start': fields.date('Start Date', required=True),
+        'date_stop': fields.date('End Date', required=True),
+        'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
+    }
+    _defaults={
+        'date_start':_get_new_period_start,
+    }
+    
+    def create_period_weekly(self,cr, uid, ids, context={}):
+        res=self.create_period(cr, uid, ids, context, 6, 'Weekly')
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.period',
+                'type': 'ir.actions.act_window',                
+            }
+    
+    def create_period_monthly(self,cr, uid, ids, context={},interval=1):
+        for p in self.browse(cr, uid, ids, context):
+            dt = p.date_start
+            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')
+            while ds.strftime('%Y-%m-%d')<p.date_stop:
+                de = ds + RelativeDateTime(months=interval, minutes=-1)
+                self.pool.get('stock.period').create(cr, uid, {
+                    'name': ds.strftime('%Y/%m'),
+                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),                    
+                })
+                ds = ds + RelativeDateTime(months=interval)
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.period',
+                'type': 'ir.actions.act_window',                
+            }
+
+    def create_period(self,cr, uid, ids, context={}, interval=0, name='Daily'):
+        for p in self.browse(cr, uid, ids, context):
+            dt = p.date_start
+            ds = mx.DateTime.strptime(p.date_start, '%Y-%m-%d')            
+            while ds.strftime('%Y-%m-%d')<p.date_stop:
+                de = ds + RelativeDateTime(days=interval, minutes =-1)
+                if name=='Daily':
+                    new_name=de.strftime('%Y-%m-%d')
+                if name=="Weekly":
+                    new_name=de.strftime('%Y, week %W')
+                self.pool.get('stock.period').create(cr, uid, {
+                    'name': new_name,
+                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
+                })
+                ds = ds + RelativeDateTime(days=interval) + 1
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.period',
+                'type': 'ir.actions.act_window',                
+            }
+stock_period_createlines()
+
+# Periods have no company_id field as they can be shared across similar companies.
+# If somone thinks different it can be improved.
+class stock_period(osv.osv):
+    _name = "stock.period"
+    _columns = {
+        'name': fields.char('Period Name', size=64),
+        'date_start': fields.datetime('Start Date', required=True),
+        'date_stop': fields.datetime('End Date', required=True),        
+        'state' : fields.selection([('draft','Draft'),('open','Open'),('close','Close')],'State')
+    }
+    _defaults = {
+        'state' : lambda * a : 'draft'
+    }
+stock_period()
+
+# Creates forecasts records for products from selected Product Category for selected 'Warehouse - Period'
+# Object added by contributor in ver 1.1
+class stock_sale_forecast_createlines(osv.osv_memory):
+    _name = "stock.sale.forecast.createlines"
+
+# FIXME Add some period sugestion like below
+
+#    def _get_latest_period(self,cr,uid,context={}):
+#        cr.execute("select max(date_stop) from stock_period")
+#        result=cr.fetchone()        
+#        return result and result[0] or False
+   
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
+        'warehouse_id1': fields.many2one('stock.warehouse' , 'Warehouse', required=True, \
+                                help='Warehouse which forecasts will concern. '\
+                                   'If during stock planning you will need sales forecast for all warehouses choose any warehouse now.'),
+        'period_id1': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which forecasts will concern.' ),
+        'product_categ_id1': fields.many2one('product.category' , 'Product Category', required=True, \
+                                help ='Product Category of products which created forecasts will concern.'),
+        'copy_forecast' : fields.boolean('Copy Last Forecast', help="Copy quantities from last Stock and Sale Forecast."),
+    }
+
+    _defaults = { 
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast.createlines', context=c),
+    }
+
+    def create_forecast(self,cr, uid, ids, context={}):
+        product_obj = self.pool.get('product.product')
+        forecast_obj=self.pool.get('stock.sale.forecast')
+        for f in self.browse(cr, uid, ids, context):
+            prod_categ_obj=self.pool.get('product.category')
+            template_obj=self.pool.get('product.template')
+            categ_ids =  f.product_categ_id1.id and [f.product_categ_id1.id] or []
+            prod_categ_ids=prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)]) 
+            templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) 
+            products_ids = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
+            if len(products_ids)==0:
+                raise osv.except_osv(_('Error !'), _('No products in selected category !'))
+            copy = f.copy_forecast
+            for p in product_obj.browse(cr, uid, products_ids,{}):
+                if len(forecast_obj.search(cr, uid, [('product_id','=',p.id) , \
+                                                       ('period_id','=',f.period_id1.id), \
+                                                       ('user_id','=',uid), \
+                                                       ('warehouse_id','=',f.warehouse_id1.id)]))== 0:
+                    forecast_qty = 0.0
+# Not sure if it is expected quantity for this feature (copying forecast from previous period)
+# because it can take incidental forecast of this warehouse, this product and this user (creating, writing or validating forecast).
+# It takes only one forecast line (no sum). If user creates only one forecast per period it will be OK. If not I have no idea how to count it.
+                    
+                    prod_uom = False
+                    if copy:
+                        cr.execute("SELECT period.date_stop, forecast.product_qty, forecast.product_uom \
+                                    FROM stock_sale_forecast AS forecast \
+                                    LEFT JOIN stock_period AS period \
+                                    ON forecast.period_id = period.id \
+                                    WHERE (forecast.user_id = %s OR forecast.create_uid = %s OR forecast.write_uid = %s) \
+                                        AND forecast.warehouse_id = %s AND forecast.product_id = %s \
+                                        AND period.date_stop < %s \
+                                    ORDER BY period.date_stop DESC",
+                                    (uid, uid, uid, f.warehouse_id1.id, p.id, f.period_id1.date_stop) )
+                        ret=cr.fetchone()
+                        if ret:
+                            forecast_qty = ret[1]        
+                            prod_uom = ret[2]
+                    prod_uom = prod_uom or p.uom_id.id
+                    prod_uos_categ = False
+                    if p.uos_id:
+                        prod_uos_categ = p.uos_id.category_id.id
+                    forecast_obj.create(cr, uid, {
+                        'company_id'  : f.warehouse_id1.company_id.id,
+                        'period_id': f.period_id1.id,
+                        'warehouse_id': f.warehouse_id1.id,
+                        'product_id': p.id,
+                        'product_qty' : forecast_qty,
+                        'product_amt' : 0.0,
+                        'product_uom' : prod_uom,
+                        'active_uom' : prod_uom,
+                        'product_uom_categ' : p.uom_id.category_id.id,
+                        'product_uos_categ' : prod_uos_categ,
+                     })
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.sale.forecast',
+                'type': 'ir.actions.act_window',                
+            }
+stock_sale_forecast_createlines()
+
+
+# Stock and Sales Forecast object. Previously stock_planning_sale_prevision.
+# A lot of changes in 1.1
+class stock_sale_forecast(osv.osv):
+    _name = "stock.sale.forecast"
+    
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'create_uid':  fields.many2one('res.users', 'Responsible'),
+        'name' : fields.char('Name', size=64, readonly=True, states={'draft':[('readonly',False)]}),
+        'user_id': fields.many2one('res.users' , 'Created/Validated by',readonly=True, \
+                                        help='Shows who created this forecast, or who validated.'),
+        'warehouse_id': fields.many2one('stock.warehouse' , 'Warehouse', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+                                        help='Shows which warehouse this forecast concerns. '\
+                                         'If during stock planning you will need sales forecast for all warehouses choose any warehouse now.'),
+        'period_id': fields.many2one('stock.period' , 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+                                        help = 'Shows which period this forecast concerns.'),
+        'product_id': fields.many2one('product.product' , 'Product', readonly=True, required=True, states={'draft':[('readonly',False)]}, \
+                                        help = 'Shows which product this forecast concerns.'),
+        'product_qty' : fields.float('Product Quantity', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+                                        help= 'Forecasted quantity.'),
+        'product_amt' : fields.float('Product Amount', readonly=True, states={'draft':[('readonly',False)]}, \
+                                        help='Forecast value which will be converted to Product Quantity according to prices.'),
+        'product_uom_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'),  # Invisible field for product_uom domain
+        'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
+                        help = "Unit of Measure used to show the quanities of stock calculation." \
+                        "You can use units form default category or from second category (UoS category)."),
+        'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoS Category'), # Invisible field for product_uos domain
+# Field used in onchange_uom to check what uom was before change and recalculate quantities acording to old uom (active_uom) and new uom.
+        'active_uom' :fields.many2one('product.uom',  string = "Active UoM"),  
+        'state' : fields.selection([('draft','Draft'),('validated','Validated')],'State',readonly=True),
+        'analyzed_period1_id' : fields.many2one('stock.period' , 'Period1', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period2_id' : fields.many2one('stock.period' , 'Period2', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period3_id' : fields.many2one('stock.period' , 'Period3', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period4_id' : fields.many2one('stock.period' , 'Period4', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_period5_id' : fields.many2one('stock.period' , 'Period5', readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_user_id' : fields.many2one('res.users' , 'This User', required=False, readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_dept_id' : fields.many2one('hr.department' , 'This Department', required=False, \
+                                    readonly=True, states={'draft':[('readonly',False)]},),
+        'analyzed_warehouse_id' : fields.many2one('stock.warehouse' , 'This Warehouse', required=False, \
+                                    readonly=True, states={'draft':[('readonly',False)]}),
+        'analyze_company' : fields.boolean('Per Company', readonly=True, states={'draft':[('readonly',False)]}, \
+                                    help = "Check this box to see the sales for whole company."),
+        'analyzed_period1_per_user' : fields.float('This User Period1', readonly=True),
+        'analyzed_period2_per_user' : fields.float('This User Period2', readonly=True),
+        'analyzed_period3_per_user' : fields.float('This User Period3', readonly=True),
+        'analyzed_period4_per_user' : fields.float('This User Period4', readonly=True),
+        'analyzed_period5_per_user' : fields.float('This User Period5', readonly=True),
+        'analyzed_period1_per_dept' : fields.float('This Dept Period1', readonly=True),
+        'analyzed_period2_per_dept' : fields.float('This Dept Period2', readonly=True),
+        'analyzed_period3_per_dept' : fields.float('This Dept Period3', readonly=True),
+        'analyzed_period4_per_dept' : fields.float('This Dept Period4', readonly=True),
+        'analyzed_period5_per_dept' : fields.float('This Dept Period5', readonly=True),
+        'analyzed_period1_per_warehouse' : fields.float('This Warehouse Period1', readonly=True),
+        'analyzed_period2_per_warehouse' : fields.float('This Warehouse Period2', readonly=True),
+        'analyzed_period3_per_warehouse' : fields.float('This Warehouse Period3', readonly=True),
+        'analyzed_period4_per_warehouse' : fields.float('This Warehouse Period4', readonly=True),
+        'analyzed_period5_per_warehouse' : fields.float('This Warehouse Period5', readonly=True),
+        'analyzed_period1_per_company' : fields.float('This Copmany Period1', readonly=True),
+        'analyzed_period2_per_company' : fields.float('This Company Period2', readonly=True),
+        'analyzed_period3_per_company' : fields.float('This Company Period3', readonly=True),
+        'analyzed_period4_per_company' : fields.float('This Company Period4', readonly=True),
+        'analyzed_period5_per_company' : fields.float('This Company Period5', readonly=True),
+    }
+    _defaults = {
+        'user_id': lambda obj, cr, uid, context: uid,
+        'state': lambda *args: 'draft',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast', context=c),
+    }
+
+    def action_validate(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'validated','user_id':uid})
+        return True
+    
+    def unlink(self, cr, uid, ids, context={}):
+        forecasts = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for t in forecasts:
+            if t['state'] in ('draft'):
+                unlink_ids.append(t['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Validated Sale Forecasts !'))
+        osv.osv.unlink(self, cr, uid, unlink_ids,context=context)
+        return True
+
+    def onchange_company(self, cr, uid, ids, company_id):
+        result = {}
+        if company_id:
+            result['warehouse_id'] = False
+            result['analyzed_user_id'] = False
+            result['analyzed_dept_id'] = False
+            result['analyzed_warehouse_id'] = False
+        return {'value': result}
+
+    def product_id_change(self, cr, uid, ids, product_id):
+        ret={}
+        if product_id:
+            product_rec =  self.pool.get('product.product').browse(cr, uid, product_id)
+            ret['product_uom'] = product_rec.uom_id.id
+            ret['product_uom_categ'] = product_rec.uom_id.category_id.id
+            ret['product_uos_categ'] = product_rec.uos_id and product_rec.uos_id.category_id.id or False
+            ret['active_uom'] = product_rec.uom_id.id
+        else:
+            ret['product_uom'] = False
+            ret['product_uom_categ'] = False
+            ret['product_uos_categ'] = False
+        res = {'value': ret}
+        return res
+
+    def onchange_uom(self, cr, uid, ids, product_uom=False, product_qty=0.0, active_uom=False ):
+        ret={}
+        val1 = self.browse(cr, uid, ids)
+        val = val1[0]
+        coeff_uom2def = self._to_default_uom_factor(cr, uid, val, active_uom, {})
+        coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+        coeff = coeff_uom2def * coeff_def2uom
+        ret['product_qty'] = rounding(coeff * product_qty, round_value)
+        ret['active_uom'] = product_uom
+        return {'value': ret}
+
+    def product_amt_change(self, cr, uid, ids, product_amt = 0.0, product_uom=False):
+        ret={}
+        if product_amt:
+            coeff_def2uom = 1
+            val1 = self.browse(cr, uid, ids)
+            val = val1[0]
+            if (product_uom != val.product_id.uom_id.id):
+                coeff_def2uom, rounding = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+            ret['product_qty'] = rounding(coeff_def2uom * product_amt/(val.product_id.product_tmpl_id.list_price), round_value)
+        res = {'value': ret}
+        return res
+
+    def _to_default_uom_factor(self, cr, uid, val, uom_id, context):
+        uom_obj = self.pool.get('product.uom')
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        coef =  uom.factor
+        if uom.category_id.id <> val.product_id.uom_id.category_id.id:
+            coef = coef / val.product_id.uos_coeff
+        return val.product_id.uom_id.factor / coef
+
+    def _from_default_uom_factor(self, cr, uid, val, uom_id, context):
+        uom_obj = self.pool.get('product.uom')
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        res = uom.factor
+        if uom.category_id.id <> val.product_id.uom_id.category_id.id:
+            res = res / val.product_id.uos_coeff
+        return res / val.product_id.uom_id.factor, uom.rounding
+
+    def _sales_per_users(self, cr, uid, so, so_line, company, users):
+        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
+                   "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s)) AND (s.company_id=%s) " \
+                    "AND (s.user_id IN (%s)) " %(so_line, so, company, users))
+        ret = cr.fetchone()[0] or 0.0
+        return ret
+
+    def _sales_per_warehouse(self, cr, uid, so, so_line, company, shops):        
+        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
+                   "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s))AND (s.company_id=%s) " \
+                    "AND (s.shop_id IN (%s))" %(so_line, so, company, shops))
+        ret = cr.fetchone()[0] or 0.0
+        return ret
+
+    def _sales_per_company(self, cr, uid, so, so_line, company, ):
+        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
+                   "WHERE (sol.id IN (%s)) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN (%s)) AND (s.company_id=%s)"%(so_line, so, company))
+        ret = cr.fetchone()[0] or 0.0
+        return ret
+    
+    def calculate_sales_history(self, cr, uid, ids, context, *args):
+        sales=[[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],]
+        for obj in  self.browse(cr, uid, ids):
+            periods =obj.analyzed_period1_id, obj.analyzed_period2_id, obj.analyzed_period3_id, obj.analyzed_period4_id, obj.analyzed_period5_id
+            so_obj = self.pool.get('sale.order')
+            so_line_obj= self.pool.get('sale.order.line')
+            so_line_product_ids = so_line_obj.search(cr, uid, [('product_id','=', obj.product_id.id)], context = context)
+            if so_line_product_ids:
+                so_line_product_set = ','.join(map(str,so_line_product_ids))
+                if obj.analyzed_warehouse_id:
+                    shops = self.pool.get('sale.shop').search(cr, uid,[('warehouse_id','=', obj.analyzed_warehouse_id.id)], context = context)
+                    shops_set = ','.join(map(str,shops))
+                else:
+                    shops = False
+                if obj.analyzed_dept_id:
+                    dept_obj = self.pool.get('hr.department')
+                    dept_id =  obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or []
+                    dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)])
+                    dept_ids_set = ','.join(map(str,dept_ids))
+                    cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN (%s))" %(dept_ids_set))
+                    dept_users = [x for x, in cr.fetchall()]
+                    dept_users_set =  ','.join(map(str,dept_users))
+                else:
+                    dept_users = False
+                factor, round_value = self._from_default_uom_factor(cr, uid, obj, obj.product_uom.id, context=context)
+                for i, period in enumerate(periods):
+                    if period:
+                        so_period_ids = so_obj.search(cr, uid, [('date_order','>=',period.date_start), ('date_order','<=',period.date_stop)], context = context)
+                        if so_period_ids:
+                            so_period_set = ','.join(map(str,so_period_ids))
+                            if obj.analyzed_user_id:
+                                user_set = str(obj.analyzed_user_id.id)
+                                sales[i][0] =self._sales_per_users(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, user_set)
+                                sales[i][0] *=factor
+                            if dept_users:
+                                sales[i][1]=  self._sales_per_users(cr, uid, so_period_set,  so_line_product_set, obj.company_id.id, dept_users_set)
+                                sales[i][1]*=factor
+                            if shops:
+                                sales[i][2]= self._sales_per_warehouse(cr, uid, so_period_set,  so_line_product_set, obj.company_id.id, shops_set)
+                                sales[i][2]*=factor
+                            if obj.analyze_company:
+                                sales[i][3]= self._sales_per_company(cr, uid, so_period_set, so_line_product_set, obj.company_id.id, )
+                                sales[i][3]*=factor
+        self.write(cr, uid, ids, {
+            'analyzed_period1_per_user':sales[0][0],
+            'analyzed_period2_per_user':sales[1][0],
+            'analyzed_period3_per_user':sales[2][0],
+            'analyzed_period4_per_user':sales[3][0],
+            'analyzed_period5_per_user':sales[4][0],
+            'analyzed_period1_per_dept':sales[0][1],
+            'analyzed_period2_per_dept':sales[1][1],
+            'analyzed_period3_per_dept':sales[2][1],
+            'analyzed_period4_per_dept':sales[3][1],
+            'analyzed_period5_per_dept':sales[4][1],
+            'analyzed_period1_per_warehouse':sales[0][2],
+            'analyzed_period2_per_warehouse':sales[1][2],
+            'analyzed_period3_per_warehouse':sales[2][2],
+            'analyzed_period4_per_warehouse':sales[3][2],
+            'analyzed_period5_per_warehouse':sales[4][2],
+            'analyzed_period1_per_company':sales[0][3],
+            'analyzed_period2_per_company':sales[1][3],
+            'analyzed_period3_per_company':sales[2][3],
+            'analyzed_period4_per_company':sales[3][3],
+            'analyzed_period5_per_company':sales[4][3],
+        })
+        return True
+
+
+stock_sale_forecast()
+
+# Creates stock planning records for products from selected Product Category for selected 'Warehouse - Period' 
+# Object added by contributor in ver 1.1 
+class stock_planning_createlines(osv.osv_memory):
+    _name = "stock.planning.createlines"
+
+    def onchange_company(self, cr, uid, ids, company_id):
+        result = {}
+        if company_id:
+            result['warehouse_id2'] = False
+        return {'value': result}
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required = True),
+        'period_id2': fields.many2one('stock.period' , 'Period', required=True, help = 'Period which planning will concern.'),
+        'warehouse_id2': fields.many2one('stock.warehouse' , 'Warehouse', required=True, help = 'Warehouse which planning will concern.'),
+        'product_categ_id2': fields.many2one('product.category' , 'Product Category', \
+                        help = 'Planning will be created for products from Product Category selected by this field. '\
+                               'This field is ignored when you check \"All Forecasted Product\" box.' ),
+        'forecasted_products': fields.boolean('All Products with Forecast', \
+                     help = "Check this box to create planning for all products having any forecast for selected Warehouse and Period. "\
+                            "Product Category field will be ignored."),
+    }
+
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
+    }
+
+    def create_planning(self,cr, uid, ids, context={}):
+        product_obj = self.pool.get('product.product')
+        planning_obj=self.pool.get('stock.planning')
+
+        for f in self.browse(cr, uid, ids, context=context):
+            if f.forecasted_products:
+                cr.execute("SELECT product_id \
+                                FROM stock_sale_forecast \
+                                WHERE (period_id = %s) AND (warehouse_id = %s)", (f.period_id2.id, f.warehouse_id2.id))
+                products_id1 = [x for x, in cr.fetchall()]
+            else:
+                prod_categ_obj=self.pool.get('product.category')
+                template_obj=self.pool.get('product.template')
+                categ_ids =  f.product_categ_id2.id and [f.product_categ_id2.id] or []
+                prod_categ_ids=prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)]) 
+                templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) 
+                products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
+            if len(products_id1)==0:
+                raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !'))
+
+            for p in product_obj.browse(cr, uid, products_id1,context=context):
+                if len(planning_obj.search(cr, uid, [('product_id','=',p.id),
+                                                      ('period_id','=',f.period_id2.id),
+                                                      ('warehouse_id','=',f.warehouse_id2.id)]))== 0:
+                    cr.execute("SELECT period.date_stop, planning.product_uom, planning.planned_outgoing, planning.to_procure, \
+                                    planning.stock_only, planning.procure_to_stock, planning.confirmed_forecasts_only, \
+                                    planning.supply_warehouse_id, planning.stock_supply_location \
+                                FROM stock_planning AS planning \
+                                LEFT JOIN stock_period AS period \
+                                ON planning.period_id = period.id \
+                                WHERE (planning.create_uid = %s OR planning.write_uid = %s) \
+                                     AND planning.warehouse_id = %s AND planning.product_id = %s \
+                                     AND period.date_stop < %s \
+                                ORDER BY period.date_stop DESC",
+                                    (uid, uid, f.warehouse_id2.id, p.id, f.period_id2.date_stop) )
+                    ret=cr.fetchone()
+#                        forecast_qty = ret and ret[0] or 0.0
+                    if ret:
+#                            raise osv.except_osv(_('Error !'), _('ret is %s %s %s %s %s %s')%(ret[0],ret[2],ret[3],ret[4],ret[5],ret[6],))
+                        prod_uom = ret[1]
+                        planned_out = ret[2]        
+                        to_procure = ret[3]
+                        stock_only = ret[4]
+                        procure_to_stock = ret[5]
+                        confirmed_forecasts_only = ret[6]
+                        supply_warehouse_id = ret[7]
+                        stock_supply_location = ret[8]
+                    else:
+                        prod_uom = p.uom_id.id
+                        planned_out = False        
+                        to_procure = False
+                        stock_only = False
+                        procure_to_stock = False
+                        confirmed_forecasts_only = False
+                        supply_warehouse_id = False
+                        stock_supply_location = False
+                    prod_uos_categ = False
+                    if p.uos_id:
+                        prod_uos_categ = p.uos_id.category_id.id
+                    planning_obj.create(cr, uid, {
+                        'company_id' : f.warehouse_id2.company_id.id,
+                        'period_id': f.period_id2.id,
+                        'warehouse_id' : f.warehouse_id2.id,
+                        'product_id': p.id,
+                        'product_uom' : prod_uom,
+                        'product_uom_categ' : p.uom_id.category_id.id,
+                        'product_uos_categ' : prod_uos_categ,
+                        'active_uom' : prod_uom,
+                        'planned_outgoing': planned_out,       
+                        'to_procure': to_procure,
+                        'stock_only': stock_only,
+                        'procure_to_stock': procure_to_stock,
+                        'confirmed_forecasts_only': confirmed_forecasts_only,
+                        'supply_warehouse_id': supply_warehouse_id,
+                        'stock_supply_location': stock_supply_location,
+
+                    })
+        return {
+                'view_type': 'form',
+                "view_mode": 'tree',
+                'res_model': 'stock.planning',
+                'type': 'ir.actions.act_window',                
+            }
+stock_planning_createlines()
+
+
+# The main Stock Planning object
+# A lot of changes by contributor in ver 1.1
+class stock_planning(osv.osv):
+    _name = "stock.planning"
+    
+    def _get_in_out(self, cr, uid, val, date_start, date_stop, direction, done, context):
+#        res = {}
+#        if not context:
+#            context = {}
+        mapping = {'in': {
+                        'field': "incoming_qty",
+                        'adapter': lambda x: x,
+                  },
+                  'out': {
+                        'field': "outgoing_qty",
+                        'adapter': lambda x: -x,
+                  },
+        }
+        context['from_date'] = date_start
+        context['to_date'] = date_stop
+        locations = [val.warehouse_id.lot_stock_id.id,]
+        if not val.stock_only:
+            locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id])
+        context['location'] = locations
+        context['compute_child'] = True
+        product_obj =  self.pool.get('product.product')
+        prod_id = val.product_id.id
+        if done:
+            c1=context.copy()
+            c1.update({ 'states':('done',), 'what':(direction,) })
+            prod_ids = [prod_id]
+            st = product_obj.get_product_available(cr,uid, prod_ids, context=c1)
+            res = mapping[direction]['adapter'](st.get(prod_id,0.0))
+        else:
+            product=product_obj.read(cr, uid, prod_id,[], context)
+            product_qty = product[mapping[direction]['field']]
+            res = mapping[direction]['adapter'](product_qty)
+#            res[val.id] = product_obj['incoming_qty']
+        return res
+
+    def _get_outgoing_before(self, cr, uid, val, date_start, date_stop, context):
+        cr.execute("SELECT sum(planning.planned_outgoing), planning.product_uom \
+                    FROM stock_planning AS planning \
+                    LEFT JOIN stock_period AS period \
+                    ON (planning.period_id = period.id) \
+                    WHERE (period.date_stop >= %s) AND (period.date_stop <= %s) \
+                        AND (planning.product_id = %s) AND (planning.company_id = %s) \
+                    GROUP BY planning.product_uom", \
+                        (date_start, date_stop, val.product_id.id, val.company_id.id,))
+        planning_qtys = cr.fetchall()
+        res = self._to_planning_uom(cr, uid, val, planning_qtys, context)
+        return res
+
+    def _to_planning_uom(self, cr, uid, val, qtys, context):
+        res_qty = 0
+        if qtys:
+            uom_obj = self.pool.get('product.uom')
+            for qty, prod_uom in qtys:
+                coef = self._to_default_uom_factor(cr, uid, val, prod_uom, context=context)
+                res_coef, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context)
+                coef = coef * res_coef
+                res_qty += rounding(qty * coef, round_value)
+        return res_qty
+        
+
+    def _get_forecast(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            res[val.id]={}
+            valid_part = val.confirmed_forecasts_only and " AND state = 'validated'" or ""
+            cr.execute('SELECT sum(product_qty), product_uom  \
+                        FROM stock_sale_forecast \
+                        WHERE product_id = %s AND period_id = %s AND company_id = %s '+valid_part+ \
+                       'GROUP BY product_uom', \
+                            (val.product_id.id,val.period_id.id, val.company_id.id))
+            company_qtys = cr.fetchall()
+            res[val.id]['company_forecast'] = self._to_planning_uom(cr, uid, val, company_qtys, context)
+
+            cr.execute('SELECT sum(product_qty), product_uom \
+                        FROM stock_sale_forecast \
+                        WHERE product_id = %s and period_id = %s AND warehouse_id = %s ' + valid_part + \
+                       'GROUP BY product_uom', \
+                        (val.product_id.id,val.period_id.id, val.warehouse_id.id))
+            warehouse_qtys = cr.fetchall()
+            res[val.id]['warehouse_forecast'] = self._to_planning_uom(cr, uid, val, warehouse_qtys, context)
+            res[val.id]['warehouse_forecast'] = rounding(res[val.id]['warehouse_forecast'],  val.product_id.uom_id.rounding)
+        return res
+
+    def _get_stock_start(self, cr, uid, val, date, context):
+        context['from_date'] = None
+        context['to_date'] = date
+        locations = [val.warehouse_id.lot_stock_id.id,]
+        if not val.stock_only:
+            locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id])
+        context['location'] = locations
+        context['compute_child'] = True
+        product_obj =  self.pool.get('product.product').read(cr, uid,val.product_id.id,[], context)
+        res = product_obj['qty_available']     # value for stock_start
+        return res
+    
+    def _get_past_future(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids, context=context):
+            if val.period_id.date_stop < time.strftime('%Y-%m-%d'):
+                res[val.id] = 'Past'
+            else:
+                res[val.id] = 'Future'
+        return res
+
+    def _get_op(self, cr, uid, ids, field_names, arg, context):  # op = OrderPoint
+        res = {}
+        for val in self.browse(cr, uid, ids, context=context):
+            res[val.id]={}
+            cr.execute("SELECT product_min_qty, product_max_qty, product_uom  \
+                        FROM stock_warehouse_orderpoint \
+                        WHERE warehouse_id = %s AND product_id = %s AND active = 'TRUE'", (val.warehouse_id.id, val.product_id.id))
+            ret =  cr.fetchone() or [0.0,0.0,False]
+            coef = 1
+            round_value = 1
+            if ret[2]:
+                coef = self._to_default_uom_factor(cr, uid, val, ret[2], context)
+                res_coef, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context)
+                coef = coef * res_coef
+            res[val.id]['minimum_op'] = rounding(ret[0]*coef, round_value)
+            res[val.id]['maximum_op'] = ret[1]*coef
+        return res
+    
+    def onchange_company(self, cr, uid, ids, company_id):
+        result = {}
+        if company_id:
+            result['warehouse_id'] = False
+        return {'value': result}
+
+    def onchange_uom(self, cr, uid, ids, product_uom, ):
+        if not product_uom:
+            return {}
+        ret={}
+        val1 = self.browse(cr, uid, ids)
+        val = val1[0]
+        coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.active_uom.id, {})
+        coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+        coeff = coeff_uom2def * coeff_def2uom
+        ret['planned_outgoing'] = rounding(coeff * val.planned_outgoing, round_value)
+        ret['to_procure'] = rounding(coeff * val.to_procure, round_value)
+        ret['active_uom'] = product_uom
+        return {'value': ret}
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required = True),
+        'history' : fields.text('Procurement History', readonly=True, help = "History of procurement or internal supply of this planning line."),
+        'state' : fields.selection([('draft','Draft'),('done','Done')],'State',readonly=True),
+        'period_id': fields.many2one('stock.period' , 'Period', required=True, \
+                help = 'Period for this planning. Requisition will be created for beginning of the period.'),
+        'warehouse_id' : fields.many2one('stock.warehouse','Warehouse', required=True), 
+        'product_id': fields.many2one('product.product' , 'Product', required=True, help = 'Product which this planning is created for.'),
+        'product_uom_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uom domain
+        'product_uom' : fields.many2one('product.uom', 'UoM', required=True, help = "Unit of Measure used to show the quanities of stock calculation." \
+                        "You can use units form default category or from second category (UoS category)."),
+        'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoM Category'), # Invisible field for product_uos domain
+# Field used in onchange_uom to check what uom was before change to recalculate quantities acording to old uom (active_uom) and new uom.
+        'active_uom' :fields.many2one('product.uom',  string = "Active UoM"), 
+        'planned_outgoing' : fields.float('Planned Out', required=True,  \
+                help = 'Enter planned outgoing quantity from selected Warehouse during the selected Period of selected Product. '\
+                        'To plan this value look at Confirmed Out or Sales Forecasts. This value should be equal or greater than Confirmed Out.'),
+        'company_forecast': fields.function(_get_forecast, method=True, string ='Company Forecast', multi = 'company', \
+                help = 'All sales forecasts for whole company (for all Warehouses) of selected Product during selected Period.'),
+        'warehouse_forecast': fields.function(_get_forecast, method=True, string ='Warehouse Forecast',  multi = 'warehouse',\
+                help = 'All sales forecasts for selected Warehouse of selected Product during selected Period.'),
+        'stock_simulation': fields.float('Stock Simulation', readonly =True, \
+                help = 'Stock simulation at the end of selected Period.\n For current period it is: \n' \
+                       'Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n' \
+                        'For periods ahead it is: \nInitial Stock - Planned Out Before + Incoming Before - Planned Out + Planned In.'),
+        'incoming': fields.float('Confirmed In', readonly=True, \
+                help = 'Quantity of all confirmed incoming moves in calculated Period.'),
+        'outgoing': fields.float('Confirmed Out', readonly=True, \
+                help = 'Quantity of all confirmed outgoing moves in calculated Period.'),
+        'incoming_left': fields.float('Incoming Left', readonly=True,  \
+                help = 'Quantity left to Planned incoming quantity. This is calculated difference between Planned In and Confirmed In. ' \
+                        'For current period Already In is also calculated. This value is used to create procurement for lacking quantity.'),
+        'outgoing_left': fields.float('Expected Out', readonly=True, \
+                help = 'Quantity expected to go out in selected period. As a difference between Planned Out and Confirmed Out. ' \
+                        'For current period Already Out is also calculated'),
+        'to_procure': fields.float(string='Planned In', required=True, \
+                help = 'Enter quantity which (by your plan) should come in. Change this value and observe Stock simulation. ' \
+                        'This value should be equal or greater than Confirmed In.'),
+        'line_time' : fields.function(_get_past_future, method=True,type='char', string='Past/Future'),
+        'minimum_op' : fields.function(_get_op, method=True, type='float', string = 'Minimum Rule', multi= 'minimum', \
+                            help = 'Minimum quantity set in Minimum Stock Rules for this Warhouse'),
+        'maximum_op' : fields.function(_get_op, method=True, type='float', string = 'Maximum Rule', multi= 'maximum', \
+                            help = 'Maximum quantity set in Minimum Stock Rules for this Warhouse'),
+        'outgoing_before' : fields.float('Planned Out Before', readonly=True, \
+                            help= 'Planned Out in periods before calculated. '\
+                                    'Between start date of current period and one day before start of calculated period.'),
+        'incoming_before': fields.float('Incoming Before', readonly = True, \
+                            help= 'Confirmed incoming in periods before calculated (Including Already In). '\
+                                    'Between start date of current period and one day before start of calculated period.'),
+        'stock_start' : fields.float('Initial Stock', readonly=True, \
+                            help= 'Stock quantity one day before current period.'),
+        'already_out' : fields.float('Already Out', readonly=True, \
+                            help= 'Quantity which is already dispatched out of this warehouse in current period.'),
+        'already_in' : fields.float('Already In', readonly=True, \
+                            help= 'Quantity which is already picked up to this warehouse in current period.'),
+        'stock_only' : fields.boolean("Stock Location Only", help = "Check to calculate stock location of selected warehouse only. " \
+                                        "If not selected calculation is made for input, stock and output location of warehouse."),
+        "procure_to_stock" : fields.boolean("Procure To Stock Location", help = "Chect to make procurement to stock location of selected warehouse. " \
+                                        "If not selected procurement will be made into input location of warehouse."),
+        "confirmed_forecasts_only" : fields.boolean("Validated Forecasts", help = "Check to take validated forecasts only. " \
+                    "If not checked system takes validated and draft forecasts."),
+        'supply_warehouse_id' : fields.many2one('stock.warehouse','Source Warehouse', help = "Warehouse used as source in supply pick move created by 'Supply from Another Warhouse'."), 
+        "stock_supply_location" : fields.boolean("Stock Supply Location", help = "Check to supply from Stock location of Supply Warehouse. " \
+                "If not checked supply will be made from Output location of Supply Warehouse. Used in 'Supply from Another Warhouse' with Supply Warehouse."),
+
+    }
+
+    _defaults = {
+        'state': lambda *args: 'draft' ,
+        'to_procure' : 0.0,
+        'planned_outgoing' : 0.0,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
+    }   
+    
+    _order = 'period_id'
+
+    def _to_default_uom_factor(self, cr, uid, val, uom_id, context):
+        uom_obj = self.pool.get('product.uom')
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        coef =  uom.factor
+        if uom.category_id.id != val.product_id.uom_id.category_id.id:
+            coef = coef / val.product_id.uos_coeff
+        return val.product_id.uom_id.factor / coef
+
+
+    def _from_default_uom_factor(self, cr, uid, val, uom_id, context):
+        uom_obj = self.pool.get('product.uom')
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        res = uom.factor
+        if uom.category_id.id != val.product_id.uom_id.category_id.id:
+            res = res / val.product_id.uos_coeff
+        return res / val.product_id.uom_id.factor, uom.rounding
+
+    def calculate_planning(self, cr, uid, ids, context, *args):
+        one_minute = RelativeDateTime(minutes=1)
+        current_date_beginning_c = mx.DateTime.today()
+        current_date_end_c = current_date_beginning_c  + RelativeDateTime(days=1, minutes=-1)  # to get hour 23:59:00 
+        current_date_beginning = current_date_beginning_c.strftime('%Y-%m-%d %H:%M:%S')
+        current_date_end = current_date_end_c.strftime('%Y-%m-%d %H:%M:%S')
+        for val in self.browse(cr, uid, ids, context=context):
+            day = mx.DateTime.strptime(val.period_id.date_start, '%Y-%m-%d %H:%M:%S')
+            dbefore = mx.DateTime.DateTime(day.year, day.month, day.day) - one_minute
+            day_before_calculated_period = dbefore.strftime('%Y-%m-%d %H:%M:%S')   # one day before start of calculated period
+            cr.execute("SELECT date_start \
+                    FROM stock_period AS period \
+                    LEFT JOIN stock_planning AS planning \
+                    ON (planning.period_id = period.id) \
+                    WHERE (period.date_stop >= %s) AND (period.date_start <= %s) AND \
+                        planning.product_id = %s", (current_date_end, current_date_end, val.product_id.id,)) #
+            date = cr.fetchone()
+            start_date_current_period = date and date[0] or False
+            start_date_current_period = start_date_current_period or current_date_beginning
+            day = mx.DateTime.strptime(start_date_current_period, '%Y-%m-%d %H:%M:%S')
+            dbefore = mx.DateTime.DateTime(day.year, day.month, day.day) - one_minute
+            date_for_start = dbefore.strftime('%Y-%m-%d %H:%M:%S')   # one day before current period
+            already_out = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='out', done = True, context=context),
+            already_in = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='in', done = True, context=context),
+            outgoing = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='out', done = False, context=context),
+            incoming = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='in', done = False, context=context),
+            outgoing_before = self._get_outgoing_before(cr, uid, val, start_date_current_period, day_before_calculated_period, context=context),
+            incoming_before = self._get_in_out(cr, uid, val, start_date_current_period, day_before_calculated_period, direction='in', done = False, context=context),
+            stock_start = self._get_stock_start(cr, uid, val, date_for_start, context=context),
+            if start_date_current_period == val.period_id.date_start:   # current period is calculated
+                current=True
+            else:
+                current=False
+            factor, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context)
+            self.write(cr, uid, ids, {
+                'already_out': rounding(already_out[0]*factor,round_value),
+                'already_in': rounding(already_in[0]*factor,round_value),
+                'outgoing': rounding(outgoing[0]*factor,round_value),
+                'incoming': rounding(incoming[0]*factor,round_value),
+                'outgoing_before' : rounding(outgoing_before[0]*factor,round_value),
+                'incoming_before': rounding((incoming_before[0]+ (not current and already_in[0]))*factor,round_value),
+                'outgoing_left': rounding(val.planned_outgoing - (outgoing[0] + (current and already_out[0]))*factor,round_value),
+                'incoming_left': rounding(val.to_procure - (incoming[0] + (current and already_in[0]))*factor,round_value),
+                'stock_start' : rounding(stock_start[0]*factor,round_value),
+                'stock_simulation': rounding(val.to_procure - val.planned_outgoing + (stock_start[0]+ incoming_before[0] - outgoing_before[0] \
+                                     + (not current and already_in[0]))*factor,round_value),
+            })
+        return True
+
+# method below converts quantities and uoms to general OpenERP standard with UoM Qty, UoM, UoS Qty, UoS.
+# from stock_planning standard where you have one Qty and one UoM (any from UoM or UoS category) 
+# so if UoM is from UoM category it is used as UoM in standard and if product has UoS the UoS will be calcualated.
+# If UoM is from UoS category it is recalculated to basic UoS from product (in planning you can use any UoS from UoS category) 
+# and basic UoM is calculated.
+    def _qty_to_standard(self, cr, uid, val, context):
+        uos = False
+        uos_qty = 0.0
+        if val.product_uom.category_id.id == val.product_id.uom_id.category_id.id:
+            uom_qty = val.incoming_left
+            uom = val.product_uom.id
+            if val.product_id.uos_id:
+                uos = val.product_id.uos_id.id
+                coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.product_uom.id, {})
+                coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uos, {})
+                uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
+        elif val.product_uom.category_id.id == val.product_id.uos_id.category_id.id:
+            coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.product_uom.id, {})
+            uos = val.product_id.uos_id.id
+            coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uos, {})
+            uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
+            uom = val.product_id.uom_id.id
+            coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uom, {})
+            uom_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
+        return uom_qty, uom, uos_qty, uos
+    
+    def procure_incomming_left(self, cr, uid, ids, context, *args):
+        for obj in self.browse(cr, uid, ids):
+            if obj.incoming_left <= 0:
+                raise osv.except_osv(_('Error !'), _('Incoming Left must be greater than 0 !'))
+            uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                        'company_id' : obj.company_id.id,
+                        'name': _('Manual planning for ') + obj.period_id.name,
+                        'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
+                        'date_planned': obj.period_id.date_start,
+                        'product_id': obj.product_id.id,
+                        'product_qty': uom_qty,
+                        'product_uom': uom,
+                        'product_uos_qty': uos_qty,
+                        'product_uos': uos,
+                        'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id, 
+                        'procure_method': 'make_to_order',
+                        'note' : _("Procurement created in MPS by user: ") + str(user.login) + _("  Creation Date: ") + \
+                                            time.strftime('%Y-%m-%d %H:%M:%S') + \
+                                        _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \
+                                        _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \
+                                        _("\n Initial Stock: ") + str(obj.stock_start) + \
+                                        _("\n Planned Out: ") + str(obj.planned_outgoing) + _("    Planned In: ") + str(obj.to_procure) + \
+                                        _("\n Already Out: ") + str(obj.already_out) + _("    Already In: ") +  str(obj.already_in) + \
+                                        _("\n Confirmed Out: ") + str(obj.outgoing) + _("    Confirmed In: ") + str(obj.incoming) + \
+                                        _("\n Planned Out Before: ") + str(obj.outgoing_before) + _("    Confirmed In Before: ") + \
+                                                                                            str(obj.incoming_before) + \
+                                        _("\n Expected Out: ") + str(obj.outgoing_left) + _("    Incoming Left: ") + str(obj.incoming_left) + \
+                                        _("\n Stock Simulation: ") +  str(obj.stock_simulation) + _("    Minimum stock: ") + str(obj.minimum_op),
+
+                            }, context=context)
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+            self.calculate_planning(cr, uid, ids, context)
+            prev_text = obj.history or ""
+            self.write(cr, uid, ids, {
+                    'history' : prev_text + _('Requisition (') + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') + str(obj.incoming_left) + \
+                    " " + obj.product_uom.name + "\n",
+                })
+        return True
+
+    def internal_supply(self, cr, uid, ids, context, *args):
+        for obj in self.browse(cr, uid, ids):
+            if obj.incoming_left <= 0:
+                raise osv.except_osv(_('Error !'), _('Incoming Left must be greater than 0 !'))
+            if not obj.supply_warehouse_id:
+                raise osv.except_osv(_('Error !'), _('You must specify a Source Warehouse !'))
+            if obj.supply_warehouse_id.id == obj.warehouse_id.id:
+                raise osv.except_osv(_('Error !'), _('You must specify a Source Warehouse different than calculated (destination) Warehouse !'))
+            uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                            'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
+                            'type': 'internal',
+                            'state': 'auto',
+                            'date' :  obj.period_id.date_start,
+                            'move_type': 'direct',
+                            'invoice_state':  'none',
+                            'company_id': obj.company_id.id,
+                            'note': _("Pick created from MPS by user: ") + str(user.login) + _("  Creation Date: ") + \
+                                            time.strftime('%Y-%m-%d %H:%M:%S') + \
+                                        _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \
+                                        _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \
+                                        _("\n Initial Stock: ") + str(obj.stock_start) + \
+                                        _("\n Planned Out: ") + str(obj.planned_outgoing) + _("    Planned In: ") + str(obj.to_procure) + \
+                                        _("\n Already Out: ") + str(obj.already_out) + _("    Already In: ") +  str(obj.already_in) + \
+                                        _("\n Confirmed Out: ") + str(obj.outgoing) + _("    Confirmed In: ") + str(obj.incoming) + \
+                                        _("\n Planned Out Before: ") + str(obj.outgoing_before) + _("    Confirmed In Before: ") + \
+                                                                                            str(obj.incoming_before) + \
+                                        _("\n Expected Out: ") + str(obj.outgoing_left) + _("    Incoming Left: ") + str(obj.incoming_left) + \
+                                        _("\n Stock Simulation: ") +  str(obj.stock_simulation) + _("    Minimum stock: ") + str(obj.minimum_op),
+                        })
+
+            move_id = self.pool.get('stock.move').create(cr, uid, {
+                        'name': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
+                        'picking_id': picking_id,
+                        'product_id': obj.product_id.id,
+                        'date_planned': obj.period_id.date_start,
+                        'product_qty': uom_qty,
+                        'product_uom': uom,
+                        'product_uos_qty': uos_qty,
+                        'product_uos': uos,
+                        'location_id': obj.stock_supply_location and obj.supply_warehouse_id.lot_stock_id.id or \
+                                                                obj.supply_warehouse_id.lot_output_id.id,
+                        'location_dest_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or \
+                                                                obj.warehouse_id.lot_input_id.id,
+                        'tracking_id': False,
+                        'company_id': obj.company_id.id,
+                    })
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+
+        self.calculate_planning(cr, uid, ids, context)
+        prev_text = obj.history or ""
+        pick_name = self.pool.get('stock.picking').browse(cr, uid, picking_id).name
+        self.write(cr, uid, ids, {
+              'history' : prev_text + _('Pick List ')+ pick_name + " (" + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') \
+                + str(obj.incoming_left) +" " + obj.product_uom.name + "\n",
+                })
+
+        return True
+   
+    def product_id_change(self, cr, uid, ids, product_id):
+        ret={}
+        if product_id:
+            product_rec =  self.pool.get('product.product').browse(cr, uid, product_id)
+            ret['product_uom'] = product_rec.uom_id.id
+            ret['active_uom'] = product_rec.uom_id.id
+            ret['product_uom_categ'] = product_rec.uom_id.category_id.id
+            ret['product_uos_categ'] = product_rec.uos_id and product_rec.uos_id.category_id.id or False
+        else:
+            ret['product_uom'] = False
+            ret['product_uom_categ'] = False
+            ret['product_uos_categ'] = False
+        res = {'value': ret}
+        return res
+
+stock_planning()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
new file mode 100644
index 00000000000..e90d68cf855
--- /dev/null
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+        <menuitem id="menu_stock_period_main" 
+                  name="Stock and Sales Periods" 
+                  parent="base.menu_base_config"/>
+
+<!-- Creating periods section -->
+
+    <record id="view_stock_period_createlines_form" model="ir.ui.view">
+            <field name="name">stock.period.createlines.form</field>
+            <field name="model">stock.period.createlines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock and Sales Periods">
+                    <separator colspan="4" string="Create periods for Stock and Sales Planning"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>                             
+                    <separator colspan="4" string=""/>        
+                    <group col="3" colspan="4">
+                        <button name="create_period" string="Create Daily Periods" type="object"/>
+                        <button name="create_period_weekly" string="Create Weekly Periods" type="object"/>
+                        <button name="create_period_monthly" string="Create Monthly Periods" type="object"/>
+                    </group> 
+                </form>
+            </field>
+        </record>      
+
+        <record id="action_stock_period_createlines_form" model="ir.actions.act_window">
+            <field name="name">Stock and Sales Planning Periods</field>
+            <field name="res_model">stock.period.createlines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_period_createlines_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem id="menu_stock_period_creatlines" 
+                  name="Create Stock and Sales Periods" 
+                  parent="menu_stock_period_main" 
+                  action="action_stock_period_createlines_form"
+                  sequence = "5"/>
+
+<!-- Periods tree and form section -->
+
+        <record id="view_stock_period_form" model="ir.ui.view">
+            <field name="name">stock.period.form</field>
+            <field name="model">stock.period</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock and Sales Periods">
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="state" select="1"/>
+                    <field name="date_stop"/>
+                </form>
+            </field>
+        </record>
+        
+        <record id="view_stock_period_tree" model="ir.ui.view">
+            <field name="name">stock.period.tree</field>
+            <field name="model">stock.period</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock and Sales Period" editable="bottom">
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                    <field name="state" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_stock_period_form" model="ir.actions.act_window">
+            <field name="name">Stock and Sales Periods</field>
+            <field name="res_model">stock.period</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        
+        <menuitem
+            id="menu_stock_period"
+            parent="menu_stock_period_main"
+            action="action_stock_period_form"
+            sequence = "10"/>
+
+<!--   Create Forecast section   -->
+
+        <record id="view_stock_sale_forecast_createlines_form" model="ir.ui.view">
+            <field name="name">stock.sale.forecast.createlines</field>
+            <field name="model">stock.sale.forecast.createlines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock and Sales Forecasts">
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <field name="period_id1" widget="selection"/>
+                    <newline/>
+                    <field name="warehouse_id1" domain = "[('company_id','=',company_id)] "/>
+                    <newline/>
+                    <field name="product_categ_id1" widget="selection"/>
+                    <newline/>
+                    <field name="copy_forecast"/>
+                    <separator colspan ="4" string="Forecast lines creation"/>
+                    <label  colspan ="4" string="Creates forecast lines for selected warehouse and period. Doesn't duplicate existing lines created by you."/>
+                    <group colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" name="create_forecast" string="Create Forecasts" type="object" />
+                    </group>         
+                </form>
+            </field>
+        </record>      
+
+        <record id="action_stock_sale_forecast_createlines_form" model="ir.actions.act_window">
+            <field name="name">Create Stock and Sales Forecasts</field>
+            <field name="res_model">stock.sale.forecast.createlines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_sale_forecast_createlines_form"/>
+            <field name="target">new</field>
+        </record>
+        
+        <menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" parent="base.menu_base_partner"/>
+        
+        <menuitem id="menu_stock_sale_forecast_createlines" name="Create Stock and Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
+
+        <record id="view_stock_sale_forecast_form" model="ir.ui.view">
+            <field name="name">stock.sale.forecast.form</field>
+            <field name="model">stock.sale.forecast</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock and Sales Forecast">
+                    <group colspan = "4" col = "4">
+		        <group colspan = "2" col="2" >
+                            <field name="company_id" select="1" 
+                                        groups="base.group_multi_company" 
+                                        widget="selection" 
+                                        on_change="onchange_company(company_id)"/>
+                            <field name="warehouse_id" select="1" domain = "[('company_id','=',company_id)] "/>
+                            <field name="period_id" select="1" />
+                            <field name="product_id" select="1" on_change="product_id_change(product_id)" />
+			    <field name="product_uom_categ"  invisible = "True"/>
+			    <field name="product_uos_categ"  invisible = "True"/>
+                            <field name="product_uom"  
+                                         domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
+                                         on_change = "onchange_uom(product_uom, product_qty, active_uom)"/>
+                            <field name="active_uom" invisible = "True" />  
+		         </group>
+		         <group colspan = "2" col="2" >
+                            <field name="user_id"/>
+                            <field name="product_amt" on_change="product_amt_change( product_amt, product_uom)" />
+                            <field name="product_qty"  />
+                            <field name="state"/>
+                            <button name="action_validate" string="Validate" states="draft" type="object" colspan = "2"/>
+		        </group>
+                    </group>
+                    <separator colspan ="4" string="Sales history"/>
+                    <group colspan = "4" col = "5"> 
+                        <label string = " "/>
+                        <label string = "Per User :"/>
+                        <label string = "Per Department :"/>
+                        <label string = "Per Warehouse :"/>
+                        <label string = "Per Company :"/>
+                        <label string = "Periods :"/>
+                        <field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
+                        <field name="analyzed_dept_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />
+                        <field name="analyzed_warehouse_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />
+                        <group colspan = "1" col = "2"> 
+                            <field name = "analyze_company"/>
+                        </group>
+                        <field name = "analyzed_period1_id" nolabel = "1"  />
+                        <field name = "analyzed_period1_per_user" nolabel = "1" />
+                        <field name = "analyzed_period1_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period1_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period1_per_company" nolabel = "1"/>
+                        <field name = "analyzed_period2_id" nolabel = "1" />
+                        <field name = "analyzed_period2_per_user" nolabel = "1" />
+                        <field name = "analyzed_period2_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period2_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period2_per_company" nolabel = "1" />
+                        <field name = "analyzed_period3_id" nolabel = "1"/>
+                        <field name = "analyzed_period3_per_user" nolabel = "1" />
+                        <field name = "analyzed_period3_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period3_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period3_per_company" nolabel = "1" />
+                        <field name = "analyzed_period4_id" nolabel = "1" />
+                        <field name = "analyzed_period4_per_user" nolabel = "1" />
+                        <field name = "analyzed_period4_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period4_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period4_per_company" nolabel = "1" />
+                        <field name = "analyzed_period5_id" nolabel = "1" />
+                        <field name = "analyzed_period5_per_user" nolabel = "1" />
+                        <field name = "analyzed_period5_per_dept" nolabel = "1" />
+                        <field name = "analyzed_period5_per_warehouse" nolabel = "1" />
+                        <field name = "analyzed_period5_per_company" nolabel = "1" />
+                        <button name="calculate_sales_history" icon="gtk-execute" 
+                                string="Calculate Sales History" type="object" colspan = "1" states="draft" />
+                    </group>
+
+                </form>
+            </field>
+        </record>
+        
+        <record id="view_stock_sale_forecast_tree" model="ir.ui.view">
+             <field name="name">stock.sale.forecast.tree</field>
+            <field name="model">stock.sale.forecast</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock and Sales Forecasts" editable="bottom">
+                    <field name="warehouse_id" select="1"/>
+                    <field name="user_id"/>
+                    <field name="period_id" select="1"/>
+                    <field name="product_id" on_change="product_id_change(product_id)" />
+                    <field name="product_qty"/>
+                    <field name="product_uom" />
+                </tree>
+            </field>
+        </record>
+        
+       <record id="view_stock_sale_forecast_graph" model="ir.ui.view">
+             <field name="name">stock.sale.forecast.graph</field>
+            <field name="model">stock.sale.forecast</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Stock and Sales Forecast" type = "bar">
+                    <field name="period_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_id"/>
+                </graph>
+            </field>
+        </record>
+
+
+       <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
+            <field name="name">stock.sale.forecast.list.select</field>
+            <field name="model">stock.sale.forecast</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Stock and Sales Forecast">
+                 <group col='10' colspan='4'>
+                    <filter icon="terp-purchase" string="Validated" domain="[('state','=','validated')]" separator="1"/>
+                    <field name="company_id" select="1" widget="selection"/>
+                    <field name="warehouse_id" select="1" widget="selection"/>
+                    <field name="period_id" select="1" widget="selection"/>
+                    <field name="product_id" select="1" widget="selection"/>
+                    <field name="create_uid" select="1" widget="selection">
+                        <filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Forecasts"/>
+                    </field>
+                </group>
+              </search>
+            </field>
+        </record>
+
+        
+        <record id="action_view_stock_sale_forecast_form" model="ir.actions.act_window">
+            <field name="name">Stock and Sales Forecast</field>
+            <field name="res_model">stock.sale.forecast</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="search_view_id" ref="view_stock_sale_forecast_filter"/>
+        </record>
+        
+        <menuitem id="menu_stock_sale_forecast_all" 
+                  name="Stock and Sales Forecasts" 
+                  parent="menu_stock_sale_forecast" 
+                  action="action_view_stock_sale_forecast_form"/>
+        
+<!-- Create Planning section -->
+
+        <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root"/>
+
+       <record id="view_stock_planning_createlines_form" model="ir.ui.view">
+            <field name="name">stock.planning.createlines.form</field>
+            <field name="model">stock.planning.createlines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock Planning">                            
+		    <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="period_id2" widget="selection"/>
+                    <newline/>
+                    <field name="warehouse_id2" domain = "[('company_id','=',company_id)] "/>
+                    <newline/>
+                    <field name="forecasted_products"/>
+                    <newline/>
+                    <field name="product_categ_id2" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
+                    <separator colspan ="4" string="Stock planning lines creation"/>
+                    <label  colspan ="4" string="Creates planning lines for selected period and warehouse. Doesn't duplicate existing lines created by you."/>
+                    <group colspan="4">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="create_planning" string="Create Stock Planning" type="object"/>
+                    </group>         
+                </form>
+            </field>
+        </record>      
+
+        <record id="action_stock_planning_createlines_form" model="ir.actions.act_window">
+            <field name="name">Create Stock Planning Lines</field>
+            <field name="res_model">stock.planning.createlines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_planning_createlines_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            id="menu_stock_planning_createlines" 
+            parent="menu_stock_planning_main"
+            action="action_stock_planning_createlines_form" sequence = "5"/>
+
+<!-- Planning section -->
+
+        <record id="view_stock_planning_form" model="ir.ui.view">
+            <field name="name">stock.planning.form</field>
+            <field name="model">stock.planning</field>
+            <field name="type">form</field>
+            <field name="priority">50</field>
+            <field name="arch" type="xml">
+                <form string="Stock Planning">
+                    <group colspan="4" col="7">
+                        <group colspan ="3" col="2">
+                            <separator colspan ="2" string = "General Info"/>
+
+                            <field name="company_id" select = "1" widget= "selection" 
+                                         on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                            <field name="warehouse_id" select="1" domain = "[('company_id','=',company_id)] " />
+                            <field name="period_id" select="1"  />
+                            <field name="product_id" on_change="product_id_change(product_id)"  />
+			    <field name="product_uom_categ"  invisible = "True"/>
+			    <field name="product_uos_categ"  invisible = "True"/>
+                            <field name="product_uom"  
+                                         domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
+                                         on_change = "onchange_uom(product_uom)"/>
+<!--                            <field name="state"/>    -->
+                            <separator colspan ="2" string = "Forecasts"/>
+                            <field name="warehouse_forecast"/>
+                            <field name="company_forecast"/>
+                            <field name="confirmed_forecasts_only"/>
+
+
+                        </group>
+                        <group colspan ="2" col="2">
+                            <separator colspan ="2" string = "Current Period Situation"/>
+                            <field name="stock_start"/>
+                            <field name="already_out"/>
+                            <field name="already_in"/>
+                            <separator colspan ="2" string = "Planning and Situation for Calculated Period"/>
+                            <field name="planned_outgoing"/>
+                            <field name="outgoing"/>
+                            <field name="outgoing_left"/>
+                            <field name="to_procure"/>
+                            <field name="incoming"/>
+                            <field name="incoming_left"/>
+                            <button name="calculate_planning" string="Calculate Planning" type="object" colspan="2"/>
+                            <field name="stock_only"/> 
+                        </group>
+                        <group colspan ="2" col="2">
+                            <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
+                            <field name="minimum_op"/>
+                            <field name="maximum_op"/>
+                            <separator colspan ="2" string = "Calculated Period Simulation"/>
+                            <field name="outgoing_before"/>
+                            <field name="incoming_before"/>
+                            <field name="stock_simulation"/> 
+                            <button name="procure_incomming_left" string="Procure Incoming Left" type="object" colspan="2"/>
+                            <field name="procure_to_stock"/> 
+                            <separator colspan ="2" string = "Internal Supply"/>
+			    <button name="internal_supply" string="Supply from Another Warehouse" type="object" colspan="2"/>
+                            <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/> 
+                            <field name="stock_supply_location"/> 
+                        </group>
+                    </group>
+                    <separator colspan ="4" string = "Requisition history"/>
+                    <field name = "history" colspan = "2" nolabel = "1"/>
+                </form>
+            </field>
+        </record>
+
+       <record id="view_stock_planning_filter" model="ir.ui.view">
+            <field name="name">stock.planning.list.select</field>
+            <field name="model">stock.planning</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Stock Planning">
+                 <group col='10' colspan='4'>
+<!--  Doesn't work !       <filter icon="terp-purchase" string="Current" domain="[('line_time','=','Future')]" separator="1"/>  -->
+                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" separator="1"/>
+                    <field name="company_id" select="1" widget="selection"/>
+                    <field name="warehouse_id" select="1" widget="selection"/>
+                    <field name="period_id" select="1" widget="selection"/>
+                    <field name="product_id" select="1" widget="selection"/>
+                 </group>
+              </search>
+            </field>
+        </record>
+
+
+        <record id="view_stock_planning_tree" model="ir.ui.view">
+             <field name="name">stock.planning.tree</field>
+            <field name="model">stock.planning</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Master Procurement Schedule" colors ="blue:line_time=='Past';black:line_time=='Future'">
+                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
+                    <field name="period_id"/>
+                    <field name="product_id" on_change="product_id_change(product_id)" />
+                    <field name="product_uom"/>
+                    <field name="warehouse_forecast" string="Forecast"/>
+                    <field name="planned_outgoing"/>
+                    <field name="to_procure"/>
+                    <field name="stock_simulation" string="Stock"/>   <!-- previously stock_start -->
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_view_stock_planning_form" model="ir.actions.act_window">
+            <field name="name">Master Procurement Schedule</field>
+            <field name="res_model">stock.planning</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_stock_planning_filter"/>
+        </record>
+
+        <menuitem
+            id="menu_stock_planning" 
+            parent="menu_stock_planning_main"
+            action="action_view_stock_planning_form"/>
+        
+</data>
+</openerp>
diff --git a/addons/subscription/i18n/ar.po b/addons/subscription/i18n/ar.po
index 4f55e149285..46d0bd6551f 100644
--- a/addons/subscription/i18n/ar.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/bg.po b/addons/subscription/i18n/bg.po
index 367c5e46370..14f221cfbe8 100644
--- a/addons/subscription/i18n/bg.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/bs.po b/addons/subscription/i18n/bs.po
index 08b7bf044d4..020ef4a6f59 100644
--- a/addons/subscription/i18n/bs.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ca.po b/addons/subscription/i18n/ca.po
index df25d5c1a89..3a10a448e03 100644
--- a/addons/subscription/i18n/ca.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/cs.po b/addons/subscription/i18n/cs.po
index d17ce4081dd..1c0ca78dee2 100644
--- a/addons/subscription/i18n/cs.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index 7a9fff10d6d..c29e3335df3 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index 5587b092782..ef23ab3e09f 100644
--- a/addons/subscription/i18n/es.po
+++ b/addons/subscription/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:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/es_AR.po b/addons/subscription/i18n/es_AR.po
index e2afe2f4412..d4f21844b13 100644
--- a/addons/subscription/i18n/es_AR.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/subscription/i18n/et.po b/addons/subscription/i18n/et.po
index ab615f72dd1..c4954fbf6ae 100644
--- a/addons/subscription/i18n/et.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index 1acc2b8f4cb..785fa4b877d 100644
--- a/addons/subscription/i18n/fr.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/hr.po b/addons/subscription/i18n/hr.po
index 4f55e149285..46d0bd6551f 100644
--- a/addons/subscription/i18n/hr.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/hu.po b/addons/subscription/i18n/hu.po
index 4f55e149285..46d0bd6551f 100644
--- a/addons/subscription/i18n/hu.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/id.po b/addons/subscription/i18n/id.po
index 2e4ee72e5c2..1d1ec68997a 100644
--- a/addons/subscription/i18n/id.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index fe7a60147d2..2222a48bc93 100644
--- a/addons/subscription/i18n/it.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ko.po b/addons/subscription/i18n/ko.po
index 78c6dea2642..cc8f3ca3833 100644
--- a/addons/subscription/i18n/ko.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/lt.po b/addons/subscription/i18n/lt.po
index 0fb8b789279..c84d38d2c23 100644
--- a/addons/subscription/i18n/lt.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/nl.po b/addons/subscription/i18n/nl.po
index 65d7fc71665..5273f53f2fd 100644
--- a/addons/subscription/i18n/nl.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/nl_BE.po b/addons/subscription/i18n/nl_BE.po
index 9e81decb88f..e6ed1aa89d8 100644
--- a/addons/subscription/i18n/nl_BE.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 8bcafd398eb..8c78b77dd9b 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index 91705565c51..3ed8c333aeb 100644
--- a/addons/subscription/i18n/pt.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/pt_BR.po b/addons/subscription/i18n/pt_BR.po
index 502b5808cb6..36422d387ec 100644
--- a/addons/subscription/i18n/pt_BR.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/subscription/i18n/ro.po b/addons/subscription/i18n/ro.po
index 4f55e149285..46d0bd6551f 100644
--- a/addons/subscription/i18n/ro.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po
index bc2d547d3d1..347503d70b8 100644
--- a/addons/subscription/i18n/ru.po
+++ b/addons/subscription/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:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/sl.po b/addons/subscription/i18n/sl.po
index 8e03d1a6f73..ce2e0aa376c 100644
--- a/addons/subscription/i18n/sl.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/subscription/i18n/sv.po b/addons/subscription/i18n/sv.po
index 34e9a07674e..cefe94a4401 100644
--- a/addons/subscription/i18n/sv.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/subscription/i18n/tlh.po b/addons/subscription/i18n/tlh.po
index 9408e5aa13d..e99e78d0806 100644
--- a/addons/subscription/i18n/tlh.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 64268228bd5..3a552a0f454 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/subscription/i18n/uk.po b/addons/subscription/i18n/uk.po
index f6037871f99..1958caf7aad 100644
--- a/addons/subscription/i18n/uk.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index fb0dd99e2a3..cb49e2c72d2 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -4,34 +4,34 @@
 #
 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-16 17:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 10:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
 #: field:subscription.subscription.history,document_id:0
 msgid "Source Document"
-msgstr "源单据"
+msgstr "源文档"
 
 #. module: subscription
 #: field:subscription.document,model:0
 msgid "Object"
-msgstr ""
+msgstr "对象"
 
 #. module: subscription
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -41,47 +41,47 @@ msgstr "首次日期"
 #. module: subscription
 #: field:subscription.document.fields,field:0
 msgid "Field"
-msgstr "字段名称"
+msgstr "字段"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
 msgid "Subscription history"
-msgstr ""
+msgstr "预订历史"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "Current Date"
-msgstr ""
+msgstr "当前日期"
 
 #. module: subscription
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "这动作定义中无效的模块名"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
-msgstr ""
+msgstr "周"
 
 #. module: subscription
 #: field:subscription.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 msgid "Subscription document fields"
-msgstr ""
+msgstr "预订文档字段"
 
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
 msgid "Interval Qty"
-msgstr "号码间隔"
+msgstr "间隔数量"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -91,23 +91,23 @@ msgstr "停止"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Set to Draft"
-msgstr "报送单据"
+msgstr "设为草稿"
 
 #. module: subscription
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
-msgstr ""
+msgstr "模块允许创建新的文档和在文档增加预订"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "运行"
 
 #. module: subscription
 #: view:subscription.subscription.history:0
 msgid "Subscription History"
-msgstr "多次订货历史"
+msgstr "预订历史"
 
 #. module: subscription
 #: field:subscription.subscription,user_id:0
@@ -117,7 +117,7 @@ msgstr "用户"
 #. module: subscription
 #: field:subscription.subscription,interval_type:0
 msgid "Interval Unit"
-msgstr "单位间隔"
+msgstr "间隔单位"
 
 #. module: subscription
 #: field:subscription.subscription.history,date:0
@@ -132,17 +132,17 @@ msgstr "设置"
 #. module: subscription
 #: field:subscription.subscription,exec_init:0
 msgid "Number of documents"
-msgstr "呼入号码"
+msgstr "文档号码"
 
 #. module: subscription
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: subscription
 #: field:subscription.document,name:0
@@ -158,32 +158,32 @@ msgstr "字段"
 #. module: subscription
 #: field:subscription.subscription,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Months"
-msgstr ""
+msgstr "月"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Days"
-msgstr ""
+msgstr "日"
 
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr ""
+msgstr "预定和经常性操作"
 
 #. module: subscription
 #: field:subscription.subscription,active:0
 msgid "Active"
-msgstr "活动的"
+msgstr "有效"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 msgid "Subscription document"
-msgstr ""
+msgstr "预订文档"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -194,28 +194,28 @@ msgstr "定时作业"
 #: model:ir.model,name:subscription.model_subscription_subscription
 #: field:subscription.subscription.history,subscription_id:0
 msgid "Subscription"
-msgstr ""
+msgstr "预订"
 
 #. module: subscription
 #: field:subscription.subscription,partner_id:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "业务伙伴"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Subsription Data"
-msgstr "多次订货数据"
+msgstr "预订数据"
 
 #. module: subscription
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
 msgid "Subscription Document"
-msgstr "多次订货文档"
+msgstr "预订文档"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "False"
-msgstr ""
+msgstr "假"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -226,34 +226,34 @@ msgstr "处理"
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
 #: model:ir.ui.menu,name:subscription.menu_action_subscription_form
 msgid "All Subscriptions"
-msgstr ""
+msgstr "所有预订"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.next_id_45
 #: view:subscription.subscription:0
 msgid "Subscriptions"
-msgstr "多次订货"
+msgstr "预订"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
 #: model:ir.ui.menu,name:subscription.menu_action_document_form
 msgid "Document Types"
-msgstr "单据类型"
+msgstr "文档类型"
 
 #. module: subscription
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr "多次订货文档字段"
+msgstr "预订文档字段"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: subscription
 #: field:subscription.document.fields,value:0
@@ -269,4 +269,4 @@ msgstr "文档已建立"
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "工具"
diff --git a/addons/subscription/i18n/zh_TW.po b/addons/subscription/i18n/zh_TW.po
index 3d4e05242b7..c2af7106b97 100644
--- a/addons/subscription/i18n/zh_TW.po
+++ b/addons/subscription/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: subscription
diff --git a/addons/survey/i18n/bg.po b/addons/survey/i18n/bg.po
index 63a975b87dd..568151620ea 100644
--- a/addons/survey/i18n/bg.po
+++ b/addons/survey/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: survey
diff --git a/addons/survey/i18n/cs.po b/addons/survey/i18n/cs.po
index 0270dd40854..d29b616d5f9 100644
--- a/addons/survey/i18n/cs.po
+++ b/addons/survey/i18n/cs.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: survey
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
new file mode 100644
index 00000000000..558afcd8aea
--- /dev/null
+++ b/addons/survey/i18n/de.po
@@ -0,0 +1,697 @@
+# German 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 <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:01+0000\n"
+"PO-Revision-Date: 2010-03-31 21:32+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_form
+msgid "Surveys"
+msgstr "Umfragen"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey
+msgid "Survey Analysis Report"
+msgstr "Umfrage Analyse Report"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.ui.menu,name:survey.menu_survey_question_form1
+msgid "Survey Questions"
+msgstr "Umfrage Fragen"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.response:0
+msgid "Set to draft"
+msgstr "Setze auf Entwurf"
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "Startdatum"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "Historie"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail:0
+msgid "Body"
+msgstr "Hauptteil"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Give Survey Response"
+msgstr "Gib Umfrage Antworten"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "All Questions"
+msgstr "Alle Fragen"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "Umfrage Start Datum"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr "survey.name.wiz"
+
+#. module: survey
+#: view:survey:0
+msgid "Users Details"
+msgstr "Benutzer Details"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "Umfrage Frage"
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one response per user"
+msgstr "Setze auf eins, wenn nur eine Antwort je Benutzer benötigt wird"
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "Seitentitel"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "Umfrage Geschichte"
+
+#. module: survey
+#: field:survey.response,comment:0
+#: field:survey.response.answer,comment:0
+msgid "Notes"
+msgstr "Bemerkung"
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Response"
+msgstr "Gesamt Antworten"
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "Ihre Mitteilung"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "Kommentarfeld erlauben"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Warnung!"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr "Setze Erinnerung für bestehend Benutzer"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
+msgid "New Survey Question"
+msgstr "Neue Umfrage Frage"
+
+#. module: survey
+#: view:survey.response:0
+msgid "Skip"
+msgstr "Überspringe"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,partner_ids:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_subject:0
+#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
+msgid "Subject"
+msgstr "Betrifft"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Response Limit"
+msgstr "Maximale Anworten Grenze"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_from:0
+msgid "From"
+msgstr "Von"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Response Type"
+msgstr "Antwort Typ"
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr "Seite Übertragung"
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.response,question_id:0
+msgid "Question"
+msgstr "Frage"
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,init,send:0
+msgid "Send"
+msgstr "Absenden"
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Response"
+msgstr "# Antwort"
+
+#. module: survey
+#: field:survey.response,response_answer_ids:0
+msgid "Response Answer"
+msgstr "Antwort"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Summary"
+msgstr "Antwort Zusammenfassung"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail:0
+msgid "Send mail for new user"
+msgstr "Mail an neuen Benutzer senden"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fehler !"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Skipped Question"
+msgstr "Übersprungene Frage"
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,send,end:0
+msgid "_Ok"
+msgstr "_OK"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr "Link"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_config
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr "survey.question.wiz"
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML Code für diese Ansicht!"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.response.answer:0
+msgid "Survey Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Page :-"
+msgstr "Seite :-"
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Response per User"
+msgstr "Maximale Antworten je Benutzer"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Started Survey :-"
+msgstr "Gesamt gestartete Umfrage :-"
+
+#. module: survey
+#: view:survey.response:0
+msgid "Comment"
+msgstr "Kommentar"
+
+#. module: survey
+#: field:survey.response,date_modify:0
+msgid "Modify Date"
+msgstr "Datum ändern"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Answered Question"
+msgstr "Beantwortete Frage"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr "Sie können diese Umfrage nicht öfter als %s Mal beantworten"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr "Manuell"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+msgid "All Surveys"
+msgstr "Alle Umfragen"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,users:0
+msgid "Users"
+msgstr "Benutzer"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Message"
+msgstr "Nachricht"
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr "Seitennummer"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,send,note:0
+msgid "Log"
+msgstr "Protokoll"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "All Survey Questions"
+msgstr "Alle Umfrage Fragen"
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr "Umfrage Enddatum"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr "Start"
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.response,state:0
+msgid "Draft"
+msgstr "Entwurf"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "Abgeschlossen"
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.response.answer,answer_id:0
+msgid "Answer"
+msgstr "Antwort"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+msgid "All Survey Pages"
+msgstr "Alle Umfrage Seiten"
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr "Speichere Antwort"
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr "Umfrage Modul"
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveing. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr "Umfrage Details"
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Required Answer"
+msgstr "zwingend notwendige Anwort"
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: field:survey.response,response_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr "Gruppen"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,response_ids:0
+#: view:survey.response:0
+#: field:survey.response.answer,response_id:0
+msgid "Response"
+msgstr "Antwort"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_form1
+#: model:ir.ui.menu,name:survey.menu_new_survey_form
+msgid "New Survey"
+msgstr "Neue Umfrage"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.main_menu_survey
+msgid "Survey Management"
+msgstr "Umfrage Management"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Skiped"
+msgstr "Übersprungen"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: view:survey.answer:0
+msgid "Survey Answer"
+msgstr "Umfrage Antwort"
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "Attention!"
+msgstr "Achtung!"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey
+#: view:res.users:0
+#: view:survey:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: field:survey.page,survey_id:0
+#: field:survey.question,survey:0
+msgid "Survey"
+msgstr "Umfrage"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Completed Survey :-"
+msgstr "Gesamt abgeschlossene Umfrage :-"
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr "Verlauf"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr "Seq"
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr "Gesamt abgeschlossene Umfrage"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Percentage"
+msgstr "Antwort Prozente"
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr "Anzahl"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Survey Title :-"
+msgstr "Umfrage Titel"
+
+#. module: survey
+#: view:survey.response:0
+msgid "Done"
+msgstr "Fertig"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+#: wizard_button:wizard.send.invitation,init,end:0
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr "Schließen"
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr "Öffnen"
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr "Gesamt gestartete Umfrage"
+
+#. module: survey
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+"beinhalten"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+#: view:survey.response:0
+msgid "Survey Response"
+msgstr "Umfrage Antwort"
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr "# Mittel"
+
+#. module: survey
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr "Verantwortlich"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Answered"
+msgstr "Beantwortet"
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr "Andere"
+
+#. module: survey
+#: model:ir.actions.wizard,name:survey.wizard_send_invitation
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Send Invitation"
+msgstr "Einladung verschicken"
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr "Umfragetitel"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "%"
+msgstr "%"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr "Auswahl Umfrage"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
+msgid "New Survey Page"
+msgstr "Neue Umfrage Seite"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr "Umfrage Seite"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Survey Answers"
+msgstr "Umfrage Antworten"
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr "# Fragen"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Que:"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+msgid "Page"
+msgstr "Seite"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "User creation"
+msgstr "Benutzer anlegen"
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.page,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr "Sequenz"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "Results :"
+msgstr "Ergebnisse:"
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr "%s Umfrage ist nicht im Status Offen"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Select Partner"
+msgstr "Wähle Partner"
+
+#. module: survey
+#: field:survey.response,date_create:0
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+msgid "Survey Pages"
+msgstr "Umfrage Seiten"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Count"
+msgstr "Umfrage Anzahl"
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr "Seitenposition"
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index ed11a524062..b03acba3435 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -2,20 +2,21 @@
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 06:01+0000\n"
-"PO-Revision-Date: 2010-03-03 09:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian <hr@li.org>\n"
+"PO-Revision-Date: 2010-03-22 00:56+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_survey_form
@@ -25,65 +26,65 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey
 msgid "Survey Analysis Report"
-msgstr ""
+msgstr "Izvještaj po analizi Upitnika"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_page_question
 #: model:ir.ui.menu,name:survey.menu_survey_question_form1
 msgid "Survey Questions"
-msgstr ""
+msgstr "Pitanja Upitnika"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.response:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Vrati na Nacrt"
 
 #. module: survey
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: survey
 #: field:survey.history,date:0
 msgid "Date started"
-msgstr ""
+msgstr "Datum započinjanja"
 
 #. module: survey
 #: field:survey,history:0
 msgid "History Lines"
-msgstr ""
+msgstr "Povijesni niz"
 
 #. module: survey
 #: wizard_field:wizard.send.invitation,init,mail:0
 msgid "Body"
-msgstr ""
+msgstr "Tijelo"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
 #: model:ir.ui.menu,name:survey.menu_run_survey_form
 msgid "Give Survey Response"
-msgstr ""
+msgstr "Give Survey Response"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_question
 msgid "All Questions"
-msgstr ""
+msgstr "Sva Pitanja"
 
 #. module: survey
 #: field:survey,date_open:0
 msgid "Survey Open Date"
-msgstr ""
+msgstr "Datum otvaranja Upitnika"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_name_wiz
 msgid "survey.name.wiz"
-msgstr ""
+msgstr "survey.name.wiz"
 
 #. module: survey
 #: view:survey:0
 msgid "Users Details"
-msgstr ""
+msgstr "Detalji o Korisnicima"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_question_message
@@ -92,102 +93,102 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Survey Question"
-msgstr ""
+msgstr "Pitanja Upitnika"
 
 #. module: survey
 #: help:survey,response_user:0
 msgid "Set to one if  you require only one response per user"
-msgstr ""
+msgstr "Postavite na jedan, ako tražite samo jedan odgovor korisnika"
 
 #. module: survey
 #: field:survey.page,title:0
 msgid "Page Title"
-msgstr ""
+msgstr "Naslov stranice"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_history
 msgid "Survey History"
-msgstr ""
+msgstr "Povijest Upitnika"
 
 #. module: survey
 #: field:survey.response,comment:0
 #: field:survey.response.answer,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: survey
 #: field:survey.question,tot_resp:0
 msgid "Total Response"
-msgstr ""
+msgstr "Ukupni odaziv"
 
 #. module: survey
 #: view:survey.question.wiz:0
 msgid "Your Messages"
-msgstr ""
+msgstr "Vaše poruke"
 
 #. module: survey
 #: selection:survey,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazan"
 
 #. module: survey
 #: field:survey.question,allow_comment:0
 msgid "Allow Comment Field"
-msgstr ""
+msgstr "Dopustite polje upisa Komentara"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Upozorenje!"
 
 #. module: survey
 #: wizard_view:wizard.send.invitation,init:0
 #: wizard_field:wizard.send.invitation,init,send_mail_existing:0
 msgid "Send reminder for existing user"
-msgstr ""
+msgstr "Pošalji podsjetnik postojećem korisniku"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_new_survey_question_form
 #: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
 msgid "New Survey Question"
-msgstr ""
+msgstr "Novo pitanje Upitnika"
 
 #. module: survey
 #: view:survey.response:0
 msgid "Skip"
-msgstr ""
+msgstr "Preskoči"
 
 #. module: survey
 #: wizard_field:wizard.send.invitation,init,partner_ids:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: survey
 #: wizard_field:wizard.send.invitation,init,mail_subject:0
 #: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
 msgid "Subject"
-msgstr ""
+msgstr "Predmet"
 
 #. module: survey
 #: field:survey,max_response_limit:0
 msgid "Maximum Response Limit"
-msgstr ""
+msgstr "Granica maksimalnog odziva"
 
 #. module: survey
 #: wizard_field:wizard.send.invitation,init,mail_from:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: survey
 #: field:survey.response,response_type:0
 msgid "Response Type"
-msgstr ""
+msgstr "Tip odziva"
 
 #. module: survey
 #: field:survey.name.wiz,transfer:0
 msgid "Page Transfer"
-msgstr ""
+msgstr "Prijenos stranice"
 
 #. module: survey
 #: field:survey.answer,question_id:0
@@ -195,116 +196,116 @@ msgstr ""
 #: field:survey.question,question:0
 #: field:survey.response,question_id:0
 msgid "Question"
-msgstr ""
+msgstr "Pitanje"
 
 #. module: survey
 #: wizard_button:wizard.send.invitation,init,send:0
 msgid "Send"
-msgstr ""
+msgstr "Pošalji"
 
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Response"
-msgstr ""
+msgstr "#Response"
 
 #. module: survey
 #: field:survey.response,response_answer_ids:0
 msgid "Response Answer"
-msgstr ""
+msgstr "Odgovor na odaziv"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Response Summary"
-msgstr ""
+msgstr "Sažetak Odziva"
 
 #. module: survey
 #: wizard_view:wizard.send.invitation,init:0
 #: wizard_field:wizard.send.invitation,init,send_mail:0
 msgid "Send mail for new user"
-msgstr ""
+msgstr "Pošalji mail novom korisniku"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Greška !"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Skipped Question"
-msgstr ""
+msgstr "Preskočeno pitanje"
 
 #. module: survey
 #: wizard_button:wizard.send.invitation,send,end:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Ok"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Link"
-msgstr ""
+msgstr "Veza"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_survey_config
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
 msgid "survey.question.wiz"
-msgstr ""
+msgstr "survey.question.wiz"
 
 #. module: survey
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response_answer
 #: view:survey.response.answer:0
 msgid "Survey Response Answer"
-msgstr ""
+msgstr "Odgovor Upitnika"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Page :-"
-msgstr ""
+msgstr "Stranica :-"
 
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Response per User"
-msgstr ""
+msgstr "Maksimalni odaziv po korisniku"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Total Started Survey :-"
-msgstr ""
+msgstr "Ukupno pokrenuto Upitnika :-"
 
 #. module: survey
 #: view:survey.response:0
 msgid "Comment"
-msgstr ""
+msgstr "Komentar"
 
 #. module: survey
 #: field:survey.response,date_modify:0
 msgid "Modify Date"
-msgstr ""
+msgstr "Izmijeni datum"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Answered Question"
-msgstr ""
+msgstr "Odgovoreno pitanje"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "You can not give response for this survey more than %s times"
-msgstr ""
+msgstr "Na ovo pitanje ne možete odgovoriti više od %s puta"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Manually"
-msgstr ""
+msgstr "Manualno"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_form1
@@ -325,38 +326,38 @@ msgstr ""
 #. module: survey
 #: field:survey.name.wiz,page_no:0
 msgid "Page Number"
-msgstr ""
+msgstr "Broj stranice"
 
 #. module: survey
 #: wizard_field:wizard.send.invitation,send,note:0
 msgid "Log"
-msgstr ""
+msgstr "Zapis"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_question_form
 msgid "All Survey Questions"
-msgstr ""
+msgstr "Sva pitanja upitnika"
 
 #. module: survey
 #: field:survey,date_close:0
 msgid "Survey Close Date"
-msgstr ""
+msgstr "Datum zatvaranja Upitnika"
 
 #. module: survey
 #: view:survey.name.wiz:0
 msgid "Start"
-msgstr ""
+msgstr "Početak"
 
 #. module: survey
 #: selection:survey,state:0
 #: selection:survey.response,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: survey
 #: selection:survey,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Zaključen"
 
 #. module: survey
 #: view:survey:0
@@ -366,28 +367,28 @@ msgstr ""
 #: field:survey.question,answer_choice_ids:0
 #: field:survey.response.answer,answer_id:0
 msgid "Answer"
-msgstr ""
+msgstr "Odgovor"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_page_form
 msgid "All Survey Pages"
-msgstr ""
+msgstr "Sve stranice upitnika"
 
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
 msgid "Store Answer"
-msgstr ""
+msgstr "Spremi odgovor"
 
 #. module: survey
 #: field:survey,state:0
 #: field:survey.response,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: survey
 #: model:ir.module.module,shortdesc:survey.module_meta_information
 msgid "Survey Module"
-msgstr ""
+msgstr "Modul Upitnika"
 
 #. module: survey
 #: model:ir.module.module,description:survey.module_meta_information
@@ -403,28 +404,36 @@ msgid ""
 "invitation of the survey\n"
 "    "
 msgstr ""
+"\n"
+"    Ovaj se modul koristi za anketiranje. Ovisi o odgovorima na pitanja i "
+"komentarima korisnika. Upitnik može imati više stranica. Svaka stranica može "
+"sadržavati više raznovrsnih pitanja i svako pitanje dopušta više odgovora. "
+"Različiti korisnici dati će različite odgovore na pitanja i na tome se "
+"zasniva anketiranje. Partnerima se također mailom šalju pozivi na ankete s "
+"korisničkim imenom i zaporkom.\n"
+"    "
 
 #. module: survey
 #: view:survey:0
 #: view:survey.name.wiz:0
 msgid "Survey Details"
-msgstr ""
+msgstr "Detalji Upitnika"
 
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Required Answer"
-msgstr ""
+msgstr "Zahtjevani odgovor"
 
 #. module: survey
 #: field:survey.history,user_id:0
 #: field:survey.response,response_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: survey
 #: field:res.users,survey_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #. module: survey
 #: view:survey:0
@@ -434,35 +443,35 @@ msgstr ""
 #: view:survey.response:0
 #: field:survey.response.answer,response_id:0
 msgid "Response"
-msgstr ""
+msgstr "Odziv"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_new_survey_form1
 #: model:ir.ui.menu,name:survey.menu_new_survey_form
 msgid "New Survey"
-msgstr ""
+msgstr "Novi Upitnik"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.main_menu_survey
 msgid "Survey Management"
-msgstr ""
+msgstr "Upravljanje Anketama"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Skiped"
-msgstr ""
+msgstr "Preskočen"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_answer
 #: view:survey.answer:0
 msgid "Survey Answer"
-msgstr ""
+msgstr "Odgovor Upitnika"
 
 #. module: survey
 #: code:addons/survey/wizard/wizard_survey.py:0
 #, python-format
 msgid "Attention!"
-msgstr ""
+msgstr "Pažnja!"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey
@@ -474,17 +483,17 @@ msgstr ""
 #: field:survey.page,survey_id:0
 #: field:survey.question,survey:0
 msgid "Survey"
-msgstr ""
+msgstr "Upitnik"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Total Completed Survey :-"
-msgstr ""
+msgstr "Ukupno ispunjeno Upitnika :-"
 
 #. module: survey
 #: view:survey:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: survey
 #: view:survey:0
@@ -492,109 +501,110 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Seq"
-msgstr ""
+msgstr "Seq"
 
 #. module: survey
 #: field:survey,tot_comp_survey:0
 msgid "Total Completed Survey"
-msgstr ""
+msgstr "Ukupno ispunjeno Upitnika"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Response Percentage"
-msgstr ""
+msgstr "Postotak odziva"
 
 #. module: survey
 #: field:survey.question.wiz,name:0
 msgid "Number"
-msgstr ""
+msgstr "Broj"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Survey Title :-"
-msgstr ""
+msgstr "Naziv upitnika :-"
 
 #. module: survey
 #: view:survey.response:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
-msgstr ""
+msgstr "'\" + que_rec[0]['question'] + \"' Ovo pitanje zahtijeva odgovor."
 
 #. module: survey
 #: view:survey:0
 #: view:survey.name.wiz:0
 #: wizard_button:wizard.send.invitation,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: survey
 #: view:survey:0
 msgid "Close"
-msgstr ""
+msgstr "Zaključi"
 
 #. module: survey
 #: view:survey:0
 #: selection:survey,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: survey
 #: field:survey,tot_start_survey:0
 msgid "Total Started Survey"
-msgstr ""
+msgstr "Ukupno pokrenuto Upitnika"
 
 #. module: survey
 #: 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: survey
 #: model:ir.model,name:survey.model_survey_response
 #: view:survey.response:0
 msgid "Survey Response"
-msgstr ""
+msgstr "Odziv na Upitnik"
 
 #. module: survey
 #: field:survey.answer,average:0
 msgid "#Avg"
-msgstr ""
+msgstr "#Avg"
 
 #. module: survey
 #: field:survey,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Answered"
-msgstr ""
+msgstr "Odgovoren"
 
 #. module: survey
 #: view:survey:0
 msgid "Other"
-msgstr ""
+msgstr "Drugi"
 
 #. module: survey
 #: model:ir.actions.wizard,name:survey.wizard_send_invitation
 #: wizard_view:wizard.send.invitation,init:0
 msgid "Send Invitation"
-msgstr ""
+msgstr "Poslan poziv"
 
 #. module: survey
 #: field:survey,title:0
 msgid "Survey Title"
-msgstr ""
+msgstr "Naziv Upitnika"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: survey
 #: view:survey:0
@@ -604,92 +614,92 @@ msgstr ""
 #: field:survey.page,note:0
 #: view:survey.response:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: survey
 #: view:survey.name.wiz:0
 msgid "Select Survey"
-msgstr ""
+msgstr "Odaberi Upitnik"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_new_survey_page_form
 #: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
 msgid "New Survey Page"
-msgstr ""
+msgstr "Nova stranica Upitnika"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: field:survey.question,page_id:0
 msgid "Survey Page"
-msgstr ""
+msgstr "Stranica Upitnika"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
 msgid "Survey Answers"
-msgstr ""
+msgstr "Odgovori Upitnika"
 
 #. module: survey
 #: view:survey.page:0
 msgid "#Questions"
-msgstr ""
+msgstr "#Questions"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Que:"
-msgstr ""
+msgstr "Que:"
 
 #. module: survey
 #: field:survey,page_ids:0
 msgid "Page"
-msgstr ""
+msgstr "Stranica"
 
 #. module: survey
 #: wizard_view:wizard.send.invitation,send:0
 msgid "User creation"
-msgstr ""
+msgstr "Kreirao korisnik"
 
 #. module: survey
 #: field:survey.answer,sequence:0
 #: field:survey.page,sequence:0
 #: field:survey.question,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Slijed"
 
 #. module: survey
 #: wizard_view:wizard.send.invitation,send:0
 msgid "Results :"
-msgstr ""
+msgstr "Rezultati :"
 
 #. module: survey
 #: code:addons/survey/wizard/wizard_survey.py:0
 #, python-format
 msgid "%sSurvey is not in open state"
-msgstr ""
+msgstr "%sSurvey is not in open state"
 
 #. module: survey
 #: wizard_view:wizard.send.invitation,init:0
 msgid "Select Partner"
-msgstr ""
+msgstr "Odaberi Partnera"
 
 #. module: survey
 #: field:survey.response,date_create:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
 #: model:ir.model,name:survey.model_survey_page
 #: model:ir.ui.menu,name:survey.menu_survey_page_form1
 msgid "Survey Pages"
-msgstr ""
+msgstr "Stranice Upitnika"
 
 #. module: survey
 #: rml:survey_analysis_report:0
 msgid "Response Count"
-msgstr ""
+msgstr "Broj odziva"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
-msgstr ""
+msgstr "Pozicija stranice"
diff --git a/addons/survey/i18n/sl.po b/addons/survey/i18n/sl.po
index e8d36ad9426..8cbf8e5e4f4 100644
--- a/addons/survey/i18n/sl.po
+++ b/addons/survey/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: survey
diff --git a/addons/thunderbird/__terp__.py b/addons/thunderbird/__terp__.py
index 8ebe6b80b10..1b7c752d1b1 100644
--- a/addons/thunderbird/__terp__.py
+++ b/addons/thunderbird/__terp__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -53,6 +53,17 @@
 	"website" : "http://www.axelor.com/",
 	"depends" : ["base","crm"],
 	"category" : "Generic Modules/Thunderbird interface",
+	"description": '''
+                  This module is required for the thuderbird plug-in to work
+                  properly.
+
+                  This allows you to select an object that you’d like to add
+                  to your email and its attachments. You can select a partner, a task,
+                  a project, an analytical account, or any other object and attach selected
+                  mail as .eml file in attachment of selected record.
+
+                  You can create new case in crm using Create Case button.
+                  Select a section for which you want to create case.''',
 	"init_xml" : [],
 	"demo_xml" : [],
 	"update_xml" : ['security/ir.model.access.csv'],
diff --git a/addons/thunderbird/i18n/bg.po b/addons/thunderbird/i18n/bg.po
index a1b364c913b..a59aabd1beb 100644
--- a/addons/thunderbird/i18n/bg.po
+++ b/addons/thunderbird/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:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/cs.po b/addons/thunderbird/i18n/cs.po
index e17ec9b9657..eb1074d839c 100644
--- a/addons/thunderbird/i18n/cs.po
+++ b/addons/thunderbird/i18n/cs.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: thunderbird
diff --git a/addons/thunderbird/i18n/de.po b/addons/thunderbird/i18n/de.po
index e4d235c0ccd..856d454c6a9 100644
--- a/addons/thunderbird/i18n/de.po
+++ b/addons/thunderbird/i18n/de.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: thunderbird
diff --git a/addons/thunderbird/i18n/fr.po b/addons/thunderbird/i18n/fr.po
index 66f636308af..39c8a736fcf 100644
--- a/addons/thunderbird/i18n/fr.po
+++ b/addons/thunderbird/i18n/fr.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: thunderbird
diff --git a/addons/thunderbird/i18n/hr.po b/addons/thunderbird/i18n/hr.po
index 39d67c85bba..af3f235b175 100644
--- a/addons/thunderbird/i18n/hr.po
+++ b/addons/thunderbird/i18n/hr.po
@@ -2,20 +2,21 @@
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 06:05+0000\n"
-"PO-Revision-Date: 2010-03-03 09:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian <hr@li.org>\n"
+"PO-Revision-Date: 2010-03-21 23:36+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,copy_to:0
@@ -27,59 +28,60 @@ msgstr ""
 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: thunderbird
 #: field:tinythunderbird.partner,description:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,reference:0
 msgid "Reference"
-msgstr ""
+msgstr "Referenca"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_tinythunderbird_partner
 msgid "Thunderbid mails"
-msgstr ""
+msgstr "Thunderbird mailovi"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,attachments:0
 msgid "Attached Files"
-msgstr ""
+msgstr "Datoteke u privitku"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,res_user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,receiver:0
 msgid "Receiver"
-msgstr ""
+msgstr "Primatelj"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,title:0
 msgid "Subject"
-msgstr ""
+msgstr "Predmet"
 
 #. module: thunderbird
 #: code:addons/thunderbird/partner/partner.py:0
 #, python-format
 msgid "Archive"
-msgstr ""
+msgstr "Arhiv"
 
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
 msgid "Thunderbird Interface"
-msgstr ""
+msgstr "Sučelje Thunderbirda"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,sender:0
 msgid "Sender"
-msgstr ""
+msgstr "Pošiljatelj"
diff --git a/addons/thunderbird/i18n/it.po b/addons/thunderbird/i18n/it.po
index ce6328d25b3..39e2e86b242 100644
--- a/addons/thunderbird/i18n/it.po
+++ b/addons/thunderbird/i18n/it.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: thunderbird
diff --git a/addons/thunderbird/i18n/sk.po b/addons/thunderbird/i18n/sk.po
index b77fb5a7b4f..7d1d794f3ca 100644
--- a/addons/thunderbird/i18n/sk.po
+++ b/addons/thunderbird/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: thunderbird
diff --git a/addons/thunderbird/i18n/sl.po b/addons/thunderbird/i18n/sl.po
index 4982a565c0c..f702babce4c 100644
--- a/addons/thunderbird/i18n/sl.po
+++ b/addons/thunderbird/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:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
old mode 100755
new mode 100644
index 7fb57818c15..57fa5ac8104
Binary files a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ
diff --git a/addons/users_ldap/__terp__.py b/addons/users_ldap/__terp__.py
index ecdbf43d1b1..b4dbfb19a57 100644
--- a/addons/users_ldap/__terp__.py
+++ b/addons/users_ldap/__terp__.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,7 +14,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 <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,7 +23,7 @@
     "version" : "0.1",
     "depends" : ["base"],
     "author" : "Tiny",
-    "description": """Add support for authentication by ldap server""",
+    "description": """Adds support for authentication by ldap server""",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Others",
     "init_xml" : [
diff --git a/addons/warning/i18n/ar.po b/addons/warning/i18n/ar.po
index a2fd0054998..aaeeda4a56f 100644
--- a/addons/warning/i18n/ar.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/bg.po b/addons/warning/i18n/bg.po
index bc5e57c3261..5b2ca53e4ee 100644
--- a/addons/warning/i18n/bg.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/bs.po b/addons/warning/i18n/bs.po
index 67010d8f2f9..68a5ab8fc09 100644
--- a/addons/warning/i18n/bs.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/ca.po b/addons/warning/i18n/ca.po
index 06f710a9f93..905b09f0321 100644
--- a/addons/warning/i18n/ca.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/cs.po b/addons/warning/i18n/cs.po
index ed16fe40353..09a97c9a7cc 100644
--- a/addons/warning/i18n/cs.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/de.po b/addons/warning/i18n/de.po
index 02e20ccc68c..1fb19c7fb83 100644
--- a/addons/warning/i18n/de.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index e50fc18df95..290d1af168c 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/es_AR.po b/addons/warning/i18n/es_AR.po
index 7b8d7fb4825..06c2d7f1923 100644
--- a/addons/warning/i18n/es_AR.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/et.po b/addons/warning/i18n/et.po
index 355ad4c952f..a5249ba1711 100644
--- a/addons/warning/i18n/et.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index 498e7908d2a..8e80f6f8e8a 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index 90c049ccead..50a0669e103 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* warning
-#
+# * warning
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 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-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-22 00:56+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: warning
 #: field:product.product,purchase_line_warn:0
@@ -24,28 +25,28 @@ msgstr ""
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sale Order Line"
-msgstr ""
+msgstr "Poruka za liniju prodaje"
 
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
-msgstr ""
+msgstr "Poruka za liniju dobave"
 
 #. module: warning
 #: field:product.product,sale_line_warn:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Linija prodaje"
 
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
-msgstr ""
+msgstr "Upozorenje kod kupnje ovog proizvoda"
 
 #. module: warning
 #: view:product.product:0
 #: view:res.partner:0
 msgid "Warnings"
-msgstr ""
+msgstr "Upozorenja"
 
 #. module: warning
 #: selection:product.product,sale_line_warn:0
@@ -54,12 +55,12 @@ msgstr ""
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
-msgstr ""
+msgstr "Blokiranje poruke"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Invoice"
-msgstr ""
+msgstr "Upozorenje na račun"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -69,52 +70,52 @@ msgstr ""
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "No Message"
-msgstr ""
+msgstr "Nema poruke"
 
 #. module: warning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
 
 #. module: warning
 #: field:res.partner,invoice_warn:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: warning
 #: model:ir.module.module,shortdesc:warning.module_meta_information
 msgid "Module for Warnings form onchange Event"
-msgstr ""
+msgstr "Module for Warnings form onchange Event"
 
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr ""
+msgstr "Upozorenje kod prodaje ovog proizvoda"
 
 #. module: warning
 #: field:res.partner,sale_warn:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Prodajna narudžba"
 
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
-msgstr ""
+msgstr "Preuzimanje zaliha"
 
 #. module: warning
 #: field:res.partner,purchase_warn:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Kupovna narudžba"
 
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
 msgid "Message for Sale Order"
-msgstr ""
+msgstr "Poruka uz Prodajnu narudžnu"
 
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
-msgstr ""
+msgstr "Prodaja uz kupovnu narudžbu"
 
 #. module: warning
 #: help:product.product,purchase_line_warn:0
@@ -128,31 +129,34 @@ msgid ""
 "Selecting \"Blocking Message\" will throw an exception with the message and "
 "block the flow. The Message has to be written in the next field."
 msgstr ""
+"Odabirom opcije \"Upozorenje\" obavijestit ćete korisnika porukom, odabirom "
+"opcije \"Blokiranje poruke\" učinit ćete izuzetak s porukom i blokirati tok. "
+"Poruku treba napisati u slijedećem polju."
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
-msgstr ""
+msgstr "Poruka uz Račun"
 
 #. module: warning
 #: model:ir.module.module,description:warning.module_meta_information
 msgid "Module for Warnings form onchange Event."
-msgstr ""
+msgstr "Module for Warnings form onchange Event."
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr ""
+msgstr "Upozorenje vezano uz preuzimanje"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Purchase Order"
-msgstr ""
+msgstr "Upozorenje vezano uz prodajnu narudžbu"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Sale Order"
-msgstr ""
+msgstr "Upozorenje vezano uz kupovnu narudžbu"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -162,9 +166,9 @@ msgstr ""
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Warning"
-msgstr ""
+msgstr "Upozorenje"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
 msgid "Message for Stock Picking"
-msgstr ""
+msgstr "Poruka uz preuzimanje zaliha"
diff --git a/addons/warning/i18n/hu.po b/addons/warning/i18n/hu.po
index a2fd0054998..aaeeda4a56f 100644
--- a/addons/warning/i18n/hu.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/id.po b/addons/warning/i18n/id.po
index edcea73d231..3018ada01ad 100644
--- a/addons/warning/i18n/id.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/it.po b/addons/warning/i18n/it.po
index dc560a7f430..984bf2639cb 100644
--- a/addons/warning/i18n/it.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/ko.po b/addons/warning/i18n/ko.po
index 402da112e09..8815c527027 100644
--- a/addons/warning/i18n/ko.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/lt.po b/addons/warning/i18n/lt.po
index 90c049ccead..aaeeda4a56f 100644
--- a/addons/warning/i18n/lt.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index b5fa0f01098..e54b9d0ab68 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/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:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/nl_BE.po b/addons/warning/i18n/nl_BE.po
index 534683c1773..7d15284b815 100644
--- a/addons/warning/i18n/nl_BE.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/pl.po b/addons/warning/i18n/pl.po
index 91418750795..46b3ead4e05 100644
--- a/addons/warning/i18n/pl.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/pt.po b/addons/warning/i18n/pt.po
index e8cf8ef5160..b832115b823 100644
--- a/addons/warning/i18n/pt.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/pt_BR.po b/addons/warning/i18n/pt_BR.po
index a18110b3ce7..09e887755ba 100644
--- a/addons/warning/i18n/pt_BR.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/ro.po b/addons/warning/i18n/ro.po
index 90c049ccead..aaeeda4a56f 100644
--- a/addons/warning/i18n/ro.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index 239c25efd76..d8c6b0608a3 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/sl.po b/addons/warning/i18n/sl.po
index ce37f664236..a414d705c1d 100644
--- a/addons/warning/i18n/sl.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/sr.po b/addons/warning/i18n/sr.po
index 999fac89158..e7bf35ad8bb 100644
--- a/addons/warning/i18n/sr.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/sv.po b/addons/warning/i18n/sv.po
index ed3927e5b3c..7f73b49b5cc 100644
--- a/addons/warning/i18n/sv.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/tlh.po b/addons/warning/i18n/tlh.po
index 70d13f1e323..e35e59a1307 100644
--- a/addons/warning/i18n/tlh.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 85a8f4d4ce6..5d385489c5c 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/uk.po b/addons/warning/i18n/uk.po
index 71ef3589c26..e7ba8899457 100644
--- a/addons/warning/i18n/uk.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index 58649a99590..345acfb6ddc 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 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-12-29 07:33+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -29,7 +29,7 @@ msgstr "销售订单明细信息"
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
-msgstr "销售订单明细信息"
+msgstr "采购订单明细信息"
 
 #. module: warning
 #: field:product.product,sale_line_warn:0
@@ -39,7 +39,7 @@ msgstr "销售订单明细"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
-msgstr "采购该货品时的警示"
+msgstr "采购订单产品警告"
 
 #. module: warning
 #: view:product.product:0
@@ -54,12 +54,12 @@ msgstr "警告"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
-msgstr "封锁消息"
+msgstr "消息"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Invoice"
-msgstr "发票警示"
+msgstr "发票警告"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -69,12 +69,12 @@ msgstr "发票警示"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "No Message"
-msgstr "无消息"
+msgstr "没信息"
 
 #. module: warning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构"
+msgstr "无效XML视图结构!"
 
 #. module: warning
 #: field:res.partner,invoice_warn:0
@@ -84,12 +84,12 @@ msgstr "发票"
 #. module: warning
 #: model:ir.module.module,shortdesc:warning.module_meta_information
 msgid "Module for Warnings form onchange Event"
-msgstr "变更事件警示模块"
+msgstr "变更事件警告模块"
 
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr "销售这货品时警示"
+msgstr "销售这产品时警告"
 
 #. module: warning
 #: field:res.partner,sale_warn:0
@@ -99,7 +99,7 @@ msgstr "销售订单"
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
-msgstr "存货分拣"
+msgstr "仓库领料/提货"
 
 #. module: warning
 #: field:res.partner,purchase_warn:0
@@ -137,17 +137,17 @@ msgstr "发票信息"
 #. module: warning
 #: model:ir.module.module,description:warning.module_meta_information
 msgid "Module for Warnings form onchange Event."
-msgstr "变更事件警示模块"
+msgstr "变更事件警告模块"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr "分拣单警示"
+msgstr "领料/提货警告"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Purchase Order"
-msgstr "采购订单警示"
+msgstr "采购订单警告"
 
 #. module: warning
 #: view:res.partner:0
@@ -162,9 +162,9 @@ msgstr "销售订单警告"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Warning"
-msgstr "警示"
+msgstr "警告"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
 msgid "Message for Stock Picking"
-msgstr "存货分拣单信息"
+msgstr "仓库领料/提货信息"
diff --git a/addons/warning/i18n/zh_TW.po b/addons/warning/i18n/zh_TW.po
index 8141132fa08..1ce105feb61 100644
--- a/addons/warning/i18n/zh_TW.po
+++ b/addons/warning/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:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/ar.po b/addons/wiki/i18n/ar.po
index 9deb4ec1aef..b6f88ca9eee 100644
--- a/addons/wiki/i18n/ar.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/bg.po b/addons/wiki/i18n/bg.po
index 6245a4d5f04..105db7c4f5c 100644
--- a/addons/wiki/i18n/bg.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/bs.po b/addons/wiki/i18n/bs.po
index 56b753ffa05..f583b6bbb30 100644
--- a/addons/wiki/i18n/bs.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/ca.po b/addons/wiki/i18n/ca.po
index a3b9ca761a7..dc8054a8432 100644
--- a/addons/wiki/i18n/ca.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/cs.po b/addons/wiki/i18n/cs.po
index 4c59a829c77..88448113433 100644
--- a/addons/wiki/i18n/cs.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/de.po b/addons/wiki/i18n/de.po
index ffc9492bb52..424d8ca7661 100644
--- a/addons/wiki/i18n/de.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/el.po b/addons/wiki/i18n/el.po
index 7e20308499d..ac59f6a6072 100644
--- a/addons/wiki/i18n/el.po
+++ b/addons/wiki/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/wiki/i18n/es.po b/addons/wiki/i18n/es.po
index 0674132fb89..eb18e52ac4c 100644
--- a/addons/wiki/i18n/es.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/es_AR.po b/addons/wiki/i18n/es_AR.po
index 49ba4fa3edd..c9838d489e1 100644
--- a/addons/wiki/i18n/es_AR.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/et.po b/addons/wiki/i18n/et.po
index 44a3cf5814d..853c69c58f2 100644
--- a/addons/wiki/i18n/et.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/fr.po b/addons/wiki/i18n/fr.po
index 704f6d0ddcc..54c4187ee7e 100644
--- a/addons/wiki/i18n/fr.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/gl.po b/addons/wiki/i18n/gl.po
index 9af8f090e91..25677bff814 100644
--- a/addons/wiki/i18n/gl.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/hr.po b/addons/wiki/i18n/hr.po
index 95dfaf83569..a9afeb6f13c 100644
--- a/addons/wiki/i18n/hr.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/hu.po b/addons/wiki/i18n/hu.po
index 9deb4ec1aef..b6f88ca9eee 100644
--- a/addons/wiki/i18n/hu.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/id.po b/addons/wiki/i18n/id.po
index 08aaf9b3227..74567cb508d 100644
--- a/addons/wiki/i18n/id.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/it.po b/addons/wiki/i18n/it.po
index be45beb9c1b..1ecb685619f 100644
--- a/addons/wiki/i18n/it.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/ko.po b/addons/wiki/i18n/ko.po
index a038cf628de..b84ce100c8d 100644
--- a/addons/wiki/i18n/ko.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/lt.po b/addons/wiki/i18n/lt.po
index 9deb4ec1aef..b6f88ca9eee 100644
--- a/addons/wiki/i18n/lt.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/nl.po b/addons/wiki/i18n/nl.po
index 62c1a6e1209..6a6a4020a7f 100644
--- a/addons/wiki/i18n/nl.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/nl_BE.po b/addons/wiki/i18n/nl_BE.po
index fef85dab6b5..301ef9f752c 100644
--- a/addons/wiki/i18n/nl_BE.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/pl.po b/addons/wiki/i18n/pl.po
index 39ad123be6d..755435a3e98 100644
--- a/addons/wiki/i18n/pl.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/pt.po b/addons/wiki/i18n/pt.po
index ffebb5718c7..ec512f49b46 100644
--- a/addons/wiki/i18n/pt.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/pt_BR.po b/addons/wiki/i18n/pt_BR.po
index 987ab645e15..cffe9339ac5 100644
--- a/addons/wiki/i18n/pt_BR.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/ro.po b/addons/wiki/i18n/ro.po
index 1ac3762d565..968969dba15 100644
--- a/addons/wiki/i18n/ro.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po
index a1dc85074ac..774bf28430d 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/sk.po b/addons/wiki/i18n/sk.po
index feda71820bf..7a85795cd80 100644
--- a/addons/wiki/i18n/sk.po
+++ b/addons/wiki/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:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/sl.po b/addons/wiki/i18n/sl.po
index ca784cb98df..6ef4342cd74 100644
--- a/addons/wiki/i18n/sl.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/sr.po b/addons/wiki/i18n/sr.po
index ae7c20c7b89..a8346aff49b 100644
--- a/addons/wiki/i18n/sr.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/sv.po b/addons/wiki/i18n/sv.po
index ffa8b872f32..65a76434449 100644
--- a/addons/wiki/i18n/sv.po
+++ b/addons/wiki/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-03-09 21:36+0000\n"
-"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/tlh.po b/addons/wiki/i18n/tlh.po
index 0f72804d783..7b5d1e00de6 100644
--- a/addons/wiki/i18n/tlh.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index 3fae1c41c1e..e93af51bbda 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/uk.po b/addons/wiki/i18n/uk.po
index d0c3aab914b..133874e503c 100644
--- a/addons/wiki/i18n/uk.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/zh_CN.po b/addons/wiki/i18n/zh_CN.po
index b5a52badaee..7056e06d5fe 100644
--- a/addons/wiki/i18n/zh_CN.po
+++ b/addons/wiki/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.4\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:54+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:32+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -25,12 +25,12 @@ msgstr "wizard.wiki.history.show_diff"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须是以x_开头并且不能含有特殊字符"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_groups_link
 msgid "Wiki Groups Links"
-msgstr "维基组链接"
+msgstr "Wiki组链接"
 
 #. module: wiki
 #: field:wiki.wiki,create_uid:0
@@ -40,7 +40,7 @@ msgstr "作者"
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_open_page
 msgid "Open Page"
-msgstr "打开维基页"
+msgstr "打开页"
 
 #. module: wiki
 #: field:wiki.groups.link,action_id:0
@@ -50,30 +50,30 @@ msgstr "菜单"
 #. module: wiki
 #: field:wiki.groups,child_ids:0
 msgid "Child Groups"
-msgstr "下级维基组"
+msgstr "子组"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 #: model:ir.actions.act_window,name:wiki.action_wiki
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
 msgid "Wiki Pages"
-msgstr "维基页"
+msgstr "Wiki页"
 
 #. module: wiki
 #: field:wiki.groups,section:0
 msgid "Make Section ?"
-msgstr "生成章节？"
+msgstr "生成分段?"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
 #: view:wiki.wiki.history:0
 msgid "Wiki History"
-msgstr "维基修改历史"
+msgstr "Wiki日志"
 
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr "小改动"
+msgstr "小编辑"
 
 #. module: wiki
 #: field:wiki.wiki,text_area:0
@@ -83,18 +83,18 @@ msgstr "内容"
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document_configuration
 msgid "Wiki Configuration"
-msgstr "维基设置"
+msgstr "Wiki设置"
 
 #. module: wiki
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在动作定义中无效的模块名"
 
 #. module: wiki
 #: field:wiki.groups,name:0
 #: field:wiki.wiki,group_id:0
 msgid "Wiki Group"
-msgstr "维基组"
+msgstr "Wiki组"
 
 #. module: wiki
 #: field:wiki.wiki,name:0
@@ -104,22 +104,22 @@ msgstr "标题"
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr "历史线"
+msgstr "日志明细"
 
 #. module: wiki
 #: field:wiki.groups,template:0
 msgid "Wiki Template"
-msgstr "维基模板"
+msgstr "Wiki模板"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
 msgid "Document Management - Wiki"
-msgstr "文档管理——维基"
+msgstr "文档管理 - Wiki"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Create a Menu"
-msgstr "创建菜单"
+msgstr "创建一菜单"
 
 #. module: wiki
 #: field:wiki.groups,notes:0
@@ -129,37 +129,37 @@ msgstr "描述"
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr "章节"
+msgstr "分段"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "History Differance"
-msgstr "历史差异"
+msgstr "历史递延"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,page:0
 msgid "Group Home Page"
-msgstr "维基组首页"
+msgstr "组首页"
 
 #. module: wiki
 #: field:wiki.wiki,write_uid:0
 msgid "Last Author"
-msgstr "最近的作者"
+msgstr "最后作者"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_view_diff
 msgid "Differences"
-msgstr "差异"
+msgstr "分歧"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr "使用页章节代码如 1.2.1"
+msgstr "用户页段代码如1.2.1"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Page Template"
-msgstr "页面模板"
+msgstr "页模板"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document2
@@ -174,7 +174,7 @@ msgstr "日期"
 #. module: wiki
 #: wizard_view:wiki.make.index,init:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr "想要为选定的页面创建索引吗？ "
+msgstr "想在选择的页创建一索引? "
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -185,17 +185,17 @@ msgstr "设置"
 #: field:wiki.groups,home:0
 #: field:wiki.groups,page_ids:0
 msgid "Pages"
-msgstr "页面"
+msgstr "页"
 
 #. module: wiki
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效的视图结构xml文件"
 
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
 msgid "Text area"
-msgstr "文本框"
+msgstr "文本区"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_parent_id:0
@@ -205,7 +205,7 @@ msgstr "上级菜单"
 #. module: wiki
 #: field:wiki.wiki,create_date:0
 msgid "Created on"
-msgstr "创建于"
+msgstr "创建在"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -222,7 +222,7 @@ msgstr "菜单信息"
 #: field:wiki.groups,parent_id:0
 #: field:wiki.groups.link,group_id:0
 msgid "Parent Group"
-msgstr "上级维基组"
+msgstr "父组"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
@@ -233,13 +233,13 @@ msgstr "摘要"
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr "创建时间"
+msgstr "创建日期"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
 #: model:ir.ui.menu,name:wiki.menu_action_history
 msgid "All Page Histories"
-msgstr "全部页面历史记录"
+msgstr "所有页的历史"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki
@@ -249,7 +249,7 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Wiki Differance"
-msgstr "维基页差异"
+msgstr "Wiki分歧"
 
 #. module: wiki
 #: field:wiki.wiki.history,wiki_id:0
@@ -259,7 +259,7 @@ msgstr "维基页标识符"
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_name:0
 msgid "Menu Name"
-msgstr "菜单名称"
+msgstr "菜单名"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -269,7 +269,7 @@ msgstr "修改"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "History"
-msgstr "历史记录"
+msgstr "历史"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document
@@ -291,7 +291,7 @@ msgstr "创建索引"
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr "这是重要修改吗？"
+msgstr "这是一项重大修改?"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_group_menu_create
@@ -304,7 +304,7 @@ msgstr "创建菜单"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Tags"
-msgstr "标记"
+msgstr "标签"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -314,12 +314,12 @@ msgstr "标记"
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_groups_browse
 #: view:wiki.groups:0
 msgid "Wiki Groups"
-msgstr "维基组"
+msgstr "Wiki组"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
 msgid "Modify By"
-msgstr "修改由"
+msgstr "修改之"
 
 #. module: wiki
 #: field:wiki.wiki,toc:0
@@ -340,4 +340,4 @@ msgstr "差异"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Need Review"
-msgstr "需要复审"
+msgstr "需要预览"
diff --git a/addons/wiki/i18n/zh_TW.po b/addons/wiki/i18n/zh_TW.po
index 8486f6d2e9b..da94dfd37ad 100644
--- a/addons/wiki/i18n/zh_TW.po
+++ b/addons/wiki/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:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki_faq/__terp__.py b/addons/wiki_faq/__terp__.py
index 3d06108cb5b..7716ba015fe 100644
--- a/addons/wiki_faq/__terp__.py
+++ b/addons/wiki_faq/__terp__.py
@@ -23,7 +23,7 @@
     'name': 'Document Management - Wiki - FAQ',
     'version': '1.0',
     'category': 'Generic Modules/Others',
-    'description': """FAQ Template
+    'description': """This module provides a wiki FAQ Template
     """,
     'author': 'Tiny',
     'website': 'http://openerp.com',