diff --git a/addons/account/account.py b/addons/account/account.py
index 7cce45ad006..6d074beb646 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -25,6 +25,7 @@ from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 
 import netsvc
+import pooler
 from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
@@ -1641,12 +1642,19 @@ class account_tax(osv.osv):
             return result in the context
             Ex: result=round(price_unit*0.21,4)
     """
+
+    def get_precision_tax():
+        def change_digit_tax(cr):
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            return (16, res+2)
+        return change_digit_tax
+
     _name = 'account.tax'
     _description = 'Tax'
     _columns = {
         'name': fields.char('Tax Name', size=64, required=True, translate=True, help="This name will be displayed on reports"),
         'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."),
-        'amount': fields.float('Amount', required=True, digits_compute=dp.get_precision('Account'), help="For taxes of type percentage, enter % ratio between 0-1."),
+        'amount': fields.float('Amount', required=True, digits_compute=get_precision_tax(), help="For taxes of type percentage, enter % ratio between 0-1."),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the tax without removing it."),
         'type': fields.selection( [('percent','Percentage'), ('fixed','Fixed Amount'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True,
             help="The computation method for the tax amount."),
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index da2d0706f1c..db3325e313c 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -327,7 +327,7 @@ class account_cash_statement(osv.osv):
         for statement in statement_pool.browse(cr, uid, ids, context=context):
             vals = {}
             if not self._user_allow(cr, uid, statement.id, context=context):
-                raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
+                raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
 
             if statement.name and statement.name == '/':
                 number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4d4b0a3022f..e5427a93361 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -354,7 +354,7 @@
                    <group col="10" colspan="4">
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter name="invoices" icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
+                        <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 35a3b63edda..ce6e3c40f86 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -33,8 +33,8 @@
                     <separator colspan="4" string="States"/>
                     <group>
                         <field name="state" select="1" readonly="1"/>
-                        <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="gtk-dnd"/>
-                        <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="gtk-dnd"/>
+                        <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
+                        <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
                     </group>
                 </form>
             </field>
@@ -129,7 +129,7 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="code"/>
@@ -207,10 +207,10 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Parent Account" icon="terp-folder-green" domain="" context="{'group_by':'parent_id'}"/>
+                        <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Account Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
-                        <filter string="Internal Type" icon="terp-folder-yellow" domain="" context="{'group_by':'type'}"/>
+                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
+                        <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
                     </group>
                 </search>
             </field>
@@ -393,7 +393,7 @@
                     <group expand="0" string="Group By...">
                     <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
                     <separator orientation="vertical"/>
-                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
+                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
                     </group>
                 </tree>
             </field>
@@ -1164,8 +1164,15 @@
                         <field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="ref" select="1" string="Reference"/>
+                        <field name="name" select="1"/>
+                        <field name="narration" select="1"/>
+                        <field name="balance" string="Debit/Credit" select='1'/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Account"  icon="terp-folder-green" context="{'group_by':'account_id'}"/>
@@ -1173,12 +1180,6 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended options...">
-                        <field name="ref" select="1" string="Reference"/>
-                        <field name="name" select="1"/>
-                        <field name="narration" select="1"/>
-                        <field name="balance" string="Debit/Credit" select='1'/>
-                    </group>
                 </search>
             </field>
         </record>
@@ -1404,7 +1405,7 @@
                         <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_zoom" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="Journal Entries to Review"/>
+                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="Journal Entries to Review"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="ref"/>
@@ -1418,7 +1419,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -2137,7 +2138,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Internal Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
                    </group>
                 </search>
@@ -2196,7 +2197,7 @@
                       <newline/>
                       <group expand="0" string="Group By...">
                         <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
-                        <filter string="Bank Account" icon="terp-folder-blue" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
+                        <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
                         <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 16e1d00e683..963a36876c6 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -6283,10 +6283,7 @@ msgstr ""
 #. module: account
 #: code:addons/account/account_cash_statement.py:0
 #, python-format
-msgid "User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))\n"
-"\n"
-"        if statement.name and statement.name == '/':\n"
-"            number = self.pool.get('ir.sequence"
+msgid "User \"%s\" does not have rights to access \"%s\" journal !"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index e86d4b5b06a..97cffec7b6d 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -16,6 +16,18 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: account
+#: field:account.partner.balance,result_selection:0
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
@@ -520,6 +532,16 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
+#: field:account.common.report,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.balance.report,target_move:0
+#: field:account.pl.report,target_move:0
+#: field:account.bs.report,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.general.journal,target_move:0
+#: field:account.central.journal,target_move:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
 msgid "Target Moves"
 msgstr ""
 
@@ -929,14 +951,6 @@ msgstr ""
 msgid "Quantity"
 msgstr ""
 
-#. module: account
-#: wizard_field:account.account.balance.report,checktype,date_to:0
-#: wizard_field:account.general.ledger.report,checktype,date_to:0
-#: wizard_field:account.partner.balance.report,init,date2:0
-#: wizard_field:account.third_party_ledger.report,init,date2:0
-msgid "End date"
-msgstr ""
-
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
@@ -1019,6 +1033,7 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
+#: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
 msgstr ""
 
@@ -1433,6 +1448,11 @@ msgstr ""
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
+#: field:account.common.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+#: field:account.balance.report,display_account:0
+#: field:account.pl.report,display_account:0
+#: field:account.bs.report,display_account:0
 msgid "Display accounts "
 msgstr ""
 
@@ -1648,6 +1668,16 @@ msgstr ""
 #: view:account.journal.period:0
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid "Journals"
 msgstr ""
 
@@ -1837,12 +1867,36 @@ msgstr ""
 #: wizard_button:account.partner.balance.report,init,report:0
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.partner.balance:0
+#: view:account.aged.trial.balance:0
+#: view:account.partner.ledger:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
 msgid "Print"
 msgstr ""
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
-msgid "Start date"
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
+#: field:account.subscription,date_start:0
+#: field:account.common.report,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.balance.report,date_from:0
+#: field:account.pl.report,date_from:0
+#: field:account.bs.report,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.general.journal,date_from:0
+#: field:account.central.journal,date_from:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: account
@@ -1924,7 +1978,13 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
-msgid "Sort by:"
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By:"
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
@@ -2480,6 +2540,10 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
+#: field:account.common.report,landscape:0
+#: field:account.report.general.ledger,landscape:0
+#: field:account.pl.report,landscape:0
+#: field:account.bs.report,landscape:0
 msgid "Landscape Mode"
 msgstr ""
 
@@ -2535,9 +2599,42 @@ msgstr ""
 #: wizard_button:account_use_models,init_form,end:0
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
+#: view:account.period.close:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.partner.balance:0
+#: view:account.aged.trial.balance:0
+#: view:account.partner.ledger:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.vat.declaration:0
 msgid "Cancel"
 msgstr ""
 
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: field:account.common.report,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.pl.report,chart_account_id:0
+#: field:account.bs.report,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+msgid "Chart of account"
+msgstr ""
+
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
@@ -2763,6 +2860,7 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
+#: field:account.aged.trial.balance,direction_selection:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -3498,6 +3596,18 @@ msgstr ""
 #: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
+#: field:account.common.report,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: field:account.pl.report,fiscalyear_id:0
+#: field:account.bs.report,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.general.journal,fiscalyear_id:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.vat.declaration,fiscalyear_id:0
 msgid "Fiscal year"
 msgstr ""
 
@@ -3540,6 +3650,11 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.central.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
 msgid "With Currency"
 msgstr ""
 
@@ -3713,9 +3828,15 @@ msgstr ""
 #: field:account.config.wizard,date1:0
 #: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
+#: field:account.aged.trial.balance,date_from:0 
 msgid "Start Date"
 msgstr ""
 
+#. module: account
+#: field:account.aged.trial.balance,period_length:0 
+msgid "Period length(days)"
+msgstr ""
+
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
@@ -4031,7 +4152,8 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,reconcil:0
-msgid "       Include Reconciled Entries"
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
 msgstr ""
 
 #. module: account
@@ -4269,9 +4391,25 @@ msgstr ""
 #: wizard_field:account.general.ledger.report,checktype,soldeinit:0
 #: wizard_field:account.partner.balance.report,init,soldeinit:0
 #: wizard_field:account.third_party_ledger.report,init,soldeinit:0
+#: field:account.report.general.ledger,initial_balance:0
+#: field:account.partner.ledger,initial_balance:0
 msgid "Include initial balances"
 msgstr ""
 
+#. module: account
+#: field:account.common.report,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.pl.report,filter:0
+#: field:account.bs.report,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+msgid "Filter by"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
@@ -4323,9 +4461,83 @@ msgstr ""
 #. module: account
 #: field:account.config.wizard,date2:0
 #: field:account.fiscalyear,date_stop:0
+#: wizard_field:account.account.balance.report,checktype,date_to:0
+#: wizard_field:account.general.ledger.report,checktype,date_to:0
+#: wizard_field:account.partner.balance.report,init,date2:0
+#: wizard_field:account.third_party_ledger.report,init,date2:0
+#: field:account.common.report,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: field:account.balance.report,date_to:0
+#: field:account.pl.report,date_to:0
+#: field:account.bs.report,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.general.journal,date_to:0
+#: field:account.central.journal,date_to:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
 msgid "End Date"
 msgstr ""
 
+#. module: account
+#: field:account.common.report,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: field:account.balance.report,period_from:0
+#: field:account.pl.report,period_from:0
+#: field:account.bs.report,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.general.journal,period_from:0
+#: field:account.central.journal,period_from:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.vat.declaration,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.common.report,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: field:account.balance.report,period_to:0
+#: field:account.pl.report,period_to:0
+#: field:account.bs.report,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.general.journal,period_to:0
+#: field:account.central.journal,period_to:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.vat.declaration,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+#: view:account.vat.declaration:0
+msgid "Periods"
+msgstr ""
+
+
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
@@ -5708,6 +5920,7 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
+#: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
 msgstr ""
 
@@ -5907,9 +6120,24 @@ msgstr ""
 #: wizard_view:account.general.ledger.report,checktype:0
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid "Filters"
 msgstr ""
 
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,yes:0
 msgid "Yes"
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 90192211bac..47ebbe96250 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -16,6 +16,18 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: account
+#: field:account.partner.balance,result_selection:0
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
@@ -530,6 +542,16 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
+#: field:account.common.report,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.balance.report,target_move:0
+#: field:account.pl.report,target_move:0
+#: field:account.bs.report,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.general.journal,target_move:0
+#: field:account.central.journal,target_move:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
 msgid "Target Moves"
 msgstr ""
 
@@ -944,9 +966,80 @@ msgstr "Количество"
 #: wizard_field:account.general.ledger.report,checktype,date_to:0
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
-msgid "End date"
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
+#: field:account.common.report,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: field:account.balance.report,date_to:0
+#: field:account.pl.report,date_to:0
+#: field:account.bs.report,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.general.journal,date_to:0
+#: field:account.central.journal,date_to:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
+msgid "End Date"
 msgstr "Крайна дата"
 
+#. module: account
+#: field:account.common.report,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: field:account.balance.report,period_from:0
+#: field:account.pl.report,period_from:0
+#: field:account.bs.report,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.general.journal,period_from:0
+#: field:account.central.journal,period_from:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.vat.declaration,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.common.report,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: field:account.balance.report,period_to:0
+#: field:account.pl.report,period_to:0
+#: field:account.bs.report,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.general.journal,period_to:0
+#: field:account.central.journal,period_to:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.vat.declaration,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+#: view:account.vat.declaration:0
+msgid "Periods"
+msgstr ""
+
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
@@ -1029,9 +1122,21 @@ msgstr "Мерни единици"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
+#: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
 msgstr ""
 
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,display_account:0
+#: wizard_field:account.general.ledger.report,checktype,display_account:0
+#: field:account.common.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+#: field:account.balance.report,display_account:0
+#: field:account.pl.report,display_account:0
+#: field:account.bs.report,display_account:0
+msgid "Display accounts "
+msgstr ""
+
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
@@ -1662,6 +1767,16 @@ msgstr "Начален баланс"
 #: view:account.journal.period:0
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid "Journals"
 msgstr "Дневници"
 
@@ -1851,14 +1966,47 @@ msgstr "година"
 #: wizard_button:account.partner.balance.report,init,report:0
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.partner.balance:0
+#: view:account.aged.trial.balance:0
+#: view:account.partner.ledger:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
 msgid "Print"
 msgstr "Печат"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
-msgid "Start date"
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
+#: field:account.subscription,date_start:0
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
+#: field:account.subscription,date_start:0
+#: field:account.common.report,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.balance.report,date_from:0
+#: field:account.pl.report,date_from:0
+#: field:account.bs.report,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.general.journal,date_from:0
+#: field:account.central.journal,date_from:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+#: field:account.aged.trial.balance,date_from:0 
+msgid "Start Date"
 msgstr "Начална дата"
 
+#. module: account
+#: field:account.aged.trial.balance,period_length:0 
+msgid "Period length(days)"
+msgstr ""
+
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
@@ -1938,9 +2086,15 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
+#: field:account.report.general.ledger,sortby:0
 msgid "Sort by:"
 msgstr ""
 
+#. module: account
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
@@ -2497,6 +2651,10 @@ msgstr "Сумата е във валутата на дневника"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
+#: field:account.common.report,landscape:0
+#: field:account.report.general.ledger,landscape:0
+#: field:account.pl.report,landscape:0
+#: field:account.bs.report,landscape:0
 msgid "Landscape Mode"
 msgstr ""
 
@@ -2552,9 +2710,42 @@ msgstr ""
 #: wizard_button:account_use_models,init_form,end:0
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
+#: view:account.period.close:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.partner.balance:0
+#: view:account.aged.trial.balance:0
+#: view:account.partner.ledger:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.vat.declaration:0
 msgid "Cancel"
 msgstr "Отказ"
 
+ #. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: field:account.common.report,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.pl.report,chart_account_id:0
+#: field:account.bs.report,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+msgid "Chart of account"
+msgstr ""
+
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
@@ -2780,6 +2971,7 @@ msgstr "Приравняване на транзакции"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
+#: field:account.aged.trial.balance,direction_selection:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -3522,6 +3714,18 @@ msgstr "Косолидирани подчинени сметки"
 #: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
+#: field:account.common.report,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: field:account.pl.report,fiscalyear_id:0
+#: field:account.bs.report,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.general.journal,fiscalyear_id:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.vat.declaration,fiscalyear_id:0
 msgid "Fiscal year"
 msgstr "Финансова година"
 
@@ -3564,6 +3768,11 @@ msgstr "Модел на запис"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.central.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
 msgid "With Currency"
 msgstr ""
 
@@ -3733,13 +3942,6 @@ msgstr ""
 msgid "Account Configure Wizard "
 msgstr ""
 
-#. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
-#: field:account.subscription,date_start:0
-msgid "Start Date"
-msgstr ""
-
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
@@ -4059,7 +4261,8 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,reconcil:0
-msgid "       Include Reconciled Entries"
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
 msgstr ""
 
 #. module: account
@@ -4301,9 +4504,25 @@ msgstr "Премахване на редове"
 #: wizard_field:account.general.ledger.report,checktype,soldeinit:0
 #: wizard_field:account.partner.balance.report,init,soldeinit:0
 #: wizard_field:account.third_party_ledger.report,init,soldeinit:0
+#: field:account.report.general.ledger,initial_balance:0
+#: field:account.partner.ledger,initial_balance:0
 msgid "Include initial balances"
 msgstr ""
 
+#. module: account
+#: field:account.common.report,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.pl.report,filter:0
+#: field:account.bs.report,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+msgid "Filter by"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
@@ -4352,12 +4571,6 @@ msgstr "Публикувано"
 msgid "Credit Notes"
 msgstr ""
 
-#. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
-msgid "End Date"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
@@ -5746,6 +5959,7 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
+#: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
 msgstr "Записи подредени по"
 
@@ -5947,9 +6161,24 @@ msgstr "Име на колона"
 #: wizard_view:account.general.ledger.report,checktype:0
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid "Filters"
 msgstr ""
 
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,yes:0
 msgid "Yes"
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 5bdd6822d9d..c3a87811252 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-27 09:42+0000\n"
+"PO-Revision-Date: 2010-10-28 07:39+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 87a53c60bc7..68bfae4f060 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.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-08-02 19:37+0000\n"
-"Last-Translator: ninaiz <inigo.rekalde@gmail.com>\n"
+"PO-Revision-Date: 2010-10-28 18:00+0000\n"
+"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu@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-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -61,7 +61,7 @@ msgstr ""
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Kontularitza-jartzapenak sartzeko erabilitako moneta"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -78,12 +78,12 @@ msgstr ""
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr ""
+msgstr "Utzi hutsik baliozkotze-eguneko epea erabiltzeko (faktura)."
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Emaitzen adiskidetza"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
@@ -95,18 +95,18 @@ msgstr ""
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "Oinarri-kodea"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "Kontuen estatistikak"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "Inprimatu zerga-txostena"
 
 #. module: account
 #: field:account.account,parent_id:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 351dfbd7a6e..e0a947f5e8c 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,15 +7,27 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:09+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-10-28 08:22+0000\n"
+"Last-Translator: TeMPO <openerp@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-09-30 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: account
+#: field:account.partner.balance,result_selection:0
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.general.ledger.report,checktype:0
@@ -40,6 +52,18 @@ msgstr " Clôturer les états de l'exercice fiscal et des périodes"
 #: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
+#: field:account.common.report,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: field:account.pl.report,fiscalyear_id:0
+#: field:account.bs.report,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.general.journal,fiscalyear_id:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.vat.declaration,fiscalyear_id:0
 msgid "Fiscal year"
 msgstr "Exercice fiscal"
 
@@ -594,6 +618,16 @@ msgstr "Payé et lettré"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
+#: field:account.common.report,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.balance.report,target_move:0
+#: field:account.pl.report,target_move:0
+#: field:account.bs.report,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.general.journal,target_move:0
+#: field:account.central.journal,target_move:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
 msgid "Target Moves"
 msgstr "Mouvements Cibles"
 
@@ -1095,6 +1129,7 @@ msgstr "UdM"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
+#: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
 msgstr "Un partenaire par page"
 
@@ -1519,8 +1554,13 @@ msgstr "        Date de début"
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
-msgid "Display accounts "
-msgstr "Affichage des comptes "
+#: field:account.common.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+#: field:account.balance.report,display_account:0
+#: field:account.pl.report,display_account:0
+#: field:account.bs.report,display_account:0
+msgid "Display accounts"
+msgstr "Affichage des comptes"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
@@ -1736,6 +1776,16 @@ msgstr "Solde de début"
 #: view:account.journal.period:0
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid "Journals"
 msgstr "Journaux"
 
@@ -1925,12 +1975,36 @@ msgstr "Année"
 #: wizard_button:account.partner.balance.report,init,report:0
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.partner.balance:0
+#: view:account.aged.trial.balance:0
+#: view:account.partner.ledger:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
 msgid "Print"
 msgstr "Imprimer"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
-msgid "Start date"
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
+#: field:account.subscription,date_start:0
+#: field:account.common.report,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.balance.report,date_from:0
+#: field:account.pl.report,date_from:0
+#: field:account.bs.report,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.general.journal,date_from:0
+#: field:account.central.journal,date_from:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+msgid "Start Date"
 msgstr "Date de début"
 
 #. module: account
@@ -2010,8 +2084,13 @@ msgstr "Nombre de jours"
 msgid "The partner reference of this invoice."
 msgstr "La référence partenaire sur la facture."
 
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
+#: field:account.report.general.ledger,sortby:0
 msgid "Sort by:"
 msgstr "Trier par :"
 
@@ -2582,6 +2661,10 @@ msgstr "Le montant dans la devise du journal"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
+#: field:account.common.report,landscape:0
+#: field:account.report.general.ledger,landscape:0
+#: field:account.pl.report,landscape:0
+#: field:account.bs.report,landscape:0
 msgid "Landscape Mode"
 msgstr "Mode paysage"
 
@@ -2637,9 +2720,41 @@ msgstr "Depuis un compte analytique, créer une facture"
 #: wizard_button:account_use_models,init_form,end:0
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
+#: view:account.period.close:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.partner.balance:0
+#: view:account.aged.trial.balance:0
+#: view:account.partner.ledger:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.vat.declaration:0
 msgid "Cancel"
 msgstr "Annuler"
 
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: field:account.common.report,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.pl.report,chart_account_id:0
+#: field:account.bs.report,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+msgid "Chart of account"
+msgstr ""
+
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
@@ -2872,7 +2987,7 @@ msgid "Reconciliation transactions"
 msgstr "Écritures des lettrages"
 
 #. module: account
-#: wizard_field:account.aged.trial.balance,init,direction_selection:0
+#: field:account.aged.trial.balance,direction_selection:0
 msgid "Analysis Direction"
 msgstr "Direction d'Analyse"
 
@@ -3652,6 +3767,11 @@ msgstr "Modèle d'écriture"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.central.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
 msgid "With Currency"
 msgstr "Avec devise"
 
@@ -3831,9 +3951,14 @@ msgstr "Assistant de configuration de compte "
 #: field:account.config.wizard,date1:0
 #: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
+#: field:account.aged.trial.balance,date_from:0 
 msgid "Start Date"
 msgstr "Date de Début"
 
+#: field:account.aged.trial.balance,period_length:0 
+msgid "Period length(days)"
+msgstr ""
+
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
@@ -4171,8 +4296,9 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,reconcil:0
-msgid "       Include Reconciled Entries"
-msgstr "       Inclus les écritures lettrées"
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr "Inclus les écritures lettrées"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -4415,10 +4541,26 @@ msgstr "Facture annulée"
 msgid "Remove Lines"
 msgstr "Supprimer lignes"
 
+#. module: account
+#: field:account.common.report,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.pl.report,filter:0
+#: field:account.bs.report,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+msgid "Filter by"
+msgstr ""
+
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,soldeinit:0
 #: wizard_field:account.partner.balance.report,init,soldeinit:0
 #: wizard_field:account.third_party_ledger.report,init,soldeinit:0
+#: field:account.report.general.ledger,initial_balance:0
+#: field:account.partner.ledger,initial_balance:0
 msgid "Include initial balances"
 msgstr "Inclure les soldes initiaux"
 
@@ -4473,9 +4615,78 @@ msgstr "Avoirs"
 #. module: account
 #: field:account.config.wizard,date2:0
 #: field:account.fiscalyear,date_stop:0
+#: field:account.common.report,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: field:account.balance.report,date_to:0
+#: field:account.pl.report,date_to:0
+#: field:account.bs.report,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.general.journal,date_to:0
+#: field:account.central.journal,date_to:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
 msgid "End Date"
 msgstr "Date de Fin"
 
+#. module: account
+#: field:account.common.report,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: field:account.balance.report,period_from:0
+#: field:account.pl.report,period_from:0
+#: field:account.bs.report,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.general.journal,period_from:0
+#: field:account.central.journal,period_from:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.vat.declaration,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.common.report,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: field:account.balance.report,period_to:0
+#: field:account.pl.report,period_to:0
+#: field:account.bs.report,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.general.journal,period_to:0
+#: field:account.central.journal,period_to:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.vat.declaration,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+#: view:account.vat.declaration:0
+msgid "Periods"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
@@ -5877,6 +6088,7 @@ msgstr "account.sequence.fiscalyear"
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
+#: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
 msgstr "Écritures triées par"
 
@@ -6061,9 +6273,24 @@ msgstr "Nom de colonne"
 #: wizard_view:account.general.ledger.report,checktype:0
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid "Filters"
 msgstr "Filtres"
 
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,yes:0
 msgid "Yes"
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 4f8add38bc2..f5dc66d2ad5 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-27 14:03+0000\n"
+"PO-Revision-Date: 2010-10-28 09:22+0000\n"
 "Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.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-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+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 36ccf56abb3..771c04d8cf6 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -243,6 +243,19 @@ msgstr "Давтан гүйлгээнүүд"
 msgid "Amount"
 msgstr "Дүн"
 
+#. module: account
+#: field:account.partner.balance,result_selection:0
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
@@ -532,6 +545,16 @@ msgstr "Төлсөн тулгалт"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
+#: field:account.common.report,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.balance.report,target_move:0
+#: field:account.pl.report,target_move:0
+#: field:account.bs.report,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.general.journal,target_move:0
+#: field:account.central.journal,target_move:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
 msgid "Target Moves"
 msgstr "Төлөвлөгөөт гүйлгээ"
 
@@ -947,14 +970,6 @@ msgstr "Дансны мод сонгох"
 msgid "Quantity"
 msgstr "Тоо хэмжээ"
 
-#. module: account
-#: wizard_field:account.account.balance.report,checktype,date_to:0
-#: wizard_field:account.general.ledger.report,checktype,date_to:0
-#: wizard_field:account.partner.balance.report,init,date2:0
-#: wizard_field:account.third_party_ledger.report,init,date2:0
-msgid "End date"
-msgstr "Дуусах огноо"
-
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
@@ -1037,6 +1052,7 @@ msgstr "Хэмжих нэгж"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
+#: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
 msgstr "Хуудас бүрт нэг харилцагч"
 
@@ -1452,15 +1468,15 @@ msgstr "Дэд дансууд"
 msgid "Display History"
 msgstr "Дэлгэрэнгүй хэвлэх"
 
-#. module: account
-#: wizard_field:account.third_party_ledger.report,init,date1:0
-msgid "        Start date"
-msgstr "        Эхлэх огноо"
-
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
-msgid "Display accounts "
+#: field:account.common.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+#: field:account.balance.report,display_account:0
+#: field:account.pl.report,display_account:0
+#: field:account.bs.report,display_account:0
+msgid "Display accounts"
 msgstr "Данс харуулах "
 
 #. module: account
@@ -1679,6 +1695,16 @@ msgstr "Эхлэлийн баланс"
 #: view:account.journal.period:0
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid "Journals"
 msgstr "Журналууд"
 
@@ -1870,12 +1896,36 @@ msgstr "жил"
 #: wizard_button:account.partner.balance.report,init,report:0
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.partner.balance:0
+#: view:account.aged.trial.balance:0
+#: view:account.partner.ledger:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
 msgid "Print"
 msgstr "Хэвлэх"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
-msgid "Start date"
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
+#: field:account.subscription,date_start:0
+#: field:account.common.report,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.balance.report,date_from:0
+#: field:account.pl.report,date_from:0
+#: field:account.bs.report,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.general.journal,date_from:0
+#: field:account.central.journal,date_from:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+msgid "Start Date"
 msgstr "Эхлэх огноо"
 
 #. module: account
@@ -1956,8 +2006,8 @@ msgid "The partner reference of this invoice."
 msgstr "Уг нэхэмжлэлийг тухайн харилцагч хэрхэн нэрлэн дугаарлах."
 
 #. module: account
-#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
-msgid "Sort by:"
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By:"
 msgstr "Эрэмбэлэх"
 
 #. module: account
@@ -2183,6 +2233,11 @@ msgstr "Төлбөр шаардах зурвас"
 msgid "Chart of Taxes"
 msgstr "Татварын мод"
 
+#. module: account
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
@@ -2523,6 +2578,10 @@ msgstr "Журналын валютаар тооцсон дүн"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
+#: field:account.common.report,landscape:0
+#: field:account.report.general.ledger,landscape:0
+#: field:account.pl.report,landscape:0
+#: field:account.bs.report,landscape:0
 msgid "Landscape Mode"
 msgstr "Хэвтээ хэлбэр"
 
@@ -2578,9 +2637,42 @@ msgstr "Аналитизк дансаас нэхэмжлэл үүсгэх."
 #: wizard_button:account_use_models,init_form,end:0
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
+#: view:account.period.close:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.partner.balance:0
+#: view:account.aged.trial.balance:0
+#: view:account.partner.ledger:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.vat.declaration:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: field:account.common.report,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.pl.report,chart_account_id:0
+#: field:account.bs.report,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+msgid "Chart of account"
+msgstr ""
+
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
@@ -2813,7 +2905,7 @@ msgid "Reconciliation transactions"
 msgstr "нийцүүлэх гүйлгээнүүд"
 
 #. module: account
-#: wizard_field:account.aged.trial.balance,init,direction_selection:0
+#: field:account.aged.trial.balance,direction_selection:0
 msgid "Analysis Direction"
 msgstr "судалгаа шинжилгээний чиглэл"
 
@@ -3563,6 +3655,18 @@ msgstr "Нэгтгэгдсэн дэд дансууд"
 #: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
+#: field:account.common.report,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: field:account.pl.report,fiscalyear_id:0
+#: field:account.bs.report,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.general.journal,fiscalyear_id:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.vat.declaration,fiscalyear_id:0
 msgid "Fiscal year"
 msgstr "Санхүүгийн жил"
 
@@ -3605,6 +3709,11 @@ msgstr "Гүйлгээний модель"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.central.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
 msgid "With Currency"
 msgstr "Вальюттай хэвлэх эсэх"
 
@@ -3782,9 +3891,15 @@ msgstr "Данс тохиргооны хэсэг "
 #: field:account.config.wizard,date1:0
 #: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
+#: field:account.aged.trial.balance,date_from:0 
 msgid "Start Date"
 msgstr "Эхлэх огноо"
 
+#. module: account
+#: field:account.aged.trial.balance,period_length:0 
+msgid "Period length(days)"
+msgstr ""
+
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
@@ -4119,8 +4234,9 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,reconcil:0
-msgid "       Include Reconciled Entries"
-msgstr "       Нийцүүлсэн бичилтүүдийг хамруулах"
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr "Нийцүүлсэн бичилтүүдийг хамруулах"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -4368,6 +4484,8 @@ msgstr "Цувааг арилгах"
 #: wizard_field:account.general.ledger.report,checktype,soldeinit:0
 #: wizard_field:account.partner.balance.report,init,soldeinit:0
 #: wizard_field:account.third_party_ledger.report,init,soldeinit:0
+#: field:account.report.general.ledger,initial_balance:0
+#: field:account.partner.ledger,initial_balance:0
 msgid "Include initial balances"
 msgstr "Анхны балансыг хамруулах"
 
@@ -4419,12 +4537,96 @@ msgstr "Илгээсэн"
 msgid "Credit Notes"
 msgstr "Орлогын тэмдэглэл"
 
+#. module: account
+#: field:account.common.report,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.pl.report,filter:0
+#: field:account.bs.report,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+msgid "Filter by"
+msgstr ""
+
 #. module: account
 #: field:account.config.wizard,date2:0
 #: field:account.fiscalyear,date_stop:0
+#: field:account.common.report,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: field:account.balance.report,date_to:0
+#: field:account.pl.report,date_to:0
+#: field:account.bs.report,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.general.journal,date_to:0
+#: field:account.central.journal,date_to:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
 msgid "End Date"
 msgstr "Дуусах огноо"
 
+#. module: account
+#: field:account.common.report,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: field:account.balance.report,period_from:0
+#: field:account.pl.report,period_from:0
+#: field:account.bs.report,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.general.journal,period_from:0
+#: field:account.central.journal,period_from:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.vat.declaration,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.common.report,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: field:account.balance.report,period_to:0
+#: field:account.pl.report,period_to:0
+#: field:account.bs.report,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.general.journal,period_to:0
+#: field:account.central.journal,period_to:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.vat.declaration,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+#: view:account.vat.declaration:0
+msgid "Periods"
+msgstr ""
+
+
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
@@ -5825,6 +6027,7 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
+#: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted By"
 msgstr "Гүйлгээг эрэмбэлэх"
 
@@ -6031,6 +6234,16 @@ msgstr "Баганы нэр"
 #: wizard_view:account.general.ledger.report,checktype:0
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
+#: view:account.common.report:0
+#: view:account.report.general.ledger:0
+#: view:account.balance.report:0
+#: view:account.pl.report:0
+#: view:account.bs.report:0
+#: view:account.print.journal:0
+#: view:account.general.journal:0
+#: view:account.central.journal:0
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
 msgid "Filters"
 msgstr "Шүүлтүүр"
 
@@ -6123,6 +6336,12 @@ msgstr "Бүх данс"
 msgid "Entries Selection Based on"
 msgstr ""
 
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
+
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index c0223881324..7ba4f1a3d88 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-27 13:56+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:26+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+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 5d904b52274..b6327cda94c 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-27 11:14+0000\n"
+"PO-Revision-Date: 2010-10-28 09:31+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+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 56caceda12f..e465cad095c 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.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-10-26 08:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 20:40+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-27 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4510,7 +4510,7 @@ msgstr "Sigurno želite da otvorite ovaj račun?"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 msgid "Partner Other Ledger"
-msgstr ""
+msgstr "Partnerova ostala skladista"
 
 #. module: account
 #: view:res.partner:0
@@ -5453,6 +5453,9 @@ msgid ""
 "amount.If the tax account is base tax code,                    this field "
 "will contain the basic amount(without tax)."
 msgstr ""
+"Ako je poreski nalog poreski kod naloga, ovo polje sadrzi oporezovani iznos. "
+"Ako je poreski nalog bazni poreski kod , ovo polje sadrzi bazni isnos ( bez "
+"poreza)"
 
 #. module: account
 #: view:account.bank.statement:0
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 83ddff6065d..74f262d0cea 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -125,8 +125,8 @@ class account_installer(osv.osv_memory):
         obj_tax_fp = self.pool.get('account.fiscal.position.tax')
         obj_ac_fp = self.pool.get('account.fiscal.position.account')
 
-        result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template')
-        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'configurable_chart_template')
+        id = result and result[1] or False
         obj_multi = obj_acc_chart_template.browse(cr, uid, id, context=context)
 
         record = self.browse(cr, uid, ids, context=context)[0]
@@ -244,17 +244,18 @@ class account_installer(osv.osv_memory):
                 }
                 bank_account = obj_acc.create(cr, uid, b_vals, context=context)
 
+
                 view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here?
                 view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here?
 
-                cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
-                cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'], context=context)[0]['res_id']
+                cash_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_cash')
+                cash_type_id = cash_result and cash_result[1] or False
 
-                bank_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_bnk')
-                bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'], context=context)[0]['res_id']
+                bank_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_bnk')
+                bank_type_id = bank_result and bank_result[1] or False
 
-                check_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_chk')
-                check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'], context=context)[0]['res_id']
+                check_result = mod_obj.get_object_reference(cr, uid, 'account', 'conf_account_type_chk')
+                check_type_id = check_result and check_result[1] or False
 
 #                record = self.browse(cr, uid, ids, context=context)[0]
                 code_cnt = 1
@@ -559,8 +560,9 @@ class account_installer(osv.osv_memory):
                 tax_val = {}
                 default_tax = []
 
-                pur_temp_tax = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_purchases')
-                pur_temp_tax_id = mod_obj.read(cr, uid, [pur_temp_tax], ['res_id'], context=context)[0]['res_id']
+                pur_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_purchases')
+                pur_temp_tax_id = pur_temp_tax and pur_temp_tax[1] or False
+
                 pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'], context=context)
                 pur_tax_parent_name = pur_temp_tax_names and pur_temp_tax_names[0]['name'] or False
                 pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)], context=context)
@@ -568,9 +570,8 @@ class account_installer(osv.osv_memory):
                     pur_taxcode_parent_id = pur_taxcode_parent_id[0]
                 else:
                     pur_taxcode_parent_id = False
-
-                pur_temp_tax_paid = mod_obj._get_id(cr, uid, 'account', 'tax_code_input')
-                pur_temp_tax_paid_id = mod_obj.read(cr, uid, [pur_temp_tax_paid], ['res_id'], context=context)[0]['res_id']
+                pur_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_input')
+                pur_temp_tax_paid_id = pur_temp_tax_paid and pur_temp_tax_paid[1] or False
                 pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'], context=context)
                 pur_tax_paid_parent_name = pur_temp_tax_names and pur_temp_tax_paid_names[0]['name'] or False
                 pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)], context=context)
@@ -579,8 +580,8 @@ class account_installer(osv.osv_memory):
                 else:
                     pur_taxcode_paid_parent_id = False
 
-                sale_temp_tax = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_sales')
-                sale_temp_tax_id = mod_obj.read(cr, uid, [sale_temp_tax], ['res_id'], context=context)[0]['res_id']
+                sale_temp_tax = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_base_sales')
+                sale_temp_tax_id = sale_temp_tax and sale_temp_tax[1] or False
                 sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'], context=context)
                 sale_tax_parent_name = sale_temp_tax_names and sale_temp_tax_names[0]['name'] or False
                 sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)], context=context)
@@ -589,8 +590,8 @@ class account_installer(osv.osv_memory):
                 else:
                     sale_taxcode_parent_id = False
 
-                sale_temp_tax_paid = mod_obj._get_id(cr, uid, 'account', 'tax_code_output')
-                sale_temp_tax_paid_id = mod_obj.read(cr, uid, [sale_temp_tax_paid], ['res_id'], context=context)[0]['res_id']
+                sale_temp_tax_paid = mod_obj.get_object_reference(cr, uid, 'account', 'tax_code_output')
+                sale_temp_tax_paid_id = sale_temp_tax_paid and sale_temp_tax_paid[1] or False
                 sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'], context=context)
                 sale_tax_paid_parent_name = sale_temp_tax_paid_names and sale_temp_tax_paid_names[0]['name'] or False
                 sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)], context=context)
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 22e0221ac8b..8df9e00be0f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -196,7 +196,7 @@
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
                     <group col='6' colspan='4'>
-                        <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-sale" help="Analytic Journal Items related to a sale journal."/>
+                        <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-check" help="Analytic Journal Items related to a sale journal."/>
                         <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
                         <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
                         <separator orientation="vertical"/>
@@ -206,10 +206,16 @@
                         <field name="user_id">
                             <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                         </field>
+                    </group>
+					<newline/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="journal_id" widget="selection"/>
+                        <field name="product_id" widget="selection"/>
+                        <field name="amount" select="1"/>
                     </group>
                     <newline/>
                     <group string="Group By..." expand="0">
-                        <filter string="Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-blue"/>
+                        <filter string="Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-green"/>
                         <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
                         <separator orientation="vertical"/>
@@ -217,12 +223,6 @@
                         <separator orientation="vertical"/>
                         <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options...">
-                        <field name="journal_id" widget="selection"/>
-                        <field name="product_id" widget="selection"/>
-                        <field name="amount" select="1"/>
-                    </group>
                 </search>
             </field>
         </record>
@@ -313,7 +313,7 @@
                   </group>
                   <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/account/project/wizard/account_analytic_chart.py b/addons/account/project/wizard/account_analytic_chart.py
index 22ec9d8a957..a10e938e293 100644
--- a/addons/account/project/wizard/account_analytic_chart.py
+++ b/addons/account/project/wizard/account_analytic_chart.py
@@ -35,8 +35,8 @@ class account_analytic_chart(osv.osv_memory):
         result_context = {}
         if context is None:
             context = {}
-        result = mod_obj._get_id(cr, uid, 'account', 'action_account_analytic_account_tree2')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_analytic_account_tree2')
+        id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
         data = self.read(cr, uid, ids, [])[0]
         if data['from_date']:
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
index 5437abe5be7..f99da966634 100644
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -41,8 +41,8 @@ class project_account_analytic_line(osv.osv_memory):
                 domain = [('date','>=',from_date)]
           elif to_date:
                 domain = [('date','<=',to_date)]
-          result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
-          id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+          result = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
+          id = result and result[1] or False
           return {
                 'name': _('Analytic Entries by line'),
                 'view_type': 'form',
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 954bfe3ff94..0b4042b8681 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -87,25 +87,6 @@
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
                 </group>
-                <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/>
-                    <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-                    <filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Acc.Type" icon="terp-folder-blue" context="{'group_by':'user_type'}" name="usertype"/>
-                    <filter string="Int.Type" icon="terp-folder-yellow" context="{'group_by':'type'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
-                    <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
-                    <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
-                 </group>
                  <newline/>
                  <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="fiscalyear_id"/>
@@ -119,6 +100,25 @@
                     <field name="date"/>
                     <field name="date_maturity"/>
                  </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/>
+                    <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/>
+                    <filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
+                    <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
+                    <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
+                 </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 8f9e582c321..b8a3c126e11 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -73,11 +73,11 @@
                            domain="[('state','not in', ('draft','cancel'))]"
                            help = "Open and Paid Invoices"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-sale" string="Customer"
+                    <filter icon="terp-personal" string="Customer"
                             name="customer"
                             domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
                             help="Customer Invoices And Refunds"/>
-                    <filter icon="terp-purchase"
+                    <filter icon="terp-personal"
                             string="supplier"
                             separator="1"
                             domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
@@ -98,6 +98,17 @@
                    <field name="categ_id" />
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="product_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="account_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -119,17 +130,6 @@
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
                     <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="product_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 52e012e4460..06475311bf3 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -164,6 +164,10 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
+        if self.reconcil:
+            RECONCILE_TAG = " "
+        else:
+            RECONCILE_TAG = "AND l.reconcile_id IS NULL"
 
         self.cr.execute(
             "SELECT COALESCE(SUM(l.debit),0.0), COALESCE(SUM(l.credit),0.0), COALESCE(sum(debit-credit), 0.0) " \
@@ -173,7 +177,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             "AND m.id = l.move_id " \
             "AND m.state IN %s "
             "AND account_id IN %s" \
-            "AND reconcile_id IS NULL  " \
+            " " + RECONCILE_TAG + " "\
             "AND " + self.init_query + "  ",
             (partner.id, tuple(move_state), tuple(self.account_ids)))
         return self.cr.fetchall()
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index fdf684b2522..f4c360cd253 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -79,8 +79,8 @@ class account_chart(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
-        result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
-        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_tree')
+        id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
         result['periods'] = []
         if data['period_from'] and data['period_to']:
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 4adc25a049d..8cd1f1315b9 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -202,8 +202,8 @@ class account_invoice_refund(osv.osv_memory):
                 xml_id = 'action_invoice_tree3'
             else:
                 xml_id = 'action_invoice_tree4'
-            result = mod_obj._get_id(cr, uid, 'account', xml_id)
-            id = mod_obj.read(cr, uid, result, ['res_id'], context=context)['res_id']
+            result = mod_obj.get_object_reference(cr, uid, 'account', xml_id)
+            id = result and result[1] or False
             result = act_obj.read(cr, uid, id, context=context)
             invoice_domain = eval(result['domain'])
             invoice_domain.append(('id', 'in', created_inv))
diff --git a/addons/account/wizard/account_journal_select.py b/addons/account/wizard/account_journal_select.py
index 0337009d1c8..98099925e29 100644
--- a/addons/account/wizard/account_journal_select.py
+++ b/addons/account/wizard/account_journal_select.py
@@ -34,8 +34,8 @@ class account_journal_select(osv.osv_memory):
         if context is None:
             context = {}
 
-        result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_select')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_move_line_select')
+        id = result and result[1] or False
         result = act_obj.read(cr, uid, [id])[0]
         cr.execute('select journal_id, period_id from account_journal_period where id=%s', (context['active_id'],))
         res = cr.fetchone()
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 7f64f52c100..b5381675b55 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -160,8 +160,8 @@ class account_move_journal(osv.osv_memory):
             period = period_pool.browse(cr, uid, ids[0], context=context)
             name = (period.journal_id.code or '') + ':' + (period.period_id.code or '')
 
-        result = data_pool._get_id(cr, uid, 'account', 'view_account_move_line_filter')
-        res_id = data_pool.browse(cr, uid, result, context=context).res_id
+        result = data_pool.get_object_reference(cr, uid, 'account', 'view_account_move_line_filter')
+        res_id = result and result[1] or False
 
         return {
             'name': name,
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index 556a688f867..7ece00ca8b5 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -51,8 +51,8 @@ class account_move_line_select(osv.osv_memory):
                     period_ids.append(period.id)
             domain = str(('period_id', 'in', period_ids))
 
-        result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_tree1')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_move_line_tree1')
+        id = result and result[1] or False
         result = act_obj.read(cr, uid, [id])[0]
         result['context'] = {
             'fiscalyear': False,
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 55cfeaf9ca3..7a50b49d310 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -42,8 +42,8 @@ class account_subscription_generate(osv.osv_memory):
              line_ids = map(lambda x: x[0], cr.fetchall())
              moves = self.pool.get('account.subscription.line').move_create(cr, uid, line_ids, context=context)
              moves_created.extend(moves)
-        result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_form')
-        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_move_line_form')
+        id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
         result['domain'] = str([('id','in',moves_created)])
         return result
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 82925d1a53d..80bc7a8030e 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -54,8 +54,8 @@ class account_tax_chart(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
-        result = mod_obj._get_id(cr, uid, 'account', 'action_tax_code_tree')
-        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_tax_code_tree')
+        id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
         if data['period_id']:
             fiscalyear_id = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['fiscalyear_id'][0]
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 01d10bc13ab..00656771c42 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -45,7 +45,7 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group col="10" colspan="4">
-                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater then today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
+                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
                     <separator orientation="vertical"/>
                     <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 79d9acb4873..6721f554677 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-21 11:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 14:30+0000\n"
+"Last-Translator: Sam_inv <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-10-22 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index 0d0e0cffdf9..949e19219ab 100644
--- a/addons/account_analytic_default/i18n/sr.po
+++ b/addons/account_analytic_default/i18n/sr.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-26 08:45+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 20:48+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-27 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -95,6 +95,9 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
 msgstr ""
+"Selektuj kompaniju koja ce koristiti Analiticki konto specificiranim kao "
+"podrazumevani ( npr, kada kreiras novu Fakturu, ili slicno, i ako selektujes "
+"ovu kompaniju, ona ce automatski preuzeti ovo kao Analiticki konto)"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 072b21b1656..35015dfebf0 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-21 11:23+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 18:34+0000\n"
+"Last-Translator: Sam_inv <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-10-22 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index 6c3f26dc10c..b778254f0e6 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-26 08:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 20:57+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-27 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -375,6 +375,39 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
+"Ovaj ti modul omogucava da koristis nekoliko analitickih planova, u odnosu "
+"na Osnovni Dnevnik,\n"
+"tako da visestruke analiticke linije su kreirane kada i fakture ili je "
+"sadrzaj potvrdjen.\n"
+"\n"
+"Na primer , mozes definisati sledecu analiticku strukturu:\n"
+"  Projekat:\n"
+"       Projekat 1\n"
+"               SubProj 1.1\n"
+"               SubProj 1.2\n"
+"      Projekat 2\n"
+"  Prodavac\n"
+"                 Janko\n"
+"                 Marko\n"
+"\n"
+"Ovde imamo dva plana: Projekat i Prodavac. Linija fakture mora\n"
+"da bude sposobna da upise analiticki sadrzaj u dva plana: SubProj 1.1 i\n"
+"MArko. IZnos se takodje moze podeliti. Sledeci primer je za fakturu koja ima "
+"dodira sa dva sub projekta i dodeljena je jednom prodavcu:\n"
+"\n"
+"Plan1\"\n"
+"    SubProjekat 1.1 : 50%\n"
+"    SubProjekat 1.2 : 50%\n"
+"PLan2\n"
+"    Janko: 100%\n"
+"\n"
+"Tako da ovaj red fakture bude bio potvrdjen on ce generisati 3 Analiticke "
+"stavke, \n"
+"za jedan sadrzaj naloga,\n"
+"Analiticki plan potvrdjuje minimum i maksimum procenata u vreme kada je "
+"generisan\n"
+"distribucioni model.\n"
+"        "
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 866021f5f24..414c4cbfde1 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -173,7 +173,7 @@
                <search string="Budget">
                    <group col="20" colspan="4">
                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
-                       <filter string="To Approve" icon="terp-gtk-media-pause" domain="[('state','=','confirm')]" help="To Approve Budgets" />
+                       <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
                        <separator orientation="vertical"/>
                        <field name="name" select="1"/>
                        <field name="code" select="1" />
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index ba639c6a5f2..7535124684f 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-21 11:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 18:35+0000\n"
+"Last-Translator: Sam_inv <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-10-22 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
index 3fe006e8558..d684e5aab6e 100644
--- a/addons/account_budget/i18n/sr.po
+++ b/addons/account_budget/i18n/sr.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 08:02+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 20:36+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -173,7 +173,7 @@ msgstr "Gotovo"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Prakticna zarada"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -315,7 +315,7 @@ msgstr "Izvestaj unakrsnog budzeta naloga"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "Teoretska zarada"
 
 #. module: account_budget
 #: constraint:ir.rule:0
@@ -366,6 +366,27 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"Ovaj modul omogucava knjigovodjama da obradjuju analize i unakrsne budzete.\n"
+"\n"
+"Kada je jedno definisan Master Budzet i budzeti ( U knjigovodstvo/Budzeti),\n"
+"Menadzer Projekta moze da postavi planirani iznos za svaki analiticki "
+"konto.\n"
+"\n"
+"Knjigovodja ima mogucnost da vidi ukupni planirani iznos za svaki\n"
+"Budzet i Master Budzet da bi osigurao da ukupno planirani iznos nije manji "
+"/veci od \n"
+"planiranog Budzeta/Master Budzeta. Svaka lista\n"
+"zapisa moze da se prebaci i u grafikon za laksi pregled iste.\n"
+"\n"
+"Dostupna su TRI Izvestaja:\n"
+"    1. Prvi je dostupan iz liste Budzeta. I on daje rasipanje za te budzete, "
+"analitickog konta u odnosu na Master Budzet.\n"
+"    2.Drugi je sumarni predhodnog izvestaja, on samo daje rasispanje za "
+"selektovani Budzet analitickog konta.\n"
+"    3.Poslednji je dostupan iz Analitickog Grafikona naloga ( konta). On "
+"daje rasipanje za slektovani analiticki konto, MAster Budzeta po \n"
+"Budzetu.\n"
+"\n"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -383,7 +404,7 @@ msgstr "Budzet"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "Planirana Zarada"
 
 #. module: account_budget
 #: view:account.budget.post:0
diff --git a/addons/account_coda/i18n/nl.po b/addons/account_coda/i18n/nl.po
index ca39ba7fc79..056e8a7b875 100644
--- a/addons/account_coda/i18n/nl.po
+++ b/addons/account_coda/i18n/nl.po
@@ -7,19 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-10-01 11:59+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 13:55+0000\n"
+"Last-Translator: Sam_inv <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-02 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
-#: field:account.coda,journal_id:0
-#: wizard_field:account.coda_import,init,journal_id:0
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
 msgid "Bank Journal"
 msgstr "Bank Dagafschrift"
 
@@ -31,19 +31,14 @@ msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: account_coda
-#: wizard_field:account.coda_import,extraction,note:0
-msgid "Log"
-msgstr "Logboek"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: account_coda
-#: wizard_button:account.coda_import,extraction,open:0
-msgid "_Open Statement"
-msgstr "_Open Afschrift"
-
-#. module: account_coda
-#: model:ir.module.module,shortdesc:account_coda.module_meta_information
-msgid "Account CODA"
-msgstr "Rekening CODA"
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr ""
 
 #. module: account_coda
 #: field:account.coda,name:0
@@ -51,19 +46,24 @@ msgid "Coda file"
 msgstr "Coda bestand"
 
 #. module: account_coda
-#: wizard_view:account.coda_import,init:0
-msgid "Clic on 'New' to select your file :"
-msgstr "Klik op 'Nieuw' om uw bestand te selecteren :"
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Sorteren op"
 
 #. module: account_coda
-#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
-msgid "Import Coda File"
-msgstr "Importeer Coda bestand"
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
 
 #. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Importdatum"
+
+#. module: account_coda
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kan geen herhalend Menu maken"
 
 #. module: account_coda
 #: field:account.coda,note:0
@@ -71,43 +71,63 @@ msgid "Import log"
 msgstr "Import logboek"
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,def_receivable:0
-msgid "Default receivable Account"
-msgstr "Standaard ontvangstenrekening"
-
-#. module: account_coda
-#: model:ir.module.module,description:account_coda.module_meta_information
-msgid ""
-"Module provides functionality to import\n"
-"    bank statements from .csv file.\n"
-"    Import coda file wizard is used to import bank statements."
+#: view:account.coda.import:0
+msgid "Import"
 msgstr ""
-"Module voorziet in functies voor het importeren van bankafschriften in "
-".csv.bestanden.\n"
-"Import coda bestand wizard importeert bankafschriften."
-
-#. module: account_coda
-#: wizard_button:account.coda_import,extraction,end:0
-msgid "_Close"
-msgstr "_Afsluiten"
-
-#. module: account_coda
-#: field:account.coda,statement_id:0
-msgid "Generated Bank Statement"
-msgstr "Gegenereerd bankafschrift"
 
 #. module: account_coda
 #: view:account.coda:0
-#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
-#: model:ir.actions.act_window,name:account_coda.action_account_coda
 msgid "Coda import"
 msgstr "Coda import"
 
 #. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Logboek"
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
 #: field:account.coda,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr ""
+
 #. module: account_coda
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -119,52 +139,172 @@ msgid "coda for an Account"
 msgstr "coda voor een rekening"
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,def_payable:0
+#: field:account.coda.import,def_payable:0
 msgid "Default Payable Account"
 msgstr "Standaard uitgavenrekening"
 
 #. module: account_coda
-#: model:ir.ui.menu,name:account_coda.menu_account_coda
-msgid "Coda Statements"
-msgstr "Coda afschriften"
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr "Detail bankafschriften opslaan"
 
 #. module: account_coda
-#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import Coda Statements"
 msgstr "Importeer Coda afschriften"
 
 #. module: account_coda
-#: wizard_button:account.coda_import,init,extraction:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: account_coda
-#: wizard_view:account.coda_import,extraction:0
-#: wizard_view:account.coda_import,init:0
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
 msgid "Import Coda Statement"
 msgstr "Importeer Coda afschrift"
 
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
 msgid "Coda"
 msgstr "Coda"
 
 #. module: account_coda
-#: wizard_view:account.coda_import,extraction:0
+#: view:account.coda.import:0
 msgid "Results :"
 msgstr "Resultaten :"
 
 #. module: account_coda
-#: wizard_field:account.coda_import,init,coda:0
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
 msgid "Coda File"
 msgstr "Coda Bestand"
 
 #. module: account_coda
-#: field:account.coda,date:0
-msgid "Import Date"
-msgstr "Importdatum"
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bank Afschrift"
 
 #. module: account_coda
-#: wizard_view:account.coda_import,init:0
-msgid "Select your bank journal :"
-msgstr "Selecteer bank dagboek :"
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "Result"
+msgstr "Resultaat"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "Sluiten"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:0
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr "Dagboek"
+
+#~ msgid "_Open Statement"
+#~ msgstr "_Open Afschrift"
+
+#~ msgid "Account CODA"
+#~ msgstr "Rekening CODA"
+
+#~ msgid "_Ok"
+#~ msgstr "_Ok"
+
+#~ msgid "Import Coda File"
+#~ msgstr "Importeer Coda bestand"
+
+#~ msgid "Clic on 'New' to select your file :"
+#~ msgstr "Klik op 'Nieuw' om uw bestand te selecteren :"
+
+#~ msgid "Coda Statements"
+#~ msgstr "Coda afschriften"
+
+#~ msgid "Default receivable Account"
+#~ msgstr "Standaard ontvangstenrekening"
+
+#~ msgid ""
+#~ "Module provides functionality to import\n"
+#~ "    bank statements from .csv file.\n"
+#~ "    Import coda file wizard is used to import bank statements."
+#~ msgstr ""
+#~ "Module voorziet in functies voor het importeren van bankafschriften in "
+#~ ".csv.bestanden.\n"
+#~ "Import coda bestand wizard importeert bankafschriften."
+
+#~ msgid "_Close"
+#~ msgstr "_Afsluiten"
+
+#~ msgid "Generated Bank Statement"
+#~ msgstr "Gegenereerd bankafschrift"
+
+#~ msgid "Select your bank journal :"
+#~ msgstr "Selecteer bank dagboek :"
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index fcb5d3fd459..2d096401553 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:09+0000\n"
+"PO-Revision-Date: 2010-10-28 07:37+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_payment/i18n/es_EC.po b/addons/account_payment/i18n/es_EC.po
index 7179d0ea39d..c92e208138f 100644
--- a/addons/account_payment/i18n/es_EC.po
+++ b/addons/account_payment/i18n/es_EC.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+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 ac1ef08880a..cc4cf3bde06 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:10+0000\n"
+"PO-Revision-Date: 2010-10-28 09:28+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_reporting/i18n/ru.po b/addons/account_reporting/i18n/ru.po
index 296c444ccb7..74dfaa988c6 100644
--- a/addons/account_reporting/i18n/ru.po
+++ b/addons/account_reporting/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:14+0000\n"
+"PO-Revision-Date: 2010-10-28 09:29+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/sr.po b/addons/account_reporting/i18n/sr.po
index 733e84d3ca4..4209b695d93 100644
--- a/addons/account_reporting/i18n/sr.po
+++ b/addons/account_reporting/i18n/sr.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-26 08:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 20:44+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-27 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
@@ -211,6 +211,7 @@ msgid ""
 "Gives the sequence order when displaying a list of account reporting for "
 "balance sheet."
 msgstr ""
+"Daje redosled sekvencama pri prikazu liste izvestaja naloga za sheet stanja"
 
 #. module: account_reporting
 #: view:account.report.bs:0
@@ -257,7 +258,7 @@ msgstr "Helvetica-Oblique"
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_account_reporting_balance_report
 msgid "Account balance report"
-msgstr ""
+msgstr "Izvestaj Stanja Racuna"
 
 #. module: account_reporting
 #: field:account.report.bs,child_id:0
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index a07e41ff000..0e3ea22c73e 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -115,13 +115,13 @@ class account_voucher(osv.osv):
         return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
-        if not view_id and context.get('invoice_type', False):
+        if not view_id:
             mod_obj = self.pool.get('ir.model.data')
-            if context.get('invoice_type') in ('out_invoice', 'out_refund'):
-                result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
+            if context.get('invoice_type', False) in ('out_invoice', 'out_refund') or context.get('line_type', False) == 'customer':
+                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
             else:
-                result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_payment_form')
-            result = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+                result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form')
+            result = result and result[1] or False
             view_id = result
         res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         doc = etree.XML(res['arch'])
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index a36578bb70b..0511a8325d5 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -96,7 +96,7 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="number"/>
@@ -107,6 +107,13 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
+                        <field name="reference"/>
+                        <field name="name"/>
+                        <field name="narration"/>
+                        <field name="amount"/>
+                   </group>
                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -114,13 +121,6 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="narration"/>
-                        <field name="amount"/>
-                   </group>
                 </search>
             </field>
         </record>
@@ -199,7 +199,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-                    <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
         </record>
@@ -211,7 +211,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before">
-                    <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
         </record>
@@ -222,7 +222,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-                    <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
         </record>
@@ -234,7 +234,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='amount']" position="after">
-                    <field name="voucher_id" context="{'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index dc3823a2aae..365aa0015b7 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-26 08:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 20:47+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-27 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -290,7 +290,7 @@ msgstr "Uvezi Racune"
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
-msgstr ""
+msgstr "Treba da konfigurises osnovu naloga i porez naloga u '%s'  poreza!"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -311,7 +311,7 @@ msgstr "Na Nalogu od:"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Linije Prodaje"
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
@@ -456,12 +456,12 @@ msgstr "Valuta"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "Prijemi i Isplate"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Plati kasnije ili Grupiraj Sumu"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -591,7 +591,7 @@ msgstr "referentni broj Transakcije"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr ""
+msgstr "Fakture i neobradjene transakcije"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -608,7 +608,7 @@ msgstr "Poništi zatvaranje"
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "Knjigovodstvo Vaucera"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index f6b41f318ed..83b6243a627 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -12,7 +12,7 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="number"/>
@@ -23,20 +23,20 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -52,7 +52,7 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="number"/>
@@ -63,20 +63,20 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -216,8 +216,8 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -324,8 +324,8 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 46db5747f94..a0d61e00a12 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -11,7 +11,7 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="number"/>
@@ -22,20 +22,20 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -50,7 +50,7 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <field name="number"/>
@@ -61,20 +61,20 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-                   <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
                     <newline/>
-                    <group expand="0" string="Extended options..." col='8' colspan='4'>
+                    <group expand="0" string="Extended Filters..." col='8' colspan='4'>
                         <field name="reference"/>
                         <field name="name"/>
                         <field name="narration"/>
                         <field name="amount"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -259,9 +259,9 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 4267f6bd464..1256fe54aad 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/i18n/es.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:09+0000\n"
+"PO-Revision-Date: 2010-10-28 09:19+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 36a1b60096c..6213cc07f9a 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -28,7 +28,7 @@
             <form string="Artists">
                 <separator string="Author/Artist" colspan="4"/>
                 <group colspan="4" col="6">
-                    <field name="name" colspan="4" string="Name"/>
+                    <field name="name" colspan="4" string="Name" select="1"/>
                     <newline/>
                     <field name="pseudo"/>
                     <field name="birth_death_dates"/>
@@ -436,7 +436,7 @@
                      string="Draft"  help="New Object"
                      name="draft"
                      domain="[('state','=', 'draft')]"/>
-                 <filter icon="terp-dolar_ok!"
+                 <filter icon="terp-dolar"
                      string="Sold"  help="Buy object"
                      domain="[('state','=','sold')]"/>
                  <separator orientation="vertical"/>
diff --git a/addons/auction/report/report_auction_view.xml b/addons/auction/report/report_auction_view.xml
index ec4f36ceb70..b521ce38e78 100644
--- a/addons/auction/report/report_auction_view.xml
+++ b/addons/auction/report/report_auction_view.xml
@@ -75,7 +75,7 @@
                     <filter string="Buyer" icon="terp-personal" name="buyer" context="{'group_by':'buyer'}"/>
                     <filter string="Seller" icon="terp-personal" name="seller" context="{'group_by':'seller'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Auction" icon="terp-project" name="auction_date" context="{'group_by':'auction'}"/>
+                    <filter string="Auction" icon="terp-purchase" name="auction_date" context="{'group_by':'auction'}"/>
                     <separator orientation="vertical" />
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Type"
@@ -265,4 +265,4 @@ Object encoded
     </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po
index fa6f677f9b1..ad96a374529 100644
--- a/addons/audittrail/i18n/nl.po
+++ b/addons/audittrail/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 12:02+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 08:46+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index e53aa8bbe15..27fc9b40b13 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:11+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index 2b555106932..4b54cd812f7 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 09:53+0000\n"
+"PO-Revision-Date: 2010-10-28 08:56+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index dfbdc745613..c3aa7bb8720 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -916,7 +916,7 @@ class calendar_event(osv.osv):
         return [(x.lower(), x) for x in pytz.all_timezones]
 
     def onchange_allday(self, cr, uid, ids, allday, context=None):
-        """Sets duration as 24 Hours if event is selcted for all day
+        """Sets duration as 24 Hours if event is selected for all day
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1630,6 +1630,14 @@ true, it will allow you to hide the event alarm information without removing it.
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
 
+        updated_vals = self.onchange_dates(cr, uid, [],
+            vals.get('date', False),
+            vals.get('duration', False),
+            vals.get('date_deadline', False),
+            vals.get('allday', False),
+            context=context)
+        vals.update(updated_vals.get('value', {}))
+
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 9f27e79d5a5..2280b5454b3 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -108,7 +108,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <filter icon="terp-camera_test" name="toreview" string="To Review"
+                   <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
                        domain="[('state','=', 'needs-action')]"
                        separator="1" help="Invitations To Review" />
                    <filter icon="terp-check" string="Accepted"
@@ -130,7 +130,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]"
                             context="{'group_by':'user_id'}" />
-                        <filter string="Contact" icon="terp-partner" domain="[]"
+                        <filter string="Contact" icon="terp-personal" domain="[]"
                             context="{'group_by':'partner_address_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
@@ -229,7 +229,7 @@
                     <group col="6" colspan="4">
                         <field name="name" select="1" string="Summary"
                             colspan="4" required="1" />
-                        <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
+                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" />
                         <newline/>
                         <field name="date" string="Start Date" required="1" select="1"
                             on_change="onchange_dates(date,duration,False,allday)" />
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
index d3ebd52211e..4fd40795bce 100644
--- a/addons/base_contact/i18n/nl.po
+++ b/addons/base_contact/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:25+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:19+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po
index 2804a613994..1b60f6adaa3 100644
--- a/addons/base_iban/i18n/nl.po
+++ b/addons/base_iban/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 11:46+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:19+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po
index d8c008b6b9e..7b4696c14af 100644
--- a/addons/base_report_creator/i18n/sr.po
+++ b/addons/base_report_creator/i18n/sr.po
@@ -7,14 +7,14 @@ 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-10-16 09:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 20:22+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-17 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -27,6 +27,11 @@ msgstr ""
 "Unesite izraz za polje po kojem želite filtrirati zapise.\n"
 "npr. res_partner.id=3"
 
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_report_menu_create
+msgid "Menu Create"
+msgstr "Kreiraj Meni"
+
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
 msgid "Graph Type"
@@ -48,9 +53,19 @@ msgid "Graph Mode"
 msgstr "Grafički"
 
 #. module: base_report_creator
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Pogrešno ime modela u definiciji akcije."
+#: code:addons/base_report_creator/base_report_creator.py:0
+#, python-format
+msgid ""
+"These is/are model(s) (%s) in selection which is/are not related to any "
+"other model"
+msgstr ""
+"Ovo je(su) odabrani model(i) (%s) koji nije(su) povezan(i) s niti jednim "
+"drugim modelom"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Legend"
+msgstr "Legenda"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -85,7 +100,7 @@ msgstr "SQL upit"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
-#: wizard_button:base_report_creator.report.menu.create,init,create_menu:0
+#: view:report.menu.create:0
 msgid "Create Menu"
 msgstr "Kreiraj Meni"
 
@@ -106,13 +121,23 @@ msgid "OR"
 msgstr "ILI"
 
 #. module: base_report_creator
-#: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action
-#: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action_config
+#: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
 msgid "Custom Reports"
 msgstr "Prilagođeni izvještaji"
 
 #. module: base_report_creator
-#: wizard_view:base_report_creator.report.menu.create,init:0
+#: code:addons/base_report_creator/base_report_creator.py:0
+#, python-format
+msgid "No Related Models!!"
+msgstr "Nema srodnih modela!!"
+
+#. module: base_report_creator
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: base_report_creator
+#: view:report.menu.create:0
 msgid "Menu Information"
 msgstr "Informacije Menija"
 
@@ -136,23 +161,13 @@ msgstr "Lista polja"
 msgid "Report Type"
 msgstr "Tip izveštaja"
 
-#. module: base_report_creator
-#: view:base_report_creator.report:0
-msgid "State"
-msgstr "Stanje"
-
-#. module: base_report_creator
-#: selection:base_report_creator.report,state:0
-msgid "Valid"
-msgstr "Potvrđeno"
-
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
 msgstr "Dodaj Filter"
 
 #. module: base_report_creator
-#: model:ir.actions.wizard,name:base_report_creator.wizard_menu_create
+#: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
 msgid "Create Menu for Report"
 msgstr "Kreiraj Meni za Izveštaje"
 
@@ -171,6 +186,7 @@ msgid "/"
 msgstr "/"
 
 #. module: base_report_creator
+#: view:base_report_creator.report:0
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
@@ -187,6 +203,11 @@ msgstr "Početni datum"
 msgid "Invalid XML for View Architecture!"
 msgstr "Nevažeći XML za pregled arhitekture"
 
+#. module: base_report_creator
+#: field:base_report_creator.report,group_ids:0
+msgid "Authorized Groups"
+msgstr "Autorizovane Grupe"
+
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
@@ -194,11 +215,6 @@ msgstr "Nevažeći XML za pregled arhitekture"
 msgid "Tree"
 msgstr "Stablo"
 
-#. module: base_report_creator
-#: field:base_report_creator.report,group_ids:0
-msgid "Authorized Groups"
-msgstr "Autorizovane Grupe"
-
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_orientation:0
 msgid "Graph Orientation"
@@ -215,7 +231,7 @@ msgid "Security"
 msgstr "Bezbednost"
 
 #. module: base_report_creator
-#: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
+#: field:report.menu.create,menu_name:0
 msgid "Menu Name"
 msgstr "Naziv Menija"
 
@@ -259,21 +275,11 @@ msgstr "Grafikon"
 msgid "Field Name"
 msgstr "Naziv polja"
 
-#. module: base_report_creator
-#: selection:base_report_creator.report,state:0
-msgid "Draft"
-msgstr "Priprema"
-
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Set Filter Values"
 msgstr "Postavi Vrednosti Filtera"
 
-#. module: base_report_creator
-#: field:base_report_creator.report,state:0
-msgid "Status"
-msgstr "Status"
-
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Vertical"
@@ -289,6 +295,11 @@ msgstr "Izvestaj redova i kolona"
 msgid "General Configuration"
 msgstr "Opšte podešavanje"
 
+#. module: base_report_creator
+#: help:base_report_creator.report.fields,sequence:0
+msgid "Gives the sequence order when displaying a list of fields."
+msgstr "daje sekvence zahteva kada prikazuje listu polja"
+
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,init:0
 msgid "Select Field to filter"
@@ -315,6 +326,15 @@ msgstr "Metod grupisanja"
 msgid "Condition"
 msgstr "Uslov"
 
+#. module: base_report_creator
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the report "
+"without removing it."
+msgstr ""
+"ako je aktivno polje postavljeno na 'istina', ono ti omogucava da sakrijes "
+"izvetaj bez uklanjanja."
+
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
@@ -326,7 +346,7 @@ msgid "X Axis"
 msgstr "X osa"
 
 #. module: base_report_creator
-#: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0
+#: field:report.menu.create,menu_parent_id:0
 msgid "Parent Menu"
 msgstr "Roditeljski Meni"
 
@@ -341,7 +361,7 @@ msgid "Filter Name"
 msgstr "Naziv Filtera"
 
 #. module: base_report_creator
-#: model:ir.actions.wizard,name:base_report_creator.wizard_report_open
+#: view:base_report_creator.report:0
 msgid "Open Report"
 msgstr "Otvori izveštaj"
 
@@ -357,9 +377,9 @@ msgid "Report Creator"
 msgstr "Kreator izveštaja"
 
 #. module: base_report_creator
-#: wizard_button:base_report_creator.report.menu.create,init,end:0
 #: wizard_button:base_report_creator.report_filter.fields,init,end:0
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
+#: view:report.menu.create:0
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -370,6 +390,11 @@ msgid ""
 msgstr ""
 "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
+#. module: base_report_creator
+#: field:base_report_creator.report,menu_id:0
+msgid "Menu"
+msgstr "Meni"
+
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
 msgid "First View"
@@ -385,6 +410,11 @@ msgstr "Kašnjenje"
 msgid "Field"
 msgstr "Polje"
 
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Unique Colors"
+msgstr "Jedinstvane Boje"
+
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Filters on Fields"
@@ -400,27 +430,10 @@ msgstr "Tortni grafikon"
 msgid "Third View"
 msgstr "Treći pogled"
 
-#. module: base_report_creator
-#: model:ir.module.module,description:base_report_creator.module_meta_information
-msgid ""
-"This modules allows you to create any statistic\n"
-"report on several object. It's a SQL query builder and browser\n"
-"for and users.\n"
-"\n"
-"After installing the module, it adds a menu to define custom report in\n"
-"the \"Dashboard\" menu.\n"
-msgstr ""
-"Ovi moduli vam dozvoljavaju kreiranje bilo kojeg statističkog\n"
-"izvještaja iz više objekata. To je graditelj SQL upita i pretrazivac\n"
-"za krajnje korisnike.\n"
-"\n"
-"Nakon instalacije, modul dodaje Meni za kreiranje prilagođenog izvještaja\n"
-"na Meniju Glavne Table.\n"
-
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
-msgid "Uniq Colors"
-msgstr "Jedinstvene boje"
+msgid "End Date"
+msgstr "Krajnji Datum"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
@@ -439,8 +452,8 @@ msgstr "Prosečno"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
-msgid "Reports"
-msgstr "Izveštaji"
+msgid "Use %(uid)s to filter by the connected user"
+msgstr "Koristi %(uid)s da filtriras konektovane korisnike"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
@@ -468,7 +481,7 @@ msgid "Second View"
 msgstr "Drugi pogled"
 
 #. module: base_report_creator
-#: wizard_view:base_report_creator.report.menu.create,init:0
+#: view:report.menu.create:0
 msgid "Create Menu For This Report"
 msgstr "Kreiraj Meni za ovaj izveštaj"
 
@@ -498,3 +511,54 @@ msgstr "Polja za Prikaz"
 #: field:base_report_creator.report,filter_ids:0
 msgid "Filters"
 msgstr "Filteri"
+
+#. module: base_report_creator
+#: model:ir.module.module,description:base_report_creator.module_meta_information
+msgid ""
+"This module allows you to create any statistic\n"
+"report on several objects. It's a SQL query builder and browser\n"
+"for and users.\n"
+"\n"
+"After installing the module, it adds a menu to define custom report in\n"
+"the \"Dashboard\" menu.\n"
+msgstr ""
+"Ovaj vam modul omogucava da kreirate bilo koji statisticki\n"
+"izvestaj za nekoliko objekata.To je SQL upit , graditelj i pretrazivac za "
+"korisnike.\n"
+"\n"
+"Nakon instaliranja modula, on dodaje meni za definisanje proizvoljni "
+"izvestaj u\n"
+"meniju \" Glavne Table\".\n"
+
+#~ msgid "Valid"
+#~ msgstr "Potvrđeno"
+
+#~ msgid "State"
+#~ msgstr "Stanje"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Draft"
+#~ msgstr "Priprema"
+
+#~ msgid "Uniq Colors"
+#~ msgstr "Jedinstvene boje"
+
+#~ msgid ""
+#~ "This modules allows you to create any statistic\n"
+#~ "report on several object. It's a SQL query builder and browser\n"
+#~ "for and users.\n"
+#~ "\n"
+#~ "After installing the module, it adds a menu to define custom report in\n"
+#~ "the \"Dashboard\" menu.\n"
+#~ msgstr ""
+#~ "Ovi moduli vam dozvoljavaju kreiranje bilo kojeg statističkog\n"
+#~ "izvještaja iz više objekata. To je graditelj SQL upita i pretrazivac\n"
+#~ "za krajnje korisnike.\n"
+#~ "\n"
+#~ "Nakon instalacije, modul dodaje Meni za kreiranje prilagođenog izvještaja\n"
+#~ "na Meniju Glavne Table.\n"
+
+#~ msgid "Reports"
+#~ msgstr "Izveštaji"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 4034a995654..1f1453d49da 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 12:49+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:29+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
index e35a43837fa..66fbaf7ec82 100755
--- a/addons/base_synchro/base_synchro_view.xml
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -42,7 +42,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By" colspan="4">
-                      <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'obj_id'}"/>
+                      <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'obj_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'name'}"/>
                     </group>
@@ -124,7 +124,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By" colspan="4">
-                      <filter string="Object to synchronize" icon="terp-stage" domain="[]" context="{'group_by':'model_id'}"/>
+                      <filter string="Object to synchronize" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Latest synchronization" icon="terp-go-month" domain="[]" context="{'group_by':'synchronize_date'}"/>
                     </group>
@@ -185,7 +185,6 @@
                         <field name="server_port"/>
                         <field name="server_db"/>
                     </group>
-                    
                 </form>
             </field>
         </record>
@@ -199,10 +198,7 @@
 
         <menuitem action="action_base_synchro_server_tree" id="synchro_server_tree_menu_id" parent="base_synchro.next_id_63"/>
 
-
-
 <!--view_base_synchro_server end -->
 
-
     </data>
 </openerp>
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index 3ffbf1e9af9..8cf88f99091 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 14:19+0000\n"
+"PO-Revision-Date: 2010-10-28 09:29+0000\n"
 "Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.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-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+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 6172f5406c6..9f3cf5c408a 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/i18n/nl.po
@@ -6,23 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 03:16+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 12:46+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
-#: model:ir.module.module,description:base_vat.module_meta_information
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
 msgid ""
-"Enable the VAT Number for the partner. Check the validity of that VAT Number."
-msgstr ""
-"Activeer het BTW-nummer voor de relatie. Controleer of het BTW-nummer geldig "
-"is."
+"The Vat does not seems to be correct. You should have entered something like "
+"this %s"
+msgstr "De BTW lijkt niet correct te zijn. U moet iets invullen zoals dit %s"
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
@@ -30,11 +30,47 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Ongeldige XML voor overzicht!"
 
 #. module: base_vat
-#: field:res.partner,vat_subjected:0
-msgid "VAT Legal Statement"
-msgstr "BTW-verklaring"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De Object naam moet beginnen met x_ en mag geen speciaal teken bevatten !"
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
-msgid "VAT"
-msgstr "BTW"
+msgid "Base VAT - To check VAT number validity"
+msgstr "Basis BTW - voor controle geldigheid BTW nummer"
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
+msgid "The VAT is invalid, It should begin with the country code"
+msgstr "De BTW-nummer is ongeldig, het zou moeten beginnen met de landcode"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+"Aanvinken indien de relatie BTW-plichtig is. Het wordt gebruikt voor de BTW "
+"aangifte."
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr "BTW-plichtig"
+
+#~ msgid "VAT"
+#~ msgstr "BTW"
+
+#~ msgid ""
+#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
+#~ msgstr ""
+#~ "Activeer het BTW-nummer voor de relatie. Controleer of het BTW-nummer geldig "
+#~ "is."
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index 98aecb1e7f2..ae5d7f93889 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/i18n/sr.po
@@ -7,34 +7,70 @@ 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-10-15 08:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 21:02+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-16 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
-#: model:ir.module.module,description:base_vat.module_meta_information
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
 msgid ""
-"Enable the VAT Number for the partner. Check the validity of that VAT Number."
-msgstr ""
-"Dozvoli porezni broj partnera. Proveri ispravnost tog poreznog broja."
+"The Vat does not seems to be correct. You should have entered something like "
+"this %s"
+msgstr "PDV izgleda da nije korektan. Trebas upisati nesto kao %s"
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Nevažeći XML za pregled arhitekture"
 
+#. module: base_vat
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora poceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#. module: base_vat
+#: model:ir.module.module,shortdesc:base_vat.module_meta_information
+msgid "Base VAT - To check VAT number validity"
+msgstr "Osnovni PDV - Za Proveru validnosti PDV cifre"
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
+msgid "The VAT is invalid, It should begin with the country code"
+msgstr "PDV je neispravan, trebalo bi da zapocne sa kodom zemlje"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+"Cekiraj ovu kucicu ukoliko je PDV naslovljen na partnera. On ce koristiti "
+"zakonsku PDV izjavu."
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
 msgstr "PDV zakonska izjava"
 
-#. module: base_vat
-#: model:ir.module.module,shortdesc:base_vat.module_meta_information
-msgid "VAT"
-msgstr "PDV"
+#~ msgid "VAT"
+#~ msgstr "PDV"
+
+#~ msgid ""
+#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
+#~ msgstr ""
+#~ "Dozvoli porezni broj partnera. Proveri ispravnost tog poreznog broja."
diff --git a/addons/board/i18n/nl.po b/addons/board/i18n/nl.po
index 38e6fdd21c6..eb254929d76 100644
--- a/addons/board/i18n/nl.po
+++ b/addons/board/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 12:33+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 08:42+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1b1e7ec04e9..dff880c7fce 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -347,8 +347,8 @@
                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Category" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <filter string="Campaign" icon="terp-stock_symbol-selection"
+                    <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
+                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                         domain="[]" context="{'group_by':'type_id'}" />
                     <filter string="Channel" icon="terp-call-start"
                         domain="[]" context="{'group_by':'channel_id'}" />
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a028e3e0e64..2f215488c99 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -32,7 +32,7 @@
                     <field name="categ_id" widget="selection"
                         string="Meeting Type" groups="base.group_extended"
                         domain="[('object_id.model', '=', 'crm.meeting')]" />
-                    <field name="allday" on_change="onchange_allday(allday)" />
+                    <field name="allday" on_change="onchange_dates(date,False,False,allday)" />
                     <newline/>
                     <field name="date" string="Start Date" required="1"
                         on_change="onchange_dates(date,duration,False,allday)" />
@@ -321,7 +321,7 @@
                            <field name="user_id" select="1"/>
                        </group>
                         <newline/>
-                        <group expand="0" string="Extended Options...">
+                        <group expand="0" string="Extended Filters...">
                            <field name="class" select="1" string="Privacy"/>
                            <field name="show_as" string="Show time as" select="1"/>
                         </group>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 644d12cfc77..a13c3675fa1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -75,7 +75,7 @@
                                 <field name="state"/>
                                 <button name="case_cancel" string="Cancel"
                                     states="draft" type="object"
-                                    icon="gtk-close" />
+                                    icon="gtk-cancel" />
                                 <button name="case_mark_lost" string="Mark Lost"
                                     states="open,pending" type="object"
                                     icon="gtk-cancel" />
@@ -330,9 +330,9 @@
                                 context="{'group_by':'priority'}" />
                             <filter string="Category" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'categ_id'}" />
-                            <filter string="Campaign" icon="terp-stock_symbol-selection"
+                            <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                                 domain="[]" context="{'group_by':'type_id'}" groups="base.group_extended"/>
-                            <filter string="Channel" icon="terp-stock_symbol-selection"
+                            <filter string="Channel" icon="terp-call-start"
                                 domain="[]" context="{'group_by':'channel_id'}" />
                             <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                             <separator orientation="vertical" />
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 61b2dd1c4d0..0763135b80b 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 09:53+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:30+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+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 b16825d6779..c37d2aa7431 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 13:48+0000\n"
+"PO-Revision-Date: 2010-10-28 09:17+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index b711bd68fb5..6f24d89bec2 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -139,9 +139,9 @@
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Campaign" icon="terp-stock_symbol-selection"
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-stock_symbol-selection"
+                        <filter string="Channel" icon="terp-call-start"
                             domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a8e269b77ee..5cb8a74b95b 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -64,7 +64,7 @@
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Phone calls made in last month"/>
                         <separator orientation="vertical" />
-                        <filter icon="terp-check"
+                        <filter icon="terp-gtk-go-back-rtl"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"
                             help="Phone calls which are in draft and open state"/>
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index 82a902a772b..0ee02e7f33c 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 09:58+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 08:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po
index da1290de6bc..22ffd8b5a50 100644
--- a/addons/crm_fundraising/i18n/nl.po
+++ b/addons/crm_fundraising/i18n/nl.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:01+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index f2570a8c57c..1508704d2d6 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -64,7 +64,7 @@ class crm_helpdesk(crm.crm_case, osv.osv):
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"), 
-            'duration': fields.float('Duration'), 
+            'duration': fields.float('Duration', states={'done': [('readonly', True)]}), 
             'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index 4ec07e8b769..706c45bcafd 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:03+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 71e784ca90f..6562d17012d 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -18,7 +18,7 @@
                         <filter icon="terp-check"
                             string="Current"
                             domain="[('state','in',('draft','open'))]"/>
-                        <filter icon="terp-check"
+                        <filter icon="terp-dialog-close"
                             string="Closed"
                             domain="[('state','=','done')]"/>
                         <separator orientation="vertical" />
@@ -47,7 +47,7 @@
                    <group  expand="1" string="Group By...">
                        <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_assigned_id'}" />
+                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" />
                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Section" icon="terp-personal+"
diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po
index bc9edc23f90..4e218acca9a 100644
--- a/addons/crm_profiling/i18n/nl.po
+++ b/addons/crm_profiling/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:07+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 08:38+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index 5dbb2006b52..e91e8d2d1c1 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -23,7 +23,6 @@ from osv import osv, fields
 from tools import cache
 import pooler
 
-
 class decimal_precision(osv.osv):
     _name = 'decimal.precision'
     _columns = {
@@ -31,7 +30,7 @@ class decimal_precision(osv.osv):
         'digits': fields.integer('Digits', required=True),
     }
     _defaults = {
-        'digits': lambda *a : 2,
+        'digits': 2,
     }
 
     _sql_constraints = [
@@ -55,10 +54,10 @@ class decimal_precision(osv.osv):
 
 decimal_precision()
 
-
 def get_precision(application):
     def change_digit(cr):
         res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, application)
         return (16, res)
     return change_digit
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/decimal_precision/i18n/nl.po b/addons/decimal_precision/i18n/nl.po
index 797d0eedc1a..935e4370288 100644
--- a/addons/decimal_precision/i18n/nl.po
+++ b/addons/decimal_precision/i18n/nl.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:08+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:29+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index 22a62246dbf..6ecff2d7a6c 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 16:05+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:29+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index e5719705ebe..544ad1694be 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -162,7 +162,7 @@
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
                     <filter string="Static" domain="[('type','=','directory')]"/>
-                    <filter string="Resources" domain="[('type','=','ressource')]"/>
+                    <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <separator orientation="vertical"/>
                     <field name="name" />
                     <field name="user_id" />
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index 46aba593082..6e294448519 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 18:11+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 08:58+0000\n"
+"Last-Translator: OpenERP Administrators <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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -517,6 +517,7 @@ msgstr ""
 msgid ""
 "If not checked, media is currently offline and its contents not available"
 msgstr ""
+"Indien niet aangevinkt, is medium offline en de inhoud niet beschikbaar"
 
 #. module: document
 #: view:document.directory:0
@@ -553,11 +554,14 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Vink dit veld aan als u wilt dat de naam van het bestand de recordnaam "
+"bevat.\n"
+"In dat geval moet de map een resource zijn."
 
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr "Inclusief naam record"
+msgstr "Naam record invoegen"
 
 #. module: document
 #: view:ir.attachment:0
@@ -567,12 +571,12 @@ msgstr "Bijlage"
 #. module: document
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief menu maken"
 
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "Online"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -592,13 +596,13 @@ msgstr "Beveiliging"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -615,13 +619,13 @@ msgstr "Groepen"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: document
 #: view:ir.attachment:0
@@ -638,12 +642,12 @@ msgstr "Definitie"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr "Reeks"
+msgstr "Volgnr."
 
 #. module: document
 #: selection:document.storage,type:0
@@ -653,12 +657,12 @@ msgstr "Database"
 #. module: document
 #: help:document.configuration,project:0
 msgid "Auto directory configuration for Projects."
-msgstr ""
+msgstr "Auto map configuratie voor projecten."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr ""
+msgstr "Gerelateerd aan"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
@@ -673,22 +677,22 @@ msgstr "Gekoppeld aan"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr "Bestanden per gebruikers"
+msgstr "Bestanden per gebruiker"
 
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr ""
+msgstr "Alleen lezen"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Expressie"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -702,7 +706,7 @@ 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 ""
-"Als u hier een object plaats, zal dit mapsjabloon onderaan al deze objecten "
+"Als u hier een object plaatst, zal dit mapsjabloon onderaan al deze objecten "
 "verschijnen. Plaats geen bovenliggende map als u een bovenliggend model "
 "kiest."
 
@@ -717,12 +721,12 @@ msgstr "Bestanden per maand"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Voorvoegsel"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -737,12 +741,12 @@ msgstr "Bestandsnaam"
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr "Bron ID"
+msgstr "Resource ID"
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "Externe opslag"
 
 #. module: document
 #: constraint:ir.model:0
@@ -761,7 +765,7 @@ msgstr "Wall of Shame"
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Voor bestandsopslag, het hoofdpad van de opslag"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -771,17 +775,17 @@ msgstr "Details bestanden per relatie"
 #. module: document
 #: field:document.directory.dctx,field:0
 msgid "Field"
-msgstr ""
+msgstr "Veld"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "Map dynamische context"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr "Hoofdmodel"
+msgstr "Bovenliggend model"
 
 #. module: document
 #: view:report.document.user:0
@@ -805,7 +809,7 @@ msgstr "Overzichten"
 #. module: document
 #: field:document.configuration,product:0
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -816,12 +820,12 @@ msgstr "Boomstructuur"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-msgstr "Alls gebruikersbestanden"
+msgstr "Alle gebruikersbestanden"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
@@ -832,27 +836,28 @@ msgstr "Gebruikers die de laatste maand geen documenten hebben toegevoegd"
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
 msgstr ""
+"Voor elke hier gemaakte invoer verschijnen virtuele bestanden in deze map."
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Nieuwe bestanden"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: document
 #: view:document.directory:0
 msgid "Static"
-msgstr ""
+msgstr "Statisch"
 
 #. module: document
 #: view:report.files.partner:0
@@ -865,6 +870,8 @@ msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
 msgstr ""
+"De naam van het veld. Merk op dat het voorvoegsel \"dctx_\" aan het begin "
+"wordt gezet van de tekst die hier wordt ingevuld."
 
 #. module: document
 #: view:report.document.user:0
@@ -880,7 +887,7 @@ msgstr "Notities"
 #: help:document.configuration,sale_order:0
 msgid ""
 "Auto directory configuration for Sale Orders and Quotation with report."
-msgstr ""
+msgstr "Auto map configuratie voor verkooporders en offerte met overzicht."
 
 #. module: document
 #: help:document.directory,type:0
@@ -891,18 +898,23 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"Elke map kan of het soort statisch zijn of worden gekoppeld aan een andere "
+"resource. Een statische map is, zoals bij het operating systeem, de "
+"klassieke map die een set bestanden kan bevatten. De mappen die zijn "
+"gekoppeld aan een resource bevatten automatisch submappen voor alle resource "
+"soorten die in de bovenliggende map zijn gedefinieerd."
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr ""
+msgstr "Statistieken per gebruiker"
 
 #. module: document
 #: field:document.directory,name:0
@@ -913,18 +925,18 @@ msgstr "Naam"
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "Velden"
 
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "Indien ingesteld is medium alleen lezen"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: document
 #: field:report.document.user,nbr:0
@@ -938,6 +950,7 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
+"Alleen leden van deze groepen hebben toegang tot deze map en haar bestanden."
 
 #. module: document
 #: view:document.directory:0
@@ -945,16 +958,18 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Deze groepen gelden echter NIET voor onderliggende mappen, die hun eigen "
+"groepen moeten definiëren."
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
+msgstr "Mime Type"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr "Reeks"
+msgstr "Volgorde"
 
 #. module: document
 #: field:document.directory.content,name:0
@@ -970,13 +985,13 @@ msgstr "Bestandsnaam moet uniek zijn!"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "Interne opslag"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directories' Structure"
-msgstr ""
+msgstr "Mapstructuur"
 
 #. module: document
 #: view:board.board:0
@@ -989,19 +1004,19 @@ msgstr "Bestanden per soort bron"
 #: field:report.document.user,name:0
 #: field:report.files.partner,name:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: document
 #: view:document.storage:0
 #: model:ir.model,name:document.model_document_storage
 #: model:ir.ui.menu,name:document.menu_document_storage_media
 msgid "Storage Media"
-msgstr ""
+msgstr "Opslagmedium"
 
 #. module: document
 #: view:document.storage:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "Zoek documentopslag"
 
 #. module: document
 #: field:document.directory.content,extension:0
diff --git a/addons/document_ics/i18n/nl.po b/addons/document_ics/i18n/nl.po
index d9bc9834e84..7f140878445 100644
--- a/addons/document_ics/i18n/nl.po
+++ b/addons/document_ics/i18n/nl.po
@@ -6,16 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 13:42+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 08:04+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: document_ics
+#: help:document.ics.crm.wizard,claims:0
+msgid ""
+"Manages the supplier and customers claims,including your corrective or "
+"preventive actions."
+msgstr ""
+"Beheert de leverancier- en klantklachten, inclusief uw correctieve en "
+"preventieve acties."
+
+#. module: document_ics
+#: field:document.directory.content,object_id:0
+msgid "Object"
+msgstr "Object"
+
 #. module: document_ics
 #: constraint:ir.model:0
 msgid ""
@@ -29,34 +43,35 @@ msgid "uid"
 msgstr "uid"
 
 #. module: document_ics
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Fout! U kunt geen recursieve mappen maken"
+#: help:document.ics.crm.wizard,fund:0
+msgid ""
+"This may help associations in their fund raising process and tracking."
+msgstr "Dit kan verenigingen helpen bij het bijhouden van hun fondsenwerving"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
 msgstr "Werving & selectieproces"
 
-#. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "Configure Calendars for CRM Sections"
-msgstr "Configureer agenda's voor CRM-secties"
-
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
 msgstr "Helpdesk"
 
 #. module: document_ics
-#: field:document.directory.ics.fields,field_id:0
-msgid "Open ERP Field"
-msgstr "OpenERP veld"
+#: selection:document.directory.ics.fields,fn:0
+msgid "Interval in hours"
+msgstr "Interval in uren"
 
 #. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "Next"
-msgstr "Volgende"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "deelnemer"
+
+#. module: document_ics
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr "Fout ! U kunt geen recursief verkoopteam maken."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -74,50 +89,44 @@ msgid "Shared Calendar Meetings"
 msgstr "Gedeelde agenda vergaderingen"
 
 #. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "url"
-msgstr "url"
+#: help:document.ics.crm.wizard,helpdesk:0
+msgid "Manages an Helpdesk service."
+msgstr "Beheert een helpdesk-dienst."
 
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de actie-definitie."
 
-#. module: document_ics
-#: help:document.ics.crm.wizard,bugs:0
-msgid "Used by companies to track bugs and support requests on softwares"
-msgstr ""
-"Gebruikt door bedrijven om foutrapporten en ondersteuningsverzoeken op "
-"software te volgen."
-
-#. 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 ""
-"Deze configuratiestap wordt gebruikt om agenda's te maken in document voor "
-"alle dossier-secties."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: document_ics
-#: help:document.ics.crm.wizard,jobs:0
+#: model:ir.model,name:document_ics.model_crm_meeting
+msgid "Meeting"
+msgstr "Afspraak"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,lead:0
 msgid ""
-"Help you to organise the jobs hiring process: evaluation, meetings, email "
-"integration..."
+"Allows you to track and manage leads which are pre-sales requests or "
+"contacts, the very first contact with a customer request."
 msgstr ""
-"Helpt u om het werving & selectieproces te organiseren: evaluaties, "
-"gesprekken, email-integratie..."
+"Laat u leads beheren en volgen die pre-sales aanvragen of contacten zijn, "
+"het eerste contact met een klant."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "description"
 msgstr "omschrijving"
 
+#. module: document_ics
+#: field:document.directory.ics.fields,fn:0
+msgid "Function"
+msgstr "Functie"
+
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
@@ -129,15 +138,23 @@ msgid "Tracks identified business opportunities for your sales pipeline."
 msgstr "Volgt geïdentificeerde kansen voor uw sales pijplijn."
 
 #. module: document_ics
-#: help:document.ics.crm.wizard,fund:0
-msgid ""
-"This may help associations in their fund raising process and tracking."
-msgstr "Dit kan verenigingen helpen bij het bijhouden van hun fondsenwerving"
+#: field:document.ics.crm.wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Configuratievoortgang"
 
 #. module: document_ics
-#: help:document.ics.crm.wizard,helpdesk:0
-msgid "Manages an Helpdesk service."
-msgstr "Beheert een helpdesk-dienst."
+#: help:document.ics.crm.wizard,jobs:0
+msgid ""
+"Helps you to organise the jobs hiring process: evaluation, meetings, email "
+"integration..."
+msgstr ""
+"Help u bij het organiseren van het wervingsproces: evaluatie, afspraken, "
+"email integratie..."
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "title"
+msgstr "titel"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
@@ -145,14 +162,14 @@ msgid "Fund Raising Operations"
 msgstr "Fondswervingsacties"
 
 #. module: document_ics
-#: field:document.directory.content,ics_object_id:0
-msgid "Object"
-msgstr "Object"
+#: model:ir.model,name:document_ics.model_document_directory_content
+msgid "Directory Content"
+msgstr "Mapinhoud"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive sections."
-msgstr "Fout! U kunt geen recursieve secties maken"
+#: model:ir.model,name:document_ics.model_document_directory_ics_fields
+msgid "Document Directory ICS Fields"
+msgstr "Documentmap ICS velden"
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
@@ -160,9 +177,18 @@ msgid "Support for iCal based on Document Management System"
 msgstr "Ondersteuning voor iCal gebaseerd op documentbeheersysteem."
 
 #. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "location"
-msgstr "locatie"
+#: help:document.ics.crm.wizard,phonecall:0
+msgid ""
+"Helps you to encode the result of a phone call or to plan a list of phone "
+"calls to process."
+msgstr ""
+"Helpt u bij het vastleggen van de uitkomst van een telefoongesprek of het "
+"plannen van een lijst van af te handelen telefoongesprekken."
+
+#. module: document_ics
+#: field:document.directory.ics.fields,field_id:0
+msgid "OpenERP Field"
+msgstr "OpenERP veld"
 
 #. module: document_ics
 #: view:document.directory:0
@@ -175,48 +201,41 @@ msgid "ICS Value"
 msgstr "ICS-waarde"
 
 #. module: document_ics
-#: model:ir.module.module,description:document_ics.module_meta_information
-msgid "Allows to synchronise calendars with others applications."
-msgstr ""
-"Maakt het mogelijk agenda's te synchroniseren met externe toepassingen."
+#: selection:document.directory.ics.fields,fn:0
+msgid "Expression as constant"
+msgstr "Expressie als constante"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "location"
+msgstr "locatie"
 
 #. module: document_ics
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Ongeldige XML voor weergave!"
 
-#. module: document_ics
-#: help:document.ics.crm.wizard,lead:0
-msgid ""
-"Allows you to track and manage prospects which are pre-sales requests or "
-"contacts, the very first contact with a customer request."
-msgstr ""
-"Maakt het mogelijk prospects, of pre-sales contacten, te beheren en te "
-"volgen."
-
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
 msgid "Name"
 msgstr "Naam"
 
+#. module: document_ics
+#: help:document.directory.ics.fields,fn:0
+msgid "Alternate method                 of calculating the value"
+msgstr "Alternatieve manier om de waarde te berekenen"
+
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
 msgstr "Beheert de vergader-/contactagenda van de gebruikers"
 
 #. module: document_ics
-#: field:document.directory.content,ics_domain:0
-msgid "Domain"
-msgstr "Domein"
-
-#. module: document_ics
-#: help:document.ics.crm.wizard,claims:0
-msgid ""
-"Manages the supplier and customers claims, including your corrective or "
-"preventive actions."
+#: help:document.ics.crm.wizard,bugs:0
+msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
-"Beheert de claims van leveranciers en klanten, inclusief uw corrigerende of "
-"preventieve acties."
+"Gebruikt door bedrijven voor het bijhouden van fouten en support aanvragen "
+"bij software"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -228,11 +247,6 @@ msgstr "laatst gewijzigd"
 msgid "ICS Mapping"
 msgstr "ICS-vertaling"
 
-#. module: document_ics
-#: view:crm.case:0
-msgid "Duration(In Hour)"
-msgstr "Duur (in uren)"
-
 #. module: document_ics
 #: field:document.ics.crm.wizard,document_ics:0
 msgid "Shared Calendar"
@@ -243,24 +257,15 @@ msgstr "Gedeelde agenda"
 msgid "Claims"
 msgstr "Claims"
 
-#. 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 ""
-"Helpt u de resultaten van telefoongesprekken te registreren of om een lijst "
-"van te voeren telefoongesprekken te plannen."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstart"
 msgstr "startdatum"
 
 #. module: document_ics
-#: field:document.ics.crm.wizard,phonecall:0
-msgid "Phone Calls"
-msgstr "Telefoongesprekken"
+#: field:document.directory.ics.fields,expr:0
+msgid "Expression"
+msgstr "Expressie"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
@@ -273,14 +278,40 @@ msgid "categories"
 msgstr "categorieën"
 
 #. module: document_ics
-#: field:document.ics.crm.wizard,lead:0
-msgid "Prospect"
-msgstr "Prospect"
+#: selection:document.directory.ics.fields,fn:0
+msgid "Use the field"
+msgstr "Gebruik het veld"
 
 #. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "Create Pre-Configured Calendars"
-msgstr "Maak voorgeconfigureerde agenda's"
+#: field:document.directory.content,ics_domain:0
+msgid "Domain"
+msgstr "Domein"
+
+#. module: document_ics
+#: field:document.directory.content,fname_field:0
+msgid "Filename field"
+msgstr "Bestandsnaam veld"
+
+#. module: document_ics
+#: field:document.directory.content,obj_iterate:0
+msgid "Iterate object"
+msgstr "Herhalen object"
+
+#. module: document_ics
+#: field:crm.meeting,code:0
+msgid "Calendar Code"
+msgstr "Agendacode"
+
+#. module: document_ics
+#: model:ir.module.module,description:document_ics.module_meta_information
+msgid "Allows to synchronise calendars with others applications."
+msgstr ""
+"Maakt het mogelijk agenda's te synchroniseren met externe toepassingen."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,config_logo:0
+msgid "Image"
+msgstr "Afbeelding"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -288,29 +319,38 @@ msgid "created"
 msgstr "gemaakt"
 
 #. module: document_ics
-#: field:crm.case,code:0
-msgid "Calendar Code"
-msgstr "Agendacode"
+#: help:document.directory.content,obj_iterate:0
+msgid ""
+"If set, a separate                         instance will be created for each "
+"record of Object"
+msgstr ""
+"Indien ingesteld, wordt een apart exemplaar voor elk record van het object "
+"gemaakt."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "summary"
 msgstr "samenvatting"
 
+#. module: document_ics
+#: field:document.ics.crm.wizard,lead:0
+msgid "Leads"
+msgstr "Leads"
+
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
 msgid "document.ics.crm.wizard"
 msgstr "document.ics.crm.wizard"
 
 #. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "deelnemer"
+#: view:document.ics.crm.wizard:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
 
 #. module: document_ics
-#: model:ir.model,name:document_ics.model_document_directory_ics_fields
-msgid "document.directory.ics.fields"
-msgstr "document.directory.ics.fields"
+#: field:document.ics.crm.wizard,phonecall:0
+msgid "Phone Calls"
+msgstr "Telefoongesprekken"
 
 #. module: document_ics
 #: field:document.directory.content,ics_field_ids:0
@@ -318,9 +358,9 @@ msgid "Fields Mapping"
 msgstr "Vertaling velden"
 
 #. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "Cancel"
-msgstr "Annuleren"
+#: selection:document.directory.ics.fields,name:0
+msgid "url"
+msgstr "url"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
@@ -331,3 +371,82 @@ msgstr "Zakelijke kansen"
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstamp"
 msgstr "datum/tijd"
+
+#. module: document_ics
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
+msgstr ""
+"Het veld van het object wordt gebruikt als bestandsnaam. Moet een unieke "
+"identifier zijn."
+
+#~ msgid "Open ERP Field"
+#~ msgstr "OpenERP veld"
+
+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+#~ msgid "Configure Calendars for CRM Sections"
+#~ msgstr "Configureer agenda's voor CRM-secties"
+
+#~ msgid "Used by companies to track bugs and support requests on softwares"
+#~ msgstr ""
+#~ "Gebruikt door bedrijven om foutrapporten en ondersteuningsverzoeken op "
+#~ "software te volgen."
+
+#~ msgid ""
+#~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
+#~ "integration..."
+#~ msgstr ""
+#~ "Helpt u om het werving & selectieproces te organiseren: evaluaties, "
+#~ "gesprekken, email-integratie..."
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "Fout! U kunt geen recursieve secties maken"
+
+#~ msgid ""
+#~ "Allows you to track and manage prospects which are pre-sales requests or "
+#~ "contacts, the very first contact with a customer request."
+#~ msgstr ""
+#~ "Maakt het mogelijk prospects, of pre-sales contacten, te beheren en te "
+#~ "volgen."
+
+#~ msgid ""
+#~ "Manages the supplier and customers claims, including your corrective or "
+#~ "preventive actions."
+#~ msgstr ""
+#~ "Beheert de claims van leveranciers en klanten, inclusief uw corrigerende of "
+#~ "preventieve acties."
+
+#~ msgid "Duration(In Hour)"
+#~ msgstr "Duur (in uren)"
+
+#~ msgid ""
+#~ "Help you to encode the result of a phone call or to planify a list of phone "
+#~ "calls to process."
+#~ msgstr ""
+#~ "Helpt u de resultaten van telefoongesprekken te registreren of om een lijst "
+#~ "van te voeren telefoongesprekken te plannen."
+
+#~ msgid "Create Pre-Configured Calendars"
+#~ msgstr "Maak voorgeconfigureerde agenda's"
+
+#~ msgid "Prospect"
+#~ msgstr "Prospect"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "Fout! U kunt geen recursieve mappen maken"
+
+#~ msgid ""
+#~ "This Configuration step use to create Calendars in document for all Case "
+#~ "Sections"
+#~ msgstr ""
+#~ "Deze configuratiestap wordt gebruikt om agenda's te maken in document voor "
+#~ "alle dossier-secties."
+
+#~ msgid "document.directory.ics.fields"
+#~ msgstr "document.directory.ics.fields"
diff --git a/addons/document_webdav/i18n/nl.po b/addons/document_webdav/i18n/nl.po
index 4698434af05..0026d6d4fe7 100644
--- a/addons/document_webdav/i18n/nl.po
+++ b/addons/document_webdav/i18n/nl.po
@@ -7,25 +7,133 @@ 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-09-02 07:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 07:42+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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-09-29 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: document_webdav_old
-#: model:ir.module.module,description:document_webdav_old.module_meta_information
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "document.webdav.dir.property"
+
+#. module: document_webdav
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave opbouw!"
+
+#. module: document_webdav
+#: constraint:ir.model:0
 msgid ""
-"This is a complete document management system:\n"
-"\t* WebDav Interface\n"
-"\t* User Authentification\n"
-"\t* Document Indexation\n"
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Dit is een compleet document management systeem:\n"
-"\t* WebDav Interface\n"
-"\t* Gebruiker authentificatie\n"
-"\t* Document Indexatie\n"
+"De objectnaam moet beginnen met x_ en mag geen speciaal teken bevatten !"
+
+#. module: document_webdav
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ongeldige modelnaam in actie definitie."
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Fout ! U kunt geen recursieve mappen maken."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Group By..."
+msgstr "Groepeer op..."
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr "WebDAV server voor documentbeheer"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+msgid "Namespace"
+msgstr "Naamruimte"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV eigenschappen"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamische context"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Deze eigenschappen worden toegevoegd bij WebDAV aanvragen"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+msgid "Substitute"
+msgstr "Vervangen"
+
+#. module: document_webdav
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kunt geen recursief menu maken."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV eigenschappen"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Map"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+msgid "Value"
+msgstr "Waarde"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Search Document storage"
+msgstr "Zoek documentopslag"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
+msgstr "DAV eigenschappen voor mappen"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Map"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+msgid "Name"
+msgstr "Naam"
+
+#~ msgid ""
+#~ "This is a complete document management system:\n"
+#~ "\t* WebDav Interface\n"
+#~ "\t* User Authentification\n"
+#~ "\t* Document Indexation\n"
+#~ msgstr ""
+#~ "Dit is een compleet document management systeem:\n"
+#~ "\t* WebDav Interface\n"
+#~ "\t* Gebruiker authentificatie\n"
+#~ "\t* Document Indexatie\n"
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 36e7a5f9037..5da74772c44 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -183,7 +183,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group by..." colspan="4" col="10">
-                        <filter string="Account" domain="[]" context="{'group_by':'from_account'}" icon="terp-personal"/>
+                        <filter string="Account" domain="[]" context="{'group_by':'from_account'}" icon="terp-folder-orange"/>
                         <separator orientation="vertical"/>
                         <filter string="Resource" domain="[]" context="{'group_by':'object_name'}" icon="terp-accessories-archiver"/>
                     </group>
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index 909f65d15a6..44ce414633c 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/i18n/nl.po
@@ -6,21 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-07 07:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 11:32+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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-09-29 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+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 "Einddatum"
+#: view:event.event:0
+msgid "Invoice Information"
+msgstr "Factuurinformatie"
+
+#. module: event
+#: help:event.event,register_max:0
+msgid "Provide Maximun Number of Registrations"
+msgstr "Geef maximum aantal inschrijvingen"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event Details"
+msgstr "Details evenement"
+
+#. module: event
+#: field:event.event,main_speaker_id:0
+msgid "Main Speaker"
+msgstr "Hoofdspreker"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "Group By..."
+msgstr "Groepeer op..."
 
 #. module: event
 #: field:event.event,register_min:0
@@ -33,49 +54,143 @@ msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: event
-#: field:event.event,mail_registr:0
-msgid "Registration Email"
-msgstr "Registratie email"
+#: field:event.registration.badge,title:0
+msgid "Title"
+msgstr "Titel"
 
 #. module: event
-#: model:crm.case.section,name:event.event_0_crm_case_section
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr "Inschrijving email"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_confirm_registration
+msgid "Make Invoices"
+msgstr "Maak facturen"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Registration Date"
+msgstr "Inschrijfdatum"
+
+#. module: event
+#: help:event.event,main_speaker_id:0
+msgid "Speaker who are giving speech on event."
+msgstr "Spreker die een toespraak houdt tijdens gebeurtenis."
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Close"
+msgstr "_Sluiten"
+
+#. module: event
+#: model:event.event,name:event.event_0
 msgid "Concert of Bon Jovi"
 msgstr "Concert van Bon Jovi"
 
+#. module: event
+#: help:event.event,unit_price:0
+msgid ""
+"This will be the default price used as registration cost when invoicing this "
+"event. Note that you can specify for each registration a specific amount if "
+"you want to"
+msgstr ""
+"Dit wordt de standaardprijs voor inschrijfkosten bij factureren van dit "
+"evenement. Merk op dat u voor elke inschrijving een specifiek bedrag kunt "
+"opgeven als u dat wilt."
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "March"
+msgstr "Maart"
+
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
 msgstr "Bevestigings email"
 
 #. module: event
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive sections."
-msgstr "Fout! U kunt geen recursieve secties maken."
+#: code:addons/event/wizard/event_make_invoice.py:0
+#, python-format
+msgid "Registration doesn't have any partner to invoice."
+msgstr "Inschrijving heeft geen relatie om te factureren."
 
 #. module: event
+#: field:event.event,company_id:0
+#: field:event.registration,company_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: event
+#: field:event.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Factuurdatum"
+
+#. module: event
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr "Prijslijstversie voor actuele evenement."
+
+#. module: event
+#: code:addons/event/wizard/partner_event_registration.py:0
+#: view:event.registration:0
+#: model:ir.actions.act_window,name:event.action_partner_event_registration
 #: model:ir.model,name:event.model_event_registration
+#: view:partner.event.registration:0
+#, python-format
 msgid "Event Registration"
 msgstr "Evenementregistratie"
 
 #. module: event
-#: model:ir.actions.wizard,name:event.event_reg_invoice
+#: view:report.event.registration:0
+msgid "Last 7 Days"
+msgstr "Laatste 7 dagen"
+
+#. module: event
+#: field:event.event,parent_id:0
+msgid "Parent Event"
+msgstr "Bovenliggend evenement"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
 msgstr "Maak factuur"
 
 #. module: event
-#: field:report.event.type.registration,draft_state:0
-msgid "Draft Registrations"
-msgstr "Concept inschrijvingen"
+#: field:event.registration,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotaal"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "Gebeurtenis bij registratie"
+msgstr "Evenement met inschrijving"
 
 #. module: event
-#: wizard_button:event.reg_make_invoice,init,end:0
-msgid "Ok"
-msgstr "Ok"
+#: view:report.event.registration:0
+msgid "Current Events"
+msgstr "Actuele evenementen"
+
+#. module: event
+#: view:event.registration:0
+msgid "Add Internal Note"
+msgstr "Interne notitie toevoegen"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_report_event_registration
+#: model:ir.model,name:event.model_report_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+#: view:report.event.registration:0
+msgid "Events Analysis"
+msgstr "Evenement analyse"
+
+#. module: event
+#: field:event.registration,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -88,62 +203,98 @@ msgid "Ticket for Opera"
 msgstr "Operakaartje"
 
 #. module: event
-#: wizard_field:event.reg_make_invoice,init,inv_rejected:0
-msgid "Invoice Rejected"
-msgstr "Factuur geweigerd"
-
-#. module: event
+#: code:addons/event/event.py:0
 #: view:event.event:0
+#, python-format
 msgid "Confirm Event"
 msgstr "Bevestig evenement"
 
 #. module: event
-#: model:crm.case.section,name:event.event_1_crm_case_section
+#: selection:event.event,state:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: event
+#: field:event.event,reply_to:0
+msgid "Reply-To"
+msgstr "Antwoord naar"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.open_board_associations_manager
+msgid "Event Dashboard"
+msgstr "Evenement dashboard"
+
+#. module: event
+#: model:event.event,name:event.event_1
 msgid "Opera of Verdi"
 msgstr "Opera van Verdi"
 
 #. module: event
-#: field:report.event.registration,draft_state:0
-msgid "Draft Registration"
-msgstr "Concept inschrijving"
+#: field:event.event,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prijslijst"
 
 #. module: event
-#: wizard_view:event.reg_make_invoice,init:0
-msgid "Create Invoices"
-msgstr "Maak facturen"
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr "Contactpersoon relatie"
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration_badge
+msgid "event.registration.badge"
+msgstr "event.registration.badge"
+
+#. module: event
+#: field:event.registration,ref:0
+msgid "Reference"
+msgstr "Referentie"
+
+#. module: event
+#: help:event.event,date_end:0
+#: help:partner.event.registration,end_date:0
+msgid "Closing Date of Event"
+msgstr "Sluitdatum evenement"
+
+#. module: event
+#: view:event.registration:0
+msgid "Emails"
+msgstr "Emails"
 
 #. module: event
 #: model:ir.module.module,description:event.module_meta_information
 msgid ""
-"Organization and management of events.\n"
+"Oraganization and management of Event.\n"
 "\n"
 "    This module allow you\n"
 "        * to manage your events and their registrations\n"
 "        * to use emails to automatically confirm and send acknowledgements "
 "for any registration to an event\n"
 "        * ...\n"
-"\n"
+"    A dashboard for associations that includes:\n"
+"    * Registration by Events (graph)\n"
 "    Note that:\n"
 "    - You can define new types of events in\n"
 "                Events / Configuration / Types of Events\n"
 "    - You can access predefined reports about number of registration per "
-"event or per event category in :\n"
+"event or per event category in:\n"
 "                Events / Reporting\n"
 msgstr ""
-"Organisatie en beheer van evenementen.\n"
+"Organisatie en beheer van evenement.\n"
 "\n"
-"    Deze module stelt u in staat\n"
-"        * uw evenementen en hun inschrijvingen te beheren\n"
-"        * emails te gebruiken voor automatische bevestigingen voor elke "
-"inschrijving van een evenement\n"
+"    Deze module laat u \n"
+"        * evenementen in inschrijvingen beheren\n"
+"        * email gebruiken om automatisch alle inschrijvingen te bevestigen\n"
 "        * ...\n"
-"\n"
+"    Een dashboard voor verenigingen dat inhoudt:\n"
+"    * Inschrijvingen per evenement (grafiek)\n"
 "    Merk op dat:\n"
-"    - U nieuwe soorten evenementen kunt definiëren in\n"
-"        Evenementen / Instellingen / Soorten evenementen\n"
-"    - U kunt voorgedefinieerde overzichten over aantallen inschrijvingen per "
-"evenement of per evenementcategorie in:\n"
-"        Evenementen / Overzichten\n"
+"    - U nieuwe soorten evenementen kunt definiëren in \n"
+"                Evenement / Configuratie / Evenementsoorten\n"
+"    - U voorgedefinieerde overzichten kunt gebruiken over het aantal "
+"inschrijvingen per evenement categorie in:\n"
+"                Evenement / Overzichten\n"
 
 #. module: event
 #: view:event.registration:0
@@ -151,43 +302,122 @@ msgid "Extra Info"
 msgstr "Extra informatie"
 
 #. module: event
+#: view:event.event:0
 #: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
 msgid "Registration"
 msgstr "Inschrijving"
 
+#. module: event
+#: selection:event.event,state:0
+#: selection:report.event.registration,state:0
+msgid "Draft"
+msgstr "Concept"
+
 #. module: event
 #: field:event.type,name:0
-#: model:ir.model,name:event.model_event_type
 msgid "Event type"
-msgstr "Soort evenement"
+msgstr "Evenementsoort"
+
+#. module: event
+#: model:ir.model,name:event.model_event_type
+msgid " Event Type "
+msgstr " Evenementsoort "
 
 #. module: event
 #: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,event_id:0
 #: model:ir.model,name:event.model_event_event
 #: model:ir.module.module,shortdesc:event.module_meta_information
-#: field:report.event.registration,name:0
+#: field:partner.event.registration,event_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,event_id:0
+#: view:res.partner:0
 msgid "Event"
 msgstr "Evenement"
 
 #. module: event
+#: view:event.registration:0
+#: field:event.registration,badge_ids:0
+msgid "Badges"
+msgstr "Naamplaatjes"
+
+#. module: event
+#: view:event.event:0
 #: selection:event.event,state:0
+#: view:event.registration:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
 msgid "Confirmed"
 msgstr "Bevestigd"
 
 #. module: event
-#: wizard_view:event.confirm_registration,split:0
+#: view:event.confirm.registration:0
 msgid "Registration Confirmation"
 msgstr "Inschrijvingsbevestiging"
 
+#. module: event
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kunt geen recursief menu maken."
+
+#. module: event
+#: help:event.event,product_id:0
+msgid ""
+"The invoices of this event registration will be created with this Product. "
+"Thus it allows you to set the default label and the accounting info you want "
+"by default on these invoices."
+msgstr ""
+"De facturen van dit evenement worden gemaakt met dit product, zodat u de "
+"standaard omschrijving en financiële info kunt instellen voor deze facturen."
+
 #. module: event
 #: view:event.registration:0
-msgid "Dates"
-msgstr "Data"
+msgid "Misc"
+msgstr "Overig"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,speaker_ids:0
+msgid "Other Speakers"
+msgstr "Andere sprekers"
+
+#. module: event
+#: model:ir.model,name:event.model_event_make_invoice
+msgid "Event Make Invoice"
+msgstr "Evenement facturen aanmaken"
+
+#. module: event
+#: help:event.registration,nb_register:0
+msgid "Number of Registrations or Tickets"
+msgstr "Aantal inschrijvingen of kaartjes"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Waarschuwing !"
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr "Nieuwe email sturen"
+
+#. module: event
+#: view:event.event:0
+msgid "Location"
+msgstr "Locatie"
+
+#. module: event
+#: view:event.registration:0
+msgid "Reply"
+msgstr "Beantwoorden"
 
 #. module: event
 #: field:event.event,register_current:0
-#: model:ir.actions.act_window,name:event.action_registration_confirm
-#: model:ir.ui.menu,name:event.menu_action_registration_confirm
+#: view:report.event.registration:0
 msgid "Confirmed Registrations"
 msgstr "Bevestigde inschrijvingen"
 
@@ -197,14 +427,15 @@ msgid "Mail Auto Register"
 msgstr "Automatische mail inschrijving"
 
 #. module: event
-#: view:event.registration:0
-msgid "Badge"
-msgstr "Badge"
+#: field:event.event,type:0
+#: field:partner.event.registration,event_type:0
+msgid "Type"
+msgstr "Soort"
 
 #. module: event
-#: field:event.event,section_id:0
-msgid "Case section"
-msgstr "Dossiersectie"
+#: field:event.registration,email_from:0
+msgid "Email"
+msgstr "Email"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
@@ -212,369 +443,45 @@ msgid "To be Invoiced"
 msgstr "Te factureren"
 
 #. module: event
-#: model:ir.ui.menu,name:event.menu_event_event
-msgid "All Events"
-msgstr "Alle evenementen"
+#: code:addons/event/event.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fout !"
 
 #. module: event
-#: model:ir.ui.menu,name:event.menu_report_event
-msgid "Reporting"
-msgstr "Overzichten"
+#: code:addons/event/wizard/event_confirm_registration.py:0
+#, python-format
+msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
+msgstr ""
+"Waarschuwing: Het evenement '%s' heeft zijn maximale limiet (%s) bereikt."
 
 #. module: event
+#: field:event.registration,create_date:0
+msgid "Creation Date"
+msgstr "Aanmaakdatum"
+
+#. module: event
+#: view:event.event:0
 #: view:event.registration:0
+#: view:res.partner:0
 msgid "Cancel Registration"
-msgstr "Annuleer inschrijving"
+msgstr "Inschrijving annuleren"
 
 #. module: event
-#: model:ir.ui.menu,name:event.menu_action_event_categories
-msgid "Events by Categories"
-msgstr "Evenementen per categorie"
-
-#. module: event
-#: wizard_view:event.confirm_registration,split:0
-msgid "The event limit is reached. What do you want to do?"
-msgstr ""
-"De inschrijvingslimiet van het evenement is bereikt. Wat wilt u doen?"
-
-#. module: event
-#: field:report.event.type.registration,confirm_state:0
-msgid "Confirm Registrations"
-msgstr "Bevestig inschrijvingen"
-
-#. module: event
-#: view:event.registration:0
-msgid "References"
-msgstr "Verwijzingen"
-
-#. 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 "Inschrijvingen per soort evenement"
-
-#. module: event
-#: model:ir.ui.menu,name:event.menu_event_config
-msgid "Configuration"
-msgstr "Instellingen"
-
-#. module: event
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: event
-#: wizard_button:event.confirm_registration,split,confirm:0
-msgid "Confirm Anyway"
-msgstr "Bevestig alsnog"
-
-#. module: event
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Fout: Verkoopeenheid moet in een andere categorie staan dan de maateenheid"
-
-#. module: event
-#: view:event.event:0
-msgid "Parent Category"
-msgstr "Hoofdcategorie"
-
-#. module: event
-#: view:event.registration:0
-msgid "Registration Invoiced"
-msgstr "Inschrijving gefactureerd"
-
-#. module: event
-#: field:report.event.type.registration,nbevent:0
-msgid "Number Of Events"
-msgstr "Aantal evenementen"
-
-#. module: event
-#: view:event.event:0
-msgid "Cancel Event"
-msgstr "Annuleer evenement"
-
-#. module: event
-#: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
-msgid "Error Messages"
-msgstr "Foutmeldingen"
-
-#. module: event
-#: view:event.event:0
-msgid "Mailing"
-msgstr "Mailing"
-
-#. module: event
-#: model:product.template,name:event.event_product_0_product_template
-msgid "Ticket for Concert"
-msgstr "Concertkaartje"
-
-#. 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 "Onbevestigde inschrijvingen"
-
-#. module: event
-#: field:event.registration,partner_invoice_id:0
-msgid "Partner Invoiced"
-msgstr "Relatie gefactureerd"
-
-#. module: event
-#: view:event.registration:0
-msgid "Communication history"
-msgstr "Communicatiegeschiedenis"
-
-#. module: event
-#: selection:event.event,state:0
-msgid "Canceled"
-msgstr "Geannuleerd"
-
-#. module: event
-#: view:event.event:0
-msgid "Event Done"
-msgstr "Evenement geweest"
-
-#. module: event
-#: field:event.registration,badge_name:0
-msgid "Badge Name"
-msgstr "Naam badge"
-
-#. 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 "Evenementen op inschrijvingen"
-
-#. module: event
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Fout: de standaard meeteenheid en de inkoopeenheid moet in de zelfde "
-"categorie liggen."
-
-#. module: event
-#: wizard_field:event.reg_make_invoice,init,inv_created:0
-msgid "Invoice Created"
-msgstr "Factuur gemaakt"
-
-#. module: event
-#: view:event.event:0
-msgid "Statistics"
-msgstr "Statistieken"
-
-#. module: event
-#: selection:event.event,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: event
-#: view:event.event:0
-msgid "Event description"
-msgstr "Omschrijving evenement"
-
-#. module: event
-#: model:ir.model,name:event.model_report_event_type_registration
-msgid "Event type on registration"
-msgstr "Soort evenement op inschrijvingen"
-
-#. module: event
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#. module: event
-#: field:event.registration,event_id:0
-msgid "Event Related"
-msgstr "Evenement gerelateerd"
-
-#. module: event
-#: model:crm.case.section,name:event.case_section_event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.action_event_view
-msgid "Events"
-msgstr "Evenementen"
+#: code:addons/event/event.py:0
+#, python-format
+msgid "Registered partner doesn't have an address to make the invoice."
+msgstr "Ingeschreven relatie heeft geen adres om een factuur te maken."
 
 #. module: event
 #: field:event.registration,nb_register:0
-msgid "Number of Registration"
-msgstr "Aantal inschrijvingen"
+msgid "Quantity"
+msgstr "Aantal"
 
 #. module: event
-#: view:event.event:0
-#: field:event.event,state:0
-#: view:event.registration:0
-msgid "Status"
-msgstr "Status"
-
-#. module: event
-#: model:ir.actions.act_window,name:event.action_event_categories
-msgid "Events by section"
-msgstr "Evenementen per sectie"
-
-#. module: event
-#: model:ir.ui.menu,name:event.menu_action_registration
-msgid "All Registrations"
-msgstr "Alle inschrijvingen"
-
-#. 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 ""
-"Vink dit aan indien u de automatische email voor nieuwe inschrijvingen wilt "
-"gebruiken."
-
-#. module: event
-#: view:event.event:0
-msgid "Set To Draft"
-msgstr "Zet in concept"
-
-#. 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 "Bevestig inschrijving"
-
-#. module: event
-#: view:event.registration:0
-msgid "History"
-msgstr "Geschiedenis"
-
-#. module: event
-#: model:ir.ui.menu,name:event.menu_event_type
-msgid "Types of Events"
-msgstr "Soorten evenementen"
-
-#. module: event
-#: field:event.registration,contact_id:0
-msgid "Partner Contact"
-msgstr "Contactpersoon relatie"
-
-#. module: event
-#: view:event.event:0
-msgid "Auto Confirmation Email"
-msgstr "Automatische bevestigings email"
-
-#. module: event
-#: view:event.event:0
-#: view:event.registration:0
-msgid "General"
-msgstr "Algemeen"
-
-#. module: event
-#: view:event.registration:0
-msgid "Send Reminder"
-msgstr "Verstuur herinnering"
-
-#. module: event
-#: selection:event.event,state:0
-msgid "Done"
-msgstr "Afgerond"
-
-#. module: event
-#: field:event.event,date_begin:0
-#: field:report.event.registration,date_begin:0
-msgid "Beginning date"
-msgstr "Startdatum"
-
-#. module: event
-#: field:event.registration,invoice_id:0
-msgid "Invoice"
-msgstr "Factuur"
-
-#. module: event
-#: model:ir.model,name:event.model_report_event_registration
-msgid "Events on registrations"
-msgstr "Evenementen op inschrijvingen"
-
-#. module: event
-#: wizard_button:event.confirm_registration,split,end:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: event
-#: wizard_button:event.reg_make_invoice,init,open:0
-msgid "Open"
-msgstr "Openen"
-
-#. module: event
-#: field:event.registration,badge_title:0
-msgid "Badge Title"
-msgstr "Titel badge"
-
-#. 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 "Nieuw evenement"
-
-#. module: event
-#: field:event.registration,unit_price:0
-msgid "Unit Price"
-msgstr "Prijs per eenheid"
-
-#. module: event
-#: model:crm.case.section,name:event.event_2_crm_case_section
-msgid "Conference on ERP Buisness"
-msgstr "Congres over ERP business"
-
-#. module: event
-#: field:event.registration,badge_partner:0
-msgid "Badge Partner"
-msgstr "Relatie badge"
-
-#. 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 "Bevestigde evenementen"
-
-#. module: event
-#: field:event.event,register_max:0
-#: field:report.event.registration,register_max:0
-msgid "Maximum Registrations"
-msgstr "Maximum inschrijvingen"
-
-#. module: event
-#: field:event.event,type:0
-msgid "Type"
-msgstr "Soort"
-
-#. module: event
-#: help:event.event,mail_registr:0
-msgid "This email will be sent when someone subscribes to the event."
-msgstr "Deze email zal bij inschrijving worden verstuurd."
-
-#. module: event
-#: model:product.template,name:event.event_product_2_product_template
-msgid "Ticket for Conference"
-msgstr "Conferentiekaartje"
-
-#. module: event
-#: field:event.registration,case_id:0
-msgid "Case"
-msgstr "Dossier"
-
-#. module: event
-#: view:event.event:0
-msgid "Name"
-msgstr "Naam"
-
-#. 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 ""
-"Vink dit aan indien U de automatische bevestigingsemail of de herinnering "
-"wilt gebruiken."
+#: help:event.event,type:0
+msgid "Type of Event like Seminar, Exhibition, Conference, Training."
+msgstr "Soort evenement zoals seminar, conferentie, training."
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -587,61 +494,955 @@ msgstr ""
 "iemand zich inschrijft voor een bevestigd evenement. Dit is ook de "
 "herinnerings email om iemand aan het evenement te herinneren."
 
+#. module: event
+#: help:event.event,register_prospect:0
+msgid "Total of Prospect Registrati./event/event.py:41:ons"
+msgstr "Totaal aantal onbevestigde inschrijvingen"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Organization"
+msgstr "Evenementen"
+
+#. module: event
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Event Registraion"
+msgstr "Evenementinschrijving"
+
+#. module: event
+#: view:event.registration:0
+msgid "History Information"
+msgstr "Geschiedenis"
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "Data"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+msgid "Confirm Anyway"
+msgstr "Bevestig alsnog"
+
+#. module: event
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Fout: Verkoopeenheid moet in een andere categorie staan dan de maateenheid"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:0
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr "Inschrijving is ingesteld als niet facturabel"
+
+#. module: event
+#: field:report.event.registration,nbevent:0
+msgid "Number Of Events"
+msgstr "Aantal evenementen"
+
+#. module: event
+#: help:event.event,state:0
+msgid ""
+"If event is created, the state is 'Draft'.If event is confirmed for the "
+"particular dates the state is set to 'Confirmed'. If the event is over, the "
+"state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
+msgstr ""
+"Als het evenement wordt gemaakt, is de status 'Concept'. Als het evenement "
+"is bevestigd voor de specifieke data gaat de status naar 'Bevestigd'. Als "
+"het evenement is afgelopen gaat de status naar 'Klaar'. Als het evenement is "
+"geannuleerd gaat de status naar 'Geannuleerd'."
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr "Annuleer evenement"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Contact"
+msgstr "Contactpersoon"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 30 Days"
+msgstr "Laatste 30 dagen"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,partner_id:0
+#: model:ir.model,name:event.model_res_partner
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: event
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave!"
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_reg
+#: view:report.event.registration:0
+msgid "Events Filling Status"
+msgstr "Evenement bezettingstatus"
+
+#. module: event
+#: field:event.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Groepeer de facturen"
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr "Mailing"
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr "Concertkaartje"
+
+#. module: event
+#: view:board.board:0
+#: field:event.event,register_prospect:0
+msgid "Unconfirmed Registrations"
+msgstr "Onbevestigde inschrijvingen"
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr "Relatie gefactureerd"
+
+#. module: event
+#: field:event.registration,log_ids:0
+msgid "Logs"
+msgstr "Logs"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+#: field:event.registration,state:0
+#: view:report.event.registration:0
+#: field:report.event.registration,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "September"
+msgstr "September"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "December"
+msgstr "December"
+
+#. module: event
+#: field:event.registration,event_product:0
+msgid "Invoice Name"
+msgstr "Factuurnaam"
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid " # No of Draft Registrations"
+msgstr " # aantal voorlopige inschrijvingen"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr "Evenement afgelopen"
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr "Totaal van open en afgelopen inschrijvingen"
+
+#. module: event
+#: field:event.confirm.registration,msg:0
+msgid "Message"
+msgstr "Bericht"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "Fout ! U kunt geen recursief evenement maken."
+
+#. module: event
+#: field:event.registration,ref2:0
+msgid "Reference 2"
+msgstr "Referentie 2"
+
+#. module: event
+#: code:addons/event/event.py:0
+#: view:report.event.registration:0
+#, python-format
+msgid "Invoiced"
+msgstr "Gefactureerd"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+msgid "My Events"
+msgstr "Mijn evenementen"
+
+#. module: event
+#: view:event.event:0
+msgid "Speakers"
+msgstr "Sprekers"
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Create invoices"
+msgstr "Maak facturen"
+
+#. module: event
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Fout: de standaard meeteenheid en de inkoopeenheid moet in de zelfde "
+"categorie liggen."
+
+#. module: event
+#: help:event.registration,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Deze email adressen worden toegevoegd aan het CC veld bij alle inkomende en "
+"uitgaande emails voor dit record voorafgaand aan versturen. Scheidt "
+"verschillende email adressen met een comma."
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr "Wilt u echt de facturen aanmaken?"
+
+#. module: event
+#: view:event.event:0
+msgid "Beginning Date"
+msgstr "Begindatum"
+
+#. module: event
+#: field:event.registration,date_closed:0
+msgid "Closed"
+msgstr "Sluitdatum"
+
+#. module: event
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+#: model:ir.ui.menu,name:event.menu_board_associations_manager
+#: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.menu,name:event.menu_event_event_assiciation
+#: view:res.partner:0
+msgid "Events"
+msgstr "Evenementen"
+
+#. module: event
+#: field:partner.event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr "Aantal inschrijvingen"
+
+#. module: event
+#: field:event.event,child_ids:0
+msgid "Child Events"
+msgstr "Onderliggende evenementen"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "August"
+msgstr "Augustus"
+
+#. module: event
+#: field:res.partner,event_ids:0
+#: field:res.partner,event_registration_ids:0
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "June"
+msgstr "Juni"
+
+#. 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 ""
+"Vink dit aan indien u de automatische email voor nieuwe inschrijvingen wilt "
+"gebruiken."
+
+#. module: event
+#: field:event.registration,write_date:0
+msgid "Write Date"
+msgstr "Schrijfdatum"
+
+#. module: event
+#: view:event.registration:0
+msgid "My Registrations"
+msgstr "Mijn inschrijvingen"
+
+#. module: event
+#: view:event.confirm:0
+msgid ""
+"Warning: This Event has not reached its Minimum Registration Limit. Are you "
+"sure you want to confirm it?"
+msgstr ""
+"Waarschuwing: dit evenement heeft zijn minimale inschrijving limiet nog niet "
+"bereikt. Weet u zeker dat u wilt bevestigen?"
+
+#. module: event
+#: field:event.registration,active:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "November"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Extended Filters..."
+msgstr "Uitgebreide filters..."
+
+#. module: event
+#: help:event.event,reply_to:0
+msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
+msgstr ""
+"Dit email adres wordt staat in in de 'Antwoord aan' van alle door OpenERP "
+"verzonden e-mails."
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: event
+#: field:event.event,language:0
+msgid "Language"
+msgstr "Taal"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: event
+#: help:event.registration,email_from:0
+msgid "These people will receive email."
+msgstr "Deze personen krijgen email."
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr "Zet in concept"
+
+#. module: event
+#: code:addons/event/event.py:0
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Confirm Registration"
+msgstr "Bevestig inschrijving"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+#: view:res.partner:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: event
+#: model:ir.ui.menu,name:event.board_associations
+msgid "Dashboard"
+msgstr "Dashboard"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmation Email Body"
+msgstr "Bevestiging email tekst"
+
+#. module: event
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "History"
+msgstr "Geschiedenis"
+
+#. module: event
+#: field:event.event,address_id:0
+msgid "Location Address"
+msgstr "Locatie adres"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+#: model:ir.ui.menu,name:event.menu_event_type_association
+msgid "Types of Events"
+msgstr "Soorten evenementen"
+
+#. module: event
+#: view:event.registration:0
+msgid "Attachments"
+msgstr "Bijlagen"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:0
+#, python-format
+msgid "Event related doesn't have any product defined"
+msgstr "Gerelateerd evenement heeft geen product gedefinieerd"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr "Automatische bevestigings email"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Last 365 Days"
+msgstr "Laatste 365 dagen"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "Fout ! Sluitingsdatum kan niet voor startdatum liggen."
+
+#. module: event
+#: code:addons/event/event.py:0
+#: selection:event.event,state:0
+#: view:event.make.invoice:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+#, python-format
+msgid "Done"
+msgstr "Afgerond"
+
+#. module: event
+#: field:event.event,date_begin:0
+msgid "Beginning date"
+msgstr "Startdatum"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: event
+#: code:addons/event/event.py:0
+#, python-format
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+#: view:event.make.invoice:0
+msgid "Close"
+msgstr "Afsluiten"
+
+#. module: event
+#: view:event.event:0
+msgid "Event by Registration"
+msgstr "Evenement per inschrijving"
+
+#. module: event
+#: code:addons/event/event.py:0
+#, python-format
+msgid "Open"
+msgstr "Openen"
+
+#. module: event
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr "Verantwoordelijke gebruiker"
+
+#. module: event
+#: code:addons/event/event.py:0
+#, python-format
+msgid "Auto Confirmation: [%s] %s"
+msgstr "Automatische bevestiging: [%s] %s"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,user_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,user_id:0
+msgid "Responsible"
+msgstr "Verantwoordelijke"
+
+#. module: event
+#: field:event.event,unit_price:0
+#: view:event.registration:0
+#: field:partner.event.registration,unit_price:0
+msgid "Registration Cost"
+msgstr "Inschrijfkosten"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Current"
+msgstr "Actueel"
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "Prijs per eenheid"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,speaker_id:0
+#: field:res.partner,speaker:0
+msgid "Speaker"
+msgstr "Spreker"
+
+#. module: event
+#: view:event.registration:0
+msgid "Details"
+msgstr "Details"
+
+#. module: event
+#: model:event.event,name:event.event_2
+msgid "Conference on ERP Buisness"
+msgstr "Congres over ERP business"
+
+#. module: event
+#: field:event.event,section_id:0
+#: field:event.registration,section_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,section_id:0
+msgid "Sale Team"
+msgstr "Verkoopteam"
+
+#. module: event
+#: field:partner.event.registration,start_date:0
+msgid "Start date"
+msgstr "Startdatum"
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:partner.event.registration,end_date:0
+msgid "Closing date"
+msgstr "Sluitingsdatum"
+
 #. module: event
 #: field:event.event,product_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,product_id:0
 msgid "Product"
 msgstr "Product"
 
 #. module: event
-#: field:event.registration,invoice_label:0
-msgid "Label Invoice"
-msgstr "Factuurmerk"
-
-#. module: event
+#: view:event.event:0
+#: field:event.event,note:0
 #: view:event.registration:0
-msgid "Payments"
-msgstr "Betalingen"
+#: field:event.registration,description:0
+msgid "Description"
+msgstr "Omschrijving"
 
 #. module: event
+#: field:report.event.registration,confirm_state:0
+msgid " # No of Confirmed Registrations"
+msgstr " # Aantal bevestigde inschrijvingen"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr "Inschrijvingen"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr "Mei"
+
+#. module: event
+#: view:res.partner:0
+msgid "Events Registration"
+msgstr "Inschrijven evenementen"
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr "Deze email zal bij inschrijving worden verstuurd."
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr "Conferentiekaartje"
+
+#. module: event
+#: field:event.registration.badge,address_id:0
+msgid "Address"
+msgstr "Adres"
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_view
+msgid "Next Events"
+msgstr "Volgende evenementen"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Subcribe"
+msgstr "In_schrijven"
+
+#. module: event
+#: help:event.event,date_begin:0
+#: help:partner.event.registration,start_date:0
+msgid "Beginning Date of Event"
+msgstr "Startdatum evenement"
+
+#. module: event
+#: selection:event.registration,state:0
+msgid "Unconfirmed"
+msgstr "Onbevestigd"
+
+#. module: event
+#: code:addons/event/event.py:0
+#, python-format
+msgid "Auto Registration: [%s] %s"
+msgstr "Automatische inschrijving: [%s] %s"
+
+#. module: event
+#: field:event.registration,date_deadline:0
+msgid "End Date"
+msgstr "Einddatum"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "February"
+msgstr "Februari"
+
+#. module: event
+#: view:board.board:0
+msgid "Association Dashboard"
+msgstr "Vereniging dashboard"
+
+#. module: event
+#: view:event.event:0
+#: field:event.registration.badge,name:0
+msgid "Name"
+msgstr "Naam"
+
+#. 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 ""
+"Vink dit aan indien U de automatische bevestigingsemail of de herinnering "
+"wilt gebruiken."
+
+#. module: event
+#: field:event.event,country_id:0
+msgid "Country"
+msgstr "Land"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr "Jaar"
+
+#. module: event
+#: code:addons/event/event.py:0
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Close Registration"
+msgstr "Sluit inschrijving"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "April"
+msgstr "April"
+
+#. module: event
+#: field:event.event,name:0
+#: field:event.registration,name:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: event
+#: view:event.event:0
 #: view:event.type:0
-#: field:report.event.type.registration,name:0
+#: view:report.event.registration:0
+#: field:report.event.registration,type:0
 msgid "Event Type"
 msgstr "Soort evenement"
 
 #. module: event
 #: view:event.event:0
+#: field:event.event,registration_ids:0
 #: model:ir.actions.act_window,name:event.action_registration
-#: model:ir.actions.wizard,name:event.wizard_event_registration
+#: model:ir.ui.menu,name:event.menu_action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
 msgstr "Inschrijvingen"
 
 #. 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 "Concept evenement"
+#: field:event.registration,date:0
+msgid "Start Date"
+msgstr "Startdatum"
 
 #. module: event
-#: model:ir.ui.menu,name:event.menu_event_main
-msgid "Events Organisation"
-msgstr "Evenementorganisatie"
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr "Maximum inschrijvingen"
 
 #. module: event
-#: view:event.registration:0
-msgid "Actions"
-msgstr "Acties"
+#: field:report.event.registration,date:0
+msgid "Event Start Date"
+msgstr "Startdatum evenement"
 
 #. module: event
-#: model:ir.actions.wizard,name:event.wizard_event_reg_partners
-msgid "List Register Partners"
-msgstr "Toon ingeschreven relaties"
+#: view:event.event:0
+msgid "Registration Email Body"
+msgstr "Inschrijving email tekst"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event For Registration"
+msgstr "Evenement voor inschrijving"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:0
+#, python-format
+msgid "Invoice cannot be created if the registration is in %s state."
+msgstr "Factuur kan niet gemaakt worden als de inschrijving status %s heeft."
 
 #. module: event
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Fout: Ongeldige EAN-code"
 
+#. module: event
+#: view:event.confirm:0
+#: model:ir.actions.act_window,name:event.action_event_confirm
+#: model:ir.model,name:event.model_event_confirm
+msgid "Event Confirmation"
+msgstr "Evenement bevestiging"
+
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
 msgstr "Automatische inschrijvings-email"
+
+#. module: event
+#: view:event.registration:0
+#: view:report.event.registration:0
+#: field:report.event.registration,total:0
+msgid "Total"
+msgstr "Totaal"
+
+#. module: event
+#: help:event.event,register_min:0
+msgid "Providee Minimum Number of Registrations"
+msgstr "Geef minimum aantal inschrijvingen op"
+
+#. module: event
+#: field:event.event,speaker_confirmed:0
+msgid "Speaker Confirmed"
+msgstr "Spreker bevestigd"
+
+#~ msgid "Ending date"
+#~ msgstr "Einddatum"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Invoice Created"
+#~ msgstr "Factuur gemaakt"
+
+#~ msgid "Statistics"
+#~ msgstr "Statistieken"
+
+#~ msgid "Configuration"
+#~ msgstr "Instellingen"
+
+#~ msgid "Error Messages"
+#~ msgstr "Foutmeldingen"
+
+#~ msgid "Canceled"
+#~ msgstr "Geannuleerd"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "General"
+#~ msgstr "Algemeen"
+
+#~ msgid "Badge"
+#~ msgstr "Badge"
+
+#~ msgid "Payments"
+#~ msgstr "Betalingen"
+
+#~ msgid "Actions"
+#~ msgstr "Acties"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "Fout! U kunt geen recursieve secties maken."
+
+#~ msgid "Draft Registrations"
+#~ msgstr "Concept inschrijvingen"
+
+#~ msgid ""
+#~ "Organization and management of events.\n"
+#~ "\n"
+#~ "    This module allow you\n"
+#~ "        * to manage your events and their registrations\n"
+#~ "        * to use emails to automatically confirm and send acknowledgements "
+#~ "for any registration to an event\n"
+#~ "        * ...\n"
+#~ "\n"
+#~ "    Note that:\n"
+#~ "    - You can define new types of events in\n"
+#~ "                Events / Configuration / Types of Events\n"
+#~ "    - You can access predefined reports about number of registration per "
+#~ "event or per event category in :\n"
+#~ "                Events / Reporting\n"
+#~ msgstr ""
+#~ "Organisatie en beheer van evenementen.\n"
+#~ "\n"
+#~ "    Deze module stelt u in staat\n"
+#~ "        * uw evenementen en hun inschrijvingen te beheren\n"
+#~ "        * emails te gebruiken voor automatische bevestigingen voor elke "
+#~ "inschrijving van een evenement\n"
+#~ "        * ...\n"
+#~ "\n"
+#~ "    Merk op dat:\n"
+#~ "    - U nieuwe soorten evenementen kunt definiëren in\n"
+#~ "        Evenementen / Instellingen / Soorten evenementen\n"
+#~ "    - U kunt voorgedefinieerde overzichten over aantallen inschrijvingen per "
+#~ "evenement of per evenementcategorie in:\n"
+#~ "        Evenementen / Overzichten\n"
+
+#~ msgid "Draft Registration"
+#~ msgstr "Concept inschrijving"
+
+#~ msgid "Invoice Rejected"
+#~ msgstr "Factuur geweigerd"
+
+#~ msgid "Create Invoices"
+#~ msgstr "Maak facturen"
+
+#~ msgid "Confirm Registrations"
+#~ msgstr "Bevestig inschrijvingen"
+
+#~ msgid "Events by Categories"
+#~ msgstr "Evenementen per categorie"
+
+#~ msgid "References"
+#~ msgstr "Verwijzingen"
+
+#~ msgid "Registration By Event Types"
+#~ msgstr "Inschrijvingen per soort evenement"
+
+#~ msgid "Reporting"
+#~ msgstr "Overzichten"
+
+#~ msgid "All Events"
+#~ msgstr "Alle evenementen"
+
+#~ msgid "Case section"
+#~ msgstr "Dossiersectie"
+
+#~ msgid "The event limit is reached. What do you want to do?"
+#~ msgstr ""
+#~ "De inschrijvingslimiet van het evenement is bereikt. Wat wilt u doen?"
+
+#~ msgid "Registration Invoiced"
+#~ msgstr "Inschrijving gefactureerd"
+
+#~ msgid "Parent Category"
+#~ msgstr "Hoofdcategorie"
+
+#~ msgid "Badge Name"
+#~ msgstr "Naam badge"
+
+#~ msgid "Events On Registrations"
+#~ msgstr "Evenementen op inschrijvingen"
+
+#~ msgid "Communication history"
+#~ msgstr "Communicatiegeschiedenis"
+
+#~ msgid "Event description"
+#~ msgstr "Omschrijving evenement"
+
+#~ msgid "Event type on registration"
+#~ msgstr "Soort evenement op inschrijvingen"
+
+#~ msgid "Event Related"
+#~ msgstr "Evenement gerelateerd"
+
+#~ msgid "Events by section"
+#~ msgstr "Evenementen per sectie"
+
+#~ msgid "Send Reminder"
+#~ msgstr "Verstuur herinnering"
+
+#~ msgid "All Registrations"
+#~ msgstr "Alle inschrijvingen"
+
+#~ msgid "Events on registrations"
+#~ msgstr "Evenementen op inschrijvingen"
+
+#~ msgid "New event"
+#~ msgstr "Nieuw evenement"
+
+#~ msgid "Badge Title"
+#~ msgstr "Titel badge"
+
+#~ msgid "Case"
+#~ msgstr "Dossier"
+
+#~ msgid "Badge Partner"
+#~ msgstr "Relatie badge"
+
+#~ msgid "Confirmed Events"
+#~ msgstr "Bevestigde evenementen"
+
+#~ msgid "Label Invoice"
+#~ msgstr "Factuurmerk"
+
+#~ msgid "Events Organisation"
+#~ msgstr "Evenementorganisatie"
+
+#~ msgid "List Register Partners"
+#~ msgstr "Toon ingeschreven relaties"
+
+#~ msgid "Draft Events"
+#~ msgstr "Concept evenement"
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index d8cc84a0547..7b489775f25 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -88,6 +88,11 @@
                     </field>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                        <field name="type" widget="selection"/>
+                        <field name="date"/>
+                    </group>
+                    <newline/>
 
                     <group expand="1" string="Group By..." colspan="4" col="12">
                         <filter string="Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
@@ -95,7 +100,7 @@
                         <filter string="Sale Team"  icon="terp-personal" context="{'group_by': 'section_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
-                        <filter string="Product"  icon="terp-product" context="{'group_by': 'product_id'}"/>
+                        <filter string="Product"  icon="terp-accessories-archiver" context="{'group_by': 'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" help="Events States"/>
@@ -109,11 +114,6 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="type" widget="selection"/>
-                        <field name="date"/>
-                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 01ad398aa56..3ede9adfcfc 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -37,9 +37,9 @@
                             <field name="unit_price"/>
                             <field name="price_subtotal"/>
                             <field name="state"/>
+                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                             <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                             <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/event_project/i18n/nl.po b/addons/event_project/i18n/nl.po
index df1e81244a3..d6b0b1fbb8e 100644
--- a/addons/event_project/i18n/nl.po
+++ b/addons/event_project/i18n/nl.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 03:58+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 12:39+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
+#: model:ir.model,name:event_project.model_event_project
+msgid "Event Project"
+msgstr "Evenement project"
 
 #. module: event_project
-#: model:ir.actions.wizard,name:event_project.wizard_event_task
-msgid "Tasks"
-msgstr "Taken"
+#: field:event.project,date:0
+msgid "Date End"
+msgstr "Einddatum"
 
 #. module: event_project
-#: wizard_button:event.project,init,done:0
+#: view:event.project:0
 msgid "Ok"
 msgstr "Ok"
 
@@ -36,47 +36,91 @@ msgstr "Ok"
 msgid ""
 "Organization and management of events.\n"
 "\n"
-"    This module allow you to create retro planning for managing your "
+"    This module allows you to create retro planning for managing your "
 "events.\n"
 msgstr ""
-"Organisatie en management van evenementen.\n"
+"Organisatie en beheer van evenementen.\n"
 "\n"
-"    Deze module stelt u in staat om evenementen achterwaarts te plannen.\n"
+"    Deze module laat u een retro-planning maken voor uw evenementen.\n"
 
 #. module: event_project
-#: view:event.event:0
-msgid "Remaining Tasks"
-msgstr "Resterende taken"
+#: help:event.project,project_id:0
+msgid ""
+"This is Template Project. Project of event is a duplicate of this Template. "
+"After click on  'Create Retro-planning', New Project will be duplicated from "
+"this template project."
+msgstr ""
+"DIt is een sjabloon project. Project van evenement is een duplicaat van dit "
+"sjabloon. Na klikken van 'Retro-planning maken', wordt het nieuwe project "
+"gedupliceerd van dit sjabloon project."
 
 #. module: event_project
-#: model:ir.module.module,shortdesc:event_project.module_meta_information
-msgid "Event - Project"
-msgstr "Evenement - Project"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciaal teken bevatten !"
+
+#. module: event_project
+#: view:event.project:0
+#: model:ir.actions.act_window,name:event_project.action_event_project
+msgid "Retro-Planning"
+msgstr "Retro-planning"
+
+#. module: event_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave!"
 
 #. 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 "Project"
 
+#. module: event_project
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr "Projectsjabloon"
+
+#. module: event_project
+#: model:ir.module.module,shortdesc:event_project.module_meta_information
+msgid "Event Project - Create Retro-Planning to manage your Events"
+msgstr ""
+"Evenement project - Retro-planning maken om uw evenementen te beheren."
+
+#. module: event_project
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ongeldige modelnaam in de actie definitie."
+
+#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr "Taken"
+
 #. module: event_project
 #: field:event.event,task_ids:0
 msgid "Project tasks"
 msgstr "Projecttaken"
 
 #. module: event_project
-#: wizard_button:event.project,init,end:0
-msgid "Cancel"
-msgstr "Annuleren"
+#: view:event.project:0
+msgid "Close"
+msgstr "Afsluiten"
+
+#. module: event_project
+#: field:event.project,date_start:0
+msgid "Date Start"
+msgstr "Startdatum"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr "Maak retro-planning"
+msgstr "Retro-planning maken"
 
 #. module: event_project
-#: wizard_view:event.project,init:0
+#: model:ir.model,name:event_project.model_event_event
 msgid "Event"
 msgstr "Evenement"
 
@@ -84,3 +128,22 @@ msgstr "Evenement"
 #: view:event.event:0
 msgid "Tasks management"
 msgstr "Taakbeheer"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "Remaining Tasks"
+#~ msgstr "Resterende taken"
+
+#~ msgid "Event - Project"
+#~ msgstr "Evenement - Project"
+
+#~ msgid ""
+#~ "Organization and management of events.\n"
+#~ "\n"
+#~ "    This module allow you to create retro planning for managing your "
+#~ "events.\n"
+#~ msgstr ""
+#~ "Organisatie en management van evenementen.\n"
+#~ "\n"
+#~ "    Deze module stelt u in staat om evenementen achterwaarts te plannen.\n"
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index 8a78d6f631b..55d8f2939f8 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 13:33+0000\n"
-"PO-Revision-Date: 2010-10-08 07:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 12:51+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -78,7 +78,7 @@ msgstr "POP/IMAP Servers"
 #. module: fetchmail
 #: model:ir.module.module,shortdesc:fetchmail.module_meta_information
 msgid "Fetchmail Server"
-msgstr ""
+msgstr "Fetchmail Server"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -114,17 +114,17 @@ msgstr "Datum"
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Waiting for Verification"
-msgstr ""
+msgstr "Wacht op verificatie"
 
 #. module: fetchmail
 #: field:email.server,password:0
 msgid "Password"
-msgstr ""
+msgstr "Wachtwoord"
 
 #. module: fetchmail
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Ongeldige argumenten"
 
 #. module: fetchmail
 #: constraint:ir.ui.view:0
@@ -134,7 +134,7 @@ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 #. module: fetchmail
 #: view:email.server:0
 msgid "Auto Reply?"
-msgstr ""
+msgstr "Automatisch antwoord?"
 
 #. module: fetchmail
 #: field:email.server,name:0
@@ -144,7 +144,7 @@ msgstr "Naam"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mailgate_message
 msgid "Mailgateway Message"
-msgstr ""
+msgstr "Mailgateway bericht"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -155,7 +155,7 @@ msgstr "POP Servers"
 #. module: fetchmail
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
 msgid "Fetchmail Services"
-msgstr ""
+msgstr "Fetchmail services"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree
@@ -163,17 +163,18 @@ msgstr ""
 #: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree
 #: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree_pop
 msgid "Received Email History"
-msgstr ""
+msgstr "Ontvangen Email Historie"
 
 #. module: fetchmail
-#: field:email.server,active:0
-msgid "Active"
-msgstr "Actief"
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Soort server"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Proces parameter"
 
 #. module: fetchmail
 #: field:email.server,is_ssl:0
@@ -182,14 +183,14 @@ msgstr "SSL ?"
 
 #. module: fetchmail
 #: selection:email.server,type:0
-#: selection:mailgate.message,type:0
+#: selection:mailgate.message,server_type:0
 msgid "IMAP Server"
 msgstr "IMAP server"
 
 #. module: fetchmail
 #: field:email.server,object_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: fetchmail
 #: field:email.server,server:0
@@ -199,7 +200,7 @@ msgstr "Server"
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Email History"
-msgstr ""
+msgstr "Email historie"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -207,21 +208,10 @@ msgstr ""
 msgid "POP/IMAP Server"
 msgstr "POP/IMAP Server"
 
-#. module: fetchmail
-#: constraint:ir.rule:0
-msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
-
-#. module: fetchmail
-#: field:email.server,type:0
-#: field:mailgate.message,type:0
-msgid "Server Type"
-msgstr ""
-
 #. module: fetchmail
 #: view:email.server:0
 msgid "Login Information"
-msgstr ""
+msgstr "Aanmeldinformatie"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -230,7 +220,7 @@ msgstr "Serverinformatie"
 
 #. module: fetchmail
 #: selection:email.server,type:0
-#: selection:mailgate.message,type:0
+#: selection:mailgate.message,server_type:0
 msgid "POP Server"
 msgstr "POP Server"
 
@@ -250,18 +240,28 @@ msgid ""
 "    * Email based Records (Add, Update)\n"
 "    "
 msgstr ""
+"Fetchmail: \n"
+"    * haalt email op van POP / IMAP server\n"
+"    * Ondersteunt SSL\n"
+"    * Geïntegreerd met alle modules\n"
+"    * Automatisch email ophalen\n"
+"    * Email gebaseerde records (Add, Update)\n"
+"    "
 
 #. module: fetchmail
 #: help:email.server,priority:0
 msgid "Priority between 0 to 10, select define the order of Processing"
-msgstr ""
+msgstr "Prioriteit tussen 0 en 10, definieert de volgorde van verwerking"
 
 #. module: fetchmail
 #: field:mailgate.message,server_id:0
 msgid "Mail Server"
-msgstr ""
+msgstr "Mail server"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "Ophalen emails"
+
+#~ msgid "Active"
+#~ msgstr "Actief"
diff --git a/addons/google_map/i18n/nl.po b/addons/google_map/i18n/nl.po
index 84e1053e386..37f91291284 100644
--- a/addons/google_map/i18n/nl.po
+++ b/addons/google_map/i18n/nl.po
@@ -6,32 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 04:00+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 12:52+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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-09-29 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+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 "Start Google Maps"
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Kaart"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Ongeldige XML voor weergave!"
 
+#. module: google_map
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciaal teken bevatten !"
+
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
 msgstr "Adres2 : "
 
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Start Google Maps"
+
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
 msgid ""
@@ -44,7 +57,6 @@ msgstr ""
 "van de URL widget."
 
 #. module: google_map
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Map"
-msgstr "Kaart"
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Relatieadressen"
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index fdbed8a3a18..40bc6da9c2f 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -19,12 +19,7 @@
 #
 ##############################################################################
 
-import os
-
 from osv import fields, osv
-import tools
-from tools.translate import _
-import addons
 
 import addons
 
@@ -183,7 +178,7 @@ class hr_employee(osv.osv):
         return {'value': {'work_email' : work_email}}
 
     def _get_photo(self, cr, uid, context=None):
-	photo_path = addons.get_module_resource('hr','image','photo.png')
+        photo_path = addons.get_module_resource('hr','image','photo.png')
         return open(photo_path, 'rb').read().encode('base64')
 
     _defaults = {
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 46457c323dc..42ce61ee6fd 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -6,33 +6,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 04:57+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 15:06+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+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 gebruiker"
 
 #. 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 "Werktijdcategorieën"
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "Functie-eisen"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
 msgstr "Fout! U kunt geen recursieve afdelingen aanmaken."
 
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "Koppel de medewerker met informatie"
+
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
@@ -40,19 +44,24 @@ msgstr "BSN-nr"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Personeelszaken"
+msgstr "Personeel"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Sunday"
-msgstr "Zondag"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "Groepeer op..."
 
 #. module: hr
-#: view:res.users:0
-msgid "Parents"
-msgstr "Bovenliggende"
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr "Werk email"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
@@ -60,67 +69,142 @@ msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: hr
-#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
 msgid "Department"
 msgstr "Afdeling"
 
 #. module: hr
-#: model:process.transition,name:hr.process_transition_contactofemployee0
-msgid "Contact  of employee"
-msgstr "Contactpersoon werknemer"
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr "Vereenvoudigt het beheer van medewerkers aanwezigheid."
 
 #. module: hr
-#: field:hr.employee,work_email:0
-msgid "Work Email"
-msgstr "E-mail werk"
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr "Markeer als oud"
 
 #. module: hr
-#: field:hr.timesheet.group,name:0
-msgid "Group name"
-msgstr "Groepsnaam"
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "Functies"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "Wordt geworven"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr "titel"
 
 #. module: hr
 #: field:hr.department,company_id:0
-#: field:hr.employee,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
 msgid "Company"
 msgstr "Bedrijf"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Friday"
-msgstr "Vrijdag"
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "Werving verwacht"
 
 #. module: hr
-#: field:hr.department,parent_id:0
-msgid "Parent Department"
-msgstr "Hoofdafdeling"
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr "Vakantie"
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr "Houdt medewerker verlof, vakanties en planning bij."
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr "Medewerker huwelijkse staat"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+"Relatie die is verbonden met de actuele medewerker. Boekingen worden gemaakt "
+"op de relatie die verbonden is met de medewerker."
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "Koppel een gebruiker aan een medewerker"
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr "Arbeidsovereenkomsten"
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr "Algemeen loonlijst systeem."
 
 #. module: hr
-#: view:hr.department:0
 #: view:hr.employee:0
-#: field:hr.employee,notes:0
-msgid "Notes"
-msgstr "Opmerkingen"
+msgid "My Departments Employee"
+msgstr "Mijn afdeling medewerkers"
 
 #. module: hr
-#: field:hr.timesheet,hour_from:0
-msgid "Work from"
-msgstr "Werkt van"
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Fout ! U kunt geen afdeling selecteren waarvan de medewerker de beheerder is."
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr "Medewerker paspoort informatie"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr "Baan"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Werknemershiërarchie"
+msgstr "Medewerkershierarchie"
 
 #. module: hr
-#: model:ir.ui.menu,name:hr.menu_hr_configuration
-msgid "Configuration"
-msgstr "Instellingen"
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+"Het verbonden gebruiker veld op het medewerker formulier laat de OpenERP "
+"gebruiker (en haar rechten) koppelen met de medewerker."
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Unmaried"
-msgstr "Ongehuwd"
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr "Wordt geworven"
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr "Identificatienr."
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr "Aantal medewerkers"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -128,13 +212,24 @@ msgid "Female"
 msgstr "Vrouw"
 
 #. module: hr
-#: view:hr.timesheet.group:0
-msgid "Working Time Category"
-msgstr "Werktijd categorie"
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+"Helpt medewerkers hun urenstaten en aanwezigheid invullen en controleren."
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr "Periodieke evaluaties"
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr "Urenstaten"
 
 #. 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 "Organigram"
 
@@ -143,6 +238,11 @@ msgstr "Organigram"
 msgid "Social IDs"
 msgstr "BSN (SoFi) nummer"
 
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr "Aantal medewerkers met deze functie."
+
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
@@ -153,28 +253,50 @@ msgstr "Telefoon werk"
 msgid "Child Categories"
 msgstr "Subcategorieën"
 
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "Functieomschrijving"
+
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
 msgstr "Locatie kantoor"
 
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport"
+msgstr "Paspoort"
+
 #. module: hr
 #: view:hr.employee:0
-#: field:hr.employee,name:0
+#: view:hr.job:0
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr "Werknemer"
+msgstr "Medewerker"
 
 #. module: hr
-#: field:hr.timesheet.group,manager:0
-msgid "Workgroup manager"
-msgstr "Manager"
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "Overige informatie"
 
 #. module: hr
-#: field:hr.employee,child_ids:0
-msgid "Subordinates"
-msgstr "Ondergeschikten"
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Werkadres"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr "Personeel applicatie configuratie"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "Geboortedatum"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -182,19 +304,42 @@ msgid "Reporting"
 msgstr "Overzichten"
 
 #. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr "ir.actions.act_window"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr "Personeel dashboard"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr "Functie"
+
+#. module: hr
+#: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
 msgstr "Leden"
 
 #. module: hr
-#: field:hr.employee,ssnid:0
-msgid "SSN No"
-msgstr "BSN nummer"
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "Instellingen"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_contactofemployee0
-msgid "Fill up contact information"
-msgstr "Vul contactinformatie in"
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorieën"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr "Verwachte medewerkers"
 
 #. module: hr
 #: constraint:ir.ui.view:0
@@ -202,37 +347,38 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Ongeldige XML voor weergave!"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Divorced"
-msgstr "Gescheiden"
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr "SOFI nummer"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Hoofdcategorie"
+msgstr "Bovenliggende categorie"
 
 #. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr "Fout ! U kunt geen recursieve categorieën maken."
+
+#. module: hr
+#: view:hr.department:0
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
-#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree
-#: model:ir.ui.menu,name:hr.menu_department_def
-#: model:ir.ui.menu,name:hr.menu_department_tree
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
 msgid "Departments"
 msgstr "Afdelingen"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Contactpersoon werknemer"
+msgstr "Contactpersoon medewerker"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Maried"
-msgstr "Gehuwd"
-
-#. module: hr
-#: field:hr.timesheet,tgroup_id:0
-msgid "Employee's timesheet group"
-msgstr "Werknemers urenstaatgroep"
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mijn board"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -240,20 +386,35 @@ msgid "Male"
 msgstr "Man"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_employeeuser0
-msgid "Create openerp user"
-msgstr "Maak een OpenERP gebruiker aan"
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Categorieën medewerkers"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Categorie werknemer"
+msgstr "Categorie medewerker"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Tuesday"
-msgstr "Dinsdag"
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr "Afbeelding"
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr "Arbeidsovereenkomst"
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
+"Laat u de periodieke evaluaties en functioneringsgesprekken van medewerkers "
+"maken en beheren"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -261,16 +422,26 @@ msgid "hr.department"
 msgstr "hr.department"
 
 #. module: hr
-#: field:hr.employee,user_id:0
-msgid "Related User"
-msgstr "Gekoppelde gebruiker"
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr "Het is gekoppeld met de manager van de afdeling"
 
 #. module: hr
-#: field:hr.employee,category_id:0
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr "Wervingsproces"
+
+#. module: hr
+#: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
 msgstr "Categorie"
 
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr "Medewerker salaris bankrekening"
+
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
@@ -281,15 +452,25 @@ msgstr "Opmerking"
 msgid "Contact Information"
 msgstr "Contactgegevens"
 
+#. module: hr
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kunt geen recursief menu maken."
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr "HR manager dashboard"
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
 msgstr "Status"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Monday"
-msgstr "Maandag"
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Configuratievoortgang"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -298,17 +479,22 @@ msgid "Categories structure"
 msgstr "Categoriestructuur"
 
 #. module: hr
-#: field:hr.timesheet,dayofweek:0
-msgid "Day of week"
-msgstr "Dag van de week"
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr "onbekend"
 
 #. module: hr
-#: field:hr.employee,birthday:0
-msgid "Birthday"
-msgstr "Geboortedatum"
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr "Vakantie / verlofbeheer"
 
 #. module: hr
-#: field:hr.employee,active:0
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "BSN nummer"
+
+#. module: hr
+#: view:hr.employee:0
 msgid "Active"
 msgstr "Actief"
 
@@ -317,61 +503,74 @@ msgstr "Actief"
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Fout ! U kunt geen recursieve hiërarchie van werknemers maken."
 
-#. module: hr
-#: model:process.process,name:hr.process_process_employeecontractprocess0
-msgid "Employee Contract Process"
-msgstr "Contractproces werknemer"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_openerpuser0
-msgid "Create OpenERP User"
-msgstr "Maak een OpenERP gebruiker aan"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_employee0
-msgid "Employee Complete Form"
-msgstr "Maak werknemersformulier compleet"
-
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
 msgstr "Bedrijven"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Wednesday"
-msgstr "Woensdag"
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+"In het medewerker formulier staan verschillende soorten informatie zoals "
+"contactgegevens."
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_categ_form
-#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
-msgid "Categories of Employee"
-msgstr "Categorieën werknemers"
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr "Totaal aantal vereiste medewerkers voor deze functie."
 
 #. module: hr
-#: field:hr.timesheet,date_from:0
-msgid "Starting date"
-msgstr "Startdatum"
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr "Oud"
 
 #. module: hr
-#: field:res.users,parent_id:0
-msgid "Parent Users"
-msgstr "Bovenliggende gebruikers"
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr "Status omschrijving"
 
 #. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Werkadres"
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr "Status"
 
 #. module: hr
 #: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
 msgstr "Burgerlijke staat"
 
 #. module: hr
-#: model:ir.model,name:hr.model_hr_timesheet
-msgid "Timesheet Line"
-msgstr "Regel urenstaat"
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr "Helpt u bij het beheren en stroomlijnen van uw wervingsproces."
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr "Medewerker formulier en structuur"
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr "Foto"
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr "Loonadministratie"
 
 #. module: hr
 #: view:hr.employee:0
@@ -386,26 +585,28 @@ msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: hr
-#: view:hr.timesheet:0
-#: field:hr.timesheet.group,timesheet_id:0
-#: model:ir.model,name:hr.model_hr_timesheet_group
-msgid "Working Time"
-msgstr "Werktijd"
+#: view:res.users:0
+msgid "Current Activity"
+msgstr "Actuele activiteit"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Thursday"
-msgstr "Donderdag"
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Beheert medewerker declaraties en kan automatisch doorberekenen aan klanten "
+"als de uitgave project-gerelateerd is."
 
 #. module: hr
-#: field:hr.timesheet,hour_to:0
-msgid "Work to"
-msgstr "Werkt tot"
+#: view:hr.job:0
+msgid "Current"
+msgstr "Actueel"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Other"
-msgstr "Overig"
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "Hoofdafdeling"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -417,6 +618,40 @@ msgstr "Categorieën werknemers"
 msgid "Home Address"
 msgstr "Privé-adres"
 
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr "Aanwezigheid"
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+"Verruimt medewerker profielen voor beheer van hun arbeidsovereenkomsten."
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr "Loonlijst"
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr "Functienaam"
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr "Is vervuld"
+
 #. module: hr
 #: view:hr.department:0
 msgid "department"
@@ -428,12 +663,30 @@ msgid "Nationality"
 msgstr "Nationaliteit"
 
 #. module: hr
-#: field:hr.employee,otherid:0
-msgid "Other ID"
-msgstr "Ander ID"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "Opmerkingen"
 
 #. module: hr
-#: field:hr.timesheet,name:0
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr "hr.installer"
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr "HR manager board"
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr "Resource"
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
 msgid "Name"
 msgstr "Naam"
 
@@ -444,50 +697,185 @@ msgstr "Sexe"
 
 #. module: hr
 #: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
 #: model:ir.actions.act_window,name:hr.open_view_employee_list
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
-msgstr "Werknemers"
+msgstr "Medewerkers"
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr "Bankrekening"
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
 msgstr "Naam afdeling"
 
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr "SOFI nummer"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr "OpenERP gebruiker aanmaken"
+
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Sub-afdelingen"
 
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr "Vacatures"
+
 #. module: hr
 #: view:hr.employee:0
-msgid "Job Information"
-msgstr "Functieomschrijving"
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr "Coach"
 
 #. module: hr
-#: model:process.node,note:hr.process_node_employeecontact0
-msgid "Fill up employee's contact information"
-msgstr "Vul de contactgegevens van de werknemer in"
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr "Declaraties"
 
 #. module: hr
+#: view:hr.department:0
 #: field:hr.department,manager_id:0
+#: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
 msgstr "Manager"
 
 #. module: hr
-#: 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 "Alle werknemers"
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr "Algemeen loonlijst systeem met geïntegreerde boekhouding."
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Saturday"
-msgstr "Zaterdag"
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "Ondergeschikten"
 
-#. 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 "Nieuwe werknemer"
+#~ msgid "Sunday"
+#~ msgstr "Zondag"
+
+#~ msgid "Work Email"
+#~ msgstr "E-mail werk"
+
+#~ msgid "Group name"
+#~ msgstr "Groepsnaam"
+
+#~ msgid "Friday"
+#~ msgstr "Vrijdag"
+
+#~ msgid "Work from"
+#~ msgstr "Werkt van"
+
+#~ msgid "Workgroup manager"
+#~ msgstr "Manager"
+
+#~ msgid "Fill up contact information"
+#~ msgstr "Vul contactinformatie in"
+
+#~ msgid "Divorced"
+#~ msgstr "Gescheiden"
+
+#~ msgid "Create openerp user"
+#~ msgstr "Maak een OpenERP gebruiker aan"
+
+#~ msgid "Tuesday"
+#~ msgstr "Dinsdag"
+
+#~ msgid "Related User"
+#~ msgstr "Gekoppelde gebruiker"
+
+#~ msgid "Monday"
+#~ msgstr "Maandag"
+
+#~ msgid "Wednesday"
+#~ msgstr "Woensdag"
+
+#~ msgid "Starting date"
+#~ msgstr "Startdatum"
+
+#~ msgid "Working Time"
+#~ msgstr "Werktijd"
+
+#~ msgid "Thursday"
+#~ msgstr "Donderdag"
+
+#~ msgid "Work to"
+#~ msgstr "Werkt tot"
+
+#~ msgid "Other"
+#~ msgstr "Overig"
+
+#~ msgid "Other ID"
+#~ msgstr "Ander ID"
+
+#~ msgid "Job Information"
+#~ msgstr "Functieomschrijving"
+
+#~ msgid "Saturday"
+#~ msgstr "Zaterdag"
+
+#~ msgid "New Employee"
+#~ msgstr "Nieuwe werknemer"
+
+#~ msgid "Parent Users"
+#~ msgstr "Bovenliggende gebruikers"
+
+#~ msgid "Parents"
+#~ msgstr "Bovenliggende"
+
+#~ msgid "Contact  of employee"
+#~ msgstr "Contactpersoon werknemer"
+
+#~ msgid "Working Time Categories"
+#~ msgstr "Werktijdcategorieën"
+
+#~ msgid "Unmaried"
+#~ msgstr "Ongehuwd"
+
+#~ msgid "Maried"
+#~ msgstr "Gehuwd"
+
+#~ msgid "Day of week"
+#~ msgstr "Dag van de week"
+
+#~ msgid "Employee Contract Process"
+#~ msgstr "Contractproces werknemer"
+
+#~ msgid "Timesheet Line"
+#~ msgstr "Regel urenstaat"
+
+#~ msgid "All Employees"
+#~ msgstr "Alle werknemers"
+
+#~ msgid "Fill up employee's contact information"
+#~ msgstr "Vul de contactgegevens van de werknemer in"
+
+#~ msgid "Employee Complete Form"
+#~ msgstr "Maak werknemersformulier compleet"
+
+#~ msgid "Working Time Category"
+#~ msgstr "Werktijd categorie"
+
+#~ msgid "Employee's timesheet group"
+#~ msgstr "Werknemers urenstaatgroep"
+
+#~ msgid "Create OpenERP User"
+#~ msgstr "Maak een OpenERP gebruiker aan"
+
+#~ msgid "Birthday"
+#~ msgstr "Geboortedatum"
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index c51406f19de..9e8a4d84088 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -41,9 +41,7 @@ def _employee_get(obj, cr, uid, context=None):
     if context is None:
         context = {}
     ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
-    if ids:
-        return ids[0]
-    return False
+    return ids and ids[0] or False
 
 class hr_attendance(osv.osv):
     _name = "hr.attendance"
@@ -65,7 +63,7 @@ class hr_attendance(osv.osv):
         'day': fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
-        'name': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), #Don't remove the lambda, if you remove it then the current time will not change
+        'name': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), #please don't remove the lambda, if you remove it then the current time will not change
         'employee_id': _employee_get,
     }
 
@@ -158,4 +156,4 @@ class hr_employee(osv.osv):
 
 hr_employee()
 
-# 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/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 7070db1d5b2..3b72b2f966b 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -77,9 +77,9 @@
             <field name="help">Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attendance machine using OpenERP's webservices features.</field>
         </record>
 
-        <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
+        <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
 
-        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4"/>
+        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
 
         <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
 
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index e2b071de66a..66b8567d070 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -47,6 +47,7 @@ class hr_attendance_byweek(osv.osv_memory):
             'report_name': 'hr.attendance.allweeks',
             'datas': datas,
         }
+
 hr_attendance_byweek()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 440afa2894e..a67be5d0ad2 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -42,7 +42,7 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                   <filter string="Period" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'period_id'}"/>
+                   <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 418bfeddba5..32478f515a0 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -52,7 +52,7 @@ class hr_evaluation_plan_phase(osv.osv):
         'name': fields.char("Phase", size=64, required=True),
         'sequence': fields.integer("Sequence"),
         'company_id': fields.related('plan_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
-        'plan_id': fields.many2one('hr_evaluation.plan','Evaluation Plan', required=True, ondelete='cascade'),
+        'plan_id': fields.many2one('hr_evaluation.plan','Evaluation Plan', ondelete='cascade'),
         'action': fields.selection([
             ('top-down','Top-Down Appraisal Requests'),
             ('bottom-up','Bottom-Up Appraisal Requests'),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 08a8135353c..b0f3ea45a83 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -187,10 +187,10 @@
                             icon="gtk-cancel"/>
                     <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
                             icon="gtk-execute"/>
-                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
-                            icon="gtk-execute"/>
                     <button name="button_done" string="Done" states="progress" type="object"
                             icon="gtk-jump-to"/>
+                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
+                            icon="gtk-go-forward"/>
                     </group>
               </form>
             </field>
@@ -383,7 +383,7 @@
         <menuitem name="Interview Requests" parent="menu_eval_hr" 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"/>
+           action="action_hr_evaluation_send_mail" sequence="45" groups="base.group_hr_manager"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
       <act_window 
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 44e1ca885e5..d3d299b5e5c 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -7,161 +7,342 @@ 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-10-05 07:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 08:25+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@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-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+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 "Мэдээлэл"
+#: field:hr_evaluation.plan.phase,wait:0
+msgid "Wait Previous Phases"
+msgstr "Өмнөх үеийг хүлээх эсэх"
 
 #. module: hr_evaluation
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
-#. 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 "Утгууд"
-
-#. 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 "Байрлал"
-
-#. 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 "Оноо"
-
-#. module: hr_evaluation
-#: selection:hr_evaluation.evaluation,state:0
-msgid "Draft"
-msgstr "Ноорог"
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-msgid "Informal Data"
-msgstr "Албан ёсны өгөгдөл"
+#: view:hr.evaluation.interview:0
+#: view:hr.evaluation.report:0
+#: view:hr_evaluation.plan:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
 
 #. module: hr_evaluation
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+msgstr "Дэлгэцийн үйлдлийг тодорхойлохдоо байхгүй моделын нэр хэрэглэжээ"
 
 #. module: hr_evaluation
-#: field:hr_evaluation.evaluation,employee_id:0
-msgid "Employee"
-msgstr "Ажилтан"
+#: field:hr.evaluation.interview,request_id:0
+#: field:hr.evaluation.report,request_id:0
+msgid "Request_id"
+msgstr "Хүсэлтийн дугаар"
 
 #. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-#: field:hr_evaluation.evaluation,info_improve:0
-msgid "To Improve"
-msgstr "Сайжруулах"
+#: field:hr.evaluation.report,progress_bar:0
+#: field:hr_evaluation.evaluation,progress:0
+msgid "Progress"
+msgstr "Явц"
 
 #. module: hr_evaluation
-#: field:hr_evaluation.quote,evaluation_id:0
-msgid "Evaluation"
-msgstr "Үнэлгээ"
-
-#. module: hr_evaluation
-#: field:hr_evaluation.type.value,type_id:0
+#: field:hr.evaluation.interview,evaluation_id:0
 msgid "Evaluation Type"
 msgstr "Үнэлгээний төрөл"
 
+#. module: hr_evaluation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
+msgid "My Evaluation Remaining"
+msgstr "Өөрийн үнэлгээ (үлдэгдэл)"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Legend"
+msgstr "Ялгах тэмдэг"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:0
+#, python-format
+msgid "You cannot start evaluation without Evaluation."
+msgstr "Үнэлгээгүйгээр үнэлгээний ярилцлагыг хэлж болохгүй."
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,delay_date:0
+msgid "Delay to Start"
+msgstr "Эхлэх хүртэлх хугацаа"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr_evaluation.evaluation,rating:0
+msgid "Appreciation"
+msgstr "Үнэлэлт"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Анхааруулга !"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,company_id:0
+#: field:hr_evaluation.plan.phase,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_date:0
+msgid "Next Evaluation"
+msgstr "Дараагийн үнэлгээ"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
+msgid "Evaluation Interviews"
+msgstr "Үнэлгээний ярилцлага"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,survey_id:0
+msgid "Appraisal Form"
+msgstr "Дүгнэх маягт"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
+msgid "Send an anonymous summary to the employee"
+msgstr "Ажилтанд илгээгч нь үл мэдэгдэх товчоо илгээх"
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interview Request"
+msgstr "Ярилцлагын хүсэлт"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Body"
+msgstr "Э-мэйлийн үндсэн хэсэг"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
+#: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
+msgid "Evaluations Analysis"
+msgstr "Үнэлгээний шинжилгээ"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_reminder
+msgid "Sends Reminders to employess to fill the evaluations"
+msgstr "Ажилтанд үнэлгээгээ бөглөхийг шаардсан сануулгыг илгээдэг"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Did not meet expectations"
+msgstr "Хүлээлттэй таарахгүй байх"
+
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
-msgid "Status"
-msgstr "Байдал"
+msgid "Appraisal"
+msgstr "Дүгнэх"
 
 #. module: hr_evaluation
-#: view:hr_evaluation.type:0
-msgid "Apply to categories"
-msgstr "Хүсэлт гаргах зэрэглэл"
+#: selection:hr.evaluation.report,month:0
+msgid "July"
+msgstr "7 сар"
 
 #. module: hr_evaluation
-#: model:ir.module.module,description:hr_evaluation.module_meta_information
-msgid "Ability to create employees evaluation."
-msgstr "Ажилтны үнэлгээ үүсгэх боломж"
+#: code:addons/hr_evaluation/hr_evaluation.py:0
+#, python-format
+msgid ""
+"You cannot change state, because some appraisal in waiting answer or draft "
+"state"
+msgstr ""
+"Зарим дүгнэлт нь хариу буюу ноорог төлөвт байгаа учраас төлөвийг өөрчилж "
+"чадахгүй"
 
 #. module: hr_evaluation
-#: field:hr_evaluation.quote,name:0
-msgid "Quote"
-msgstr "Квот"
+#: field:hr_evaluation.evaluation,date_close:0
+msgid "Ending Date"
+msgstr "Дуусах огноо"
 
 #. module: hr_evaluation
-#: field:hr_evaluation.type,category_ids:0
-msgid "Appliable Role"
+#: field:hr_evaluation.plan,month_next:0
+msgid "After the Date of Start"
+msgstr "Эхлэх огнооноос хэдэн сарын дараа"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Employees"
+msgstr "Ажилтнуудад илгээх"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,deadline:0
+msgid "Deadline"
+msgstr "Тов"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Month "
+msgstr " Сар "
+
+#. module: hr_evaluation
+#: help:hr.employee,evaluation_date:0
+msgid "Date of the next evaluation"
+msgstr "Дараагийн үнэлгээ хийх огноо"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_survey_request
+msgid "survey.request"
+msgstr "Судалгааны хүсэлт"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
+msgid "Periodic Evaluations"
+msgstr "Үечилсэн үнэлгээ"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:0
+#, python-format
+msgid "''Regarding ''"
 msgstr ""
 
 #. module: hr_evaluation
-#: field:hr_evaluation.evaluation,user_id:0
-msgid "Evaluation User"
-msgstr "Хэрэглэгчийн үнэлгээ"
+#: view:hr.evaluation.reminder:0
+msgid "Send evaluation reminder"
+msgstr "Үнэлгээний сануулгын илгээх"
 
 #. module: hr_evaluation
-#: view:hr_evaluation.type:0
-msgid "Choices Results"
-msgstr "Сонголтын үр дүн"
+#: field:hr_evaluation.evaluation,note_summary:0
+msgid "Evaluation Summary"
+msgstr "Үнэлгээний товчоо"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(date)s: Current Date"
+msgstr "(Огноо) Өнөөдрийн огноо"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,state:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
+msgid "Evaluation Plan Phase"
+msgstr "Үнэлгээний төлөвлөгөөний шат"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,employee_id:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,employee_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_employee
+msgid "Employee"
+msgstr "Ажилтан"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,overpass_delay:0
+msgid "Overpassed Deadline"
+msgstr "Хугацаа хэтэрсэн тов"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_body:0
+msgid "Email"
+msgstr "Э-мэйл"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Exceeds expectations"
+msgstr "Хүлээлтээс илүү гарсан"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,mail_feature:0
+msgid ""
+"Check this box if you want to send mail to employees coming under this phase"
+msgstr ""
+"Энэ шатанд ирсэн ажилчдад э-мэйл илгээхийг хүсвэл энэ талбарыг сонгоно уу!"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "Send all answers to the manager"
+msgstr "Бүх хариуг менежерт илгээх"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Plan In Progress"
+msgstr "Төлөвлөгөө хэрэгжиж эхэлсэн"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Public Notes"
+msgstr "Нийтийн тэмдэглэл"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
-msgid "Date"
-msgstr "Огноо"
+msgid "Evaluation Deadline"
+msgstr "Үнэлгээний тов"
 
 #. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Print Interview"
+msgstr "Ярилцлагын хэвлэх"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,closed:0
+msgid "closed"
+msgstr "Хаасан"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Meet expectations"
+msgstr "Хүлээлтэд нийцэж байгаа"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,nbr:0
+msgid "# of Requests"
+msgstr "Хүсэлтийн тоо"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Evaluations"
 msgstr "Үнэлгээнүүд"
 
 #. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
-msgid "Configuration"
-msgstr "Тохируулга"
-
-#. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
-msgid "Next Evaluations"
-msgstr "Дараагийн үнэлгээнүүд"
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Буруу параметер"
 
 #. module: hr_evaluation
 #: constraint:ir.ui.view:0
@@ -169,82 +350,67 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Дэлгэцийн XML алдаатай!"
 
 #. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
-msgid "Evaluation Criterions"
-msgstr "Үнэлгээний шалгуур"
+#: view:hr.evaluation.report:0
+msgid "    Month-1    "
+msgstr "    Сар-1    "
 
 #. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
-msgid "My Preceeding Evaluations"
-msgstr "Миний урьдчилсан үнэлгээ"
+#: view:hr_evaluation.plan.phase:0
+msgid "Action to Perform"
+msgstr "Хийх үйлдэл"
 
 #. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
-msgid "HR Responsible"
-msgstr "Хариуцлагатай HR"
+#: field:hr_evaluation.evaluation,note_action:0
+msgid "Action Plan"
+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 "Тэмдэглэл"
+#: view:hr_evaluation.plan.phase:0
+msgid "(eval_name)s:Evaluation Name"
+msgstr "Үнэлгээний нэр"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
-#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
-msgid "Employee Evaluation"
-msgstr "Ажилтаны үнэлгээ"
+msgid "Ending Summary"
+msgstr "Дуусах үеийн мэдээлэл"
 
 #. module: hr_evaluation
-#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
-msgid "Employee Evaluation Type"
-msgstr "Ажилтаны үнэлгээний төрөл"
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly exceeds expectations"
+msgstr "Хүлээлтээс мэдэхүйц илүү"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
-msgid "Quotations"
-msgstr "Квот"
+msgid "In progress"
+msgstr "Эхэлсэн"
 
 #. module: hr_evaluation
-#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
-msgid "Next Employee Evaluation"
-msgstr "Дараагийн ажилтаны үнэлгээ"
+#: field:hr_evaluation.plan.phase,send_answer_employee:0
+#: field:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "All Answers"
+msgstr "Бүх хариулт"
 
 #. module: hr_evaluation
-#: field:hr_evaluation.quote,type_id:0
-msgid "Type"
-msgstr "Төрөл"
+#: field:hr_evaluation.plan,month_first:0
+msgid "Next Evaluation After"
+msgstr "Дараагийн үнэлгээ хүртэлх хугацаа"
 
 #. module: hr_evaluation
-#: view:hr_evaluation.type:0
-#: field:hr_evaluation.type,name:0
-msgid "Evaluation Criterion"
-msgstr "Үнэлгээний хэмжүүр"
+#: selection:hr.evaluation.report,month:0
+msgid "September"
+msgstr "9 сар"
 
 #. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
-msgid "My Next Evaluations"
-msgstr "Миний дарагийн үнэлгээ"
+#: selection:hr.evaluation.report,month:0
+msgid "December"
+msgstr "12 сар"
 
 #. module: hr_evaluation
-#: view:hr_evaluation.quote:0
-msgid "Evalution Quote"
-msgstr "Үнэлгээний квот"
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,month:0
+msgid "Month"
+msgstr "Сар"
 
 #. module: hr_evaluation
 #: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
@@ -252,28 +418,548 @@ msgid "Human Resources Evaluation"
 msgstr "Хүний нөөцийн үнэлгээ"
 
 #. module: hr_evaluation
-#: field:hr_evaluation.evaluation,quote_ids:0
-msgid "Quotes"
-msgstr "Квотууд"
+#: view:hr_evaluation.evaluation:0
+msgid "Group by..."
+msgstr "Бүлэглэвэл..."
 
 #. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Settings"
+msgstr "Э-мэйлийн тохиргоо"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,user_to_review_id:0
+msgid "Employee to Interview"
+msgstr "Ярилцах ажилтан"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interview Question"
+msgstr "Ярилцлагын асуулт"
+
+#. module: hr_evaluation
+#: field:survey.request,is_evaluation:0
+msgid "Is Evaluation?"
+msgstr "Үнэлгээ эсэх"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,wait:0
+msgid ""
+"Check this box if you want to wait that all preceding phases are finished "
+"before launching this phase."
+msgstr ""
+"Энэ шат эхлэхээс өмнө түүнээс өмнөх бүх шат дуустал нь хүлээхийг хүсвэл энэ "
+"талбарыг сонгоорой."
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation Data"
+msgstr "Үнэлгээний өгөгдөл"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,note_action:0
+msgid ""
+"If the evaluation does not meet the expectations, you can proposean action "
+"plan"
+msgstr ""
+"Хэрэв үнэлгээ хүлээлтэд тань нийцэхгүй бол та үйлдлийн төлөвлөгөө санал "
+"болгож болно"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: hr_evaluation
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Алдаа ! Рекурс цэс үүсгэж болохгүй"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,send_anonymous_employee:0
+#: field:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Anonymous Summary"
+msgstr "Илгээгч нь үл мэдэгдэх товчоо"
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+#: view:hr_evaluation.evaluation:0
+msgid "Evaluation"
+msgstr "Үнэлгээ"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "7 Days"
+msgstr "7 хоног"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Year "
+msgstr " Жил "
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "August"
+msgstr "8 сар"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Start Evaluation"
+msgstr "Үнэлгээг эхлэх"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "June"
+msgstr "6 сар"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly bellow expectations"
+msgstr "Хүлээлтээс мэдэгдэхүйц дутуу"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid " (employee_name)s: Partner name"
+msgstr " (Ажилтны нэр): Харилцагчийн нэр"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,plan_id:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,plan_id:0
+msgid "Plan"
+msgstr "Төлөвлөгөө"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,active:0
+msgid "Active"
+msgstr "Идэвхитэй"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "November"
+msgstr "11 сар"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Extended Filters..."
+msgstr "Нэмэлт шүүлтүүр"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "October"
+msgstr "10 сар"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:0
+#, python-format
+msgid ""
+"''\n"
+"Date : %(date)s\n"
+"\n"
+"Dear %(employee_name)s,\n"
+"\n"
+"I am doing an evaluation regarding %(eval_name)s.\n"
+"\n"
+"Kindly submit your response.\n"
+"\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        ''"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "January"
+msgstr "1 сар"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+msgid "Send Mail"
+msgstr "Э-мэйл илгээх"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Send an anonymous summary to the manager"
+msgstr "Илгээгч нь үл мэдэгдэх товчоог менежерт илгээх"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interview Evaluation"
+msgstr "Ярилцлагаар үнэлэх"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
+msgid "Evaluation Plans"
+msgstr "Үнэлгээний төлөвлөгөө"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Survey"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,rating:0
+msgid "This is the appreciation on that summarize the evaluation"
+msgstr "Энэ нь үнэлэлт бөгөөд түүгээр нийт үнэлгээг нэгтгэн дүгнэгдэнэ"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,action:0
+msgid "Action"
+msgstr "Үйлдэл"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: selection:hr.evaluation.report,state:0
+msgid "Final Validation"
+msgstr "Сүүлийн батламжлал"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Waiting Appreciation"
+msgstr "Үнэлэлтийг хүлээж байгаа"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_feature:0
+msgid "Send mail for this phase"
+msgstr "Энэ шатны э-мэйлийг илгээх"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,rating:0
+msgid "Overall Rating"
+msgstr "Нийт үнэлгээний зэрэг"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Late"
+msgstr "Өнөөдрөөс хойших"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interviewer"
+msgstr "Ярилцлага авагч"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
+msgid "Evaluations Statistics"
+msgstr "Үнэлгээний шинжилгээ"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Deadline Date"
+msgstr "Товлосон огноо"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Top-Down Appraisal Requests"
+msgstr "Дээрээс доош дүгнэх хүсэлт"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "General"
+msgstr "Ерөнхий"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_employee:0
+msgid "Send all answers to the employee"
+msgstr "Ажилтанд бүх хариултыг илгээх"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: selection:hr.evaluation.report,state:0
 #: view:hr_evaluation.evaluation:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Done"
-msgstr "Хийнэ"
+msgstr "Хийсэн"
 
 #. module: hr_evaluation
-#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
-msgid "Employee Evaluation Quote"
-msgstr "Ажилчдыг үнэлэх квот"
+#: view:hr_evaluation.plan.phase:0
+msgid "Evaluation Plan Phases"
+msgstr "Үнэлгээний төлөвлөгөөний шатууд"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: view:hr_evaluation.evaluation:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "In Progress"
+msgstr "Эхэлсэн"
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "To Do"
+msgstr "Хийх (Хариулт хүлээж байгаа)"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,phase_ids:0
+msgid "Evaluation Phases"
+msgstr "Үнэлгээний шатууд"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
-#: field:hr_evaluation.evaluation,info_employee:0
-msgid "Employee Response"
-msgstr "Ажилчдын хариулт"
+msgid "Current"
+msgstr ""
 
 #. module: hr_evaluation
-#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
-msgid "Evaluation Type Value"
-msgstr "Үнэлгээний төрлийн утга"
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
+msgid "Evaluation Interview"
+msgstr "Одоогийн"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.reminder,evaluation_id:0
+msgid "Interview"
+msgstr "Ярилцлага"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.reminder:0
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_send_mail
+msgid "Evaluation Reminders"
+msgstr "Үнэлгээний сануулга"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Self Appraisal Requests"
+msgstr "Өөрийгөө дүгнэх хүсэлт"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,email_subject:0
+msgid "char"
+msgstr "Э-мэйлийн сэдэв"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,survey_request_ids:0
+msgid "Appraisal Forms"
+msgstr "Дүгнэх маягт"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "May"
+msgstr "5 сар"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Internal Notes"
+msgstr "Дотоод тэмдэглэл"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Validate Evaluation"
+msgstr "Үнэлгээг батламжлах"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Final Interview"
+msgstr "Эцсийн ярилцлага"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,name:0
+msgid "Phase"
+msgstr "Шат"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Bottom-Up Appraisal Requests"
+msgstr "Доороос дээш дүгнэх хүсэлт"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
+msgid "Search Evaluation"
+msgstr "Үнэлгээг хайх"
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_plan_id:0
+#: view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,name:0
+#: field:hr_evaluation.plan.phase,plan_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
+msgid "Evaluation Plan"
+msgstr "Үнэлгээний төлөвлөгөө"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "February"
+msgstr "2 сар"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Managers"
+msgstr "Менежерт илгээх"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_send_mail
+msgid "Evaluation Send Mail"
+msgstr "Үнэлгээний дуусахад илгээх э-мэйл"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "April"
+msgstr "4 сар"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr "Ажилтаны үнэлгээ"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "Search Evaluation Plan"
+msgstr "Үнэлгээний төлөвлөгөөг хайх"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0
+msgid "(months)"
+msgstr "(сар)"
+
+#. module: hr_evaluation
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(user_signature)s: User name"
+msgstr "(Хэрэглэгчийн гарын үсэг) :  Хэрэглэгчийн нэр"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
+msgid "Interview Requests"
+msgstr "Ярилцлагын хүсэлт"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,create_date:0
+msgid "Create Date"
+msgstr "Үүссэн огноо"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: field:hr.evaluation.report,year:0
+msgid "Year"
+msgstr "Он"
+
+#~ msgid "Information"
+#~ msgstr "Мэдээлэл"
+
+#~ msgid "Schedule next evaluation"
+#~ msgstr "Дараагийн үнэлгээний хуваарь"
+
+#~ msgid "Bad Points"
+#~ msgstr "Муу цэгүүд"
+
+#~ msgid "My Next Evaluation"
+#~ msgstr "Миний дараагийн үнэлгээ"
+
+#~ msgid "Values"
+#~ msgstr "Утгууд"
+
+#~ msgid "Good Points"
+#~ msgstr "Сайн цэгүүд"
+
+#~ msgid "Score"
+#~ msgstr "Оноо"
+
+#~ msgid "Informal Data"
+#~ msgstr "Албан ёсны өгөгдөл"
+
+#~ msgid "To Improve"
+#~ msgstr "Сайжруулах"
+
+#~ msgid "Status"
+#~ msgstr "Байдал"
+
+#~ msgid "Quote"
+#~ msgstr "Квот"
+
+#~ msgid "Evaluation User"
+#~ msgstr "Хэрэглэгчийн үнэлгээ"
+
+#~ msgid "Choices Results"
+#~ msgstr "Сонголтын үр дүн"
+
+#~ msgid "Configuration"
+#~ msgstr "Тохируулга"
+
+#~ msgid "Next Evaluations"
+#~ msgstr "Дараагийн үнэлгээнүүд"
+
+#~ msgid "Evaluation Criterions"
+#~ msgstr "Үнэлгээний шалгуур"
+
+#~ msgid "My Preceeding Evaluations"
+#~ msgstr "Миний урьдчилсан үнэлгээ"
+
+#~ msgid "HR Responsible"
+#~ msgstr "Хариуцлагатай HR"
+
+#~ msgid "Value"
+#~ msgstr "Утга"
+
+#~ msgid "Summary"
+#~ msgstr "Дүгнэлт"
+
+#~ msgid "Employee Evaluation Type"
+#~ msgstr "Ажилтаны үнэлгээний төрөл"
+
+#~ msgid "Quotations"
+#~ msgstr "Квот"
+
+#~ msgid "Next Employee Evaluation"
+#~ msgstr "Дараагийн ажилтаны үнэлгээ"
+
+#~ msgid "Type"
+#~ msgstr "Төрөл"
+
+#~ msgid "Evaluation Criterion"
+#~ msgstr "Үнэлгээний хэмжүүр"
+
+#~ msgid "My Next Evaluations"
+#~ msgstr "Миний дарагийн үнэлгээ"
+
+#~ msgid "Evalution Quote"
+#~ msgstr "Үнэлгээний квот"
+
+#~ msgid "Quotes"
+#~ msgstr "Квотууд"
+
+#~ msgid "Employee Evaluation Quote"
+#~ msgstr "Ажилчдыг үнэлэх квот"
+
+#~ msgid "Employee Response"
+#~ msgstr "Ажилчдын хариулт"
+
+#~ msgid "Evaluation Type Value"
+#~ msgstr "Үнэлгээний төрлийн утга"
+
+#~ msgid "Ability to create employees evaluation."
+#~ msgstr "Ажилтны үнэлгээ үүсгэх боломж"
+
+#~ msgid "Apply to categories"
+#~ msgstr "Хүсэлт гаргах зэрэглэл"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index c766390025c..58008578df3 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -58,7 +58,7 @@
                     <separator orientation="vertical"/>
 	                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
-                   	<filter string="Final Validation" icon="terp-check" domain="[('state','=','progress')]"
+                   	<filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]"
                    		help = "Final Validation Evaluations"/>
                    	<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
   					<separator orientation="vertical"/>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index fba2a5f2202..d5eaf33a6ae 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -27,3 +27,5 @@
 "access_survey_question_column_heading_hr_user","survey.question.column.heading.hr.user","survey.model_survey_question_column_heading","base.group_hr_user",1,0,0,0
 "access_survey_response_line_hr_user","survey.response.line.hr.user","survey.model_survey_response_line","base.group_hr_user",1,1,1,0
 "access_survey_tbl_column_heading_hr_user","survey.tbl.column.heading.hr.user","survey.model_survey_tbl_column_heading","base.group_hr_user",1,1,1,0
+"access_base_calendar_attendee_survey_user","base.calendar.calendar.attendee.survey.user","base_calendar.model_calendar_attendee","survey.group_survey_user",1,1,1,0
+"access_base_calendar_attendee_tool_user","base.calendar.calendar.attendee.tool.user","base_calendar.model_calendar_attendee","base.group_tool_user",1,1,1,0
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 9eb073ce52e..bd1c7b8fd8b 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -35,8 +35,8 @@
                     <field name="ref"/>
                     <field name="amount"/>
                     <field name="state"/>
-                    <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
-                    <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no"/>
+                    <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -54,8 +54,8 @@
                     <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
-                    <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
-                    <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no"/>
+                    <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -101,11 +101,11 @@
                             </field>
                             <field name="state"/>
                             <group col="6" colspan="2">
-                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>
+                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_manager"/>
                                 <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
-                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
-                                <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward"/>
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward"/>
+                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward" groups="base.group_hr_manager"/>
+                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_manager"/>
                             </group>
                         </page>
                         <page string="Other Info" groups="base.group_extended">
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index 93b97a24896..e3ace679a59 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-28 04:32+0000\n"
-"Last-Translator: badralkh <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 08:25+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -128,7 +128,7 @@ msgstr "Тэмдэглэл"
 #. module: hr_expense
 #: field:hr.expense.expense,invoice_id:0
 msgid "Employee's Invoice"
-msgstr ""
+msgstr "Ажилтны нэхэмжлэх"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -138,7 +138,7 @@ msgstr "Цуцлагдсан"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Validation"
-msgstr "Батлах"
+msgstr "Батламжлах"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -153,7 +153,7 @@ msgstr "Зөвшөөрсөн"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Сар   "
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -165,7 +165,7 @@ msgstr "Лавлах"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Certified honest and conform,"
-msgstr ""
+msgstr "Үнэн зөв, зохимжтойг гэрчилж байна"
 
 #. module: hr_expense
 #: help:hr.expense.expense,date_confirm:0
@@ -173,32 +173,34 @@ msgid ""
 "Date of the confirmation of the sheet expense. It's filled when the button "
 "Confirm is pressed."
 msgstr ""
+"Цалингийн хуудсын зардлыг баталсан огноо. Энэ нь 'Батлах' товчийг дарахад "
+"бөглөгдөнө."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Мөрийн тоо"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_refuseexpense0
 msgid "Refuse expense"
-msgstr "Зардлыг хүлээн зөвшөөрөхгүй"
+msgstr "Татгалзсан зардал"
 
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_car_product_template
 msgid "Car Travel"
-msgstr ""
+msgstr "Машинаар зорчих"
 
 #. module: hr_expense
 #: field:hr.expense.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Дундаж үнэ"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Total Invoiced Lines"
-msgstr ""
+msgstr "Бүх нэхэмжилсэн мөрүүд"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -209,17 +211,17 @@ 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.report,delay_valid:0
 msgid "Delay to Valid"
-msgstr ""
+msgstr "Хүчинтэй болох хүртэлх хугацаа"
 
 #. module: hr_expense
 #: help:hr.expense.line,sequence:0
 msgid "Gives the sequence order when displaying a list of expense lines."
-msgstr ""
+msgstr "Зардлын мөрүүдийг харахдаа тэдгээрт дарааллыг олгоно."
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:0
@@ -228,6 +230,8 @@ msgid ""
 "Please configure Default Expanse account for Product purchase, "
 "`property_account_expense_categ`"
 msgstr ""
+"Худалдан авч буй барааны 'Өгөгдмөл өсөлт' талбарын тохируулна уу.  "
+"`property_account_expense_categ`"
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
@@ -239,7 +243,7 @@ msgstr "Аналитик данс"
 #. module: hr_expense
 #: field:hr.expense.report,date:0
 msgid "Date "
-msgstr ""
+msgstr "Огноо "
 
 #. module: hr_expense
 #: field:hr.expense.expense,state:0
@@ -278,23 +282,23 @@ msgstr "Зарим үнүүдийг харилцагч дахин нэхэмжи
 #: code:addons/hr_expense/hr_expense.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Алдаа !"
 
 #. module: hr_expense
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_my_expense
 msgid "My Expenses"
-msgstr "Миний зардлууд"
+msgstr "Миний өөрийн зардлууд"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Үүсгэсэн огноо"
 
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "HR expenses"
-msgstr ""
+msgstr "Хүний нөөцийн зардлууд"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
@@ -316,12 +320,12 @@ msgstr "Хүчинтэй журнал"
 #: view:hr.expense.report:0
 #: field:hr.expense.report,no_of_products:0
 msgid "# of Products"
-msgstr ""
+msgstr "Бүтээгдэхүүний тоо"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7 сар"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
@@ -341,25 +345,25 @@ msgstr "Дэлгэцийн XML алдаатай!"
 #. module: hr_expense
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Алдаа: Борлуулалтын нэгж нь хэмжилтийн нэгжээс өөр нэр томъёл"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Сар 1    "
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_valid:0
 #: field:hr.expense.report,date_valid:0
 msgid "Validation Date"
-msgstr ""
+msgstr "Батламжилсан огноо"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
 msgid "Expenses Analysis"
-msgstr ""
+msgstr "Зардлын шинжилгээ"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -379,24 +383,24 @@ msgstr "Зардлын мөрүүд"
 #. module: hr_expense
 #: field:hr.expense.report,delay_confirm:0
 msgid "Delay to Confirm"
-msgstr ""
+msgstr "Батлах хүртэлх хугацаа"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9 сар"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12 сар"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: hr_expense
 #: field:hr.expense.expense,currency_id:0
@@ -408,17 +412,17 @@ msgstr "Валют"
 #: code:addons/hr_expense/hr_expense.py:0
 #, python-format
 msgid "The employee must have a working address"
-msgstr ""
+msgstr "Ажилтан ажлын хаягтай байх ёстой"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Waiting Approval"
-msgstr ""
+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
@@ -430,18 +434,20 @@ msgstr "Нэхэмжилсэн"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "Зардлаас харагдахаар тогтоох эсэх"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Он  "
 
 #. module: hr_expense
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Алдаа: Өгөгдмөл хэмжих нэгж ба худалдан авалтын хэмжилт нь 1 ангилалд байх "
+"ёстой"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -469,7 +475,7 @@ msgstr "Ноорог"
 #. module: hr_expense
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Алдаа ! Рекурс цэсийг үүсгэж болохгүй"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -479,17 +485,17 @@ msgstr "Дансны өгөгдөл"
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveexpense0
 msgid "Expense is approved."
-msgstr "Зөвшөөрсөн зардлууд"
+msgstr "Зардлуудыг зөвшөөрлөө"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8 сар"
 
 #. 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.expense,amount:0
@@ -499,7 +505,7 @@ msgstr "Нийт хэмжээ"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6 сар"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_draftexpenses0
@@ -509,7 +515,7 @@ msgstr "Ноорог зардлууд"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Customer Project"
-msgstr ""
+msgstr "Үйлчлүүлэгчийн төсөл"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -527,12 +533,12 @@ msgstr "Огноо"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11 сар"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10 сар"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -542,7 +548,7 @@ msgstr "Нийт:"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1 сар"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -557,7 +563,9 @@ 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
 #: model:process.node,name:hr_expense.process_node_supplierinvoice0
@@ -573,23 +581,23 @@ msgstr "Зардлын хуудас"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Waiting"
-msgstr ""
+msgstr "Хүлээгдэж байгаа"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
 #: field:hr.expense.report,day:0
 msgid "Day"
-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
 msgid "References"
-msgstr ""
+msgstr "Хамаарах лавлагаа"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -607,7 +615,7 @@ msgstr "Дахин нэхэмжлэх"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_expense.action_employee_expense
 msgid "All Employee Expenses"
-msgstr ""
+msgstr "Бүх ажилнты зардал"
 
 #. module: hr_expense
 #: constraint:ir.model:0
@@ -625,7 +633,7 @@ msgstr "Бусад мэдээлэл"
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
 msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "Зардлыг нэхэмжлэхэд энэ журнал хэрэглэгдэнэ."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -677,7 +685,7 @@ msgstr "Бүтээгдэхүүн"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Expenses of My Department"
-msgstr ""
+msgstr "Тухайн хэлтсийн зардал"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -689,7 +697,7 @@ msgstr "Тайлбар"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5 сар"
 
 #. module: hr_expense
 #: field:hr.expense.line,unit_quantity:0
@@ -699,13 +707,13 @@ msgstr "Тоо хэмжээ"
 #. module: hr_expense
 #: field:hr.expense.report,no_of_account:0
 msgid "# of Accounts"
-msgstr ""
+msgstr "Дансны тоо"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 #: model:process.node,name:hr_expense.process_node_refused0
 msgid "Refused"
-msgstr "Гологдсон"
+msgstr "Татгалзсан"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -715,19 +723,19 @@ msgstr "реф."
 #. module: hr_expense
 #: field:hr.expense.report,employee_id:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Ажилтны нэр"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "This Month"
-msgstr ""
+msgstr "Энэ сар"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_valid:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,user_id:0
 msgid "Validation User"
-msgstr "Хэрэглэгч батлах"
+msgstr "Батламжилсан хэрэглэгч"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -737,7 +745,7 @@ msgstr "Огноо болон гарын үсэг"
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2 сар"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -747,7 +755,7 @@ msgstr "Нэр"
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
 msgid "Ledger Posting"
-msgstr ""
+msgstr "Дэвтэрт бичсэн гүйлгээ"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveinvoice0
@@ -757,17 +765,17 @@ msgstr "Нийлүүлэгчийн нэхэмжлэл бүрдүүлэлт"
 #. module: hr_expense
 #: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
 msgid "Hotel Accommodation"
-msgstr ""
+msgstr "Зочид буудлын байрлах"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4 сар"
 
 #. module: hr_expense
 #: field:hr.expense.line,name:0
 msgid "Expense Note"
-msgstr ""
+msgstr "Зардлын тэмдэглэл"
 
 #. module: hr_expense
 #: help:hr.expense.expense,state:0
@@ -779,11 +787,18 @@ msgid ""
 " If an invoice is made for the expense request, the state is 'Invoiced'.\n"
 " If the expense is paid to user, the state is 'Reimbursed'."
 msgstr ""
+"When the expense request is created the state is 'Draft'.\n"
+"Зардлын хүсэлт 'Ноорог' төлөвт үүссэний дара:\n"
+"Хэрэглэгч баталбал хүсэлт администраторт 'Зөвшөөрөл хүлээж байгаа' "
+"төлөвтэйгөөр шилжинэ. \n"
+"Администратор зөвшөөрвөл 'Зөвшөөрсөн' төлөвт шилжинэ.\n"
+"Зардлын хүсэлтэд нэхэмжлэх үүсвэл 'Нэхэмжилсэн' төлөвт шилжинэ.\n"
+"Зардлыг хэрэглэгчид төлбөл 'Нөхөн төлсөн' төлөвт шилжинэ."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Approve"
-msgstr ""
+msgstr "Зөвшөөрсөн"
 
 #. module: hr_expense
 #: view:hr.expense.line:0
@@ -794,7 +809,7 @@ msgstr "Нийт"
 #. module: hr_expense
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
 
 #. module: hr_expense
 #: field:hr.expense.line,sequence:0
@@ -823,12 +838,12 @@ msgstr ""
 #: view:hr.expense.report:0
 #: field:hr.expense.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Он"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "To Approve"
-msgstr ""
+msgstr "Зөвшөөрөх"
 
 #. module: hr_expense
 #: help:product.product,hr_expense_ok:0
@@ -836,6 +851,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
 msgstr ""
+"Хүний нөөцийн зардлын хуудаснаас бараа сонгоход энэ бараа барааны жагсаалтад "
+"харагдах эсэхийг тодорхойлно."
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0d94204f426..ba05ee476a7 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -66,7 +66,7 @@
                   <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
-                    <filter string="Approved" icon="terp-camera_test" domain="[('state','=','accepted')]"
+                    <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
                       help = "Approved Expenses"/>
                     <separator orientation="vertical"/>
                     <filter string="Invoiced" icon="terp-dolar" domain="[('state','=','invoiced')]"
@@ -76,7 +76,7 @@
                     <field name="department_id"/>
             </group>
             <newline/>
-            <group expand="0" string="Extended filters..." groups="base.group_extended">
+            <group expand="0" string="Extended Filters..." groups="base.group_extended">
                 <field name="product_id"/>
                 <separator orientation="vertical"/>
                 <field name="user_id"/>
@@ -95,7 +95,7 @@
                 <separator orientation="vertical"/>
                 <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                 <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                <filter string="Analytic account" icon="terp-folder-violet" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
+                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
                 <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                 <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 525b55bf681..2b5b9ffb28c 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -16,3 +16,4 @@
 "access_account_move_user","account.move.user","account.model_account_move","base.group_hr_user",1,1,1,1
 "access_account_move_line_user","account.move.line.user","account.model_account_move_line","base.group_hr_user",1,1,1,1
 "access_account_analytic_line_user","account.ianalytic.line.user","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
+"access_account_journal_period_manager","account.journal.period.manager","account.model_account_journal_period","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 54f53f47a32..96fb29deae2 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -5,7 +5,6 @@
     <!-- Casual leave -->
     <record model="hr.holidays.status" id="holiday_status_cl">
       <field name="name">Casual Leave</field>
-      <field name="double_validation">True</field>
       <field name="color_name">black</field>
     </record>
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 0d78af87975..5e2f1160306 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -10,8 +10,8 @@
                 <search string="Search Leave">
                     <group col='8' colspan='4'>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
-                            default="context.get('report', False)"/> 
-                        <separator orientation="vertical"/>                    
+                            default="context.get('report', False)"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
@@ -31,19 +31,19 @@
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended options...">
+                    <group expand="0" string="Extended Filters...">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>                        
-                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>                        
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
                         <separator orientation="vertical"/>
                         <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
                             default="context.get('report', False)"/>
-                        <separator orientation="vertical"/>                   
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
@@ -128,7 +128,7 @@
                 <notebook colspan="4">
                     <page string="General">
                         <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-                        <field name="department_id"/>                    
+                        <field name="department_id"/>
                         <field name="number_of_days_temp"/>
                         <newline/>
                         <field name="manager_id"/>
@@ -139,10 +139,10 @@
                         <field name="state" colspan="2"/>
                         <group colspan="2" col="6">
                             <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                             <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                         </group>
                     </page>
@@ -160,7 +160,7 @@
                     <field name="employee_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="holiday_status_id"/>
-                    <field name="name"/>                     
+                    <field name="name"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
@@ -217,8 +217,8 @@
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')" string="Leaves Summary">
                     <field name="employee_id"/>
                     <field name="department_id" invisible="1"/>
-                    <field name="type"/>  
-                    <field name="name"/>                    
+                    <field name="type"/>
+                    <field name="name"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from"/>
                     <field name="date_to"/>
@@ -256,7 +256,8 @@
                     <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                    <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                     <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
@@ -348,6 +349,22 @@
             sequence="40"/>
 
         <!-- holidays status -->
+        <record id="view_holidays_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 Leave Type">
+                    <field name="name"/>
+                    <field name="categ_id" widget="selection"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Meeting Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <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>
@@ -358,11 +375,23 @@
                         <field name="name" />
                         <field name="color_name"/>
                         <field name="categ_id" widget="selection" groups="base.group_extended"/>
-                        <newline/>
-                        <field name="limit"/>
-                        <field name="double_validation"/>
-                        <field name="active"/>
                     </group>
+					<notebook colspan="4">
+					  <page string="Details">
+						<group name="selection" col="4" colspan="4">
+							<group colspan="2">
+							<separator string="Validation" />
+								<newline/>
+							<field name="active" />
+								<newline/>
+							<field name="double_validation"/>
+								<newline/>
+							<field name="limit"/>
+							</group>
+							<group name="second" colspan="2"/>
+						</group>
+					  </page>
+					</notebook>
                 </form>
             </field>
         </record>
@@ -376,16 +405,31 @@
                     <field name="name"/>
                     <field name="remaining_leaves"/>
                     <field name="limit" />
+                     <field name="categ_id" invisible="1"/>
                 </tree>
             </field>
         </record>
 
+		<record id="view_hr_holidays_status_search" model="ir.ui.view">
+            <field name="name">hr.holidays.status.search</field>
+            <field name="model">hr.holidays.status</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Leave Type">
+                        <field name="name"/>
+                        <field name="categ_id" widget="selection"/>
+                </search>
+            </field>
+        </record>
+
         <record id="open_view_holiday_status" model="ir.actions.act_window">
             <field name="name">Leave Type</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_holiday_status_tree"/>
+            <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_hr_manager"/>
@@ -410,7 +454,7 @@
     <!--  Shortcuts -->
         <act_window name="Holidays"
             domain="[('type','=','remove')]"
-            context="{'search_default_employee_id': [active_id]}" 
+            context="{'search_default_employee_id': [active_id]}"
             res_model="hr.holidays"
             src_model="hr.employee"
             view_id ="eval('edit_holiday_new')"
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index bdcc0a0bea7..f1654ab80c8 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 08:07+0000\n"
+"PO-Revision-Date: 2010-10-28 08:17+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8c4fe100099..ce68f1e20cf 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -402,20 +402,25 @@
             <field name="inherit_id" ref="hr_holidays.edit_holiday_status_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="double_validation" position="replace">
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Payroll Configurtion"/>
-                        <field name="type"/>
-                        <field name="head_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/>
-                        <field name="code" readonly="True"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Validation"/>
-                        <field name="double_validation"/>
-                    </group>
-                </field>
-            </field>
+            <xpath expr="//group[@name='selection']" position="replace">
+				<group colspan="2">
+							<separator string="Validation" colspan="2"/>
+								<newline/>
+							<field name="active" />
+								<newline/>							
+							<field name="double_validation"/>
+								<newline/>
+							<field name="limit"/>
+			  	</group>
+				<group colspan="2">						
+					<separator colspan="2" string="Payroll Configurtion"/><newline/>
+					<field name="type"/><newline/>
+					<field name="head_id"/><newline/>
+					<field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/><newline/>
+					<field name="code" readonly="True"/>
+				</group>
+			</xpath>
+        </field>
         </record>
         <!-- End Holiday Status -->
 
@@ -744,7 +749,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
                         <filter string="Based" icon="terp-go-month" domain="[]" context="{'group_by':'base'}"/>
-                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                </search>
             </field>
@@ -840,8 +845,8 @@
                     </group>
                     <newline/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
-                        <filter string="Type" icon="terp-partner" name="amount_type" context="{'group_by':'amount_type'}"/>
-                        <filter string="Category" name="category_id" icon="terp-go-month"  context="{'group_by':'category_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" name="amount_type" context="{'group_by':'amount_type'}"/>
+                        <filter string="Category" name="category_id" icon="terp-stock_symbol-selection"  context="{'group_by':'category_id'}"/>
                     </group>
                 </search>
             </field>
@@ -910,9 +915,9 @@
                     </notebook>
                     <group col="6" colspan="6">
                         <field name="state"/>
+                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
                         <button name="confirm_sheet"  icon="gtk-apply" string="Confirm Sheet" states="draft" type="object"/>
                         <button name="set_to_draft" string="Set to Draft"  icon="gtk-convert"  states="cancel,confirm" type="object"/>
-                        <button name="cancel_sheet" string="Cancel Sheet" states="draft" icon="gtk-cancel"  type="object"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index a3ca06e245d..634603790fe 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 06:02+0000\n"
+"PO-Revision-Date: 2010-10-28 08:56+0000\n"
 "Last-Translator: mra (Open ERP) <mra@tinyerp.com>\n"
 "Language-Team: French <fr@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 433c6857c8d..9ce78c4bf21 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/i18n/mn.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-28 01:24+0000\n"
-"Last-Translator: badralkh <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 08:59+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index f32141a9741..04fe9aa73ea 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -45,7 +45,9 @@
             <field name="arch" type="xml">
                 <field name="code" position="after">
                    <field name="analytic_account_id"/>
+				   <newline/>
                    <field name="account_id"/>
+				   <newline/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_payroll_account/i18n/mn.po b/addons/hr_payroll_account/i18n/mn.po
index 34f07898def..925e175f2e7 100644
--- a/addons/hr_payroll_account/i18n/mn.po
+++ b/addons/hr_payroll_account/i18n/mn.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-28 02:06+0000\n"
-"Last-Translator: badralkh <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 09:29+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_recruitment/i18n/mn.po b/addons/hr_recruitment/i18n/mn.po
index 2507e6b5c66..359955a5478 100644
--- a/addons/hr_recruitment/i18n/mn.po
+++ b/addons/hr_recruitment/i18n/mn.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-28 04:22+0000\n"
-"Last-Translator: badralkh <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 08:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index a38cf0185df..4f39005a3d1 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -68,7 +68,7 @@
                         domain="[('state','=','draft')]"
                         help = "Draft recruitment"/>
                     <filter string="In progress"
-                        icon="terp-check"
+                        icon="terp-camera_test"
                         domain="[('state', '=' ,'open')]"
                         help = "In progress recruitment"/>
                        <filter string="Pending"
diff --git a/addons/hr_timesheet/i18n/mn.po b/addons/hr_timesheet/i18n/mn.po
index 0190218fa89..08520332dbb 100644
--- a/addons/hr_timesheet/i18n/mn.po
+++ b/addons/hr_timesheet/i18n/mn.po
@@ -7,400 +7,653 @@ 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-09-10 08:45+0000\n"
-"Last-Translator: munkhbold <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-29 04:09+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@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-09-29 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
-#: wizard_view:hr.analytical.timesheet,init:0
-#: wizard_view:hr.analytical.timesheet.my,init:0
-msgid "Choose your month"
-msgstr ""
+#: model:product.template,name:hr_timesheet.product_consultant_product_template
+msgid "Service on Timesheet"
+msgstr "Цаг бүртгэлд үндэслэсэн үйлчилгээ"
 
 #. module: hr_timesheet
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Wed"
+msgstr "Лхагва"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr "(Энэ өдрийн энэ цаг бол хоосон үлдээ)"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "Таны хэрэглэгчид ажилтан харгалзаагүй байна !"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
+
+#. module: hr_timesheet
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Дэлгэцийн үйлдэл дэх моделийн нэр алдаатай байна."
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Өнөөдөр"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Аналитик журнал"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr "Ажиллахаа зогсоох"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
+msgid "Employee Timesheet"
+msgstr "Ажилтны цаг бүртгэл"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr "Ажил дууссан төлөв"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr "Цаг бүртгэл"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "janvier"
+msgstr "1 сар"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Mon"
+msgstr "Даваа"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Нэвтрэх"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "avril"
+msgstr "4 сар"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr "Хамгийн бага аналитик дүн"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr "Ажилтны сарын цаг бүртгэл"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Нэвтрэх / Гарах"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "Сүүлийн мөчлөгт ажил дууссан"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr "Одоогийн төлөв"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr "Ажилтны нэр"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "Ажилтны цаг бүртгэлийг хэвлэх"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Анхааруулга"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#, python-format
+msgid "UserError"
+msgstr "Хэрэглэгчийн алдаа"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#, python-format
+msgid "No cost unit defined for this employee !"
+msgstr "Энэ ажилтны мэдээлэлд өртөг тодорхойлоглоогүй байна !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Tue"
+msgstr "Мягмар"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Analytic Account"
+msgstr "Аналитик Данс"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#, python-format
+msgid "Warning"
+msgstr "Анхааруулга"
+
+#. module: hr_timesheet
+#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
+msgid "Human Resources (Timesheet encoding)"
+msgstr "Хүний нөөц (Цаг бүртгэлийг хөтлөх)"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out By Project"
+msgstr "Нэвтэрсэн, гарсан үйлдлийг төслөөр харах"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Sat"
+msgstr "Бямба"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Sun"
+msgstr "Ням"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Хэвлэх"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr "Гарсан үйлдлийг төслөөр харах"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Timesheet Lines"
+msgstr "Цаг бүртгэлийн мөрүүд"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "juillet"
+msgstr "7 сар"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr "Ажилтны сарын  цаг бүртгэл"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "July"
+msgstr "7 сар"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Эхлэх огноо"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Ангиллууд"
+
+#. module: hr_timesheet
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн xml алдаатай байна!"
+
+#. module: hr_timesheet
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Алдаа: Борлуулалтын нэгж нь хэмжих нэгжээс өөр ангилалд байх ёстой"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "novembre"
+msgstr "11 сар"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "March"
+msgstr "3 сар"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr "Нийт өртөг"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "décembre"
+msgstr "12 сар"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "September"
+msgstr "9 сар"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "December"
+msgstr "12 сар"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "Ажилчид"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr "Төлөвийг сараар харах"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: field:hr.analytical.timesheet.employee,month:0
+#: field:hr.analytical.timesheet.users,month:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "Ажлын тухай тайлбар"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "To be invoiced"
+msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr ""
+msgstr "Ажилтны цаг бүртгэл"
 
 #. module: hr_timesheet
-#: model:ir.actions.wizard,name:hr_timesheet.si_so
-#: model:ir.ui.menu,name:hr_timesheet.menu_si_so
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Нэвтрэх, гарах үйлдлийг төслөөр харах"
 
 #. module: hr_timesheet
-#: wizard_button:hr_timesheet.si_so,sign_in,so_result_end:0
-msgid "Stop Working"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_in:0
-msgid "(Keep empty for current_time)"
-msgstr ""
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Fri"
+msgstr "Баасан"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Алдаа: Өгөгдмөл хэмжих нэгж ба худалдан авах хэмжих нэгж нь 1 ангилалд байх "
+"ёстой."
 
 #. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_in:0
-msgid "Sign in status"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_out:0
+#: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
+msgstr "(Өнөөдрийн энэ цаг бол хоосон үлдээ)"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "Цаг бүртгэл"
+
+#. module: hr_timesheet
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй."
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr "Ажилтны албан тушаалыг 'Үйлчилгээ' төрлийн бараа шиг тодорхойлно."
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_out,server_date:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "August"
+msgstr "8 сар"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "June"
+msgstr "6 сар"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Print My Timesheet"
+msgstr "Өөрийн цаг бүртгэлийг хэвлэх"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "mars"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "November"
+msgstr "11 сар"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr "Хаасан өдөр"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "October"
+msgstr "10 сар"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:0
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
+msgstr ""
+"Энэ төсөлд аналитик данс байхгүй байна.\n"
+"1 аналитик данс олгохгүй бол цаг бүртгэлийг автоматаар бөглөх боломжгүй."
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "January"
+msgstr "1 сар"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Key dates"
+msgstr "Түлхүүр(чухал) огноо"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "Thu"
+msgstr "Мягмар"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis stats"
+msgstr "Шинжилгээ, статистик"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr "Ажилтны цаг бүртгэл, өөрийн цаг бүртгэлийг хэвлэх"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "Ажилтны дугаар"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "Ерөнхий мэдээлэл"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Timesheet"
+msgstr "Өөрийн цаг бүртгэл"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis summary"
+msgstr "Шинжилгээний товчоо"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
+#: 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_hr_timesheet_users
+msgid "Employees Timesheet"
+msgstr "Ажилчдын цаг бүртгэл"
+
+#. module: hr_timesheet
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+msgid "février"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "Мэдээлэл"
+
+#. module: hr_timesheet
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Обьектын нэр x_-ээр эхэлж тусгай тэмдэгт агуулахгүй байх ёстой!"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Ажилтан"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Өнөөдөр"
 
 #. module: hr_timesheet
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: view:hr.analytic.timesheet:0
+msgid "Anlytic account"
+msgstr "Аналитик данс"
 
 #. module: hr_timesheet
-#: wizard_button:hr.analytical.timesheet,init,report:0
-#: wizard_button:hr.analytical.timesheet.my,init,report:0
-#: wizard_button:hr.analytical.timesheet_users,init,report:0
-msgid "Print"
-msgstr "Хэвлэх"
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Цаг бүртгэлийн мөр"
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
-msgid "Minimum Analytic Amount"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,server_date:0
-msgid "Current Server Date"
-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 ""
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr "Энэ дэлгэцийн оролт нь сарын цаг бүртгэлийг хэвлэнэ."
 
 #. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
 #: field:hr.employee,product_id:0
 msgid "Product"
 msgstr "Бараа"
 
-#. 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 "août"
-msgstr ""
-
-#. module: hr_timesheet
-#: field:hr.employee,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:product.uom,name:hr_timesheet.uom_hour
-msgid "Hour"
-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 ""
-
-#. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "Work done stats"
-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 ""
-
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
-msgid "Timesheet Lines"
-msgstr ""
+msgid "Invoicing"
+msgstr "Нэхэмжилж байгаа"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "May"
+msgstr "5 сар"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr ""
+msgstr "Нийт цаг"
 
 #. 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 "juillet"
-msgstr ""
-
-#. module: hr_timesheet
-#: xsl:hr.analytical.timesheet:0
-#: xsl:hr.analytical.timesheet_users:0
-#: model:ir.ui.menu,name:hr_timesheet.next_id_48
-msgid "Timesheet"
-msgstr "Цагийн хуудас"
-
-#. 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 "janvier"
-msgstr ""
-
-#. 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
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
 msgid "juin"
 msgstr ""
 
 #. module: hr_timesheet
-#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_my
-#: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_my
-msgid "Print My Timesheet"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_field:hr.analytical.timesheet,init,user_id:0
-#: wizard_field:hr.analytical.timesheet.my,init,user_id:0
-msgid "User"
-msgstr "Хэрэглэгч"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_out:0
-msgid "Sign in"
-msgstr ""
-
-#. module: hr_timesheet
-#: 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 ""
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_out:0
+#: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr ""
+msgstr "(Серве дээрх орон нутгийн цаг)"
 
 #. module: hr_timesheet
-#: view:hr.analytic.timesheet:0
-msgid "Total cost"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+#: model:ir.ui.menu,name:hr_timesheet.menu_project_working_hours
+msgid "Working Hours"
+msgstr "Ажилласан цаг"
 
 #. module: hr_timesheet
-#: model:product.uom,name:hr_timesheet.uom_day
-msgid "Day"
-msgstr "Өдөр"
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr "Нэвтрэх үйлдлийг төслөөр харах"
 
 #. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,date:0
-msgid "Closing Date"
-msgstr ""
-
-#. module: hr_timesheet
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. 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 "avril"
-msgstr ""
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "February"
+msgstr "2 сар"
 
 #. 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"
+#: view:hr.sign.in.project:0
+msgid "This Wizard will make Sign In/Out By Project"
 msgstr ""
+"Дэлгэцийн энэ оролт нь нэвтрэх гарах үйлдлийг төслөөр харахад тусална"
 
 #. module: hr_timesheet
-#: wizard_view:hr.analytical.timesheet_users,init:0
-msgid "Choose Users"
-msgstr ""
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Ажилчид"
 
 #. 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 "novembre"
+#: code:addons/hr_timesheet/hr_timesheet.py:0
+#, python-format
+msgid ""
+"Analytic journal is not defined for employee %s \n"
+"Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
+"Энэ ажилтны аналитик журнал тодорхойлогдоогүй байна.%s\n"
+"Сонгосон хэрэглэгчийн ажилтан ба ажилтны аналитик дансыг олгоно уу!"
 
 #. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_out:0
-msgid "Sign in / Sign out"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_in:0
-msgid "Work done in the last period"
-msgstr ""
-
-#. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "Key dates"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,state:0
-#: wizard_field:hr_timesheet.si_so,sign_out,state:0
-msgid "Current state"
-msgstr ""
-
-#. 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
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
 msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "Analysis stats"
-msgstr ""
+#: code:addons/hr_timesheet/report/user_timesheet.py:0
+#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#, python-format
+msgid "April"
+msgstr "4 сар"
 
 #. 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 "décembre"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,info:0
-msgid "Work Description"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,name:0
-#: wizard_field:hr_timesheet.si_so,sign_out,name:0
-msgid "Employee's name"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:product.template,name:hr_timesheet.product_consultant_product_template
-msgid "Consultancy - Senior Developer"
-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 ""
-
-#. module: hr_timesheet
-#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
-msgid "Timesheet line"
-msgstr ""
-
-#. module: hr_timesheet
-#: xsl:hr.analytical.timesheet:0
-msgid "Sum"
-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 ""
-
-#. module: hr_timesheet
-#: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
-msgid "Human Resources (Timesheet encoding)"
-msgstr ""
-
-#. 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 "mars"
-msgstr ""
-
-#. module: hr_timesheet
-#: xsl:hr.analytical.timesheet:0
-#: xsl:hr.analytical.timesheet_users:0
-msgid "Total"
-msgstr "Нийт"
-
-#. 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
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
 msgid "mai"
 msgstr ""
 
 #. module: hr_timesheet
-#: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Хэрэглэгчид"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
 msgid "Start Working"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_button:hr_timesheet.si_so,sign_in,so_result:0
-msgid "Change Work"
-msgstr ""
-
-#. 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 "février"
-msgstr ""
-
-#. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "Stats by month"
-msgstr ""
-
-#. module: hr_timesheet
-#: view:account.analytic.account:0
-#: wizard_field:hr.analytical.timesheet,init,month:0
-#: wizard_field:hr.analytical.timesheet.my,init,month:0
-#: wizard_field:hr.analytical.timesheet_users,init,month:0
-msgid "Month"
-msgstr "Сар"
-
-#. module: hr_timesheet
-#: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
-msgid "Analytic Account"
-msgstr "Аналитик Данс"
-
-#. module: hr_timesheet
-#: wizard_view:hr_timesheet.si_so,sign_in:0
-msgid "General Information"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:process.process,name:hr_timesheet.process_process_timesheetprocess0
-msgid "Timesheet Process"
-msgstr ""
+msgstr "Ажиллаж эхлэх"
 
 #. module: hr_timesheet
 #: constraint:product.product:0
@@ -410,65 +663,46 @@ msgstr ""
 #. 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 ""
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#, python-format
+msgid "No employee defined for this user"
+msgstr "Энэ хэрэглэгчид харгалзах ажилтныг тодорхойлоогүй байна."
 
 #. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "Analysis summary"
-msgstr ""
-
-#. module: hr_timesheet
-#: wizard_field:hr.analytical.timesheet,init,year:0
-#: wizard_field:hr.analytical.timesheet.my,init,year:0
-#: wizard_field:hr.analytical.timesheet_users,init,year:0
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
 msgid "Year"
 msgstr "Жил"
 
 #. module: hr_timesheet
-#: wizard_button:hr.analytical.timesheet,init,end:0
-#: wizard_button:hr.analytical.timesheet.my,init,end:0
-#: wizard_button:hr.analytical.timesheet_users,init,end:0
-#: wizard_button:hr_timesheet.si_so,sign_in,end:0
-#: wizard_button:hr_timesheet.si_so,sign_out,end:0
-msgid "Cancel"
-msgstr "Цуцлах"
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr "Санхүүгийн бүртгэл"
 
 #. module: hr_timesheet
-#: view:account.analytic.account:0
-#: wizard_field:hr.analytical.timesheet_users,init,user_ids:0
-msgid "Users"
-msgstr "Хэрэглэгчид"
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner Id"
+msgstr "Харилцагчийн дугаар"
 
 #. module: hr_timesheet
-#: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
-msgid "Working Time"
-msgstr ""
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr "Ажлыг өөрчлөх"
 
 #. module: hr_timesheet
-#: view:account.analytic.account:0
-msgid "To be invoiced"
-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 ""
-
-#. 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
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
 msgid "septembre"
-msgstr ""
+msgstr "9 сар"
 
-#. module: hr_timesheet
-#: view:hr.employee:0
-msgid "Timesheets"
-msgstr ""
+#~ msgid "User"
+#~ msgstr "Хэрэглэгч"
+
+#~ msgid "Day"
+#~ msgstr "Өдөр"
+
+#~ msgid "Total"
+#~ msgstr "Нийт"
diff --git a/addons/hr_timesheet_invoice/i18n/mn.po b/addons/hr_timesheet_invoice/i18n/mn.po
index 510348277b3..2d842e60a36 100644
--- a/addons/hr_timesheet_invoice/i18n/mn.po
+++ b/addons/hr_timesheet_invoice/i18n/mn.po
@@ -7,774 +7,1108 @@ 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-09-10 08:54+0000\n"
-"Last-Translator: munkhbold <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-29 03:23+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@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-09-29 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "Цаг бүртгэлийг хэрэглэгчээр харах"
+
 #. 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
+#: report:account.analytic.profit:0
 msgid "Profit"
-msgstr ""
+msgstr "Ашиг"
 
 #. module: hr_timesheet_invoice
-#: wizard_view:hr.timesheet.invoice.create,init:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#, python-format
+msgid "Analytic account incomplete"
+msgstr "Бүрэн биш аналитик данс"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
+msgid "Create invoice from timesheet final"
+msgstr "Эцсийн цаг бүртгэлээс нэхэмжлэх үүсгэх"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create: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 ""
+#: view:report.timesheet.line:0
+msgid "    7 Days    "
+msgstr "    7 хоног    "
 
 #. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
+#: report:account.analytic.profit:0
 msgid "Income"
-msgstr ""
+msgstr "Орлого"
 
 #. module: hr_timesheet_invoice
-#: field:hr_timesheet_invoice.factor,customer_name:0
-msgid "Visible name"
-msgstr ""
+#: view:account.analytic.line:0
+msgid "To Invoice"
+msgstr "Нэхэмжлэх"
 
 #. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1:0
-msgid "Start of period"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "Цаг бүртгэлийг өдрөөр харах"
 
 #. module: hr_timesheet_invoice
-#: help:hr.timesheet.invoice.create,init,price:0
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create.final,name:0
+msgid "Name of entry"
+msgstr "Бичлэгийн нэр"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,pricelist_id:0
 msgid ""
-"The cost of each work done will be displayed on the invoice. You probably "
-"don't want to check this."
+"The product to invoice is defined on the employee form, the price will be "
+"deduced by this pricelist on the product."
 msgstr ""
+"Нэхэмжлэх бараа нь ажилтны маягт дээр тодорхойлогдоно. Энэ барааны үнийн "
+"жагсаалтаас үнийг нь тогтооно."
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
-msgid "Invoice analytic lines"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
+msgid "Invoice Rate"
+msgstr "Нэхэмжлэхийн харьцаа"
 
 #. module: hr_timesheet_invoice
-#: help:hr.timesheet.final.invoice.create,init,time:0
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Year"
+msgstr "Энэ жил"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,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 ""
+#: view:hr.timesheet.analytic.profit:0
+msgid "Journals"
+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 ""
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,uom_id:0
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "Хэмжих нэгж"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Account"
+msgstr "Данс"
+
+#. module: hr_timesheet_invoice
+#: view:report.random.timesheet:0
+msgid "Random Timesheets"
+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
-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 ""
+#: view:report.timesheet.line:0
+msgid "Uninvoiced line with billing rate"
+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 ""
+#: view:random.timesheet.lines:0
+msgid "Random Timesheets Lines"
+msgstr "Гэнэтийн цаг бүртгэлийн мөрүүд"
 
 #. module: hr_timesheet_invoice
-#: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0
-msgid "Select period"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "Period to enddate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_button:hr.timesheet.invoice.create,init,create:0
-msgid "Create Invoices"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "Period from startdate"
-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 ""
-
-#. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.final.invoice.create,init,balance_product:0
-msgid "Balance product"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_final_invoice_create
-msgid "Final Invoice"
-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 ""
-
-#. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
-msgid "Date or Code"
-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 ""
-
-#. module: hr_timesheet_invoice
-#: wizard_view:account.analytic.profit,init:0
-msgid "Choose"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
-msgid "Debit"
-msgstr "Дебит"
-
-#. module: hr_timesheet_invoice
-#: wizard_button:account.analytic.profit,init,report:0
-#: wizard_button:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,report:0
-msgid "Print"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: 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 ""
-
-#. module: hr_timesheet_invoice
-#: wizard_view:hr.timesheet.invoice.create,init:0
-msgid "Filter on Accounts"
-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 ""
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+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
+#: field:random.timesheet.lines,amount:0
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "Дүн"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,name:0
+msgid "The detail of each work done will be displayed on the invoice"
+msgstr "Хийсэн ажил бүрийн мэдээллийг нэхэмжлэх дээр харуулна"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_board
+msgid "Random Timesheet"
+msgstr "Гэнэтийн цаг бүртгэл"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
+msgid "Create invoice from timesheet"
+msgstr "Цаг бүртгэлээс нэхэмжлэх үүсгэх"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period to enddate"
+msgstr "Дуусах огноо хүртэлх мөчлөг"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "Хаах шаардлагатай аналитик данс"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+#: view:report.timesheet.line:0
+msgid "Group By..."
+msgstr "Бүлэглэвэл..."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Create Invoices"
+msgstr "Нэхэмжлэл үүсгэх"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "Данс бүрийн өдрөөр харах цаг бүртгэл"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Final invoice for analytic account"
+msgstr "Аналитик дансны эцсийн нэхэмжлэл"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#, python-format
+msgid "Analytic Account incomplete"
+msgstr "Бүрэн биш аналитик данс"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
+#: view:random.timesheet.lines:0
+#: field:random.timesheet.lines,analytic_account_id:0
+#: field:report.random.timesheet,analytic_account_id:0
+#: field:report.timesheet.line,account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "Аналитик данс"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "Тов"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
+msgid "Accounts to invoice"
+msgstr "Нэхэмжлэл үүсгэх дансууд"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,time:0
+msgid "The time of each work done will be displayed on the invoice"
+msgstr "Хийсэн ажилд зарцуулсан хугацааг нэхэмжлэл дээр харуулна"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create.final,balance_product:0
+msgid "Balance product"
+msgstr "Үлдсэн дүнгийн бараа"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "Цаг бүртгэл"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
+msgid "hr.timesheet.analytic.cost.ledger"
+msgstr "Цаг бүртгэлийн аналитик үнийн дэвтэр"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#, python-format
+msgid ""
+"Please fill in the Partner or Customer and Sale Pricelist fields in the "
+"Analytic Account:\n"
+"%s"
+msgstr ""
+"Аналитик данс маягтын 'Харилцагч' буюу 'Үйлчлүүлэгч', 'Борлуулалтын үнийн "
+"санал' талбарыг бөглөнө үү:\n"
+"%s"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
+msgid "Final Invoice"
+msgstr "Эцсийн нэхэмжлэл"
+
+#. module: hr_timesheet_invoice
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Дэлгэцийн үйлдлийн тодорхойлолтод моделийн нэр буруу байна."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Do you want details for each line of the invoices ?"
+msgstr "Нэхэмжлэлүүдийн мөр бүрийг нарийвчлан харахыг хүсэж байна уу ?"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "Нэхэмжлэх үнийн дүн"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,account_id:0
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "Аналитик данс"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Өгөгдөл хангалтгүй байна!"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Debit"
+msgstr "Дебит"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
+msgid "Employee"
+msgstr "Ажилтан"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.line,to_invoice:0
+msgid "It allows to set the discount while making invoice"
+msgstr "Энэ нь нэхэмжлэл үүсгэх үед хөнгөлөлт бичихийг зөвшөөрнө"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,price:0
+msgid ""
+"The cost of each work done will be displayed on the invoice. You probably "
+"don't want to check this"
+msgstr ""
+"Хийсэн ажил бүрийн үнийг нэхэмжлэх дээр харуулна. Үүнийг та хянахыг хүсэхгүй "
+"байгаа болов уу"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,customer_name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "Нэхэмжлэлийн аналитик мөрүүд"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
+#, python-format
+msgid "Error !"
+msgstr "Алдаа!"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
+msgid "Gratis"
+msgstr "Үнэгүй бэлэг"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"Fill 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 ""
+"Цаг бүртгэл, зардал зэрэг аналитик дансны үнэ дээр суурилан автоматаар "
+"нэхэмжлэл үүсгэхээр төлөвлөж байвал энэ талбарыг бөглөнө үү, ... Аналитик "
+"дансуудад нэхэмжлэлийн автомат харьцааг тохируулж болно."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
+msgid "Timesheet Profit"
+msgstr "Цаг бүртгэлийн аналитик ашиг"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#, python-format
+msgid "Partner incomplete"
+msgstr "Харилцагчийн хаягийг бүртгээгүй"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,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 ""
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "July"
+msgstr "7 сар"
 
 #. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: model:ir.model,name:hr_timesheet_invoice.model_report_random_timesheet
+msgid "Random Timesheet Report"
+msgstr "Гэнэтийн цаг бүртгэлийн тайлан"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Printing date"
 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_analytic_timesheet_open_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
+msgid "Bill Tasks Works"
+msgstr "Тооцооны даалгаврын ажлууд"
 
 #. 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
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#, python-format
+msgid ""
+"Please fill in the partner and pricelist field '\n"
+"                        'in the analytic account:\n"
+"%s"
+msgstr ""
+"Дараах аналитик данс дээрх харилцагч, үнийн саналыг бөглөнө үү! \n"
+"%s"
+
+#. module: hr_timesheet_invoice
+#: report: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 ""
-
-#. 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 "Бичлэгийн нэр"
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "Employee or Journal Name"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "Currency"
-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 ""
-
-#. 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 ""
-
-#. module: hr_timesheet_invoice
-#: wizard_button:hr.timesheet.final.invoice.create,init,create:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_view:hr.timesheet.final.invoice.create,init:0
-msgid "Invoice Balance amount"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "Invoice rate by user"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_field:account.analytic.profit,init,date_from:0
-msgid "From"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: help:account.analytic.account,amount_invoiced:0
-msgid "Total invoiced"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Status"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
-msgid "Period to"
-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 ""
-
-#. 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 ""
-
-#. module: hr_timesheet_invoice
-#: help:hr.timesheet.final.invoice.create,init,date:0
-msgid "Display date in the history of works"
-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 "Огноо"
-
-#. module: hr_timesheet_invoice
-#: field:hr_timesheet_invoice.factor,factor:0
-msgid "Discount (%)"
-msgstr "Хөнгөлөлт (%)"
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "Eff."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.invoice.create,init,accounts:0
-msgid "Analytic Accounts"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
-msgid "Total:"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
-msgid "Credit"
-msgstr "Кредит"
-
-#. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0
-msgid "End of period"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
-msgid "Balance"
-msgstr "Тэнцэл"
-
-#. module: hr_timesheet_invoice
-#: field:account.analytic.account,to_invoice:0
-msgid "Reinvoice Costs"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "Totals:"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_field:account.analytic.profit,init,date_to:0
-msgid "To"
-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 ""
-
-#. module: hr_timesheet_invoice
-#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
-msgid "Period from"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:account.analytic.account,amount_max:0
-msgid "Max. Invoice Price"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:account.analytic.line,invoice_id:0
-msgid "Invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_button:account.analytic.profit,init,end:0
-#: wizard_button:hr.timesheet.final.invoice.create,init,end:0
-#: wizard_button:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,end:0
-#: wizard_button:hr.timesheet.invoice.create,init,end:0
-msgid "Cancel"
-msgstr "Цуцлах"
-
-#. module: hr_timesheet_invoice
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_field:account.analytic.profit,init,employee_ids:0
-msgid "Employee"
-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 ""
-
-#. module: hr_timesheet_invoice
-#: help:hr.timesheet.final.invoice.create,init,price:0
-msgid "Display cost of the item you reinvoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_view:hr.timesheet.invoice.create,init:0
-msgid "Choose accounts you want to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_field:hr.timesheet.invoice.create,init,product:0
-msgid "Product"
-msgstr "Бараа"
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "%"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:hr_timesheet_invoice.factor,name:0
-msgid "Internal name"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: wizard_field:account.analytic.profit,init,journal_ids:0
-msgid "Journal"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: rml:account.analytic.profit:0
-msgid "Units"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
-msgid "Invoice on analytic lines"
-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 ""
-
-#. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-#: wizard_view:hr.timesheet.invoice.create,init:0
-msgid "Invoicing Data"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
-msgid "Invoice rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: view:hr_timesheet_invoice.factor:0
-msgid "Types of invoicing"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:account.analytic.line,to_invoice:0
-msgid "Invoicing"
-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 ""
-
-#. 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 "Өртөг"
-
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
-msgid "Analytic account to close"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.analytic.account.close,quantity_max:0
-msgid "Max. Quantity"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.analytic.account.close,name:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.analytic.account.close,state:0
-msgid "State"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.analytic.account.close,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
-msgid "Analytic Account Reporting"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.analytic.account.close,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
-#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
-#: view:report.analytic.account.close:0
-msgid "Expired analytic accounts"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.analytic.account.close,quantity:0
-msgid "Quantity"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
-#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
-#: view:report.account.analytic.line.to.invoice:0
-msgid "Analytic Lines to Invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.account.analytic.line.to.invoice,sale_price:0
-msgid "Sale price"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
-msgid "Analytic lines - Reporting"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.account.analytic.line.to.invoice,name:0
-msgid "Month"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:report.account.analytic.line.to.invoice,amount:0
-msgid "Amount"
-msgstr ""
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
+#, python-format
+msgid "You can not modify an invoiced analytic line!"
+msgstr "Та нэхэмжилсэн аналитик мөрийг өөрчилж болохгүй"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
 msgid "Analytic lines to invoice report"
-msgstr ""
+msgstr "Аналитик мөрүүдийг нэхэмжлэлийн тайлан дээр харах"
 
 #. module: hr_timesheet_invoice
-#: field:report.account.analytic.line.to.invoice,product_uom_id:0
-msgid "UoM"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
+msgid "Timesheet by User"
+msgstr "Цаг бүртгэлийг хэрэгдэгчээр харах"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
-msgid "My daily timesheets by account"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
+msgid "Timesheet by Invoice"
+msgstr "Цаг бүртгэлийг нэхэмжлэлээр харах"
 
 #. module: hr_timesheet_invoice
-#: view:report_timesheet.user:0
-msgid "Timesheet by user"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "Хугацаа нь дууссан аналитик данснууд"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
-msgid "Timesheet by Account"
-msgstr ""
+#: field:hr_timesheet_invoice.factor,factor:0
+msgid "Discount (%)"
+msgstr "Хөнгөлөлт(%)"
 
 #. module: hr_timesheet_invoice
-#: view:report_timesheet.account:0
-msgid "Timesheet by account"
-msgstr ""
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
+msgid "Yes (100%)"
+msgstr "Тийм(100%)"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
-msgid "Costs to invoice"
-msgstr ""
+#: report:account.analytic.profit:0
+msgid "Employee or Journal Name"
+msgstr "Ажилтан буюу журналын нэр"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_my
-msgid "My Timesheet of the Month"
-msgstr ""
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#, python-format
+msgid "Invoices"
+msgstr "Нэхэмжлэлүүд"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_lines_board
-#: model:ir.model,name:report_timesheet_invoice.model_random_timesheet_lines
-msgid "Random Timesheet Lines"
-msgstr ""
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "December"
+msgstr "12 сар"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
-msgid "Timesheets"
-msgstr ""
+#: field:report.account.analytic.line.to.invoice,month:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,month:0
+#: field:report_timesheet.account,month:0
+#: field:report_timesheet.account.date,month:0
+#: field:report_timesheet.user,month:0
+msgid "Month"
+msgstr "Сар"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
-msgid "Timesheets per account"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: view:report_timesheet.invoice:0
-msgid "Timesheets to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
-msgid "Timesheets per day"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
-msgid "Daily Timesheet by Account"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
-msgid "Description"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
-#: view:report_timesheet.account:0
-msgid "Timesheet per account"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
-msgid "Timesheet - Reporting"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: view:report_timesheet.invoice:0
-msgid "Timesheet by invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
-msgid "This Month"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
-msgid "My timesheets by account"
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
-msgid "Random Timesheet Report"
-msgstr ""
+#: report:account.analytic.profit:0
+msgid "Currency"
+msgstr "Валют"
 
 #. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
 #: field:random.timesheet.lines,user_id:0
 #: field:report.random.timesheet,user_id:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
 #: field:report_timesheet.account.date,user_id:0
 #: field:report_timesheet.invoice,user_id:0
 #: field:report_timesheet.user,user_id:0
 msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,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 ""
+"Тухайлсан 1 барааг хэрэглэхийг тулгах гэж байгаа бол энэ талбарыг бөглөнө "
+"үү. Үнээр нь сонгох боломжтой бодит бараа хэрэглэж байгаа бол хоосон үлдээнэ "
+"үү."
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Non Assigned timesheets to users"
+msgstr "Хэрэглэгчид оноогоогүй цаг бүртгэл"
+
+#. module: hr_timesheet_invoice
+#: field:report.timesheet.line,invoice_id:0
+msgid "Invoiced"
+msgstr "Нэхэмжилсэн"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "Хамгийн их тоо хэмжээ"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Invoice Balance amount"
+msgstr "Нэхэмжлэлийн үлдсэн дүн"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Invoice rate by user"
+msgstr "Хэрэглэгчээр харах нэхэмжлэлийн харьцаа"
+
+#. module: hr_timesheet_invoice
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй."
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_from:0
+msgid "From"
+msgstr "Хэзээнээс"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,amount_invoiced:0
+msgid "Total invoiced"
+msgstr "Нэхэмжилсэн бүгд"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period to"
+msgstr "огноо хүртэлх үе"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Аналитик мөр"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "August"
+msgstr "8 сар"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_cost_ledger
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr "Үнийн дэвтэр"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
+msgid "50%"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:report.random.timesheet:0
-msgid "Random Timesheets"
-msgstr ""
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "June"
+msgstr "6 сар"
 
 #. module: hr_timesheet_invoice
-#: view:report_timesheet.account.date:0
-msgid "Daily timesheet by account"
-msgstr ""
+#: help:hr.timesheet.invoice.create.final,date:0
+msgid "Display date in the history of works"
+msgstr "Ажлын түүх дээр огноог харуулах"
 
 #. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Random Timesheets Lines"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "Данс бүрийн цаг бүртгэл"
 
 #. module: hr_timesheet_invoice
-#: field:report_timesheet.invoice,account_id:0
-msgid "Project"
-msgstr ""
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
+msgid "Timesheet by Account"
+msgstr "Дансаар харах цаг бүртгэл"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,date:0
+#: field:hr.timesheet.invoice.create.final,date:0
+#: field:random.timesheet.lines,date:0
+#: field:report.random.timesheet,date:0
+#: field:report.timesheet.line,date:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#, python-format
+msgid "Please fill in the Address field in the Partner: %s."
+msgstr "Харилцагчийн 'Хаяг' талбарыг бөглөнө үү: %s."
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "November"
+msgstr "11 сар"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Extended Filters..."
+msgstr "Нэмэлт шүүлтүүрүүд..."
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
 msgid "To invoice"
-msgstr ""
+msgstr "Нэхэмжлэх"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user_all
-msgid "Timesheet by User"
-msgstr ""
+#: report:account.analytic.profit:0
+msgid "Eff."
+msgstr "Үр нөлөө"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
-msgid "Timesheet by Invoice"
-msgstr ""
+#: view:hr.timesheet.invoice.create:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
+msgid "Invoice analytic lines"
+msgstr "Нэхэмжлэлийн аналитик мөрүүд"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
-msgid "Random Timesheet"
-msgstr ""
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr "J.C. / Гүйлгээний нэр"
 
 #. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Total:"
+msgstr "Бүгд:"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "January"
+msgstr "1 сар"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Credit"
+msgstr "Кредит"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#, python-format
+msgid "Error"
+msgstr "Алдаа"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date2:0
+msgid "End of period"
+msgstr "Мөчлөгийн эцэс"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: field:report.analytic.account.close,balance:0
+msgid "Balance"
+msgstr "Тэнцэл"
+
+#. module: hr_timesheet_invoice
+#: field:random.timesheet.lines,quantity:0
+#: field:report.analytic.account.close,quantity:0
+#: field:report.random.timesheet,quantity:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,quantity:0
+#: field:report_timesheet.account,quantity:0
+#: field:report_timesheet.account.date,quantity:0
+#: field:report_timesheet.invoice,quantity:0
+#: field:report_timesheet.user,quantity:0
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr "Огноо/Код"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
 #: field:random.timesheet.lines,general_account_id:0
+#: field:report.timesheet.line,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Ерөнхий данс"
 
 #. module: hr_timesheet_invoice
-#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
-msgid "Timesheet per day"
-msgstr ""
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "Цаг бүртгэлийн ашгийг хэвлэх"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
-msgid "My timesheets to invoice"
-msgstr ""
+#: field:account.analytic.account,to_invoice:0
+msgid "Reinvoice Costs"
+msgstr "Үнийг дахин нэхэмжлэх"
 
 #. module: hr_timesheet_invoice
-#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
-#: view:report_timesheet.account.date:0
-msgid "Daily timesheet per account"
-msgstr ""
+#: report:account.analytic.profit:0
+msgid "Totals:"
+msgstr "Бүгд :"
 
 #. module: hr_timesheet_invoice
-#: model:ir.module.module,description:report_timesheet.module_meta_information
+#: field:hr.timesheet.analytic.profit,date_to:0
+msgid "To"
+msgstr "Хэдий хүртэл"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Do you want to show details of work in invoice ?"
+msgstr "Нэхэмжлэл дээрх ажлыг дэлгэрэнгүй харах гэж байна уу ?"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period from"
+msgstr "Огнооноос хойших мөчлөг"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_max:0
+msgid "Max. Invoice Price"
+msgstr "Нэхэмжлэлийн хамгийн их үнэ"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "September"
+msgstr "11 сар"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,invoice_id:0
+#: model:ir.model,name:hr_timesheet_invoice.model_account_invoice
+#: view:report.timesheet.line:0
+msgid "Invoice"
+msgstr "Нэхэмжлэл"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_analytic_timesheet
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
+#: view:report.timesheet.line:0
+msgid "Timesheet Line"
+msgstr "Цаг бүртгэлийн мөрүүд"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#, python-format
+msgid "Balance product needed"
+msgstr "Үлдсэн дүнгийн бараа хэрэгтэй байна."
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Billing Data"
+msgstr "Тооцооны өгөгдөл"
+
+#. module: hr_timesheet_invoice
+#: constraint:ir.model:0
 msgid ""
-"Module to add timesheet views like\n"
-"    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Обьектын нэр нь x_-ээр эхэлж ямар ч тусгай тэмдэгт агуулах ёсгүй."
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "Цаг бүртгэлийг дансаар харах"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,customer_name:0
+msgid "Label for the customer"
+msgstr "Үйлчлүүлэгчийн шошго"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Current"
+msgstr "Одоогийн"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+msgid "Print"
+msgstr "Хэвлэх"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_random_timesheet_lines
+msgid "Random Timesheet Lines"
+msgstr "Гэнэтийн цаг бүртгэлийн мөрүүд"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "October"
+msgstr "10 сар"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,price:0
+msgid "Display cost of the item you reinvoice"
+msgstr "Дахин нэхэмжлэх зүйлсийн үнийг үзүүлэх"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,date:0
+msgid "The real date of each work will be displayed on the invoice"
+msgstr "Ажил бүрийн нэхэмжлэл дээр харуулах бодит огноо"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#, python-format
+msgid "At least one line has no product !"
+msgstr "Багадаа 1 мөрийн барааг сонгоогүй байна!"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "Нэхэмжлэх цаг бүртгэл"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#, python-format
+msgid "Please fill a Balance product in the wizard"
+msgstr "Оруулах дэлгэцэд үлдсэн дүнгийн бараа талбарыг бөглөнө үү!"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date1:0
+msgid "Start of period"
+msgstr "Мөчлөгийн эхлэл"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,time:0
+#: field:hr.timesheet.invoice.create.final,time:0
+msgid "Time spent"
+msgstr "Зарцуулсан ццг"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
+msgid "Daily Timesheet by Account"
+msgstr "Өдөр бүрийн цаг бүртгэлийг дансаар харах"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,product:0
+#: view:random.timesheet.lines:0
+#: field:random.timesheet.lines,product_id:0
+#: field:report.account.analytic.line.to.invoice,product_id:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,product_id:0
+msgid "Product"
+msgstr "Бараа"
+
+#. module: hr_timesheet_invoice
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
+msgid "Uninvoice lines with billing rate"
+msgstr "Тооцооны үнэ бүхий нэхэмжлээгүй мөрүүд"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "%"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,analytic_account_id:0
-#: field:report.random.timesheet,analytic_account_id:0
-#: field:report_timesheet.account,account_id:0
-#: field:report_timesheet.account.date,account_id:0
-msgid "Analytic Account"
-msgstr ""
+#: field:random.timesheet.lines,to_invoice:0
+msgid "Invoicing"
+msgstr "Нэхэмжилж байгаа"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "May"
+msgstr "5 сар"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,journal_ids:0
+msgid "Journal"
+msgstr "Журнал"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,balance_product:0
+msgid "The product that will be used to invoice the remaining amount"
+msgstr "Энэ барааг үлдсэн дүнг нэхэмжлэхэд хэрэглэдэг"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
+#, python-format
+msgid "No Records Found for Report!"
+msgstr "Энэ тайланд тохирох  бичлэг олдсонгүй"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "Цаг бүртгэлийг нэхэмжлэлээр харах"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Month"
+msgstr "Энэ сар"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_lines_board
+msgid "Working Hours"
+msgstr "Ажлын цаг"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+msgid "Select Period"
+msgstr "Мөчлөгийг сонгох"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period from startdate"
+msgstr "Эхлэх огнооноос хойших мөчлөг"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "February"
+msgstr "2 сар"
+
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
+msgid "Invoice on analytic lines"
+msgstr "Аналитик мөрүүдийг үндэслэн нэхэмжлэх"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "Өдөр бүрийн цаг бүртгэлийг дансаар харах"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "Борлуулалтын үнэ"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Employees"
+msgstr "Ажилчид"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,name:0
+#: field:report_timesheet.account,name:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
+msgid "Year"
+msgstr "Он"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "1 өдрийн цаг бүртгэл"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "April"
+msgstr "4 сар"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Invoicing Data"
+msgstr "Нэхэмжлэх өгөгдөл"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,factor:0
+msgid "Discount in percentage"
+msgstr "Хөнгөлөлт(%)"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Types of invoicing"
+msgstr "Нэхэмжлэх төрлүүд"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "1 дансны цаг бүртгэлүүд"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
+msgstr "Дотоод нэр"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:report.account.analytic.line.to.invoice,unit_amount:0
+msgid "Units"
+msgstr "Нэгжүүд"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "Нэхэмжлэх төрлүүд"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "Аналитик мөрөөс нэхэмжлэл рүү"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,name:0
+#: field:random.timesheet.lines,name:0
+#: field:report.random.timesheet,name:0
+msgid "Description"
+msgstr "Тайлбар"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Менежер"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
-#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_user
-msgid "Timesheet by user (this month)"
-msgstr ""
+#: report:account.analytic.profit:0
+#: field:hr.timesheet.invoice.create,price:0
+#: field:hr.timesheet.invoice.create.final,price:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,cost:0
+#: field:report_timesheet.user,cost:0
+msgid "Cost"
+msgstr "Өртөг"
+
+#. module: hr_timesheet_invoice
+#: view:random.timesheet.lines:0
+msgid "Search Timesheet Lines"
+msgstr "Цаг бүртгэлийн мөрийг хайх"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index e7fae82ec70..14a3b51672f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -19,6 +19,13 @@
             <field name="icon">STOCK_JUSTIFY_FILL</field>
             <field name="action" ref="ir_actions_server_timsheet_sheet"/>
         </record>
+        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
+            <field name="name">My Timesheet</field>
+            <field eval="5" name="sequence"/>
+            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
+            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="action" ref="ir_actions_server_timsheet_sheet"/>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 2e1bf6c5149..69a73747334 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -186,9 +186,6 @@
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
              sequence="2"/>
 
-        <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
-            sequence="5"/>
-
         <!--
             Company inheritancy
         -->
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index 1f573fef646..a238edfdf11 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.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-09-10 08:59+0000\n"
-"Last-Translator: munkhbold <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 11:31+0000\n"
+"Last-Translator: badralkh <Unknown>\n"
 "Language-Team: Mongolian <mn@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-09-29 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+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
@@ -28,6 +28,8 @@ msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Та давхацсан 2 цаг бүртгэлтэй байж болохгүй.\n"
+"'Одоогийн өөрийн цаг бүртгэл' цэсийг хэрэглэх замаар энэ асуудлаас зайлсхий."
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -35,30 +37,30 @@ 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
@@ -68,7 +70,7 @@ 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
@@ -76,7 +78,7 @@ 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
@@ -86,33 +88,33 @@ 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
@@ -123,32 +125,32 @@ 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
@@ -156,16 +158,18 @@ 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 ""
+"Нэвтрэх/ гарах хугацааны зөрүү зөвшөөрөгдөж хэмжээ. 1 хүснэгтийн хувьд цаг "
+"бүртгэлийг тооцоолно. Энэ хэмжээгээр хянах шаардлагагүй бол 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
@@ -175,22 +179,22 @@ 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
@@ -202,33 +206,33 @@ msgstr "Баталсан"
 #: 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
@@ -238,47 +242,47 @@ 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
 msgid "Configuration"
-msgstr ""
+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
@@ -289,7 +293,7 @@ msgstr "Өдрөөр харах"
 #: 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
@@ -300,7 +304,7 @@ msgstr "Орсон"
 #: 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
@@ -310,40 +314,40 @@ 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
@@ -358,23 +362,23 @@ 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
@@ -384,17 +388,17 @@ 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
@@ -409,18 +413,18 @@ 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
@@ -436,49 +440,49 @@ 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 "Утасны дуудлагад зориулсан 1 хугацаа"
 
 #. 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
@@ -490,12 +494,12 @@ 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
@@ -512,7 +516,7 @@ msgstr "Өдрөөр"
 #: 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
@@ -522,48 +526,48 @@ 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
@@ -573,18 +577,18 @@ 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
@@ -595,4 +599,4 @@ msgstr "Нийт"
 #: 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 "Батламжлагдах өөрийн хэлтсийн цаг бүртгэл"
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 054a4def9f2..36ea5b6418a 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -72,7 +72,7 @@
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                        <filter string="Analytic Account" icon="terp-folder-violet" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
+                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 456c4dd1f7a..c41ab7e82c6 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -291,8 +291,8 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group col="10" colspan="4">
-                    <filter icon="terp-document-new" string="Current" domain="[('state','in', ('draft', 'open'))]" help="Draft and Open Ideas"/>
-                    <filter icon="terp-check" string="Accepted"
+                    <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]" help="Draft and Open Ideas"/>
+                    <filter icon="terp-camera_test" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index 2113bbf6a1f..f1b804efaa5 100644
--- a/addons/knowledge/i18n/es.po
+++ b/addons/knowledge/i18n/es.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:12+0000\n"
+"PO-Revision-Date: 2010-10-28 09:08+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index 0a432783b9e..59f15fd9d43 100644
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 06:56+0000\n"
-"PO-Revision-Date: 2010-10-08 07:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 16:51+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
@@ -59,6 +59,15 @@ msgstr "Ongeldige modelnaam in de definitie van de actie."
 msgid "Knowledge"
 msgstr "Kennis"
 
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+"Geeft FTP toegang tot uw OpenERP documentbeheer systeem. Het laat u bijlagen "
+"en virtuele documenten benaderen met een standaard ftp cliënt."
+
 #. module: knowledge
 #: help:knowledge.installer,document_webdav:0
 msgid ""
@@ -79,15 +88,6 @@ msgstr "Voortgang configuratie"
 msgid "title"
 msgstr "titel"
 
-#. module: knowledge
-#: help:knowledge.installer,document_ftp:0
-msgid ""
-"Provides an FTP access to your OpenERP's Document Management System. Lets "
-"you access attachments and virtual documents through a standard FTP client."
-msgstr ""
-"Voorziet in FTP toegang tot uw OpenERP Document Management Systeem. Laat u "
-"bijlagen en virtuele documenten benaderen via een standaard FTP client."
-
 #. module: knowledge
 #: model:ir.module.module,description:knowledge.module_meta_information
 msgid ""
@@ -107,26 +107,11 @@ msgstr "Configuratie"
 msgid "Invalid XML for View Architecture!"
 msgstr "Ongeldige XML voor weergave opbouw!"
 
-#. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
-msgid "Knowledge Modules Installation"
-msgstr "Kennis modules installatie"
-
-#. module: knowledge
-#: view:ir.actions.todo:0
-msgid "Launch"
-msgstr "Opstarten"
-
 #. module: knowledge
 #: field:knowledge.installer,wiki_quality_manual:0
 msgid "Quality Manual"
 msgstr "Kwaliteitshandboek"
 
-#. module: knowledge
-#: view:knowledge.installer:0
-msgid "Templates of Content"
-msgstr "Inhoudssjablonen"
-
 #. module: knowledge
 #: field:knowledge.installer,document_webdav:0
 msgid "Shared Repositories (WebDAV)"
@@ -146,16 +131,16 @@ msgstr ""
 msgid "Internal FAQ"
 msgstr "Veelgestelde vragen"
 
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
-msgstr "Gezamenlijke inhoud"
-
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
 msgid "Image"
 msgstr "Afbeelding"
 
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Application Configuration"
+msgstr "Kennis applicatie configuratie"
+
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_installer
 msgid "knowledge.installer"
@@ -169,3 +154,27 @@ msgid ""
 msgstr ""
 "Laat u wiki pagina's en pagina groepen maken om bedrijfskennis te volgen en "
 "te delen met en tussen uw medewerkers."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr "Inhoud sjablonen"
+
+#~ msgid "Knowledge Modules Installation"
+#~ msgstr "Kennis modules installatie"
+
+#~ msgid "Launch"
+#~ msgstr "Opstarten"
+
+#~ msgid "Templates of Content"
+#~ msgstr "Inhoudssjablonen"
+
+#~ msgid ""
+#~ "Provides an FTP access to your OpenERP's Document Management System. Lets "
+#~ "you access attachments and virtual documents through a standard FTP client."
+#~ msgstr ""
+#~ "Voorziet in FTP toegang tot uw OpenERP Document Management Systeem. Laat u "
+#~ "bijlagen en virtuele documenten benaderen via een standaard FTP client."
+
+#~ msgid "Collaborative Content"
+#~ msgstr "Gezamenlijke inhoud"
diff --git a/addons/l10n_be/i18n/nl.po b/addons/l10n_be/i18n/nl.po
index e72fc0bda75..98b0c04df16 100644
--- a/addons/l10n_be/i18n/nl.po
+++ b/addons/l10n_be/i18n/nl.po
@@ -6,62 +6,434 @@ 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-05 11:57+0000\n"
-"Last-Translator: Nautica <beheer@elook.nl>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 14:33+0000\n"
+"Last-Translator: Sam_inv <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-09-29 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_be
-#: selection:vat.intra.xml,init,trimester:0
-msgid "Oct/Nov/Dec"
-msgstr ""
-
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers_receiv
 msgid "Tiers - Recevable"
+msgstr "Vorderingen"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,tax_code_id:0
+#: field:partner.vat.intra,tax_code_id:0
+msgid "Tax Code"
+msgstr "Belastingcode"
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_3
+msgid "Régime Intra-Communautaire"
+msgstr "Intracommunautair"
+
+#. module: l10n_be
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: l10n_be
-#: wizard_view:list.vat.detail,go:0
-#: wizard_view:vat.intra.xml,go:0
-#: wizard_view:wizard.account.xml.vat.declaration,go:0
-msgid "Notification"
-msgstr "Mededeling"
+#: model:ir.model,name:l10n_be.model_partner_vat_intra
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
+msgid "Partner VAT Intra"
+msgstr "BTW intra"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
+#, python-format
+msgid "Save XML For Vat declaration"
+msgstr "XML bestand voor BTW aangifte opslaan"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_immo
+msgid "Immobilisation"
+msgstr "Onroerende goederen"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tiers_payable
+msgid "Tiers - Payable"
+msgstr "Schulden"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Save XML"
+msgstr "XML opslaan"
+
+#. module: l10n_be
+#: field:vat.listing.clients,amount:0
+msgid "Amount"
+msgstr "Bedrag"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Is Last Declaration"
+msgstr "Laatste Aangifte"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_vat_listing_clients
+msgid "vat.listing.clients"
+msgstr "BTW listing (klanten)"
+
+#. module: l10n_be
+#: help:partner.vat,mand_id:0
+#: help:partner.vat.intra,mand_id:0
+msgid ""
+"This identifies the representative of the sending company. This is a string "
+"of 14 characters"
+msgstr ""
+"Dit identificeerd de vertegenwoordiger van het verzend bedrijd. Dit is een "
+"veld van 14 karakters"
+
+#. module: l10n_be
+#: field:vat.listing.clients,vat:0
+msgid "VAT"
+msgstr "BTW"
+
+#. module: l10n_be
+#: field:vat.listing.clients,turnover:0
+msgid "Turnover"
+msgstr "Omzet"
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_code:0
+msgid ""
+"This is where you have to set the period code for the intracom declaration "
+"using the format: ppyyyy\n"
+"      PP can stand for a month: from '01' to '12'.\n"
+"      PP can stand for a trimester: '31','32','33','34'\n"
+"          The first figure means that it is a trimester,\n"
+"          The second figure identify the trimester.\n"
+"      PP can stand for a complete fiscal year: '00'.\n"
+"      YYYY stands for the year (4 positions).\n"
+"    "
+msgstr ""
+"Dit is waar U de periode moet bepalen voor de intracom. aangifte gebruik "
+"makend van het formaat :ppyyyy\n"
+"      PP kan voor de maand staan: van '01' tot '12'\n"
+"      PP kan voor de trimester staan: '31','32','33','34'\n"
+"          Het eerste cijfer betekend dat het een trimester is,\n"
+"          Het tweede cijfer duidt aan welke trimester.\n"
+"     PP kan voor het boekjaar staan '00'.\n"
+"     YYYY staat voor het jaar (4 posities).\n"
+"    "
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_tax
+msgid "Tax"
+msgstr "Belasting"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#, python-format
+msgid "No VAT Number Associated with Main Company!"
+msgstr "Geen BTW number bepaalt voor het Hoofd Bedrijf!"
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_ids:0
+msgid ""
+"Select here the period(s) you want to include in your intracom declaration"
+msgstr ""
+"Selecteer hier de periode(s) die U wilt opnemen in uw intracom. aangifte"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_financiers
+msgid "Financier"
+msgstr "Financiëel"
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "View Client"
+msgstr "Bekijk Klant"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#, python-format
+msgid "Please select at least one Period."
+msgstr "Gelieve minstens één periode te selecteren"
 
 #. module: l10n_be
 #: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
 msgid "Régime National"
-msgstr ""
+msgstr "Nationaal Regime"
 
 #. module: l10n_be
-#: wizard_field:vat.intra.xml,init,trimester:0
-msgid "Trimester Number"
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr "Extracommunautair"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_view
+msgid "Vue"
+msgstr "Weergave"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Onvoldoende Data!"
+
+#. module: l10n_be
+#: help:partner.vat.list,partner_ids:0
+msgid ""
+"You can remove clients/partners which you do not want to show in xml file"
 msgstr ""
+"U kan klanten/partners verwijderen welke U niet wil tonen in de XML file"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#, python-format
+msgid "Save"
+msgstr "Opslaan"
+
+#. module: l10n_be
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Fout ! U kunt geen herhalende sjablonen voor rekeningen maken"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "General Information"
+msgstr "Algemene informatie"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,file_save:0
+#: field:partner.vat.intra,file_save:0
+#: field:partner.vat.list,file_save:0
+msgid "Save File"
+msgstr "Bestand opslaan"
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "Select Fiscal Year"
+msgstr "Selecteer Boekjaar"
+
+#. module: l10n_be
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Fout! U kunt geen herhalende belastingcodes maken"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr "Periode Code"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers
 msgid "Tiers"
 msgstr ""
 
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid ""
+"You can remove clients/partners which you do not want in exported xml file"
+msgstr ""
+"U kan klanten/partners verwijderen welke U niet in de geëxporteerde xml file "
+"wil"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,client_nihil:0
+msgid ""
+"Tick this case only if it concerns only the last statement on the civil or "
+"cessation of activity"
+msgstr ""
+
+#. module: l10n_be
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat,test_xml:0
+#: field:partner.vat.intra,test_xml:0
+msgid "Test XML file"
+msgstr "Test XML bestand"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Save xml"
+msgstr "Xml opslaan"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,country_ids:0
+msgid "European Countries"
+msgstr "Europese landen"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Create an XML file for Vat Intra"
+msgstr "Maak een XML file voor Intra. BTW aangifte"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Partner VAT intra"
+msgstr "BTW Intra"
+
+#. module: l10n_be
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fout ! U kan geen herhalend Menu maken"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,msg:0
+#: field:partner.vat.intra,msg:0
+#: field:partner.vat.list,msg:0
+msgid "File created"
+msgstr "Bestand aangemaakt"
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_resitution:0
+msgid "It indicates whether a resitution is to made or not?"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_list
+msgid "partner.vat.list"
+msgstr "Relatie BTW lijst"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_resitution:0
+msgid "Ask Restitution"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,no_vat:0
+msgid ""
+"The Partner whose VAT number is not defined they doesn't include in XML File."
+msgstr "Relaties zonder BTW nummer worden niet opgenomen in de XML file"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
+msgid "Vat Declaraion"
+msgstr "BTW aangifte"
+
+#. module: l10n_be
+#: view:vat.listing.clients:0
+msgid "VAT listing"
+msgstr "BTW listing"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_produit
+msgid "Produit"
+msgstr "Product"
+
+#. module: l10n_be
+#: field:partner.vat,limit_amount:0
+msgid "Limit Amount"
+msgstr "Bestedingslimiet"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_res_company
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
+msgid "Partner Vat Intra"
+msgstr "Relaties BTW Intra"
+
+#. module: l10n_be
+#: field:partner.vat,mand_id:0
+#: field:partner.vat.intra,mand_id:0
+msgid "MandataireId"
+msgstr "Agent ID"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#, python-format
+msgid "Wrong Period Code"
+msgstr "Verkeerde Periode Code"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
+msgid "Vat Declaration"
+msgstr "BTW Aangifte"
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing
+#: view:partner.vat:0
+msgid "Partner VAT Listing"
+msgstr "Relatie BTW listing"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,no_vat:0
+msgid "Partner With No VAT"
+msgstr "Relatie zonder BTW"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Periods"
+msgstr "Periodes"
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "Cancel"
+msgstr "Annuleer"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
+msgid "Close"
+msgstr "Sluiten"
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_ids:0
+msgid "Period (s)"
+msgstr "Periode(s)"
+
+#. module: l10n_be
+#: field:vat.listing.clients,name:0
+msgid "Client Name"
+msgstr "Klant Naam"
+
+#. module: l10n_be
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr "XML bestand is aangemaakt"
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#, python-format
+msgid "No partner has a VAT Number asociated with him."
+msgstr "Geen partner heeft een BTW nummer aan hem geassocieerd"
+
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_charge
 msgid "Charge"
-msgstr ""
+msgstr "Kosten"
 
 #. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_3
-msgid "Régime Intra-Communautaire"
-msgstr ""
-
-#. module: l10n_be
-#: wizard_button:list.vat.detail,init,go:0
-#: wizard_button:vat.intra.xml,init,go:0
-#: wizard_button:wizard.account.xml.vat.declaration,init,go:0
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
 msgid "Create XML"
 msgstr "XML Aanmaken"
 
@@ -71,104 +443,112 @@ msgid "Capital"
 msgstr "Kapitaal"
 
 #. module: l10n_be
-#: wizard_field:list.vat.detail,go,msg:0
-#: wizard_field:vat.intra.xml,go,msg:0
-#: wizard_field:wizard.account.xml.vat.declaration,go,msg:0
-msgid "File created"
-msgstr "Bestand aangemaakt"
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Save the File with '.xml' extension."
+msgstr "Bestand opslaan met '.xml' extentie"
 
 #. module: l10n_be
-#: selection:vat.intra.xml,init,trimester:0
-msgid "Apr/May/Jun"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_be
-#: selection:vat.intra.xml,init,trimester:0
-msgid "Jul/Aug/Sep"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_immo
-msgid "Immobilisation"
-msgstr "Onroerende goederen"
-
-#. module: l10n_be
-#: wizard_field:list.vat.detail,go,file_save:0
-#: wizard_field:vat.intra.xml,go,file_save:0
-#: wizard_field:wizard.account.xml.vat.declaration,go,file_save:0
-msgid "Save File"
-msgstr "Bestand opslaan"
-
-#. module: l10n_be
-#: wizard_view:vat.intra.xml,init:0
-msgid "This wizard will create an XML file for Vat Intra"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
-msgid "Belgium - Plan Comptable Minimum Normalise"
-msgstr ""
-
-#. module: l10n_be
-#: wizard_view:list.vat.detail,init:0
-msgid "Select Fiscal Year"
-msgstr "Selecteer Fiscaaljaar"
-
-#. module: l10n_be
-#: wizard_view:vat.intra.xml,init:0
-msgid "Partner VAT Intra"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.actions.wizard,name:l10n_be.wizard_xml_vat_declaration
-#: model:ir.ui.menu,name:l10n_be.account_wizard_vat_declaration
-msgid "Periodical VAT Declaration"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_payable
-msgid "Tiers - Payable"
-msgstr ""
-
-#. module: l10n_be
-#: wizard_view:wizard.account.xml.vat.declaration,init:0
-msgid "Select Period"
-msgstr "Kies periode"
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_produit
-msgid "Produit"
-msgstr "Product"
-
-#. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr "Weergave"
-
-#. module: l10n_be
-#: wizard_button:list.vat.detail,go,end:0
-#: wizard_button:vat.intra.xml,go,end:0
-#: wizard_button:wizard.account.xml.vat.declaration,go,end:0
+#: view:l1on_be.vat.declaration:0
 msgid "Ok"
 msgstr "Ok"
 
 #. module: l10n_be
-#: wizard_view:list.vat.detail,init:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#, python-format
+msgid "The period code you entered is not valid."
+msgstr "De periode code die U heeft opgegeven is niet geldig"
+
+#. module: l10n_be
+#: model:account.account.type,name:l10n_be.user_type_stock
+msgid "Stock et Encours"
+msgstr "Voorraden en Werken in uitvoering"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
+msgid "Annual Listing Of VAT-Subjected Customers"
+msgstr "Jaarlijkse BTW-listing Klanten"
+
+#. module: l10n_be
+#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
+msgid "Belgium - Plan Comptable Minimum Normalise"
+msgstr "België - Minimaal genormaliseerd rekeningstelsel"
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Note: "
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
+#: view:l1on_be.vat.declaration:0
+msgid "Periodical VAT Declaration"
+msgstr "Periodieke BTW-aangifte"
+
+#. module: l10n_be
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr "Dit zet de XML output als test file"
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
+msgstr "Klanten"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_payment:0
+msgid "Ask Payment"
+msgstr "Vraag Betaling"
+
+#. module: l10n_be
+#: field:vat.listing.clients,country:0
+msgid "Country"
+msgstr "Land"
+
+#. module: l10n_be
+#: field:partner.vat,fyear:0
+msgid "Fiscal Year"
+msgstr "Boekjaar"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,client_nihil:0
+msgid "Last Declaration of Enterprise"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#, python-format
+msgid "Data Insufficient"
+msgstr "Onvoldoende Data"
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
+msgid "Belgium Statements"
+msgstr "Belgische aangiften"
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Declare Periodical VAT"
+msgstr "Periodieke BTW Aangeven"
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat
+msgid "partner.vat"
+msgstr "Relatie.BTW"
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,name:0
+#: field:partner.vat.intra,name:0
+#: field:partner.vat.list,name:0
+msgid "File Name"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat:0
 msgid ""
 "This wizard will create an XML file for Vat details and total invoiced "
 "amounts per partner."
@@ -177,114 +557,32 @@ msgstr ""
 "gefactureerde bedragen per relatie."
 
 #. module: l10n_be
-#: wizard_field:list.vat.detail,init,limit_amount:0
-msgid "Limit Amount"
-msgstr "Bestedingslimiet"
+#: help:l1on_be.vat.declaration,ask_payment:0
+msgid "It indicates whether a payment is to made or not?"
+msgstr "Het geeft aan of een betaling is uitgevoerd of niet?"
 
-#. module: l10n_be
-#: model:ir.actions.wizard,name:l10n_be.partner_wizard_vat
-#: model:ir.ui.menu,name:l10n_be.partner_wizard_vat_menu
-msgid "Annual Listing of VAT-Subjected Customers"
-msgstr ""
+#~ msgid "Notification"
+#~ msgstr "Mededeling"
 
-#. module: l10n_be
-#: wizard_field:list.vat.detail,init,fyear:0
-#: wizard_field:vat.intra.xml,init,fyear:0
-msgid "Fiscal Year"
-msgstr "Boekjaar"
+#~ msgid "Select Period"
+#~ msgstr "Kies periode"
 
-#. module: l10n_be
-#: wizard_view:wizard.account.xml.vat.declaration,go:0
-msgid "XML Flie has been Created."
-msgstr "XML bestand is aangemaakt"
+#~ msgid "XML Flie has been Created."
+#~ msgstr "XML bestand is aangemaakt"
 
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_stock
-msgid "Stock et Encours"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
-msgid "Belgium Statements"
-msgstr ""
-
-#. module: l10n_be
-#: wizard_field:list.vat.detail,init,test_xml:0
-#: wizard_field:vat.intra.xml,init,test_xml:0
-msgid "Test XML file"
-msgstr "Test XML bestand"
-
-#. module: l10n_be
-#: model:ir.actions.todo,note:l10n_be.config_call_account_template
-msgid ""
-"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-"the name of the company, the chart template to follow, the no. of digits to "
-"generate the code for your accounts and Bank account, currency to create "
-"Journals. Thus,the pure copy of chart Template is generated.\n"
-"This is the same wizard that runs from Financial "
-"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-"Chart of Accounts from a Chart Template."
-msgstr ""
-"Genereer rekeningschema uit een schema sjabloon. U wordt gevraagd om de naam "
-"van de vennootschap, het schema sjabloon te gebruiken, het aantal cijfers "
-"voor het genereren van de code grootboekrekeningen, munteenheid voor de "
-"journalen. Dus wordt de zuivere kopie van het schema sjabloon aangemaakt.\n"
-"Dit is dezelfde wizard die wekt  vanuit Financieel Management / Configuratie "
-"/ Financial Accounting / Financiële Rekeningen / Genereer Rekeningsschema  "
-"uit een schema sjabloon."
-
-#. module: l10n_be
-#: wizard_field:list.vat.detail,init,mand_id:0
-#: wizard_field:vat.intra.xml,init,mand_id:0
-msgid "MandataireId"
-msgstr "Agent ID"
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tax
-msgid "Tax"
-msgstr "Belasting"
-
-#. module: l10n_be
-#: wizard_field:wizard.account.xml.vat.declaration,init,period:0
-msgid "Period"
-msgstr "Periode"
-
-#. module: l10n_be
-#: wizard_view:vat.intra.xml,init:0
-#: wizard_field:vat.intra.xml,init,country_ids:0
-msgid "European Countries"
-msgstr ""
-
-#. module: l10n_be
-#: wizard_view:vat.intra.xml,init:0
-msgid "General Information"
-msgstr ""
-
-#. module: l10n_be
-#: wizard_view:list.vat.detail,go:0
-#: wizard_view:vat.intra.xml,go:0
-msgid "XML File has been Created."
-msgstr "XML bestand is aangemaakt"
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_financiers
-msgid "Financier"
-msgstr ""
-
-#. module: l10n_be
-#: wizard_button:list.vat.detail,init,end:0
-#: wizard_button:vat.intra.xml,init,end:0
-#: wizard_button:wizard.account.xml.vat.declaration,init,end:0
-msgid "Cancel"
-msgstr "Annuleer"
-
-#. module: l10n_be
-#: model:ir.actions.wizard,name:l10n_be.partner_vat_intra
-#: model:ir.ui.menu,name:l10n_be.partner_intra_vat_menu
-msgid "Partner VAT intra"
-msgstr ""
-
-#. module: l10n_be
-#: selection:vat.intra.xml,init,trimester:0
-msgid "Jan/Feb/Mar"
-msgstr ""
+#~ msgid ""
+#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+#~ "the name of the company, the chart template to follow, the no. of digits to "
+#~ "generate the code for your accounts and Bank account, currency to create "
+#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
+#~ "This is the same wizard that runs from Financial "
+#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+#~ "Chart of Accounts from a Chart Template."
+#~ msgstr ""
+#~ "Genereer rekeningschema uit een schema sjabloon. U wordt gevraagd om de naam "
+#~ "van de vennootschap, het schema sjabloon te gebruiken, het aantal cijfers "
+#~ "voor het genereren van de code grootboekrekeningen, munteenheid voor de "
+#~ "journalen. Dus wordt de zuivere kopie van het schema sjabloon aangemaakt.\n"
+#~ "Dit is dezelfde wizard die wekt  vanuit Financieel Management / Configuratie "
+#~ "/ Financial Accounting / Financiële Rekeningen / Genereer Rekeningsschema  "
+#~ "uit een schema sjabloon."
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index 18042c69b34..038586824bc 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:14+0000\n"
+"PO-Revision-Date: 2010-10-28 09:07+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index f1b00896159..2c44b062f45 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -42,18 +42,22 @@ class base_report(report_sxw.rml_parse):
         self.context = context
 
     def _load(self, name, form):
-        fiscalyear = self.pool.get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear'])
-        period_query_cond=self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id', '=', form['fiscalyear'])])
+        fiscalyear = self.pool.get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear_id'])
+        period_ids=self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id', '=', form['fiscalyear_id'])])
 
-        self.cr.execute("SELECT MIN(date_start) AS date_start, MAX(date_stop) AS date_stop FROM account_period WHERE id IN %s", (tuple(period_query_cond),))
-        dates = self.cr.dictfetchall()
-        self._set_variable('date_start', dates[0]['date_start'])
-        self._set_variable('date_stop', dates[0]['date_stop'])
+        if period_ids:
+            self.cr.execute("SELECT MIN(date_start) AS date_start, MAX(date_stop) AS date_stop FROM account_period WHERE id = ANY(%s)", (period_ids,))
+            dates = self.cr.dictfetchall()
+        else:
+            dates = False
+        if dates:
+            self._set_variable('date_start', dates[0]['date_start'])
+            self._set_variable('date_stop', dates[0]['date_stop'])
 
         self.cr.execute("SELECT l10n_fr_line.code,definition FROM l10n_fr_line LEFT JOIN l10n_fr_report ON l10n_fr_report.id=report_id WHERE l10n_fr_report.code=%s",(name,))
         datas = self.cr.dictfetchall()
         for line in datas:
-            self._load_accounts(form,line['code'],eval(line['definition']),fiscalyear,period_query_cond)
+            self._load_accounts(form,line['code'],eval(line['definition']),fiscalyear,period_ids)
 
     def _set_variable(self, variable, valeur):
         self.localcontext.update({variable: valeur})
@@ -61,30 +65,35 @@ class base_report(report_sxw.rml_parse):
     def _get_variable(self, variable):
         return self.localcontext[variable]
 
-    def _load_accounts(self,form,code,definition,fiscalyear,period_query_cond):
+    def _load_accounts(self, form, code, definition, fiscalyear, period_ids):
         accounts = {}
         for x in definition['load']:
             p = x.split(":")
             accounts[p[1]] = [p[0],p[2]]
         sum = 0.0
         if fiscalyear.state != 'done' or not code.startswith('bpcheck'):
+            query_params = []
             query_cond = "("
             for account in accounts:
-                query_cond += "aa.code LIKE '" + account + "%' OR "
+                query_cond += "aa.code LIKE '" + account + "%%' OR "
             query_cond = query_cond[:-4]+")"
 
             if len(definition['except']) > 0:
                 query_cond = query_cond+" and ("
                 for account in definition['except']:
-                    query_cond += "aa.code NOT LIKE '"+account+"%' AND "
+                    query_cond += "aa.code NOT LIKE '"+account+"%%' AND "
                 query_cond = query_cond[:-5]+")"
 
             closed_cond = ""
             if fiscalyear.state == 'done':
-                closed_cond=" AND (aml.move_id NOT IN (SELECT account_move.id as move_id FROM account_move WHERE period_id IN "+str(tuple(period_query_cond))+" AND journal_id=(SELECT res_id FROM ir_model_data WHERE name='closing_journal' AND module='l10n_fr')) OR (aa.type != 'income' AND aa.type !='expense'))"
+                closed_cond=" AND (aml.move_id NOT IN (SELECT account_move.id as move_id FROM account_move WHERE period_id = ANY(%s) AND journal_id=(SELECT res_id FROM ir_model_data WHERE name='closing_journal' AND module='l10n_fr')) OR (aa.type != 'income' AND aa.type !='expense'))"
+                query_params.append(list(period_ids))
 
-            query = "SELECT aa.code AS code, SUM(debit) as debit, SUM(credit) as credit FROM account_move_line aml LEFT JOIN account_account aa ON aa.id=aml.account_id WHERE "+query_cond+closed_cond+" AND aml.state='valid' AND aml.period_id IN "+str(tuple(period_query_cond))+" GROUP BY code"
-            self.cr.execute(query)
+            query = "SELECT aa.code AS code, SUM(debit) as debit, SUM(credit) as credit " \
+                " FROM account_move_line aml LEFT JOIN account_account aa ON aa.id=aml.account_id "\
+                " WHERE "+query_cond+closed_cond+" AND aml.state='valid' AND aml.period_id = ANY(%s) GROUP BY code"
+            query_params.append(list(period_ids))
+            self.cr.execute(query, query_params)
 
             lines =self.cr.dictfetchall()
             for line in lines:
diff --git a/addons/l10n_fr/test/l10n_fr_report.yml b/addons/l10n_fr/test/l10n_fr_report.yml
index ddc95595175..7cf9b161223 100644
--- a/addons/l10n_fr/test/l10n_fr_report.yml
+++ b/addons/l10n_fr/test/l10n_fr_report.yml
@@ -7,6 +7,11 @@
     date_start: '2012-01-01'
     date_stop: '2012-12-31'
     name: Fiscal Year 2012
+-
+  I create the fiscal periods
+-
+  !python {model: account.fiscalyear}:
+    self.create_period(cr, uid, [ref('account_fiscalyear_01'),])
 -
   In order to test the PDF reports defined on a l10n_fr, we will print an Account Move Line Report for l10n_fr
 -
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7fb2a7056ef..3fdd81a1ab5 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -54,16 +54,16 @@
                     <field name="category"/>
                     <field name="price" sum="Total price"/>
                     <field name="state"/>
-                    <button colspan="1"
-                              name="%(action_lunch_order_confirm)d"
-                              string="Confirm Order"
-                              type="action" states="draft"
-                              icon="terp-gtk-go-back-rtl" />
                     <button colspan="1"
                               name="%(action_lunch_order_cancel)d"
                               string="Cancel Order"
                               type="action" states="confirmed"
                               icon="gtk-cancel" />
+                    <button colspan="1"
+                              name="%(action_lunch_order_confirm)d"
+                              string="Confirm Order"
+                              type="action" states="draft"
+                              icon="terp-gtk-go-back-rtl" />
                 </tree>
             </field>
         </record>
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index 89aab079090..49df0a7bd2b 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/i18n/es.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:15+0000\n"
+"PO-Revision-Date: 2010-10-28 09:24+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-10-28 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 26690757234..044746adc2c 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -195,9 +195,9 @@
                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-project" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-project" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
-               <filter icon="terp-project" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
+               <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
+               <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
+               <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
                <separator orientation="vertical"/>
                <field name="name" select="1"/>
                <field name="campaign_id" select="1"/>
@@ -343,9 +343,9 @@
                 <field name="partner_id"/>
                 <field name="date"/>
                 <field name="state"/>
+                <button string="Cancel" states="todo" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                 <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
                 <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
-                <button string="Cancel" states="todo" name="button_cancel" type="object" icon="terp-gtk-stop"/>
             </tree>
         </field>
     </record>
@@ -458,7 +458,7 @@
         view_type="form" />
 
     <!-- Campaign Statistics -->
-    <act_window 
+    <act_window
         context="{'search_default_campaign_id': [active_id]}"
         id="act_marketing_campaing_stat"
         name="Campaign Statistics" res_model="campaign.analysis"
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index fd5a8c0908f..1c8581b3f31 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -44,7 +44,7 @@
                     <filter icon="terp-gtk-go-back-rtl"
                             string="To Do"
                             domain="[('state','=','todo')]"/>
-                    <filter icon="terp-camera_test"
+                    <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
                     <filter icon="terp-emblem-important"
@@ -65,7 +65,7 @@
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
index 0727954cce3..1392b68e4ae 100644
--- a/addons/membership/i18n/nl.po
+++ b/addons/membership/i18n/nl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 07:23+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 14:49+0000\n"
+"Last-Translator: Sam_inv <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-09-29 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
@@ -28,20 +28,45 @@ msgstr "Lidmaatschapsproces"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Paid Member"
 msgstr "Betaald lid"
 
+#. module: membership
+#: help:product.product,membership_date_from:0
+msgid "Active Membership since this date"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Group By..."
+msgstr ""
+
 #. module: membership
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: membership
-#: field:report.partner_member.year,currency:0
-#: field:report.partner_member.year_new,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: field:report.membership,num_paid:0
+msgid "# Paid"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,tot_earned:0
+msgid "Earned Amount"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_membership
+msgid "Membership Analysis"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "March"
+msgstr ""
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
@@ -54,9 +79,11 @@ msgid "Invoice is be paid."
 msgstr "Factuur is betaald"
 
 #. module: membership
-#: model:process.node,note:membership.process_node_membershipproduct0
-msgid "Define membership product."
-msgstr "Definieer product voor leden"
+#: field:membership.membership_line,company_id:0
+#: view:report.membership:0
+#: field:report.membership,company_id:0
+msgid "Company"
+msgstr ""
 
 #. module: membership
 #: field:product.product,membership_date_to:0
@@ -68,11 +95,37 @@ msgstr "Datum tot"
 msgid "Waiting to invoice"
 msgstr "Wacht op facturatie"
 
+#. module: membership
+#: help:report.membership,date_to:0
+msgid "End membership date"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "All Members"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Stop membership date"
+msgstr "Einddatum lidmaatschap"
+
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
 msgstr "Product aan lid"
 
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_invoice_view
+#: view:res.partner:0
+msgid "Join Membership"
+msgstr ""
+
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
@@ -83,20 +136,25 @@ msgstr "Geassocieerd lid"
 msgid "Member is associated."
 msgstr "Lid is geassocieerd"
 
+#. module: membership
+#: field:report.membership,tot_pending:0
+msgid "Pending Amount"
+msgstr ""
+
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
 msgstr "Geassocieerde relatie"
 
 #. module: membership
-#: constraint:account.account:0
-msgid "Error ! You can not create recursive accounts."
-msgstr "Fout ! U kunt geen recursieve rekeningen aanmaken."
+#: field:report.membership,num_invoiced:0
+msgid "# Invoiced"
+msgstr ""
 
 #. module: membership
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr "Fout: Referentie omzetbelasting is verplicht."
+#: view:res.partner:0
+msgid "End Membership Date"
+msgstr ""
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -104,16 +162,17 @@ msgid "Date from"
 msgstr "Datum vanaf"
 
 #. module: membership
+#: code:addons/membership/membership.py:0
+#, python-format
+msgid "Partner doesn't have an address to make the invoice."
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_res_partner
 #: field:membership.membership_line,partner:0
 msgid "Partner"
 msgstr "Relatie"
 
-#. module: membership
-#: model:ir.actions.act_window,name:membership.action_membership_members_free
-#: model:ir.ui.menu,name:membership.menu_members_free
-msgid "Free members"
-msgstr "Gratis leden"
-
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
@@ -129,25 +188,15 @@ msgstr "Relaties"
 msgid "From"
 msgstr "Van"
 
-#. module: membership
-#: constraint:membership.membership_line:0
-msgid "Error, this membership product is out of date"
-msgstr "Fout, dit product voor leden is verlopen"
-
-#. module: membership
-#: wizard_button:wizard_invoice_membership,init,ok:0
-msgid "Confirm"
-msgstr "Bevestigen"
-
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
 msgid "Create"
 msgstr "Maak"
 
 #. module: membership
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr "Gefactureerd lid kan een geassocieerd lid zijn."
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
@@ -155,39 +204,42 @@ msgid "Member line"
 msgstr "Lid-regel"
 
 #. module: membership
-#: field:membership.membership_line,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: membership
+#: help:report.membership,date_from:0
 #: field:res.partner,membership_start:0
 msgid "Start membership date"
 msgstr "Lid vanaf"
 
+#. module: membership
+#: code:addons/membership/membership.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fout !"
+
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
 msgid "Paid member"
 msgstr "Betalend lid"
 
 #. module: membership
-#: model:ir.model,name:membership.model_report_partner_member_year
-#: model:ir.ui.menu,name:membership.menu_report_partner_member_year
-#: view:report.partner_member.year:0
-msgid "Membership by Years"
-msgstr "Lidmaatschap in jaren"
+#: view:res.partner:0
+msgid "Group By"
+msgstr ""
 
 #. module: membership
-#: model:ir.ui.menu,name:membership.menu_reporting
-msgid "Reporting"
-msgstr "Overzichten"
+#: field:report.membership,num_waiting:0
+msgid "# Waiting"
+msgstr ""
 
 #. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members
+#: model:ir.ui.menu,name:membership.menu_members
 #: view:res.partner:0
 msgid "Members"
 msgstr "Leden"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Non Member"
 msgstr "Niet-lid"
@@ -198,9 +250,26 @@ msgid "Open invoice."
 msgstr "Open factuur."
 
 #. module: membership
-#: model:ir.ui.menu,name:membership.menu_conf
-msgid "Configuration"
-msgstr "Instellingen"
+#: selection:report.membership,month:0
+msgid "July"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.membership_0_product_template
+msgid "Golden Membership"
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_report_membership
+msgid "Members Analysis"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,membership_id:0
+#: view:report.membership:0
+#: field:report.membership,membership_id:0
+msgid "Membership Product"
+msgstr ""
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
@@ -208,9 +277,20 @@ msgid "Define product for membership."
 msgstr "Definieer product voor leden."
 
 #. module: membership
-#: model:process.transition,note:membership.process_transition_invoicetoassociate0
-msgid "Invoiced member may be Associated member."
-msgstr "Gefactureerd lid kan een geassocieerd lid zijn."
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave!"
+
+#. module: membership
+#: view:membership.invoice:0
+msgid "Join"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice
+#: field:membership.membership_line,account_invoice_id:0
+msgid "Invoice"
+msgstr ""
 
 #. module: membership
 #: constraint:product.template:0
@@ -219,15 +299,14 @@ msgstr ""
 "Fout: Verkoopeenheid moet in een andere categorie staan dan de maateenheid"
 
 #. module: membership
-#: model:ir.ui.menu,name:membership.menu_membership_products
 #: view:product.product:0
 msgid "Membership products"
 msgstr "Producten voor leden"
 
 #. module: membership
-#: model:ir.ui.menu,name:membership.menu_members_waiting
-msgid "Future members (invoice not confirmed)"
-msgstr "Toekomstige leden (factuur onbevestigd)"
+#: field:membership.membership_line,date:0
+msgid "Join Date"
+msgstr ""
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
@@ -235,22 +314,51 @@ msgid "Set association"
 msgstr "Maak geassocieerd"
 
 #. module: membership
-#: model:product.template,name:membership.member_product_1_product_template
-msgid "Membership Product - 2"
-msgstr "Product voor lid - 2"
+#: view:res.partner:0
+msgid " Membership State"
+msgstr ""
 
 #. module: membership
-#: model:product.template,name:membership.member_product_0_product_template
-msgid "Membership Product - 1"
-msgstr "Product voor lid - 1"
+#: view:res.partner:0
+msgid "Memberships"
+msgstr ""
 
 #. module: membership
-#: field:report.partner_member.year,canceled_amount:0
-#: field:report.partner_member.year,canceled_number:0
-#: field:report.partner_member.year_new,canceled_amount:0
-#: field:report.partner_member.year_new,canceled_number:0
-msgid "Canceled"
-msgstr "Geannuleerd"
+#: model:ir.model,name:membership.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "September"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,month:0
+msgid "Month"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Group by..."
+msgstr ""
+
+#. module: membership
+#: code:addons/membership/membership.py:0
+#, python-format
+msgid "Partner is a free Member."
+msgstr ""
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
@@ -258,15 +366,42 @@ msgid "Member Sale Pricelist"
 msgstr "Prijslijst leden"
 
 #. module: membership
-#: field:report.partner_member.year,invoiced_amount:0
-#: field:report.partner_member.year,invoiced_number:0
-#: field:report.partner_member.year_new,invoiced_amount:0
-#: field:report.partner_member.year_new,invoiced_number:0
-msgid "Invoiced"
-msgstr "Gefactureerd"
+#: field:report.membership,associate_member_id:0
+#: view:res.partner:0
+msgid "Associate Member"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_invoice
+#: view:membership.invoice:0
+msgid "Membership Invoice"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+#: field:report.membership,user_id:0
+#: view:res.partner:0
+msgid "Salesman"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_membershipproduct0
+msgid "Define membership product."
+msgstr "Definieer product voor leden"
+
+#. module: membership
+#: view:product.product:0
+msgid "Category"
+msgstr ""
 
 #. module: membership
 #: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Free Member"
 msgstr "Gratis lid"
@@ -276,6 +411,11 @@ msgstr "Gratis lid"
 msgid "Member Sale Pricelist Version"
 msgstr "Leden verkoopprijslijst versie"
 
+#. module: membership
+#: help:product.product,membership_date_to:0
+msgid "Expired date of Membership"
+msgstr ""
+
 #. module: membership
 #: constraint:product.template:0
 msgid ""
@@ -289,41 +429,71 @@ msgstr ""
 msgid "The price negociated by the partner"
 msgstr "De overeengekomen prijs met de relatie"
 
+#. module: membership
+#: view:report.membership:0
+msgid "Forecast"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,partner_id:0
+msgid "Member"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Date From"
+msgstr ""
+
+#. module: membership
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
 msgstr "Geassocieerd lid"
 
 #. module: membership
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr "Fout: ongeldig nummer omzetbelasting (verkeerd controlegetal)"
+#: view:product.product:0
+msgid "Accounting Info"
+msgstr ""
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
 msgstr "Annuleringsdatum lidmaatschap"
 
+#. module: membership
+#: view:res.partner:0
+msgid "Customers"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "August"
+msgstr ""
+
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
+#: model:ir.ui.menu,name:membership.menu_membership_products
+#: view:product.product:0
 msgid "Membership Products"
 msgstr "Producten voor leden"
 
+#. module: membership
+#: selection:report.membership,month:0
+msgid "June"
+msgstr ""
+
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
 msgstr "Lidmaatschapsfactuur betaald."
 
-#. module: membership
-#: field:report.partner_member.year,paid_amount:0
-#: field:report.partner_member.year,paid_number:0
-#: field:report.partner_member.year_new,paid_amount:0
-#: field:report.partner_member.year_new,paid_number:0
-msgid "Paid"
-msgstr "Betaald"
-
 #. module: membership
 #: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Invoiced Member"
 msgstr "Gefactureerd lid"
@@ -331,8 +501,10 @@ msgstr "Gefactureerd lid"
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
 #: model:ir.ui.menu,name:membership.menu_membership
+#: field:membership.invoice,product_id:0
 #: view:product.product:0
 #: field:product.product,membership:0
+#: view:report.membership:0
 #: view:res.partner:0
 #: field:res.partner,member_lines:0
 msgid "Membership"
@@ -345,6 +517,7 @@ msgstr "Geef aan of dit product alleen voor leden is"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Waiting Member"
 msgstr "Wachtend lid"
@@ -355,21 +528,46 @@ msgid "Association Partner"
 msgstr "Geassocieerde relatie"
 
 #. 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 "Gefactureerde leden"
+#: selection:report.membership,month:0
+msgid "November"
+msgstr ""
 
 #. module: membership
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "U kunt geen twee overlappende prijslijsten hebben!"
+#: view:product.product:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. 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 "Oud-leden"
+#: field:membership.membership_line,state:0
+msgid "Membership State"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "October"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Description"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "January"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Membership Fee"
+msgstr ""
+
+#. module: membership
+#: constraint:product.pricelist.item:0
+msgid ""
+"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+"Item!"
+msgstr ""
 
 #. module: membership
 #: field:res.partner,membership_amount:0
@@ -377,12 +575,13 @@ msgid "Membership amount"
 msgstr "Lidmaatschapsbedrag"
 
 #. module: membership
-#: wizard_view:wizard_invoice_membership,init:0
-msgid "Choose invoice details"
-msgstr "Kies details factuur"
+#: model:product.template,name:membership.membership_2_product_template
+msgid "Basic Membership"
+msgstr ""
 
 #. module: membership
 #: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Old Member"
 msgstr "Oud-lid"
@@ -393,12 +592,21 @@ msgid "To"
 msgstr "Tot"
 
 #. module: membership
-#: field:report.partner_member.year,waiting_amount:0
-#: field:report.partner_member.year,waiting_number:0
-#: field:report.partner_member.year_new,waiting_amount:0
-#: field:report.partner_member.year_new,waiting_number:0
-msgid "Waiting"
-msgstr "Wachtend"
+#: view:report.membership:0
+#: field:report.membership,membership_state:0
+#: field:res.partner,membership_state:0
+msgid "Current Membership State"
+msgstr ""
+
+#. module: membership
+#: view:report.membership:0
+msgid "Last 365 Days"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "General"
+msgstr ""
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
@@ -406,26 +614,24 @@ msgid "Draft invoice is now open."
 msgstr "Conceptfactuur is nu open."
 
 #. module: membership
-#: model:ir.actions.act_window,name:membership.action_membership_members_waiting
-msgid "Future members"
-msgstr "Toekomstige leden"
+#: view:product.product:0
+msgid "Inactive"
+msgstr ""
 
 #. module: membership
-#: wizard_button:wizard_invoice_membership,init,end:0
-msgid "Cancel"
-msgstr "Annuleren"
+#: view:report.membership:0
+msgid "Last 30 Days"
+msgstr ""
 
 #. module: membership
-#: model:ir.actions.act_window,name:membership.action_membership_members_associated
-#: model:ir.ui.menu,name:membership.menu_members_associated
-msgid "Associated members"
-msgstr "Geassocieerde leden"
+#: view:membership.invoice:0
+msgid "Close"
+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 "Betalende leden"
+#: view:res.partner:0
+msgid "All non Members"
+msgstr ""
 
 #. module: membership
 #: view:product.product:0
@@ -437,6 +643,11 @@ msgstr "Informatie"
 msgid "Account Invoice line"
 msgstr "Factuurregel"
 
+#. module: membership
+#: view:product.product:0
+msgid "Categorization"
+msgstr ""
+
 #. module: membership
 #: constraint:ir.model:0
 msgid ""
@@ -450,45 +661,74 @@ msgid "Draft invoice for membership."
 msgstr "Conceptfactuur voor lidmaatschap."
 
 #. module: membership
-#: selection:membership.membership_line,state:0
-#: selection:res.partner,membership_state:0
-msgid "Canceled Member"
-msgstr "Geannuleerd lid"
-
-#. module: membership
+#: field:membership.invoice,member_price:0
+#: field:membership.membership_line,member_price:0
 #: model:product.price.type,name:membership.product_price_type_memberprice
 #: field:product.template,member_price:0
 msgid "Member Price"
 msgstr "Prijs voor leden"
 
+#. module: membership
+#: view:product.product:0
+msgid "Purchase Description"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Description"
+msgstr ""
+
 #. module: membership
 #: field:res.partner,free_member:0
 msgid "Free member"
 msgstr "Gratis lid"
 
 #. module: membership
-#: field:res.partner,membership_stop:0
-msgid "Stop membership date"
-msgstr "Einddatum lidmaatschap"
+#: selection:report.membership,month:0
+msgid "May"
+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 "Huidige leden"
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr "U kunt geen twee overlappende prijslijsten hebben!"
 
 #. 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 "Nieuwe leden op jaren"
+#: model:product.template,name:membership.membership_1_product_template
+msgid "Silver Membership"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: membership
+#: field:report.membership,date_to:0
+#: view:res.partner:0
+msgid "End Date"
+msgstr ""
+
+#. module: membership
+#: selection:report.membership,month:0
+msgid "February"
+msgstr ""
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
 msgstr "Gefactureerd lid"
 
+#. module: membership
+#: selection:report.membership,month:0
+msgid "April"
+msgstr ""
+
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
@@ -500,28 +740,125 @@ msgid "Waiting member"
 msgstr "Wachtend lid"
 
 #. module: membership
-#: model:ir.actions.wizard,name:membership.wizard_invoice_membership
-msgid "Invoice Membership"
-msgstr "Factureer lidmaatschap"
+#: field:report.membership,date_from:0
+#: view:res.partner:0
+msgid "Start Date"
+msgstr ""
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
-#: wizard_field:wizard_invoice_membership,init,product:0
 msgid "Membership product"
 msgstr "Product voor leden"
 
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:report.membership,membership_state:0
+#: selection:res.partner,membership_state:0
+msgid "Cancelled Member"
+msgstr ""
+
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Fout: Ongeldige EAN-code"
 
 #. module: membership
-#: field:report.partner_member.year,year:0
-#: field:report.partner_member.year_new,year:0
+#: view:report.membership:0
+#: field:report.membership,year:0
 msgid "Year"
 msgstr "Jaar"
 
 #. module: membership
-#: field:res.partner,membership_state:0
-msgid "Current membership state"
-msgstr "Status huidig lidmaatschap"
+#: view:report.membership:0
+msgid "Revenue Done"
+msgstr ""
+
+#~ msgid "Error ! You can not create recursive accounts."
+#~ msgstr "Fout ! U kunt geen recursieve rekeningen aanmaken."
+
+#~ msgid "Configuration"
+#~ msgstr "Instellingen"
+
+#~ msgid "Currency"
+#~ msgstr "Valuta"
+
+#~ msgid "Free members"
+#~ msgstr "Gratis leden"
+
+#~ msgid "Old members"
+#~ msgstr "Oud-leden"
+
+#~ msgid "Paid members"
+#~ msgstr "Betalende leden"
+
+#~ msgid "Current members"
+#~ msgstr "Huidige leden"
+
+#~ msgid "Future members"
+#~ msgstr "Toekomstige leden"
+
+#~ msgid "Invoice Membership"
+#~ msgstr "Factureer lidmaatschap"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Confirm"
+#~ msgstr "Bevestigen"
+
+#~ msgid "Canceled"
+#~ msgstr "Geannuleerd"
+
+#~ msgid "Invoiced"
+#~ msgstr "Gefactureerd"
+
+#~ msgid "Paid"
+#~ msgstr "Betaald"
+
+#~ msgid "Invoiced members"
+#~ msgstr "Gefactureerde leden"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "Waiting"
+#~ msgstr "Wachtend"
+
+#~ msgid "Error: BVR reference is required."
+#~ msgstr "Fout: Referentie omzetbelasting is verplicht."
+
+#~ msgid "Error, this membership product is out of date"
+#~ msgstr "Fout, dit product voor leden is verlopen"
+
+#~ msgid "Reporting"
+#~ msgstr "Overzichten"
+
+#~ msgid "Future members (invoice not confirmed)"
+#~ msgstr "Toekomstige leden (factuur onbevestigd)"
+
+#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
+#~ msgstr "Fout: ongeldig nummer omzetbelasting (verkeerd controlegetal)"
+
+#~ msgid "Choose invoice details"
+#~ msgstr "Kies details factuur"
+
+#~ msgid "Associated members"
+#~ msgstr "Geassocieerde leden"
+
+#~ msgid "Canceled Member"
+#~ msgstr "Geannuleerd lid"
+
+#~ msgid "New Membership by Years"
+#~ msgstr "Nieuwe leden op jaren"
+
+#~ msgid "Current membership state"
+#~ msgstr "Status huidig lidmaatschap"
+
+#~ msgid "Membership by Years"
+#~ msgstr "Lidmaatschap in jaren"
+
+#~ msgid "Membership Product - 1"
+#~ msgstr "Product voor lid - 1"
+
+#~ msgid "Membership Product - 2"
+#~ msgstr "Product voor lid - 2"
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index efbd8cc52ee..07fd35ddcb6 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -20,15 +20,15 @@
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
+                   </group>
+                   <newline/>
                    <group  expand='0' string='Group by...' groups="base.group_extended">
                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
                        <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
                    </group>
-                   <newline/>
-                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
-                   </group>
                 </search>
             </field>
         </record>
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 61e0d9ddd8b..b14d3dcb88c 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -55,7 +55,7 @@
                         <filter string="Associated Partner" icon="terp-partner" name="associate_member_id"
                             domain="[]" context="{'group_by':'associate_member_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Membership Product" icon="terp-product" name="product"
+                        <filter string="Membership Product" icon="terp-accessories-archiver" name="product"
                             domain="[]" context="{'group_by':'membership_id'}"/>
                         <filter string="Current Membership State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'membership_state'}"/>
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 51ce5ed9ad5..bd7b1c5091b 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 10:16+0000\n"
+"PO-Revision-Date: 2010-10-28 09:18+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index b318c1d30d8..362dc875ddf 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 08:29+0000\n"
+"PO-Revision-Date: 2010-10-28 08:57+0000\n"
 "Last-Translator: TeMPO <openerp@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-10-28 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -33,7 +33,7 @@ msgstr "UdM du produit"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr ""
+msgstr "Postes de charge"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -43,22 +43,22 @@ msgstr "Nombre de Cycles"
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of operations this workcenter can do."
-msgstr ""
+msgstr "Nombre d'opérations simultanées du poste de charge"
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr ""
+msgstr "Emplacement des composants"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr ""
+msgstr "Occupation du poste de charge"
 
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Centers load"
-msgstr ""
+msgstr "Occupation du poste de charge"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -87,6 +87,8 @@ msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
 msgstr ""
+"Les règles de stock mini permettent au système de créer automatiquement des "
+"approvisionnements dès que les minima sont atteints"
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -94,12 +96,14 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"Si la coche Active est validée, la nomenclature n'est pas visible sans pour "
+"autant la supprimer"
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr ""
+msgstr "Liste de colisage"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -111,7 +115,7 @@ msgstr "Coût horaire"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Cost Price per Uom"
-msgstr ""
+msgstr "Coût unitaire"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -122,7 +126,7 @@ msgstr "Rebuts"
 #: view:mrp.production.order:0
 #: field:mrp.production.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -212,7 +216,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Etat"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -244,7 +248,7 @@ msgstr "Qté de Produit"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
-msgstr ""
+msgstr "Pour un produit acheté"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -265,7 +269,7 @@ msgstr "Compte analyt. du cycle"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Cost"
-msgstr ""
+msgstr "Coût"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -275,7 +279,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr ""
+msgstr "Approvisionnement des Services"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -290,12 +294,12 @@ msgstr "Emplacement de destination"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "title"
-msgstr ""
+msgstr "Titre"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr ""
+msgstr "Données de base"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -345,7 +349,7 @@ msgstr "Référence vers une position dans un plan externe."
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Août"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
@@ -470,7 +474,7 @@ msgstr "Structure de la Nomenclature des Matériaux"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr ""
+msgstr "le produit est de type Service"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -506,7 +510,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycles"
-msgstr ""
+msgstr "Nombre de cycles"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index a8d90f1e48c..05b27911aff 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -100,6 +100,8 @@
                             <field name="state"/>
                             <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
                             <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                            <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                            <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                             <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
                             <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
                             <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
@@ -107,8 +109,6 @@
                             <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
                             <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
                             <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
-                            <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                            <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
                     <page string="Invoicing">
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index d400bc35a4b..435f0dcb3f2 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -120,7 +120,7 @@
         </record>
 
         <record id="action_new_bank_statement_all_tree" model="ir.actions.act_window">
-            <field name="name">Registers</field>
+            <field name="name">Cash Registers</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
@@ -142,24 +142,24 @@
         </record>
 
         <menuitem
-            name="Registers"
+            name="Cash Registers"
             parent="menu_cash_register"
             action="action_new_bank_statement_all_tree"
             id="menu_all_menu_all_register"
             sequence="4"
         />
 
-        <menuitem name="Register management" parent="point_of_sale.menu_point_root"
+        <menuitem name="Cash register management" parent="point_of_sale.menu_point_root"
             id="menu_point_open_config" sequence="1"/>
         <menuitem
-            name="Open Registers" parent="menu_point_open_config"
-            string="Open Registers"
+            name="Open Cash Registers" parent="menu_point_open_config"
+            string="Open Cash Registers"
             action="action_pos_open_statement"
             id="menu_open_statement" sequence="1" />
 
         <menuitem
-            name="Close Registers" parent="menu_point_open_config"
-            string="Close Registers"
+            name="Close Cash Registers" parent="menu_point_open_config"
+            string="Close Cash Registers"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
 
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 07c6a0c0c22..d590c52f9d9 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-27 22:26+0000\n"
+"PO-Revision-Date: 2010-10-28 19:58+0000\n"
 "Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@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-10-28 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -51,7 +51,7 @@ msgstr "Pogrešno ime modela u definiciji akcije."
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "Br Proizvoda"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -81,18 +81,18 @@ msgstr "Sve Kase NA dan :"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Registers"
-msgstr ""
+msgstr "Zatvori Registre"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "POS ne Radi"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
 msgid "Register Analysis"
-msgstr ""
+msgstr "Analiza Registara"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
@@ -109,7 +109,7 @@ msgstr "Jeste li sigurni da zelite da zatvorite stavke ?"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Register"
-msgstr ""
+msgstr "Otvori Registre"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
@@ -145,7 +145,7 @@ msgstr "POS ne radi"
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
 msgid "Today's Sales By Current User"
-msgstr ""
+msgstr "Danasnja prodaja po datom korisniku"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -272,7 +272,7 @@ msgstr "Ukupna cena"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Detaljnije"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -304,7 +304,7 @@ msgstr "Max Popust(%)"
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Sortie de caisse"
-msgstr ""
+msgstr "Gotovina Van"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
@@ -372,7 +372,7 @@ msgstr "Dnevni Zadaci"
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Pretrazi gotovinske izjave"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -399,7 +399,7 @@ msgstr "Juni"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
 msgid "Sales by User Monthly"
-msgstr ""
+msgstr "Mesecna prodaja po korisniku"
 
 #. module: point_of_sale
 #: field:pos.order,date_payment:0
@@ -508,7 +508,7 @@ msgstr "Cena komada"
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:0
 #, python-format
 msgid "Please check that income account is set to %s"
-msgstr ""
+msgstr "Molim proveri da li je dati nalog postavljen na %s"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:0
@@ -554,7 +554,7 @@ msgstr "Isplata"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Krajnje Stanje"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
@@ -722,7 +722,7 @@ msgstr "Ovo polje omogucava validaciju KAsa bez provere krajnjih detalja"
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "Ime Ul."
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
@@ -849,7 +849,7 @@ msgstr "Proizvodi za Troskove"
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
 #: view:pos.sales.user.today.current_user:0
 msgid "Sales for Current User"
-msgstr ""
+msgstr "Prodaja za datog Korisnika"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -865,7 +865,7 @@ msgstr "Septembar"
 #. module: point_of_sale
 #: model:account.journal,name:point_of_sale.pos_bankcard_journal
 msgid "Bancontact Journal"
-msgstr ""
+msgstr "Dnevnik kontakata Banke"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -968,7 +968,7 @@ msgstr "Otkaži"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Return Picking"
-msgstr ""
+msgstr "Povrat BIranja"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -993,7 +993,7 @@ msgstr "Prodaja po Korisniku"
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Placanje za Prodaju"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
@@ -1115,7 +1115,7 @@ msgstr "Odaberi otvoreni prodajni nalog"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Datum Narudzbe"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1204,12 +1204,12 @@ msgstr "Faks:"
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "Konektovani Prodavac"
 
 #. module: point_of_sale
 #: field:pos.order,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Metod Cena"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:0
@@ -1218,16 +1218,18 @@ msgid ""
 "The maximum value you can still withdraw is exceeded. \n"
 " Remaining value is equal to %d "
 msgstr ""
+"Maksimalna vrednost koju i dalje mozete povuci je prekoracena.\n"
+" Preostala vrednost jednaka je %d "
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print the receipt of the sale"
-msgstr ""
+msgstr "Stampaj Racun Prodaje"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Izborna Lista"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1245,14 +1247,14 @@ msgstr "Kol."
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mesec -1"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
 #: model:ir.model,name:point_of_sale.model_pos_sale_user
 #: view:pos.payment.report.user:0
 msgid "Sale by User"
-msgstr ""
+msgstr "Prodaja po Korisniku"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
@@ -1261,7 +1263,7 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_box_out.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Greska !"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:0
@@ -1277,70 +1279,79 @@ msgid ""
 "            else:\n"
 "                number = sequence_obj.get(cr, uid, 'account.cash.statement"
 msgstr ""
+"Ne mozete otvoriti kasu za \"%s\".\n"
+"Molim zatvorite dati Registar.' %(journal.name)))\n"
+"             \n"
+"             broj = \"\n"
+"             ako je journal.sequence_id:\n"
+"                 broj = sequence_obj.get_id(cr, uid, "
+"journal.sequence_id.id)\n"
+"             inace\n"
+"                 broj = sequence_obj.get(cr, uid, 'account.cash.statement"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
 msgid "Sale Confirm"
-msgstr ""
+msgstr "Potvrdi Prodaju"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "stanje"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Prices"
-msgstr ""
+msgstr "Cene"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Please provide an account for the product: %s"
-msgstr ""
+msgstr "Molim prosledite nalog za proizvod: %s"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "Kasnjenje Potvrde"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
 msgid "Number of Print"
-msgstr "Br. za Stampu"
+msgstr "Br. Odstampanih"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "POS Placanja"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "Zavrsni Period"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
 msgid "Automatic Opening"
-msgstr ""
+msgstr "Automatsko Otvaranje"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_ded:0
 msgid "Discount(Amount)"
-msgstr ""
+msgstr "Popust( Iznos)"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:0
 #, python-format
 msgid "Active ID is not found"
-msgstr ""
+msgstr "Aktivna Sifra nije nadjena"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,is_acc:0
@@ -1356,6 +1367,8 @@ msgid ""
 "You have to change either the product,\" \\n                \" the quantity "
 "or the pricelist."
 msgstr ""
+"Ne mogu naci u cenovniku proizvod \" \\n\"  date kolicine.\n"
+"Moras promeniti ili proizvod, \" \\n \" kolicinu ili cenovnik."
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1363,7 +1376,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mesec"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1373,61 +1386,61 @@ msgstr "Prodajni nalozi POS-a"
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Ime Izjave"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_cash_register
 #: field:pos.make.payment,journal:0
 msgid "Cash Register"
-msgstr ""
+msgstr "Kasa"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Pocetni datum"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "POS racun"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:0
 #, python-format
 msgid "No order lines defined for this sale "
-msgstr ""
+msgstr "Nema naloga definisanih za ovu prodaju "
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
 msgid "Sales by User Daily margin"
-msgstr ""
+msgstr "Prodaja po korisnikovoj dnevnoj marzi"
 
 #. module: point_of_sale
 #: field:pos.order,note_2:0
 msgid "Customer Note"
-msgstr ""
+msgstr "Napomena Musterije"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Registers"
-msgstr ""
+msgstr "Otvori Registre"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "No order lines defined for this sale."
-msgstr ""
+msgstr "Nema narudzbenica definisanih za ovu prodaju."
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Stanje pri otvaranju"
 
 #. module: point_of_sale
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Greska ! Ne mozes kreirati rekursivni meni."
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -1440,18 +1453,18 @@ msgstr "Plaćeni"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Sve prodajne linije"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Upit"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "The register must be opened to be able to execute a payment."
-msgstr ""
+msgstr "REgistar mora biti otvoren da bi bio u mogucnosti da primi uplatu."
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1465,22 +1478,22 @@ msgstr "Ukupno:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Prodaje po Marzama"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Konfiguracija Dnevnika"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "LInije Izjave"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "Rbr Fakture"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
@@ -1489,6 +1502,8 @@ msgid ""
 "You have to select a pricelist in the sale form !\n"
 "' \\n                    'Please set one before choosing a product."
 msgstr ""
+"Trebas selektovati cenovnik iz forme prodaje !\n"
+" ' \\n ' Molim izaberi neki pre nego izaberis proizvod."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
@@ -1498,7 +1513,7 @@ msgstr "Racun"
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr "Kreiraj Račun"
+msgstr "Kreiraj Fakturu"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
@@ -1512,29 +1527,29 @@ msgstr "Gotovo"
 #: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
 msgid "Invoice"
-msgstr "Račun"
+msgstr "Faktura"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
 msgid "Get From Sale"
-msgstr ""
+msgstr "Uzmi iz Prodaje"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "Veze naloga"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
 msgid "Sales lines Report"
-msgstr ""
+msgstr "Izvestaj prodaje"
 
 #. module: point_of_sale
 #: constraint:ir.model:0
@@ -1546,30 +1561,30 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Register"
-msgstr ""
+msgstr "Zatvori Registar"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
 #: view:pos.box.entries:0
 msgid "Box Entries"
-msgstr ""
+msgstr "Sadrzaj kutije"
 
 #. module: point_of_sale
 #: selection:pos.order,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Taxa Nije ukljucena"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,net_margin_per_qty:0
 #: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
 msgid "Net margin per Qty"
-msgstr ""
+msgstr "Neto marza po kolicini"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
 #: view:report.sales.by.margin.pos.month:0
 msgid "Sales by User Margin"
-msgstr ""
+msgstr "Prodaja po marzi Korisnika"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
@@ -1578,6 +1593,7 @@ msgid ""
 "There is no receivable account defined for this journal:'\\n                 "
 "   ' \"%s\" (id:%d)"
 msgstr ""
+"Ne postoji prijemni nalog definisan za ovaj dnevnik: '\\n ' \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1587,7 +1603,7 @@ msgstr "Porezi:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "POS Statistika"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_product_product
@@ -1607,57 +1623,57 @@ msgstr "Proizvod"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr "Blagajne"
+msgstr "POS Linije"
 
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
 msgid "Discount Control"
-msgstr ""
+msgstr "Kontrola Popusta"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Zatvaranje Stanja"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_details
 msgid "Sale Details"
-msgstr ""
+msgstr "Detalji Prodaje"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Krajnji Datum"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr "Datum naručivanja"
+msgstr "Naručeno Dana"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_user
 msgid "Sales lines by Users"
-msgstr ""
+msgstr "Prodajne Linije Po korisniku"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
 msgid "Max Difference for Cashboxes"
-msgstr ""
+msgstr "Maksimalna razlika izmedju Kasa"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_cash_register
 #: view:report.cash.register:0
 msgid "Point of Sale Cash Register Analysis"
-msgstr ""
+msgstr "Izvestaj POS registara"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1668,19 +1684,19 @@ msgstr "Vrste Poreza"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Description"
-msgstr ""
+msgstr "Opis Proizvoda"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "Registers"
-msgstr ""
+msgstr "Registri"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Pocetni datum"
 
 #. module: point_of_sale
 #: field:pos.order,amount_total:0
@@ -1696,13 +1712,13 @@ msgstr "Ukupno"
 #. module: point_of_sale
 #: view:pos.sale.user:0
 msgid "Sale By User"
-msgstr ""
+msgstr "Prodaja po Korisniku"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Izjava"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1712,7 +1728,7 @@ msgstr "Opis Narudzbe"
 #. module: point_of_sale
 #: field:pos.make.payment,num_sale:0
 msgid "Num.File"
-msgstr ""
+msgstr "Num.File"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
@@ -1720,12 +1736,12 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Izvestaj Uplate"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
 msgid "Return lines"
-msgstr ""
+msgstr "Stavke Povrata"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1754,12 +1770,12 @@ msgstr "Datum Fakture"
 #. module: point_of_sale
 #: field:pos.order.line,serial_number:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Serijski Broj"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Reprint"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
@@ -1767,12 +1783,12 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_box_out.py:0
 #, python-format
 msgid "You have to open at least one cashbox"
-msgstr ""
+msgstr "Trebas otvoriti makar jednu Kasu"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
 msgid "Today's Payment By User"
-msgstr ""
+msgstr "Danasnja PLacanja po Korisniku"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
@@ -1783,7 +1799,7 @@ msgstr "Pos narudzba"
 #: code:addons/point_of_sale/wizard/pos_payment.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Greska !"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -1814,34 +1830,34 @@ msgstr "Izlaz zadnjeg biranja"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "red Izvestaja Banke"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Izvestaj Banke"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Krajnji Datum"
 
 #. module: point_of_sale
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS Report"
-msgstr ""
+msgstr "POS Izvestaj"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
 msgid "Add Discount"
-msgstr ""
+msgstr "Dodaj Popust"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
 msgid "Refunded Quantity"
-msgstr ""
+msgstr "Refundirana kolicina"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -1852,27 +1868,27 @@ msgstr "Skeniraj Bar-Kod"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Zadatak"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 msgid "Sales Order"
-msgstr ""
+msgstr "Zahtev za Prodaju"
 
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Sadrzaj dnevnika"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrdjeno"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Otkazana Faktura"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1884,28 +1900,28 @@ msgstr "Potvrdi"
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Linije Prodaje"
 
 #. module: point_of_sale
 #: field:pos.discount,discount:0
 msgid "Discount "
-msgstr ""
+msgstr "Popust "
 
 #. module: point_of_sale
 #: model:account.journal,name:point_of_sale.pos_visa_journal
 msgid "Visa Journal"
-msgstr ""
+msgstr "Visa Dnevnik"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Invoice"
-msgstr "Račun dobavljača"
+msgstr "Faktura Dobavljaca"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Modify line failed !"
-msgstr ""
+msgstr "Neuspesno modifikovanje linije !"
 
 #. module: point_of_sale
 #: field:pos.make.payment,payment_name:0
@@ -1916,7 +1932,7 @@ msgstr "Naziv Isplate"
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:0
 #, python-format
 msgid "Registers are already closed."
-msgstr ""
+msgstr "Registri su vec zatvoreni"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
@@ -1926,17 +1942,17 @@ msgstr "Izveštavanje"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
 msgid "Products for Input Operations"
-msgstr ""
+msgstr "Proizvod za unos"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
 msgid "Today's Sales by Current User"
-msgstr ""
+msgstr "Dnevna Prodaja po datom korisniku"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Stavi Novac"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1946,7 +1962,7 @@ msgstr "Podešavanje"
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Pocetni Datum"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
@@ -1955,52 +1971,53 @@ msgid ""
 "There is no income '\\n                        'account defined for this "
 "product: \"%s\" (id:%d)"
 msgstr ""
+"Ne postoji ulazni '\\n ' nalog definisan za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
 #: field:report.pos.order,date_validation:0
 msgid "Validation Date"
-msgstr ""
+msgstr "Datum Validacije"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "Fakture"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Decembar"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,total_discount:0
 msgid "Total Discount"
-msgstr ""
+msgstr "Ukupni Popust"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Uzmi Novac"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
 msgid "Sales Details"
-msgstr ""
+msgstr "detalji Prodaje"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
 msgid "Control for Output Operations"
-msgstr ""
+msgstr "Kontrola Izlaznih zadataka"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:0
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:0
 #, python-format
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -2037,12 +2054,12 @@ msgstr "Fakturisani"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Napomena Popusta"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -2058,17 +2075,17 @@ msgstr "Priprema"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr "Nalog Blagajne"
+msgstr "Linija POS zahteva"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
 msgid "Are you sure you want to open the statements ?"
-msgstr ""
+msgstr "Jesi li siguran da zelis da otvoris Izjavu ?"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
 msgid "POS Payment Report according to date"
-msgstr ""
+msgstr "Izvestaj POS Placanja u odnosu na Datum"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2079,12 +2096,12 @@ msgstr "Predračun"
 #: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Please provide a partner for the sale."
-msgstr ""
+msgstr "Molim postavi partnera za prodaju"
 
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
 msgid "Cashier"
-msgstr ""
+msgstr "Kasir"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -2114,34 +2131,34 @@ msgstr "Prodaje po korisniku"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembar"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print Receipt"
-msgstr ""
+msgstr "Stampa Racuna"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "Linije POS ZAhteva"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Greska"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr ""
+msgstr "Dnevnik Prodaje"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2152,21 +2169,21 @@ msgstr "Refundiraj"
 #: code:addons/point_of_sale/report/pos_invoice.py:0
 #, python-format
 msgid "Please create an invoice for this sale."
-msgstr ""
+msgstr "MOlim kreiraj Fakturu za ovu prodaju"
 
 #. module: point_of_sale
 #: report:pos.sales.user:0
 #: report:pos.sales.user.today:0
 #: field:report.pos.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Datum zahteva"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Disc(%)"
-msgstr ""
+msgstr "popust(%)"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -2185,49 +2202,49 @@ msgstr "Zatvori"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order lines"
-msgstr ""
+msgstr "Linije zahteva"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "Medjuzbir w/o poreza"
 
 #. module: point_of_sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Moras da pridodas produkcionu seriju za ovaj prozivod"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "Izvestaj Placanja"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Dnevnik Gotovine"
 
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details :"
-msgstr ""
+msgstr "POS Detalji :"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Dnevna prodaja po Korisniku"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 #: view:pos.box.out:0
 msgid "Please fill these fields for entries to the box:"
-msgstr ""
+msgstr "Molim popunite ova polja za sadrzaj kutije"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:0
 #, python-format
 msgid "please check that account is set to %s"
-msgstr ""
+msgstr "molim proveri da li je dati nalog postavljen na %s"
 
 #. module: point_of_sale
 #: field:pos.box.entries,name:0
@@ -2241,39 +2258,39 @@ msgstr "Opis"
 #. module: point_of_sale
 #: model:account.journal,name:point_of_sale.pos_cash_journal
 msgid "Cash Journal"
-msgstr ""
+msgstr "Dnevnik Gotovine"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "Linije Prodaje"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne Beleske"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & Close"
-msgstr ""
+msgstr "Sacuvaj & Zatvori"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Running"
-msgstr ""
+msgstr "Radim"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
 msgid "All Cashboxes Of the day"
-msgstr ""
+msgstr "Sve kase na dan"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
 #: view:report.pos.order:0
 msgid "Point of Sale Analysis"
-msgstr ""
+msgstr "POS Analiza"
 
 #. module: point_of_sale
 #: field:pos.make.payment,partner_id:0
@@ -2281,7 +2298,7 @@ msgstr ""
 #: field:pos.order,partner_id:0
 #: view:report.pos.order:0
 msgid "Customer"
-msgstr ""
+msgstr "Musterija"
 
 #. module: point_of_sale
 #: field:pos.make.payment,is_acc:0
@@ -2289,18 +2306,18 @@ msgstr ""
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Advance"
-msgstr ""
+msgstr "Napredno"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Danas    "
 
 #. module: point_of_sale
 #: field:pos.order,remboursed:0
@@ -2310,18 +2327,18 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
 msgid "Opened Sales"
-msgstr ""
+msgstr "Otvorene Prodaje"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
 msgid "Payments"
-msgstr "Isplate"
+msgstr "Placanja"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2340,12 +2357,12 @@ msgstr "Datum Stampe"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
 msgid "Sales by User Monthly margin"
-msgstr ""
+msgstr "Prodaja po korisniku Mesecna Marza"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Pretrazi Prodajne zahteve"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -2359,13 +2376,13 @@ msgstr "Sadrzaj Naloga"
 #: view:pos.order:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "Uradi placanje"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 #: view:pos.sales.user.today:0
 msgid "Sales User Today"
-msgstr ""
+msgstr "danasnji korisnik prodaje"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2373,7 +2390,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #~ msgid "Piece number"
 #~ msgstr "Br.Komada"
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 196a4c4f9cf..46bc3e92c41 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -244,7 +244,7 @@ class pos_order(osv.osv):
         'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
         'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
         'date_validity': fields.date('Validity Date', required=True),
-        'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the register. It could be a reliever, a student or an interim employee."),
+        'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
         'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
         'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_all, method=True, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 40e59e38f0b..167851986cb 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -67,9 +67,9 @@
                         <separator orientation="vertical"/>
                         <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
 	                    <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of register"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of register"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year from Creation date of register"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year from Creation date of cash register"/>
 	                </group>                                  
 	            </search>
 	        </field>
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index 059fd755d89..dcc9779a903 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -72,8 +72,8 @@ class pos_box_entries(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Description', size=32, required=True),
-        'journal_id': fields.selection(get_journal, 'Register', required=True),
-        'product_id': fields.selection(_get_income_product, 'Operation', required=True),
+        'journal_id': fields.selection(get_journal, "Cash Register", 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),
     }
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index a9f5da433fb..a05c5f579e1 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -50,8 +50,8 @@ class pos_box_out(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Description', size=32, required=True),
-        'journal_id': fields.selection(pos_box_entries.get_journal, 'Register', required=True),
-        'product_id': fields.selection(_get_expense_product, 'Operation', required=True),
+        'journal_id': fields.selection(pos_box_entries.get_journal, "Cash Register", 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),
     }
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index 02c82a3cf98..222338f6e10 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -45,27 +45,25 @@ class pos_close_statement(osv.osv_memory):
         ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)], context=context)
         for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
             if not ids:
-                raise osv.except_osv(_('Message'), _('Registers are already closed.'))
+                raise osv.except_osv(_('Message'), _('Cash registers are already closed.'))
             else:
                 if not journal.check_dtls:
                     statement_obj.button_confirm_cash(cr, uid, ids, context=context)
 
-        id2 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree')
-        id3 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2')
-        result = mod_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_confirm_cash_statement_filter')
-        search_id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-        if id2:
-            id2 = mod_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = mod_obj.browse(cr, uid, id3, context=context).res_id
+        tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'view_bank_statement_tree')
+        tree_id = tree_res and tree_res[1] or False
+        form_res = mod_obj.get_object_reference(cr, uid, 'account', 'view_bank_statement_form2')
+        form_id = form_res and form_res[1] or False
+        search_id = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_pos_confirm_cash_statement_filter')
+        
         return {
             'domain': "[('id', 'in', " + str(ids) + ")]",
             'name': 'Close Statements',
             'view_type': 'form',
             'view_mode': 'tree, form',
-            'search_view_id': search_id['res_id'],
+            'search_view_id': search_id and search_id[1] or False,
             'res_model': 'account.bank.statement',
-            'views': [(id2, 'tree'), (id3, 'form')],
+            'views': [(tree_id, 'tree'), (form_id, 'form')],
             'type': 'ir.actions.act_window'
         }
 
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index c1ee3dc13d4..7a9a5a0e23d 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -32,7 +32,7 @@
    	
    	
         <record id="action_pos_close_statement" model="ir.actions.act_window">
-            <field name="name">Close Register</field>
+            <field name="name">Close Cash Register</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.close.statement</field>
             <field name="view_type">form</field>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 9bbed850dfc..954f95070c8 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -49,7 +49,7 @@ class pos_open_statement(osv.osv_memory):
         for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
             if len(ids):
-                raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related Register.' %(journal.name)))
+                raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related cash register.' %(journal.name)))
 
             number = ''
             if journal.sequence_id:
@@ -65,23 +65,20 @@ class pos_open_statement(osv.osv_memory):
             statement_id = statement_obj.create(cr, uid, data, context=context)
             statement_obj.button_open(cr, uid, [statement_id], context)
 
-        id2 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree')
-        id3 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2')
-        result = mod_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter')
-        search_id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-        if id2:
-            id2 = mod_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = mod_obj.browse(cr, uid, id3, context=context).res_id
+        tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'view_bank_statement_tree')
+        tree_id = tree_res and tree_res[1] or False
+        form_res = mod_obj.get_object_reference(cr, uid, 'account', 'view_bank_statement_form2')
+        form_id = form_res and form_res[1] or False
+        search_id = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter')
 
         return {
             'domain': "[('state', '=', 'open'),('user_id', '=', "+ str(uid) +")]",
             'name': 'Open Statement',
             'view_type': 'form',
             'view_mode': 'tree, form',
-            'search_view_id': search_id['res_id'],
+            'search_view_id': search_id and search_id[1] or False ,
             'res_model': 'account.bank.statement',
-            'views': [(id2, 'tree'), (id3, 'form')],
+            'views': [(tree_id, 'tree'), (form_id, 'form')],
             'context': {'search_default_open': 1},
             'type': 'ir.actions.act_window'
         }
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 2b275d36d32..870d8f71e47 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -30,7 +30,7 @@
 			id="act_pos_open_statement"/>
 
         <record id="action_pos_open_statement" model="ir.actions.act_window">
-            <field name="name">Open Register</field>
+            <field name="name">Open Cash Register</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.open.statement</field>
             <field name="view_type">form</field>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index f0536ae0ac8..a6757be6b78 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -12,7 +12,7 @@
 			<form string="Add payment :">
 				<group colspan="6" col="6" >
 					<group colspan="3" >
-						<separator string="The register must be opened to be able to execute a payment."  />
+						<separator string="The cash register must be opened to be able to execute a payment."  />
 					</group>
 					<newline/>
 					<group colspan="6">
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 7a4ea638677..031d127768e 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-26 08:01+0000\n"
+"PO-Revision-Date: 2010-10-28 10:23+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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-10-27 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -136,6 +136,15 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
+"Заказ на снабжение создается в состоянии 'Черновик'.\n"
+" Если заказ на снабжение подтверждается, состояние устанавливается в "
+"'Подтверждено'.            \n"
+"После подтверждения состояние устанавливается в 'Исполнение'.\n"
+" Если с заказом случается исключительная ситуация, то состояние становится "
+"'Исключительная ситуация'.\n"
+" Когда иключительная ситуация разрешилась, состояние становится 'Готово'.\n"
+" Состояние 'Ожидание' устанавливается, когда снабжение ожидает завершения "
+"другого процесса."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -271,7 +280,7 @@ msgstr ""
 #. module: procurement
 #: view:make.procurement:0
 msgid "Ask New Products"
-msgstr ""
+msgstr "Спросить новые ТМЦ"
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index c12aadeef14..1c90566671b 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.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-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-21 11:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-28 07:33+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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-10-22 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -1577,7 +1577,7 @@ msgstr "Барааны нийлүүлэгчийн жагсаалтад урьт
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit Of Measure"
-msgstr "Анхны нь хэмжих нэгж"
+msgstr "Анхны хэмжих нэгж"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 3992fb4f2b0..fe451eedf5f 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-26 08:48+0000\n"
+"PO-Revision-Date: 2010-10-28 11:54+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -123,7 +123,7 @@ msgstr "Фиксированный"
 #: code:addons/product/pricelist.py:0
 #, python-format
 msgid "Warning !"
-msgstr "Внимание!"
+msgstr "Внимание !"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
@@ -138,7 +138,7 @@ msgstr "Каталог"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Base Prices"
-msgstr "Базовае цены"
+msgstr "Базовые цены"
 
 #. module: product
 #: field:product.pricelist.item,name:0
@@ -709,7 +709,7 @@ msgstr "Дополнительные"
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Срок поставки"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
@@ -867,7 +867,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr "Снабжение и местоположения"
+msgstr "Снабжение и места хранения"
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -1275,7 +1275,7 @@ msgstr "Версия каталога"
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr "Расходные"
+msgstr "Потребляемый"
 
 #. module: product
 #: help:product.price.type,currency_id:0
@@ -1536,7 +1536,7 @@ msgstr "Товарно-материальные ценности"
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
-msgstr "Прозвести"
+msgstr "Произвести"
 
 #. module: product
 #: selection:product.template,procure_method:0
@@ -1708,7 +1708,7 @@ msgstr "Характеристики"
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr "Может быть продан"
+msgstr "Можно продавать"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -2076,6 +2076,8 @@ msgid ""
 "products with infinite stock, or for use when you have no inventory "
 "management in the system."
 msgstr ""
+"Изменяет режим обработки закупок. Потребляемый - хранимые ТМЦ с бесконечным "
+"остатком, или для работы без модуля управления ТМЦ в системе."
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po
index 11bd8f39000..dbc3f719001 100644
--- a/addons/product_margin/i18n/ru.po
+++ b/addons/product_margin/i18n/ru.po
@@ -6,95 +6,119 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:34+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 11:08+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "Оборот"
+
 #. 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
+#: field:product.margin,from_date:0
 msgid "From"
 msgstr "От"
 
 #. module: product_margin
-#: help:product.product,sale_expected:0
-msgid ""
-"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnorder - Standard price"
 msgstr ""
 
 #. module: product_margin
-#: wizard_field:product.margins,init,to_date:0
+#: field:product.margin,to_date:0
 msgid "To"
 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
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
+
+#. module: product_margin
+#: selection:product.margin,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 "Отчетность"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_ и не должно содержать специальных "
+"символов !"
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Сумма произведения цены из каталога продаж и количества счетов заказчика"
 
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
 msgid "Avg. Unit Price"
-msgstr ""
+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 ""
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+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.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Paid"
 msgstr "Оплачено"
 
 #. module: product_margin
 #: help:product.product,sales_gap:0
-msgid "Excepted Sale - Turn Over"
-msgstr ""
+msgid "Expected Sale - Turn Over"
+msgstr "Ожидаемые продажи - оборот"
 
 #. module: product_margin
 #: field:product.product,sale_expected:0
 msgid "Expected Sale"
-msgstr ""
+msgstr "Ожидаемые продажи"
 
 #. module: product_margin
 #: view:product.product:0
@@ -104,7 +128,7 @@ msgstr "Стандартная цена"
 #. module: product_margin
 #: help:product.product,purchase_num_invoiced:0
 msgid "Sum of Quantity in Supplier Invoices"
-msgstr ""
+msgstr "Сумма количеств в счетах поставщика"
 
 #. module: product_margin
 #: help:product.product,normal_cost:0
@@ -112,9 +136,8 @@ msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
 msgstr ""
 
 #. module: product_margin
-#: view:product.product:0
-#: field:product.product,turnover:0
-msgid "Turnover"
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
 msgstr ""
 
 #. module: product_margin
@@ -127,27 +150,17 @@ msgstr ""
 #: view:product.product:0
 #: field:product.product,total_cost:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Общая стоимость"
 
 #. module: product_margin
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Неправильный XML для просмотра архитектуры!"
 
-#. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Excepted Sale - Normal Cost"
-msgstr ""
-
 #. module: product_margin
 #: field:product.product,expected_margin:0
 msgid "Expected Margin"
-msgstr ""
-
-#. module: product_margin
-#: help:product.product,total_margin:0
-msgid "Turnorder - Total Cost"
-msgstr ""
+msgstr "Ожидаемая наценка"
 
 #. module: product_margin
 #: view:product.product:0
@@ -171,21 +184,27 @@ msgid "Avg. Price in Customer Invoices)"
 msgstr ""
 
 #. module: product_margin
-#: wizard_view:product.margins,init:0
-msgid "Select "
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
-#: wizard_field:product.margins,init,invoice_state:0
+#: field:product.margin,invoice_state:0
 #: field:product.product,invoice_state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Состояние счета"
 
 #. module: product_margin
 #: help:product.product,purchase_gap:0
 msgid "Normal Cost - Total Cost"
 msgstr ""
 
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "Общая наценка"
+
 #. module: product_margin
 #: view:product.product:0
 #: field:product.product,sales_gap:0
@@ -208,8 +227,8 @@ msgid "Avg. Price in Supplier Invoices "
 msgstr ""
 
 #. module: product_margin
-#: field:product.product,total_margin:0
-msgid "Total Margin"
+#: view:product.margin:0
+msgid "Properties categories"
 msgstr ""
 
 #. module: product_margin
@@ -223,10 +242,10 @@ msgid "Analysis Criteria"
 msgstr ""
 
 #. module: product_margin
-#: selection:product.margins,init,invoice_state:0
+#: selection:product.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Open and Paid"
-msgstr ""
+msgstr "Открыто и Оплачено"
 
 #. module: product_margin
 #: view:product.product:0
@@ -234,11 +253,18 @@ msgid "Sales"
 msgstr "Продажи"
 
 #. module: product_margin
-#: model:ir.actions.wizard,name:product_margin.action_open_margin
+#: code:addons/product_margin/wizard/product_margin.py:0
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
 #: model:ir.ui.menu,name:product_margin.menu_action_product_margin
 #: view:product.product:0
+#, python-format
 msgid "Product Margins"
-msgstr ""
+msgstr "Наценки ТМЦ"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "General Information"
+msgstr "Общая информация"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
@@ -248,29 +274,32 @@ 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
+#: view:product.margin:0
 msgid "Open Margins"
 msgstr ""
 
 #. module: product_margin
-#: wizard_button:product.margins,init,end:0
+#: view:product.margin:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: product_margin
 #: view:product.product:0
 msgid "Margins"
-msgstr ""
+msgstr "Наценки"
 
 #. module: product_margin
 #: help:product.product,sale_num_invoiced:0
 msgid "Sum of Quantity in Customer Invoices"
-msgstr ""
+msgstr "Сумма количеств в счетах заказчика"
 
 #. module: product_margin
-#: wizard_view:product.margins,init:0
-msgid "View Stock of Products"
-msgstr ""
+#: model:ir.model,name:product_margin.model_product_margin
+msgid "Product Margin"
+msgstr "Наценка ТМЦ"
+
+#~ msgid "Reporting"
+#~ msgstr "Отчетность"
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 7e315b265a7..3f2d9bad868 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -35,7 +35,7 @@
             <field name="password">jth</field>
         </record>
         <record id="res_users_tester" model="res.users">
-            <field name="name">Alien</field>
+            <field name="name">Aline</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="login">apr</field>
             <field name="password">apr</field>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index db7bda3afe7..f0158631f51 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -14,7 +14,7 @@
                     <group col="2" colspan="2">
                     </group>
                     <group col="2" colspan="2">
-                        <button icon="gtk-close" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                         <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
                     </group>
                 </form>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index bac2f621f37..8a3aa3133f1 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -123,7 +123,7 @@ class project_task(osv.osv):
             </group>
             </search> '''
         if search_extended:
-            res['arch'] = res['arch'].replace('</search>',search_extended)
+            res['arch'] = unicode(res['arch'], 'utf8').replace('</search>', search_extended)
             attrs_sel = self.pool.get('project.gtd.context').name_search(cr, uid, '', [], context=context)
             context_id_info = self.pool.get('project.task').fields_get(cr, uid, ['context_id'])
             context_id_info['context_id']['selection'] = attrs_sel
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 6978f09c8f6..a9f220fd3c0 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -102,10 +102,10 @@
                                             help="Change Type"/>
                                         <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                                         <field name="state" invisible="context.get('set_visible',False)"/>
+                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-stop" help="For cancelling the task"/>
                                         <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="terp-camera_test" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                                         <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
-                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-stop" help="For cancelling the task"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index da455015d3c..3145979d7b0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -187,7 +187,7 @@ class purchase_order(osv.osv):
             help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
                 "will just have to validate this invoice for control.\n" \
                 "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \
-                "Manual: no invoice will be pre-generated. The accountant will have to encode manually."
+                "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
         ),
         'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True,store=True, string='Expected Date', type='date', help="This is computed as the minimum scheduled date of all purchase order lines' products."),
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
@@ -597,7 +597,7 @@ class purchase_order_line(osv.osv):
     _columns = {
         'name': fields.char('Description', size=256, required=True),
         'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
-        'date_planned': fields.date('Scheduled date', required=True),
+        'date_planned': fields.date('Scheduled Date', required=True),
         'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True),
@@ -616,7 +616,7 @@ class purchase_order_line(osv.osv):
                                        \n* The \'Cancelled\' state is set automatically when user cancel purchase order.'),
         'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
-        'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),
+        'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner", store=True),
         'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date")
 
     }
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index e9e20c952b2..18317f2cff1 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -144,10 +144,10 @@
                                 <button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
-                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-go-forward"/>
+                                <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
-        <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+								<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
 
                             </group>
                         </page>
@@ -307,12 +307,16 @@
                 <tree string="Purchase Order Lines">
                     <field name="order_id"/>
                     <field name="name"/>
-                    <field name="date_planned" widget="date" width="135"/>
+                    <field name="partner_id" string="Supplier" />
                     <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
                     <field name="price_unit"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom"/>                    
                     <field name="price_subtotal"/>
+                    <field name="date_planned"  widget="date" width="135"/>
+                    
+                   
+                    
                     <field name="state" invisible="1"/>
                     <field name="invoiced" invisible="1"/>
                 </tree>
@@ -369,10 +373,12 @@
                         <group>
                         <field name="order_id"/>
                         <field name="product_id"/>
-                        </group>
+                        <field name="partner_id"  string="Supplier"/>
+                        </group> 
                         <newline/>
                         <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'product_id'}" />
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
+                        <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
                          <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
@@ -401,7 +407,7 @@
             <field name="name">Purchase Lines Not Invoiced</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
-            <field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
+            <field name="domain">[('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index f5d1f7a3b42..f570f898f7c 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -70,7 +70,7 @@
                         string="Quotations"
                         name="quotes"
                         domain="[('state','=','draft')]"/>
-                <filter icon="terp-accessories-archiver"
+                <filter icon="terp-gtk-jump-to-rtl"
                         string="Orders"
                         name="orders"
                         domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
@@ -79,7 +79,7 @@
                 <field name="product_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
+                <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
                     <field name="user_id"/>
                     <field name="validator"/>
                     <separator orientation="vertical"/>
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index 421f9d3185e..f57ae82e51f 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -24,6 +24,7 @@ import ir
 from osv import osv
 from tools.translate import _
 
+
 class purchase_line_invoice(osv.osv_memory):
     
     """ To create invoice for purchase order line"""
@@ -31,7 +32,8 @@ class purchase_line_invoice(osv.osv_memory):
     _name = 'purchase.order.line_invoice'
     _description = 'Purchase Order Line Make Invoice'
     
-    def makeInvoices(self, cr, uid, ids, context):
+    def makeInvoices(self, cr, uid, ids, context=None):
+        
         """ 
              To get Purchase Order line and create Invoice
              @param self: The object pointer.
@@ -39,7 +41,11 @@ class purchase_line_invoice(osv.osv_memory):
              @param uid: ID of the user currently logged in
              @param context: A standard dictionary 
              @return : retrun view of Invoice
-        """                
+        """
+        
+        if context is None:
+            context={}
+                            
         record_ids =  context.get('active_ids',[])
         if record_ids:
             res = False
@@ -49,35 +55,63 @@ class purchase_line_invoice(osv.osv_memory):
             property_obj=self.pool.get('ir.property')
             account_fiscal_obj=self.pool.get('account.fiscal.position')
             invoice_line_obj=self.pool.get('account.invoice.line')
-
-            def make_invoice(order, lines):
-                a = order.partner_id.property_account_payable.id
-                if order.partner_id and order.partner_id.property_payment_term.id:
-                    pay_term = order.partner_id.property_payment_term.id
+            
+            
+            def multiple_order_invoice_name(orders):
+                name = "PO";
+                for order in orders:
+                    name += "-%d" % order.id
+                return name
+                
+            def multiple_order_invoice_reference(partner, orders):
+                reference = "P%dPO" % partner.id
+                for order in orders: 
+                    reference += "-%d" % order.id
+                return reference
+                
+            def multiple_order_invoice_notes(orders):
+                notes = ""
+                for order in orders:
+                    notes += "%s \n" % order.notes
+                return notes
+                
+                
+                
+            def make_invoice_by_partner(partner, orders, lines_ids):
+                """
+                    create a new invoice for one supplier
+                    @param partner : The object partner
+                    @param orders : The set of orders to add in the invoice
+                    @param lines : The list of line's id
+                """
+             
+                a = partner.property_account_payable.id
+                if partner and partner.property_payment_term.id:
+                    pay_term = partner.property_payment_term.id
                 else:
                     pay_term = False
                 inv = {
-                    'name': order.name,
-                    'origin': order.name,
+                    'name': multiple_order_invoice_name(orders),  
+                    'origin': multiple_order_invoice_name(orders),  
                     'type': 'in_invoice',
-                    'reference': "P%dPO%d" % (order.partner_id.id, order.id),
+                    'reference': multiple_order_invoice_reference(partner, orders),
                     'account_id': a,
-                    'partner_id': order.partner_id.id,
-                    'address_invoice_id': order.partner_address_id.id,
-                    'address_contact_id': order.partner_address_id.id,
-                    'invoice_line': [(6,0,lines)],
-                    'currency_id' : order.pricelist_id.currency_id.id,
-                    'comment': order.notes,
+                    'partner_id': partner.id,
+                    'address_invoice_id': orders[0].partner_address_id.id,
+                    'address_contact_id': orders[0].partner_address_id.id,
+                    'invoice_line': [(6,0,lines_ids)],
+                    'currency_id' : orders[0].pricelist_id.currency_id.id, 
+                    'comment': multiple_order_invoice_notes(orders),
                     'payment_term': pay_term,
-                    'fiscal_position': order.partner_id.property_account_position.id
+                    'fiscal_position': partner.property_account_position.id
                 }
                 inv_id = invoice_obj.create(cr, uid, inv)
                 return inv_id
 
             for line in purchase_line_obj.browse(cr,uid,record_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] = []
+                    if not line.partner_id.id in invoices:
+                        invoices[line.partner_id.id] = []
                     if line.product_id:
                         a = line.product_id.product_tmpl_id.property_account_expense.id
                         if not a:
@@ -102,18 +136,19 @@ class purchase_line_invoice(osv.osv_memory):
                         'uos_id': line.product_uom.id,
                         'product_id': line.product_id.id or False,
                         'invoice_line_tax_id': [(6, 0, [x.id for x in line.taxes_id])],
-                        'note': line.notes,
+                        'note': line.notes, 
                         'account_analytic_id': line.account_analytic_id and line.account_analytic_id.id or False,
                     })
                     cr.execute('insert into purchase_order_line_invoice_rel (order_line_id,invoice_id) values (%s,%s)', (line.id, inv_id))
                     purchase_line_obj.write(cr, uid, [line.id], {'invoiced': True})
-                    invoices[line.order_id.id].append((line,inv_id))
+                    invoices[line.partner_id.id].append((line,inv_id))
 
             res = []
             for result in invoices.values():
-                order = result[0][0].order_id
                 il = map(lambda x: x[1], result)
-                res.append(make_invoice(order, il))
+                orders = list(set(map(lambda x : x[0].order_id, result)))
+               
+                res.append(make_invoice_by_partner(orders[0].partner_id, orders, il))
 
         return {
             'domain': "[('id','in', ["+','.join(map(str,res))+"])]",
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 2a30c3789df..bb230348e51 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -122,7 +122,7 @@
                  <group col='10' colspan='4'>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
-                    <filter icon="terp-check" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <field name="name"/>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index 7ef262642e1..76d166fc070 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -12,7 +12,7 @@
                      <field name="open_action"/>
                     <separator string="" colspan="6"/>
                     <group colspan="6" col="4" >
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="do_action" type="object" string="_Ok" icon="gtk-ok" />
                     </group>
                 </form>
diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po
new file mode 100644
index 00000000000..d1ee9782887
--- /dev/null
+++ b/addons/resource/i18n/ru.po
@@ -0,0 +1,324 @@
+# Russian 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: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-28 10:44+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@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-10-29 05:29+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Пятница"
+
+#. module: resource
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Working Time"
+msgstr "Рабочее время"
+
+#. module: resource
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Четверг"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Объединять по..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Воскресенье"
+
+#. module: resource
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Period"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Понедельник"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Компания"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "День недели"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Пользователь"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Дата окончания"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr ""
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Среда"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+msgid "Working Period"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"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%."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Вторник"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "General Information"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Дата начала"
+
+#. module: resource
+#: code:addons/resource/resource.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (копия)"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Суббота"
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index eb10e56bf0f..8285fa4d234 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 07:19+0000\n"
+"PO-Revision-Date: 2010-10-28 20:44+0000\n"
 "Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.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-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -339,7 +339,7 @@ msgstr "Quantità"
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Delivery Order Only"
-msgstr "Solo consegna"
+msgstr "Solamente ordine di consegna"
 
 #. module: sale
 #: report:sale.order:0
@@ -1154,7 +1154,7 @@ msgstr "Fattura basata su Ordini di Vendita"
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Bolla di prelievo"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -1260,6 +1260,10 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
+"Di default, OpenERP è in grado di gestire un routing complesso per i "
+"prodotti del magazzino e dei punti di stoccaggio del partner. Questo "
+"configurerà i metodi più comuni e semplici per consegnare i prodotti al "
+"cliente, tramite un paio di operazioni dell'utente."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
@@ -1308,6 +1312,8 @@ msgstr ""
 msgid ""
 "You can generate invoices based on sales orders or based on shippings."
 msgstr ""
+"E' possibile generare fatture a partire dagli ordini di vendita o a partire "
+"dalle spedizioni."
 
 #. module: sale
 #: view:sale.order:0
@@ -1362,7 +1368,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "Bolla di prelievo & Ordine di consegna"
 
 #. module: sale
 #: constraint:ir.model:0
@@ -1390,7 +1396,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr "Politica di Spedizione standard"
+msgstr "Politica di spedizione di default"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1526,7 +1532,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sale Order"
-msgstr "Procedura per fornire un ordine di vendita"
+msgstr "Procedura per consegnare un ordine di vendita"
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1699,6 +1705,9 @@ msgid ""
 "soon as possible when one product is available or you wait that all products "
 "are available.."
 msgstr ""
+"La politica di consegna è utilizzata per stabilire se si vuole consegnare il "
+"prodotto non appena questo sia disponibile oppure aspettare che tutti i "
+"prodotti siano disponibili.."
 
 #. module: sale
 #: field:sale.order,origin:0
@@ -2003,7 +2012,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "Politica di consegna di default"
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 3cd78b357d0..454b0b19155 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-25 07:16+0000\n"
+"PO-Revision-Date: 2010-10-28 10:27+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -1412,7 +1412,7 @@ msgstr "Выполнено"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
 msgid "sale.installer"
-msgstr ""
+msgstr "sale.installer"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
@@ -1549,7 +1549,7 @@ msgstr "Cостояния"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -1965,7 +1965,7 @@ msgstr "Назначить"
 #. module: sale
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Правила не поддерживаются для объектов osv_memory !"
 
 #. module: sale
 #: field:sale.report,date:0
@@ -2117,7 +2117,7 @@ msgstr "Год"
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr ""
+msgstr "Счет основанный на доставках"
 
 #~ msgid "In progress"
 #~ msgstr "Выполняется"
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index c4cc59f7b9a..e69d841053b 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -71,7 +71,7 @@
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-sale"
+                    <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
                     <separator orientation="vertical"/>
@@ -102,7 +102,7 @@
                     <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
-                    <filter string="Analytic Account" icon="terp-folder-violet" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 97b5be91848..0e1632d9afc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -469,13 +469,14 @@ class sale_order(osv.osv):
                 inv_ids1.add(record.id)
         inv_ids = list(inv_ids1.difference(inv_ids))
 
-        result = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        result = {
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+        res_id = res and res[1] or False,
+
+        return {
             'name': 'Customer Invoices',
             'view_type': 'form',
             'view_mode': 'form',
-            'view_id': [res['res_id']],
+            'view_id': [res_id],
             'res_model': 'account.invoice',
             'context': "{'type':'out_invoice'}",
             'type': 'ir.actions.act_window',
@@ -483,7 +484,6 @@ class sale_order(osv.osv):
             'target': 'current',
             'res_id': inv_ids and inv_ids[0] or False,
         }
-        return result
 
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
         res = False
@@ -1220,8 +1220,8 @@ class sale_config_picking_policy(osv.osv_memory):
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
             if o.step == 'one':
                 md = self.pool.get('ir.model.data')
-                location_id = md._get_id(cr, uid, 'stock', 'stock_location_output')
-                location_id = md.browse(cr, uid, location_id, context=context).res_id
+                location_id = md.get_object_reference(cr, uid, 'stock', 'stock_location_output')
+                location_id = location_id and location_id[1] or False
                 self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
 
 sale_config_picking_policy()
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d6b1fd18449..5c3690504c2 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -210,7 +210,7 @@
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward" type="object"/>
+                                <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
@@ -425,7 +425,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
+                    <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1" help="Sale Order Lines ready to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
@@ -436,7 +436,7 @@
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -450,12 +450,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <filter icon="terp-check" string="To Do"
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do"
                         domain="[('state','=','confirmed')]"
                         name="sale order"
                         help="Confirmed sale order lines, not yet delivered"
                         />
-                    <filter icon="terp-check" string="Done"
+                    <filter icon="terp-dialog-close" string="Done"
                         domain="[('state','=','done')]"
                         name="sale_order_done"
                         help="Sale order lines done"
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 242d83c72ef..7dd9ddac8d1 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -44,6 +44,7 @@ class sale_make_invoice(osv.osv_memory):
     
     def make_invoices(self, cr, uid, ids, context={}):
         order_obj = self.pool.get('sale.order')
+        mod_obj = self.pool.get('ir.model.data')
         newinv = []
         data = self.read(cr, uid, ids)[0]
         order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_inv = data['invoice_date'])
@@ -54,11 +55,9 @@ class sale_make_invoice(osv.osv_memory):
         for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context):
             for i in o.invoice_ids:
                 newinv.append(i.id)
-         
-        mod_obj = self.pool.get('ir.model.data')
-        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         
-        id = mod_obj.read(cr, uid, result, ['res_id'])   
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_invoice_filter')
+
         return {
             'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
             'name': 'Invoices',
@@ -68,7 +67,7 @@ class sale_make_invoice(osv.osv_memory):
             'view_id': False,
             'context': "{'type': 'out_refund'}",
             'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']                
+            'search_view_id': res and res[1] or False                
         }
 
 sale_make_invoice()        
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index b60591b4fea..8623ba0b879 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -135,7 +135,8 @@ sale_advance_payment_inv()
 class sale_open_invoice(osv.osv_memory):
     _name = "sale.open.invoice"
     _description = "Sale Open Invoice"
-    def open_invoice(self, cr, uid, ids, context):
+
+    def open_invoice(self, cr, uid, ids, context=None):
 
         """
              To open invoice.
@@ -147,14 +148,15 @@ class sale_open_invoice(osv.osv_memory):
              @return:
 
         """
-
+        if context is None:
+            context = {}
         mod_obj = self.pool.get('ir.model.data')
         for advance_pay in self.browse(cr, uid, ids):
-            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-            form_id = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
-            form_res = mod_obj.browse(cr, uid, form_id, context=context).res_id
-            tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')
-            tree_res = mod_obj.browse(cr, uid, tree_id, context=context).res_id
+            form_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+            form_id = form_res and form_res[1] or False
+            tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
+            tree_id = tree_res and tree_res[1] or False
+
         return {
             'name': _('Advance Invoice'),
             'view_type': 'form',
@@ -162,11 +164,11 @@ class sale_open_invoice(osv.osv_memory):
             'res_model': 'account.invoice',
             'res_id': int(context['invoice_id'][0]),
             'view_id': False,
-            'views': [(form_res, 'form'), (tree_res, 'tree')],
+            'views': [(form_id, 'form'), (tree_id, 'tree')],
             'context': "{'type': 'out_invoice'}",
             'type': 'ir.actions.act_window',
          }
 
 sale_open_invoice()
 
-# 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/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml
index 8c0aaa05d8c..c25f6d91ba2 100644
--- a/addons/sale_margin/report/report_margin_view.xml
+++ b/addons/sale_margin/report/report_margin_view.xml
@@ -36,7 +36,7 @@
 						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
 						<separator orientation="vertical"/>
 						<filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                   		<filter string="Pro-forma" icon="terp-check" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
+                   		<filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
                    		<filter string="Current" icon="terp-check" domain="[('state', '=' ,'open')]" help="open Invoices"/>
 	                	<filter string="Done" icon="terp-dialog-close" domain="[('state','=','paid')]" help="Done Invoices"/>
                     </group>
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index b52bf09e858..b1b7c3c2cde 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -6,35 +6,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:15+0000\n"
-"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-28 20:35+0000\n"
+"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.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-09-29 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "LIFO"
-msgstr "LIFO"
+#: selection:stock.location,icon:0
+msgid "terp-rating-rated"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups_upload
+msgid "Stock ups upload"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
 msgstr "Definizione Punto di Stoccaggio collegato"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in a new pack"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
 msgstr "STOCK_SAVE"
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_15
-msgid "Sub Products"
-msgstr "Sotto prodotti"
+#: field:stock.move.split.lines,action:0
+msgid "Action"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no journal defined '\\n                                'on the "
+"product category: \"%s\" (id: %d)"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -47,10 +71,10 @@ msgid "Invalid model name in the action definition."
 msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: stock
-#: model:ir.module.module,shortdesc:stock.module_meta_information
-#: model:ir.ui.menu,name:stock.menu_stock_root
-msgid "Inventory Management"
-msgstr "Gestione dell'inventario"
+#: model:ir.actions.act_window,name:stock.action_stock_line_date
+#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
+msgid "Last Product Inventories"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -59,8 +83,8 @@ msgstr "STOCK_SORT_ASCENDING"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
-msgid "Revision"
-msgstr "Revisione"
+msgid "Revision Number"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -68,9 +92,29 @@ msgid "STOCK_MEDIA_FORWARD"
 msgstr "STOCK_MEDIA_FORWARD"
 
 #. module: stock
-#: rml:lot.location:0
-msgid "Total :"
-msgstr "Totale :"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
+"            product_qty = partial_data.get('product_qty',0.0)\n"
+"            move_product_qty[move.id] = product_qty\n"
+"            product_uom = partial_data.get('product_uom',False)\n"
+"            product_price = partial_data.get('product_price',0.0)\n"
+"            product_currency = partial_data.get('product_currency',False)\n"
+"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -78,76 +122,187 @@ msgid "STOCK_ZOOM_100"
 msgstr "STOCK_ZOOM_100"
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Outgoing Products delay"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:report.stock.inventory,product_qty:0
+#: field:report.stock.move,product_qty:0
+#: field:stock.inventory.line,product_qty:0
+#: field:stock.inventory.line.split,qty:0
+#: report:stock.inventory.move:0
+#: field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0
+#: field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0
+#: field:stock.move.split.lines,quantity:0
+#: field:stock.move.split.lines.exist,quantity:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0
+#: field:stock.report.tracklots,name:0
+#: field:stock.split.into,quantity:0
+#, python-format
+msgid "Quantity"
+msgstr "Quantità"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,day:0
+msgid "Day"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0
+#: field:stock.move.split,product_uom:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
 msgid "UoM"
 msgstr "Unità di Misura"
 
-#. module: stock
-#: model:ir.actions.wizard,name:stock.return_picking
-msgid "Return packing"
-msgstr "Rientro Merci"
-
 #. module: stock
 #: field:product.category,property_stock_journal:0
+#: view:report.stock.move:0
+#: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Registro Inventario"
 
 #. module: stock
-#: wizard_view:stock.fill_inventory,init:0
-msgid "Fill Inventory for specific location"
-msgstr "Inserimento Inventario per locazioni specifiche"
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_picking_list
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"outgoing stock moves will be posted in this account. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:0
+#, python-format
+msgid "You cannot delete any record!"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Punto di Stoccaggio Inventario"
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,origin:0
 #: view:stock.picking:0
-#: field:stock.picking.move.wizard,picking_id:0
-msgid "Packing list"
-msgstr "Documento di Trasporto (DDT)"
+#: field:stock.picking,origin:0
+msgid "Origin"
+msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-msgid "Amount"
-msgstr "Quantità"
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr "Configurazione"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Products Received"
-msgstr "Prodotti Ricevuti"
-
-#. 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 "Prodotti in entrata"
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
 
 #. module: stock
+#: view:stock.move:0
 #: field:stock.picking,name:0
-#: field:stock.tracking,serial:0
+#: view:stock.production.lot:0
 msgid "Reference"
 msgstr "Riferimento"
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,group:0
+#: help:stock.fill.inventory,set_stock_zero:0
+msgid ""
+"If checked, all product quantities will be set to zero to help ensure a real "
+"physical inventory is done"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Split lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
 msgstr "Gruppo per Partner"
 
 #. module: stock
-#: field:stock.picking,address_id:0
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Available'.\n"
+" When the picking is done the state is 'Done'.                               "
+"   \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_res_partner
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,partner_id:0
+#: view:stock.move:0
+#: field:stock.move,partner_id:0
+#: view:stock.picking:0
+#: field:stock.picking,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: stock
-#: help:product.product,track_incoming:0
-msgid "Force to use a Production Lot during receptions"
-msgstr "Forza l'uso dei lotti di produzione durante le ricezioni"
-
-#. module: stock
-#: field:stock.move,move_history_ids:0
-#: field:stock.move,move_history_ids2:0
-msgid "Move History"
-msgstr "Cronologia movimenti"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "No invoicing"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -157,67 +312,132 @@ msgid "Production lot"
 msgstr "Lotto di Produzione"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NEW"
-msgstr "STOCK_NEW"
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CANCEL"
-msgstr "STOCK_CANCEL"
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
 msgstr "Punto di Stoccaggio Interno"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT"
-msgstr "STOCK_PRINT"
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr "Conferma Inventario"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: field:report.stock.move,state:0
+#: view:stock.inventory:0
+#: field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0
+#: view:stock.move:0
+#: field:stock.move,state:0
+#: view:stock.picking:0
+#: field:stock.picking,state:0
+#: report:stock.picking.list:0
 msgid "State"
 msgstr "Stato"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-mail-forward"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
 msgstr "Valore Reale Magazzino"
 
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr "Scaffali (Y)"
+
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
 msgstr "UoM"
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
+#: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
 msgstr "Disponibile"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Make Parcel"
-msgstr "Crea Parcella"
+#: view:stock.picking:0
+#: field:stock.picking,min_date:0
+msgid "Expected Date"
+msgstr ""
 
 #. module: stock
-#: wizard_view:stock.partial_picking,end2:0
-msgid "Packing result"
-msgstr "Risultato imballaggio"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
+msgid "Outgoing Product"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
 msgstr "STOCK_QUIT"
 
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "No product in this location."
+msgstr ""
+
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
 msgstr "Punto di Stoccaggio in Uscita"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.split_into
+#: model:ir.model,name:stock.model_stock_split_into
+msgid "Split into"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_TOP"
@@ -234,58 +454,103 @@ msgid "terp-hr"
 msgstr "terp-hr"
 
 #. module: stock
+#: field:report.stock.inventory,location_type:0
 #: field:stock.location,usage:0
 msgid "Location Type"
 msgstr "Tipo di luogo"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-purchase"
-msgstr "terp-purchase"
+#: help:report.stock.move,type:0
+#: help:stock.picking,type:0
+msgid "Shipping type specify, goods coming in or going out."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_DND"
-msgstr "STOCK_DND"
+msgid "terp-stock_effects-object-colorize"
+msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "STOCK_DELETE"
+msgstr "STOCK_DELETE"
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
 msgid "["
 msgstr "["
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Products Sent"
-msgstr "Prodotti Spediti"
+#: help:stock.production.lot,stock_available:0
+msgid ""
+"Current quantity of products with this Production Lot Number available in "
+"company warehouses"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
+#: field:stock.picking,move_lines:0
 msgid "Internal Moves"
 msgstr "Movimentazioni interne"
 
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr ""
+
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
 msgstr "Confezionamento"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: report:stock.picking.list:0
 msgid "Order(Origin)"
 msgstr "Ordine(Origine)"
 
 #. module: stock
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
 msgid "Grand Total:"
 msgstr "Totale generale"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr ""
+
 #. module: stock
 #: view:stock.location:0
 #: field:stock.location,comment:0
@@ -293,24 +558,38 @@ msgid "Additional Information"
 msgstr "Informazioni Aggiuntive"
 
 #. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Customer Refund"
-msgstr "Resi da clienti"
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Reception"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FLOPPY"
 msgstr "STOCK_FLOPPY"
 
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr ""
+
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
 msgstr "Revisioni Lotto di Produzione"
 
 #. module: stock
-#: view:stock.location:0
-msgid "Stock location"
-msgstr "Punto di Stoccaggio"
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -319,9 +598,9 @@ msgid "Location Name"
 msgstr "Nome Punto di Stoccaggio"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNINDENT"
-msgstr "STOCK_UNINDENT"
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr "Inventario Assegnato"
 
 #. module: stock
 #: view:stock.move:0
@@ -330,21 +609,22 @@ msgid "Move Information"
 msgstr "Informazioni Spostamento"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Unreceived Products"
-msgstr "Prodotti non Ricevuti"
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr ""
 
 #. module: stock
-#: field:stock.inventory,state:0
-#: field:stock.move,state:0
-#: field:stock.picking,state:0
-msgid "Status"
-msgstr "Stato"
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_customers
-msgid "Customers"
-msgstr "Clienti"
+#: model:ir.actions.act_window,name:stock.action_tracking_form
+#: model:ir.model,name:stock.model_stock_tracking
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form
+#: view:stock.tracking:0
+msgid "Packs"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -352,25 +632,18 @@ msgid "STOCK_UNDERLINE"
 msgstr "STOCK_UNDERLINE"
 
 #. module: stock
-#: view:stock.picking.move.wizard:0
-msgid "Move Lines"
-msgstr "Movimenti"
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Vendite e Acquisti"
 
 #. module: stock
-#: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
-msgstr "Includere tutti i derivati per la locazione"
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Bad Lot Assignation !"
+#: selection:report.stock.move,month:0
+msgid "June"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You are moving %.2f products but only %.2f available in this lot."
+#: selection:stock.location,icon:0
+msgid "terp-folder-blue"
 msgstr ""
 
 #. module: stock
@@ -381,29 +654,61 @@ msgstr "Punto di Approvvigionamento"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: field:stock.inventory.line.split,line_exist_ids:0
+#: field:stock.inventory.line.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0
+#: field:stock.move.split,line_ids:0
 msgid "Production Lots"
 msgstr "Lotti di Produzione"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "terp-project"
+msgstr "terp-project"
+
+#. module: stock
+#: report:stock.picking.list:0
 msgid "Recipient"
 msgstr "Destinatario"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.track_line
-msgid "Track line"
-msgstr "Linea Tracciabilità"
+#: model:ir.actions.act_window,name:stock.action_location_tree
+#: model:ir.ui.menu,name:stock.menu_action_location_tree
+msgid "Location Structure"
+msgstr ""
 
 #. module: stock
-#: field:stock.location,child_ids:0
-msgid "Contains"
-msgstr "Contiene"
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_BOLD"
 msgstr "STOCK_BOLD"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-personal+"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+msgid ""
+"When doing real-time inventory valuation, this is the Accounting Journal in "
+"which entries will be automatically posted when stock moves are processed."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
@@ -411,19 +716,35 @@ msgstr "terp-graph"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_PREFERENCES"
-msgstr "STOCK_PREFERENCES"
+msgid "STOCK_FIND_AND_REPLACE"
+msgstr "STOCK_FIND_AND_REPLACE"
 
 #. module: stock
-#: rml:lot.location:0
-#: field:stock.inventory.line,product_qty:0
-#: field:stock.move,product_qty:0
-#: rml:stock.picking.list:0
-#: field:stock.report.prodlots,name:0
-msgid "Quantity"
-msgstr "Quantità"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Receptions"
+msgstr ""
 
 #. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+msgid ""
+"Check this option to select existing lots in the list below, otherwise you "
+"should enter new ones line by line."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-dialog-close"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Now"
 msgstr "Elaborazione immediata"
@@ -433,6 +754,12 @@ msgstr "Elaborazione immediata"
 msgid "Location Address"
 msgstr "Indirizzo Punto di Stoccaggio"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is consumed with"
+msgstr ""
+
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
@@ -440,11 +767,6 @@ msgstr ""
 "Il lotto di produzione viene utilizzato per inserire un nuomero di serie "
 "nella produzione"
 
-#. module: stock
-#: model:stock.location,name:stock.stock_location_13
-msgid "Stock Level 1"
-msgstr "Magazzino Livello 1"
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_REWIND"
@@ -456,14 +778,24 @@ msgid "Location Input"
 msgstr "Punto di Stoccaggio in Ingresso"
 
 #. module: stock
-#: view:res.partner:0
-msgid "Stock Properties"
-msgstr "Proprietà Stock"
+#: selection:stock.location,icon:0
+msgid "terp-personal-"
+msgstr ""
 
 #. module: stock
-#: wizard_button:stock.partial_picking,init,split:0
-msgid "Make Picking"
-msgstr "Crea Presa"
+#: selection:stock.location,icon:0
+msgid "STOCK_CUT"
+msgstr "STOCK_CUT"
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -476,80 +808,140 @@ msgid "IT Suppliers"
 msgstr "Fornitori IT"
 
 #. 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 "Movimenti Bozza"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
 
 #. module: stock
-#: field:report.stock.lines.date,product_id:0
-msgid "Product Id"
-msgstr "Codice di identifizione di prodotto"
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_NEW"
+msgstr "STOCK_NEW"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split ' \\n               "
+"                     'for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree4
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
+#: view:stock.picking:0
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Scrap"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr "Contiene"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-dolar"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Incoming Products Delay"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr "Prezzo unitario"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines_exist
+msgid "Exist Split lines"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-jump-to-ltr"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_variation:0
+msgid "Stock Variation Account"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Bad Lot Assignation !"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,location_id:0
+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 ""
 
 #. module: stock
 #: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Vendite e Acquisti"
-
-#. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Customer Invoice"
-msgstr "Fattura cliente"
-
-#. module: stock
-#: field:product.template,property_stock_inventory:0
-msgid "Inventory Location"
-msgstr "Punto di Stoccaggio Inventario"
-
-#. module: stock
-#: help:product.product,track_production:0
-msgid "Force to use a Production Lot during production order"
-msgstr "Forzare l'uso dei Lotti di Produzione durante l'ordine di produzione"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CUT"
-msgstr "STOCK_CUT"
-
-#. module: stock
-#: help:product.template,property_stock_inventory:0
-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"
+msgid "Inventory Properties"
 msgstr ""
-"Per questo prodotto (modello), questo Punto di Stoccaggio verrà utilizzato "
-"(al posto di quello predefinito), come Punto di Stoccaggio di provenienza "
-"per gli spostamenti di magazzino generati dalle operazioni di inventario"
 
 #. module: stock
-#: help:product.category,property_stock_account_output_categ:0
-msgid "This account will be used to value the output stock"
-msgstr "Questo conto verrà utilizzato per valorizzare lo stock in uscita"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_FIT"
-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"
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
 msgstr ""
-"Questo giornale verrà utilizzato i movimenti contabili generati dalle "
-"movimentazioni di magazzino"
-
-#. 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 "Calendario delle Spedizioni"
-
-#. module: stock
-#: field:product.product,track_incoming:0
-msgid "Track Incomming Lots"
-msgstr "Tracciabilità Lotti in arrivo"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -562,9 +954,27 @@ msgid "STOCK_SAVE_AS"
 msgstr "STOCK_SAVE_AS"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_prodlots
-msgid "Stock report by production lots"
-msgstr "Stampa Magazzino da Lotti di Produzione"
+#: view:report.stock.move:0
+msgid "Month-1"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_symbol-selection"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr ""
+
+#. module: stock
+#: help:stock.location,posx:0
+#: help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -572,6 +982,7 @@ msgid "Virtual Stock"
 msgstr "Magazzino Virtuale"
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "View"
 msgstr "Vista"
@@ -586,37 +997,35 @@ msgstr "STOCK_DIALOG_ERROR"
 msgid "Left Parent"
 msgstr "Genitore sinistro"
 
-#. module: stock
-#: field:report.stock.lines.date,create_date:0
-msgid "Latest Date of Inventory"
-msgstr "Ultima Data di Inventario"
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDEX"
 msgstr "Indice del magazzino"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stage"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_BOTTOM"
 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 "Nuova Ricezione Merci"
-
-#. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: field:stock.move.track,quantity:0
 msgid "Quantity per lot"
 msgstr "Quantità per Lotto"
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 #: model:ir.actions.act_window,name:stock.action_move_form2
 #: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
 msgid "Stock Moves"
 msgstr "Movimenti di Magazzino"
 
@@ -626,9 +1035,57 @@ msgid "Production Location"
 msgstr "Luogo di Produzione"
 
 #. module: stock
-#: field:stock.move,tracking_id:0
-msgid "Tracking Lot"
-msgstr "Tracciabilità Lotto"
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+msgstr ""
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"location consumes the raw material and produces finished products\n"
+"                      "
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -645,11 +1102,23 @@ msgstr "Autore"
 msgid "STOCK_UNDELETE"
 msgstr "STOCK_UNDELETE"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Delivery Order"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EXECUTE"
 msgstr "STOCK_EXECUTE"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "No invoice were created"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_QUESTION"
@@ -660,53 +1129,102 @@ msgstr "STOCK_DIALOG_QUESTION"
 msgid "Manual Operation"
 msgstr "Operazione Manuale"
 
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Supplier"
+msgstr ""
+
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
 msgstr "Data Fine"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: report:stock.picking.list:0
 msgid "Expected Shipping Date"
 msgstr "Data di spedizione stimata"
 
 #. module: stock
-#: rml:stock.picking.list:0
-msgid "Shipping Address :"
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver-minus"
 msgstr ""
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Tracking/Serial"
-msgstr "Tracciabilità/Numero di Serie"
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
+#: model:ir.model,name:stock.model_stock_inventory_line_split
+#: view:stock.inventory:0
+#: view:stock.inventory.line:0
+msgid "Split inventory lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_FONT"
 msgstr "STOCK_SELECT_FONT"
 
+#. module: stock
+#: help:stock.location,chained_company_id:0
+msgid ""
+"The company the Picking List containing the chained move will belong to "
+"(leave empty to use the default company determination rules"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PASTE"
 msgstr "STOCK_PASTE"
 
+#. module: stock
+#: view:stock.move.split:0
+msgid "Lot number"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "Punto di Stoccaggio del Partner"
+msgstr "Punti di Stoccaggio del Partner"
 
 #. module: stock
-#: help:stock.move,tracking_id:0
+#: code:addons/stock/stock.py:0
+#, python-format
 msgid ""
-"Tracking lot is the code that will be put on the logistical unit/pallet"
+"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
+"                product_qty = partial_data.get('product_qty',0.0)\n"
+"                move_product_qty[move.id] = product_qty\n"
+"                product_uom = partial_data.get('product_uom',False)\n"
+"                product_price = partial_data.get('product_price',0.0)\n"
+"                product_currency = "
+"partial_data.get('product_currency',False)\n"
+"                prodlot_id = partial_data.get('prodlot_id"
 msgstr ""
-"Tracciabilità lotto è il codice che sarà applicato alle confezioni/pallet in "
-"spedizione"
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Tracking Number"
-msgstr "Codice Tracciabilità"
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_ZOOM_FIT"
+msgstr "STOCK_ZOOM_FIT"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -714,42 +1232,148 @@ msgid "European Customers"
 msgstr "Clienti Europei"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock"
-msgstr "terp-stock"
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
+msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "terp-calendar"
+msgstr "terp-calendar"
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import current product inventory from the following location"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select a chained location type.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
 msgid "Packing List:"
 msgstr "Lista Prelievo:"
 
+#. module: stock
+#: help:product.template,property_stock_production:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by production "
+"orders"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is in draft state."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined ' \\n                               "
+"             'for this product: \"%s\" (id: %d)"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_RECORD"
 msgstr "STOCK_MEDIA_RECORD"
 
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0
+#: view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0
+#: view:stock.location.product:0
+#: view:stock.move:0
+#: view:stock.move.track:0
+#: view:stock.picking:0
+#: view:stock.split.into:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Ready"
+msgstr ""
+
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
 msgstr "Panoramica del calendario"
 
 #. module: stock
-#: wizard_field:stock.location.products,init,from_date:0
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr ""
+
+#. module: stock
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_YES"
+msgstr "STOCK_YES"
+
+#. module: stock
+#: field:stock.location.product,from_date:0
 msgid "From"
 msgstr "Da"
 
 #. module: stock
-#: rml:stock.picking.list:0
-msgid "weight"
-msgstr "peso"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "Non Assigned Products:"
-msgstr "Prodotti non assegnati"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
+#: field:stock.picking,invoice_state:0
 msgid "Invoice Control"
 msgstr "Controllo Fatturazione"
 
@@ -760,28 +1384,34 @@ msgstr "Revisioni Lotti di Produzione"
 
 #. module: stock
 #: view:stock.picking:0
-msgid "Packing Done"
-msgstr "Imballaggio completato"
+msgid "Internal Picking List"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Waiting"
 msgstr "In attesa"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree2
-#: model:ir.actions.act_window,name:stock.action_picking_tree7
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
-#: model:ir.ui.menu,name:stock.menu_picking_waiting
-msgid "Available Packing"
-msgstr "Imballaggio disponibile"
+#: view:stock.move:0
+#: selection:stock.move.split.lines,action:0
+#: view:stock.picking:0
+msgid "Split"
+msgstr "Dividi"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_warehouse
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Magazzino"
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Company is not specified in Location"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -789,7 +1419,8 @@ msgid "terp-report"
 msgstr "terp-report"
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,type:0
+#: view:report.stock.move:0
+#: field:stock.partial.move,type:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -798,21 +1429,34 @@ msgstr "Tipo"
 msgid "Generic IT Suppliers"
 msgstr "Fornitori IT generici"
 
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview_all
-msgid "Location Content (With children)"
-msgstr "Contenuto Locazione (Con figli)"
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FILE"
 msgstr "STOCK_FILE"
 
+#. module: stock
+#: field:stock.inventory,date:0
+#: field:stock.move,create_date:0
+#: field:stock.production.lot,date:0
+#: field:stock.tracking,date:0
+msgid "Creation Date"
+msgstr ""
+
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
 msgstr "Id linea inventario"
 
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gdu-smart-failing"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EDIT"
@@ -824,9 +1468,8 @@ msgid "STOCK_CONNECT"
 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
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
 msgid "Packing"
 msgstr "Imballaggio"
 
@@ -836,6 +1479,7 @@ msgid "STOCK_GO_DOWN"
 msgstr "STOCK_GO_DOWN"
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
@@ -847,10 +1491,20 @@ msgid "STOCK_OK"
 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 "Nuovo Imballaggio interno"
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-emblem-important"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement
+msgid "Stock Replacement"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
@@ -858,21 +1512,32 @@ msgid "General Informations"
 msgstr "Informazioni Generali"
 
 #. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Nessuno"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per Visualizzazione Architettura!"
 
 #. 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
+#: view:stock.tracking:0
 msgid "Downstream traceability"
 msgstr "Tracciabilità verso il basso"
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_14
-msgid "Finished products"
-msgstr "Prodotti finiti"
+#: model:stock.location,name:stock.stock_location_company
+msgid "OpenERP S.A."
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+#: field:stock.picking,date:0
+msgid "Order Date"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,location_id:0
@@ -880,58 +1545,142 @@ msgid "Parent Location"
 msgstr "Punto di Stoccaggio Superiore"
 
 #. module: stock
-#: field:stock.inventory,date:0
-msgid "Date create"
-msgstr "Data Creazione"
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* Done: has been processed, can't be modified or cancelled anymore\n"
+"* Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
 
 #. module: stock
-#: wizard_button:inventory.merge.stock.zero,init,merge:0
-msgid "Set to Zero"
-msgstr "Imposta a Zero"
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-msgid "All Stock Moves"
-msgstr "Movimenti di tutti i magazzini"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr ""
 
 #. module: stock
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Cannot deliver products which are already delivered !"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_UNINDENT"
+msgstr "STOCK_UNINDENT"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-face-plain"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
 msgstr "Punto di Stoccaggio Fornitore"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_FIND"
+msgstr "STOCK_FIND"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Partial"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HELP"
 msgstr "STOCK_HELP"
 
 #. module: stock
-#: selection:stock.move,priority:0
-msgid "Urgent"
-msgstr "Urgente"
+#: help:stock.picking,backorder_id:0
+msgid ""
+"If this picking was split this field links to the picking that contains the "
+"other part that has been processed already."
+msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_account_input_categ:0
-msgid "This account will be used to value the input stock"
-msgstr "Questo conto verrà utilizzato per valorizzare lo stock in ingresso"
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"Variation Account is not specified for Product Category: %s' % "
+"(product_obj.categ_id.name)))\n"
+"        move_ids = []\n"
+"        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_INFO"
-msgstr "STOCK_DIALOG_INFO"
+msgid "STOCK_UNDO"
+msgstr "STOCK_UNDO"
 
 #. module: stock
-#: field:stock.move,date:0
-#: field:stock.tracking,date:0
-msgid "Date Created"
-msgstr "Data creazione"
+#: selection:stock.location,icon:0
+msgid "terp-gnome-cpu-frequency-applet+"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
 msgstr "Spedizione Merci"
@@ -941,53 +1690,135 @@ msgstr "Spedizione Merci"
 msgid "Cancel Availability"
 msgstr "Cancella Disponibilità"
 
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-media-pause"
+msgstr ""
+
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
 msgstr "Movimenti creati"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_format-scientific"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_BACK"
 msgstr "STOCK_GO_BACK"
 
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
 msgstr "Da Fatturare"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_PRINT"
+msgstr "STOCK_PRINT"
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-today"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined ' \\n                                "
+"            'for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
 msgstr "Proprietà Locazioni Counter-Part"
 
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Split in lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_FILL"
 msgstr "STOCK_JUSTIFY_FILL"
 
 #. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0
+#: view:stock.inventory:0
+#: report:stock.inventory.move:0
 #: view:stock.move:0
-#: field:stock.move,date_planned:0
+#: field:stock.move,date:0
+#: field:stock.partial.move,date:0
+#: field:stock.partial.picking,date:0
+#: view:stock.picking:0
 msgid "Date"
 msgstr "Data"
 
 #. module: stock
-#: view:product.product:0
-msgid "Stocks"
-msgstr "Magazzini"
-
-#. module: stock
-#: field:stock.location,allocation_method:0
-msgid "Allocation Method"
-msgstr "Metodo di Allocazione"
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-administration"
 msgstr "terp-administration"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CANCEL"
+msgstr "STOCK_CANCEL"
+
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
@@ -999,21 +1830,25 @@ msgid "STOCK_APPLY"
 msgstr "STOCK_APPLY"
 
 #. module: stock
-#: wizard_view:stock.partial_picking,end2:0
-msgid "The packing has been successfully made !"
-msgstr "L'imballaggio è stato creato con successo !"
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Merging is only allowed on draft inventories."
+msgstr ""
 
 #. module: stock
-#: field:stock.move,address_id:0
-#: field:stock.picking.move.wizard,address_id:0
-msgid "Dest. Address"
-msgstr "Indirizzo di Destinazione"
+#: selection:stock.location,icon:0
+msgid "terp-gtk-go-back-rtl"
+msgstr ""
 
 #. 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 "Inventario periodico"
+#: model:ir.ui.menu,name:stock.menu_dashboard_stock
+msgid "Dashboard"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_track
+msgid "Track moves"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1026,39 +1861,65 @@ msgid "STOCK_STRIKETHROUGH"
 msgstr "STOCK_STRIKETHROUGH"
 
 #. module: stock
-#: rml:lot.stock.overview_all:0
 #: field:stock.incoterms,code:0
 msgid "Code"
 msgstr "Codice"
 
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+msgid "Warehouse Dashboard"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "terp-partner"
-msgstr "terp-partner"
+msgid "terp-mail-"
+msgstr ""
 
 #. 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 "Imposta inventari periodici"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr ""
 
 #. module: stock
-#: wizard_button:inventory.merge,init,end:0
-#: wizard_button:inventory.merge.stock.zero,init,end:0
-#: wizard_button:stock.fill_inventory,init,end:0
-#: wizard_button:stock.invoice_onshipping,init,end:0
-#: wizard_button:stock.location.products,init,end:0
+#: model:ir.model,name:stock.model_stock_move_scrap
 #: view:stock.move:0
-#: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
-#: wizard_button:stock.partial_picking,init,end:0
+#: view:stock.move.scrap:0
+#: view:stock.picking:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_PREFERENCES"
+msgstr "STOCK_PREFERENCES"
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
 #: view:stock.picking:0
-#: wizard_button:stock.picking.make,init,end:0
-#: view:stock.picking.move.wizard:0
-#: wizard_button:stock.return.picking,init,end:0
 msgid "Cancel"
 msgstr "Annulla"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking
+#: model:ir.model,name:stock.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+msgid "Inventory (with child locations)"
+msgstr ""
+
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
@@ -1066,18 +1927,26 @@ msgid "Split in production lots"
 msgstr "Dividi in Lotti di Produzione"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_inventory
-#: field:stock.inventory,name:0
-#: field:stock.inventory.line,inventory_id:0
-#: selection:stock.location,usage:0
-msgid "Inventory"
-msgstr "Inventario"
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
 msgstr "Informazioni"
 
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MISSING_IMAGE"
@@ -1085,22 +1954,32 @@ msgstr "STOCK_MISSING_IMAGE"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_SPELL_CHECK"
-msgstr "STOCK_SPELL_CHECK"
+msgid "STOCK_REMOVE"
+msgstr "STOCK_REMOVE"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_tracking
-msgid "Stock Tracking Lots"
-msgstr "Tracciabilità Lotti"
+#: selection:stock.location,icon:0
+msgid "terp-call-start"
+msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-#: field:stock.move,price_unit:0
-msgid "Unit Price"
-msgstr "Prezzo unitario"
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr ""
 
 #. module: stock
+#: view:product.product:0
+#: field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Later"
 msgstr "Elabora successivamente"
@@ -1115,6 +1994,11 @@ msgstr ""
 "come Punto di Stoccaggio di provenienza per beni provenienti dal Partner "
 "attuale"
 
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not from Picking"
+msgstr ""
+
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
@@ -1126,15 +2010,54 @@ msgid "Right Parent"
 msgstr "Genitore destro"
 
 #. module: stock
-#: field:stock.picking,origin:0
-msgid "Origin Reference"
-msgstr "Riferimento dell'origine"
+#: selection:stock.location,icon:0
+msgid "STOCK_JUSTIFY_LEFT"
+msgstr "STOCK_JUSTIFY_LEFT"
 
 #. 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 "Movimenti disponibili"
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1142,269 +2065,23 @@ msgid "STOCK_HARDDISK"
 msgstr "STOCK_HARDDISK"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_relate_picking
-msgid "Related Picking"
-msgstr "Selezione collegata"
+#: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
+#: model:ir.model,name:stock.model_stock_fill_inventory
+#: view:stock.fill.inventory:0
+msgid "Import Inventory"
+msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
 #: field:stock.move,name:0
-#: field:stock.picking.move.wizard,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Nome"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Stock Inventory Lines"
-msgstr "Righe inventario di magazzino"
-
-#. module: stock
-#: wizard_button:stock.location.products,init,open:0
-msgid "Open Products"
-msgstr "Prodotti Aperti"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "]"
-msgstr "]"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Input Packing List"
-msgstr "Bolla Merci in Entrata"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_picking
-#: field:stock.move,picking_id:0
-msgid "Packing List"
-msgstr "Lista Imballaggi"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COPY"
-msgstr "STOCK_COPY"
-
-#. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Supplier Refund"
-msgstr "Rimborso Fornitore"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move
-msgid "Stock Move"
-msgstr "Movimento di magazzino"
-
-#. module: stock
-#: field:product.category,property_stock_account_output_categ:0
-#: field:product.template,property_stock_account_output:0
-msgid "Stock Output Account"
-msgstr "Contabilità Stock in Uscita"
-
-#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic No Step Added"
-msgstr "Automatic No Step Added"
-
-#. module: stock
-#: wizard_view:stock.location.products,init:0
-msgid "Stock Location Analysis"
-msgstr "Analisi Locazione Magazzini"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CDROM"
-msgstr "STOCK_CDROM"
-
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Not from Packing"
-msgstr "Non da Merci"
-
-#. module: stock
-#: view:stock.location:0
-msgid "Chained Locations"
-msgstr "Punti di Stoccaggio Collegati"
-
-#. module: stock
-#: model:stock.location,name:stock.location_inventory
-msgid "Inventory loss"
-msgstr "Perdita di Inventario"
-
-#. module: stock
-#: field:stock.production.lot,ref:0
-msgid "Internal Ref"
-msgstr "Rif. interno"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REFRESH"
-msgstr "STOCK_REFRESH"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STOP"
-msgstr "STOCK_STOP"
-
-#. module: stock
-#: wizard_view:stock.move.track,init:0
-msgid "Tracking a move"
-msgstr "Tracciare uno spostamento"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND_AND_REPLACE"
-msgstr "STOCK_FIND_AND_REPLACE"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Validate"
-msgstr "Convalida"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_WARNING"
-msgstr "STOCK_DIALOG_WARNING"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_IN"
-msgstr "STOCK_ZOOM_IN"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONVERT"
-msgstr "STOCK_CONVERT"
-
-#. module: stock
-#: field:stock.move,note:0
-#: view:stock.picking:0
-#: field:stock.picking,note:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: stock
-#: field:stock.picking,move_lines:0
-#: field:stock.picking.move.wizard,move_ids:0
-msgid "Move lines"
-msgstr "Righe movimenti"
-
-#. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-msgid "Value"
-msgstr "Valore"
-
-#. module: stock
-#: field:stock.picking,type:0
-msgid "Shipping Type"
-msgstr "Tipo Spedizione"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_location_open
-msgid "Products"
-msgstr "Prodotti"
-
-#. module: stock
-#: field:stock.picking,move_type:0
-msgid "Delivery Method"
-msgstr "Metodo di Consegna"
-
-#. module: stock
-#: model:ir.actions.wizard,name:stock.partial_picking
-msgid "Partial packing"
-msgstr "Imballaggio parziale"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-calendar"
-msgstr "terp-calendar"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_YES"
-msgstr "STOCK_YES"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
-msgid "Fill From Unreceived Products"
-msgstr "Prodotti non ricevuti"
-
-#. module: stock
-#: field:stock.move,move_dest_id:0
-msgid "Dest. Move"
-msgstr "Destinazione Spostamento"
-
-#. 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 "Nuovo Inventario Periodico"
-
-#. module: stock
-#: field:stock.production.lot,revisions:0
-msgid "Revisions"
-msgstr "Revisioni"
-
-#. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "FIFO"
-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 "Ordini di Consegna da Processare"
-
-#. module: stock
-#: field:stock.move,priority:0
-msgid "Priority"
-msgstr "Priorità"
-
-#. module: stock
-#: wizard_field:inventory.merge.stock.zero,init,location_id:0
-#: model:ir.model,name:stock.model_stock_location
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-#: wizard_field:stock.fill_inventory,init,location_id:0
-#: field:stock.inventory.line,location_id:0
-#: field:stock.picking,location_id:0
-#: rml:stock.picking.list:0
-#: field:stock.report.prodlots,location_id:0
-msgid "Location"
-msgstr "Punto di Stoccaggio"
-
-#. module: stock
-#: field:stock.picking,invoice_state:0
-msgid "Invoice Status"
-msgstr "Stato Fattura"
-
-#. module: stock
-#: rml:lot.location:0
-msgid "Units"
-msgstr "Unità"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_LEFT"
-msgstr "STOCK_JUSTIFY_LEFT"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Cancel Inventory"
-msgstr "Annulla Inventario"
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_product_history
-msgid "Future Stock Forecast"
-msgstr "Previsione del magazzino"
+#: view:product.product:0
+msgid "Stocks"
+msgstr "Magazzini"
 
 #. module: stock
 #: model:ir.module.module,description:stock.module_meta_information
@@ -1421,22 +2098,518 @@ msgid ""
 "* Bar code supported\n"
 "* Rapid detection of mistakes through double entry system\n"
 "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+"* Dashboard for warehouse that includes:\n"
+"    * Products to receive in delay (date < = today)\n"
+"    * Procurement in exception\n"
+"    * Graph : Number of Receive products vs planned (bar graph on week par "
+"day)\n"
+"    * Graph : Number of Delivery products vs planned (bar graph on week par "
+"day)\n"
 "    "
 msgstr ""
-"Il modulo di OpenERP che gestisce l'inventario può amministrare più "
-"magazzini e strutture di stoccaggio multiple e complesse.\n"
-"Grazie alla gestione con doppio accesso, il controllo sull'inventario è "
-"potente e flessibile:\n"
-"* Storia e pianificazione dei movimenti\n"
-"* Svariati metodi di inventariamento (FIFO, LIFO, ...)\n"
-"* Stima del magazzino (prezzo standard o medio, ...)\n"
-"* Robustezza di fronte a divergenze dell'inventario\n"
-"* Norme di riordino automatico (livelli del magazzino, JIT, ...)\n"
-"* Supporto dei codici a barre\n"
-"* Rivelazione rapida degli errori grazie al sistema di accesso doppio\n"
-"* Tracciabilità (upstream/downstream, lotti di produzione, numeri di serie, "
-"...)\n"
-"    "
+
+#. module: stock
+#: help:product.template,property_stock_inventory:0
+msgid ""
+"For the current product, 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 ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-locked"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "]"
+msgstr "]"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-personal"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+msgid ""
+"Inventory Journal in which the chained move will be written, if the Chaining "
+"Type is not Transparent (no journal is used if left empty)"
+msgstr ""
+
+#. module: stock
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
+msgid "Incoming Product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Cost"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_COPY"
+msgstr "STOCK_COPY"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
+#: model:ir.ui.menu,name:stock.menu_warehouse_config
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimento di magazzino"
+
+#. module: stock
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr "Contabilità Stock in Uscita"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr "Automatic No Step Added"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Product "
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr "Analisi Locazione Magazzini"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CDROM"
+msgstr "STOCK_CDROM"
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr "Punti di Stoccaggio Collegati"
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr "Perdita di Inventario"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_REFRESH"
+msgstr "STOCK_REFRESH"
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_production:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"generated by a Manufacturing Order"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_STOP"
+msgstr "STOCK_STOP"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line_old
+#: view:stock.move.track:0
+msgid "Tracking a move"
+msgstr "Tracciare uno spostamento"
+
+#. module: stock
+#: view:product.product:0
+msgid "Update"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_journal_form
+#: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
+msgid "Stock Journals"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-go-back-ltr"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Could not find any difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_DIALOG_WARNING"
+msgstr "STOCK_DIALOG_WARNING"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-mail-replied"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CONVERT"
+msgstr "STOCK_CONVERT"
+
+#. module: stock
+#: field:stock.move,note:0
+#: view:stock.picking:0
+#: field:stock.picking,note:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr "Valore"
+
+#. module: stock
+#: field:report.stock.move,type:0
+#: field:stock.location,chained_picking_type:0
+#: field:stock.picking,type:0
+msgid "Shipping Type"
+msgstr "Tipo Spedizione"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu
+#: view:stock.inventory:0
+#: view:stock.picking:0
+#, python-format
+msgid "Products"
+msgstr "Prodotti"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Nessuno"
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr "Metodo di Consegna"
+
+#. module: stock
+#: help:report.stock.move,location_dest_id:0
+#: help:stock.move,location_dest_id:0
+#: help:stock.picking,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_variation:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-partner"
+msgstr "terp-partner"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_ITALIC"
+msgstr "STOCK_ITALIC"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock"
+msgstr "terp-stock"
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-folder-green"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr "Revisioni"
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"current inventory value, and the stock input and stock output account will "
+"hold the counterpart moves for incoming and outgoing products."
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_id:0
+#: help:stock.move,location_id:0
+msgid ""
+"Sets a location if you produce at a fixed location. This can be a partner "
+"location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Dates"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr "Priorità"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: model:ir.model,name:stock.model_stock_inventory
+#: selection:report.stock.inventory,location_type:0
+#: field:stock.inventory.line,inventory_id:0
+#: report:stock.inventory.move:0
+#: selection:stock.location,usage:0
+#, python-format
+msgid "Inventory"
+msgstr "Inventario"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+#: field:stock.move,picking_id:0
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Currency in which Unit Cost is expressed"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups
+msgid "Stock ups"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr "Annulla Inventario"
+
+#. module: stock
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines.exist,name:0
+msgid "Tracking serial"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement_result
+msgid "Stock Replacement result"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -1452,15 +2625,39 @@ msgstr ""
 "speciali!"
 
 #. module: stock
-#: field:stock.picking,min_date:0
-msgid "Planned Date"
-msgstr "Data Pianificata"
+#: selection:stock.location,icon:0
+msgid "terp-stock_align_left_24"
+msgstr ""
 
 #. 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 "Prodotti in uscita"
+#: selection:stock.location,icon:0
+msgid "terp-folder-orange"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver+"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-purchase"
+msgstr "terp-purchase"
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1468,17 +2665,22 @@ msgid "STOCK_COLOR_PICKER"
 msgstr "STOCK_COLOR_PICKER"
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_lot_location
-msgid "Lots by location"
-msgstr "Lotti per Punti di Stoccaggio"
+#: selection:stock.location,icon:0
+msgid "STOCK_DND"
+msgstr "STOCK_DND"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DELETE"
-msgstr "STOCK_DELETE"
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr ""
 
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
+#: model:ir.model,name:stock.model_stock_journal
+#: field:report.stock.move,stock_journal:0
+#: view:stock.journal:0
+#: field:stock.journal,name:0
+#: field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
 msgstr "Giornale di magazzino"
 
@@ -1488,59 +2690,91 @@ msgid "STOCK_CLEAR"
 msgstr "STOCK_CLEAR"
 
 #. module: stock
-#: field:stock.production.lot,date:0
-msgid "Created Date"
-msgstr "Data di Creazione"
-
-#. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
 msgstr "Approvvigionamento"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-folder-yellow"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
 msgstr "Maxtor Suppliers"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_change_standard_price.py:0
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr ""
+
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
 msgstr "Forza la disponibilità"
 
 #. module: stock
-#: wizard_view:stock.location.products,init:0
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_reception_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in
+#: view:stock.move:0
+msgid "Receive Products"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_out_picking_move
+#: model:ir.actions.act_window,name:stock.action_partial_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_out
+msgid "Deliver Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
 msgid "View Stock of Products"
 msgstr "Visualizza giacenza prodotti"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mrp"
-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 "Ordini di consegna futuri"
+#: view:stock.picking:0
+msgid "Internal Picking list"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_UP"
 msgstr "STOCK_GO_UP"
 
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
+msgid "terp-dolar_ok!"
+msgstr ""
 
 #. 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 "Tracciabilità Lotti"
-
-#. module: stock
-#: wizard_button:inventory.merge,init,merge:0
+#: view:stock.inventory.merge:0
 msgid "Yes"
 msgstr "Si"
 
@@ -1550,31 +2784,54 @@ msgid "Inventories"
 msgstr "Inventari"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HOME"
-msgstr "STOCK_HOME"
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0
+#: field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0
+#: field:stock.move,company_id:0
+#: field:stock.picking,company_id:0
+#: field:stock.production.lot,company_id:0
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PROPERTIES"
 msgstr "STOCK_PROPERTIES"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-year"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
 msgstr "Giacenza Reale"
 
 #. 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
+#: view:stock.fill.inventory:0
 msgid "Fill Inventory"
 msgstr "Riempire l'inventario"
 
 #. module: stock
-#: wizard_view:stock.invoice_onshipping,init:0
-msgid "Create invoices"
-msgstr "Crea fatture"
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -1582,26 +2839,30 @@ msgid "Revision Date"
 msgstr "Data di revisione"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.move.split.lines.exist,lot_id:0
+#: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Lotto"
 
 #. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Set Stock to Zero"
-msgstr "Imposta giacenza a zero"
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-jump-to-rtl"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
 msgstr "Quantità (UoS)"
 
-#. 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 ""
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_STOP"
@@ -1613,57 +2874,101 @@ msgid "Set Available"
 msgstr "Imposta disponibilità"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.make_picking
-#: wizard_view:stock.picking.make,init:0
-msgid "Make packing"
-msgstr "Prepara Confezioni"
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr ""
 
 #. module: stock
-#: field:stock.picking,backorder_id:0
+#: field:stock.move,backorder_id:0
 msgid "Back Order"
 msgstr "Ordine non ricevuto"
 
+#. module: stock
+#: field:stock.production.lot,name:0
+msgid "Serial Number"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND_MULTIPLE"
 msgstr "STOCK_DND_MULTIPLE"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "New picking invoices"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_REMOVE"
-msgstr "STOCK_REMOVE"
+msgid "STOCK_SPELL_CHECK"
+msgstr "STOCK_SPELL_CHECK"
 
 #. module: stock
 #: field:stock.incoterms,active:0
 #: field:stock.location,active:0
-#: field:stock.picking,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
 msgstr "Attivo"
 
+#. module: stock
+#: model:ir.module.module,shortdesc:stock.module_meta_information
+msgid "Inventory Management"
+msgstr "Gestione dell'inventario"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-idea"
+msgstr ""
+
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
 msgstr "Proprietà"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"if you really want to change it ' \\n            #                        "
+"'for this product: \"%s\" (id: %d)"
+msgstr ""
+
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
 #: model:ir.model,name:stock.model_stock_incoterms
-#: model:ir.ui.menu,name:stock.menu_action_incoterms_tree
 #: view:stock.incoterms:0
 msgid "Incoterms"
 msgstr "Condizioni di consegna"
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
 msgid "Total:"
 msgstr "Totale:"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr "STOCK_DIALOG_AUTHENTICATION"
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"costs and responsibilities between buyer and seller and reflect state-of-the-"
+"art transportation practices."
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,recursive:0
+msgid ""
+"If checked, products contained in child locations of selected location will "
+"be included as well."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1671,34 +2976,61 @@ msgid "STOCK_ZOOM_OUT"
 msgstr "STOCK_ZOOM_OUT"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr "Prefisso tracciabilità"
 
 #. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "Nearest"
-msgstr "Più vicino"
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr ""
 
 #. module: stock
-#: wizard_field:stock.location.products,init,to_date:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Internal picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
 msgid "To"
 msgstr "a"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process"
+msgstr ""
+
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
 msgstr "Nome revisione"
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Magazzino"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_COLOR"
 msgstr "STOCK_SELECT_COLOR"
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Confirm Inventory"
-msgstr "Conferma Inventario"
+#: view:stock.location.product:0
+msgid ""
+"(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)"
+msgstr ""
 
 #. module: stock
 #: view:product.category:0
@@ -1711,17 +3043,29 @@ msgid "STOCK_NO"
 msgstr "STOCK_NO"
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_workshop
-msgid "Workshop"
-msgstr "Officina/Laboratorio"
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,state:0
 #: selection:stock.inventory,state:0
+#: view:stock.move:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Done"
 msgstr "Completato"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_standard_price
+#: model:ir.model,name:stock.model_stock_change_standard_price
+#: view:stock.change.standard.price:0
+msgid "Change Standard Price"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
@@ -1729,24 +3073,36 @@ msgstr "Punto di Stoccaggio Virtuale"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_company
-msgid "Tiny sprl"
-msgstr "Tiny Sprl"
+msgid "STOCK_GOTO_FIRST"
+msgstr "STOCK_GOTO_FIRST"
 
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
 msgstr "Data Chiusura"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Not urgent"
 msgstr "Non Urgente"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_format-default"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "To Do"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLOSE"
@@ -1759,66 +3115,143 @@ msgid "Warehouses"
 msgstr "Magazzini"
 
 #. module: stock
-#: help:product.product,track_outgoing:0
-msgid "Force to use a Production Lot during deliveries"
-msgstr "Forza l'utilizzo di un lotto di produzione durante le consegne"
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Split move lines in two"
-msgstr "Dividi Righe Spostamento in Due"
+#: selection:stock.location,icon:0
+msgid "terp-check"
+msgstr ""
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,journal_id:0
+#: selection:stock.location,icon:0
+msgid "terp-camera_test"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
+#: view:report.stock.inventory:0
+msgid "Inventory Analysis"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_SORT_DESCENDING"
+msgstr "STOCK_SORT_DESCENDING"
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
 msgstr "Registro Destinazione"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
+#: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
 #: model:stock.location,name:stock.stock_location_stock
 msgid "Stock"
 msgstr "Stock"
 
 #. module: stock
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.model,name:stock.model_product_product
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,product_id:0
 #: field:stock.inventory.line,product_id:0
+#: field:stock.inventory.line.split,product_id:0
+#: report:stock.inventory.move:0
+#: view:stock.move:0
 #: field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0
+#: field:stock.move.scrap,product_id:0
+#: field:stock.move.split,product_id:0
+#: view:stock.production.lot:0
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
+#: field:stock.report.tracklots,product_id:0
+#, python-format
 msgid "Product"
 msgstr "Prodotto"
 
 #. module: stock
-#: wizard_button:stock.return.picking,init,return:0
-msgid "Return"
-msgstr "Rientro"
+#: selection:stock.location,icon:0
+msgid "STOCK_HOME"
+msgstr "STOCK_HOME"
 
 #. module: stock
-#: field:stock.picking,auto_picking:0
-msgid "Auto-Packing"
-msgstr "Auto-Confezionamento"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You are moving %.2f products but only %.2f available in this lot."
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
 msgstr "UoS Prodotto"
 
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
 msgstr "Altezza (Z)"
 
 #. module: stock
+#: field:stock.ups,weight:0
+msgid "Lot weight"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
 #: field:stock.inventory.line,product_uom:0
-#: field:stock.move,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+#, python-format
 msgid "Product UOM"
 msgstr "Unità di Misura del Prodotto"
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
 msgid "Variants"
 msgstr "Varianti"
 
@@ -1837,30 +3270,41 @@ msgstr "Fornitori"
 msgid "STOCK_JUMP_TO"
 msgstr "STOCK_JUMP_TO"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_INDENT"
+msgstr "STOCK_INDENT"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-tools"
 msgstr "terp-tools"
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
 msgid "Location Overview"
 msgstr "Panoramica Punto di Stoccaggio"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.location_product
+#: model:ir.actions.act_window,name:stock.action_view_stock_location_product
+#: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
 msgstr "Prodotti per locazione"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_UNDO"
-msgstr "STOCK_UNDO"
+msgid "STOCK_DIALOG_INFO"
+msgstr "STOCK_DIALOG_INFO"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.move_split
-msgid "Split move line"
-msgstr "Divi Riga Spostamento"
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1868,9 +3312,9 @@ msgid "terp-sale"
 msgstr "terp-sale"
 
 #. module: stock
-#: field:stock.production.lot,name:0
-msgid "Serial"
-msgstr "Seriale"
+#: view:stock.move:0
+msgid "Order"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1878,57 +3322,133 @@ msgid "STOCK_ADD"
 msgstr "STOCK_ADD"
 
 #. module: stock
-#: field:stock.location,chained_delay:0
-msgid "Chained Delay (days)"
-msgstr "Ritardo collegato (giorni)"
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr ""
 
 #. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
 #: field:stock.move,location_id:0
 msgid "Source Location"
 msgstr "Punto di Stoccaggio di Provenienza"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-stop"
+msgstr ""
+
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
 msgstr "Registrazioni Contabili"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
 msgstr "STOCK_MEDIA_PAUSE"
 
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
 msgid "Lots"
 msgstr "Lotti"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "New pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
 msgstr "Contemporaneamente"
 
 #. module: stock
-#: field:product.product,track_outgoing:0
-msgid "Track Outging Lots"
-msgstr "Traccia i Lotti in uscita"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Quantities, UoMs, Products and Locations cannot be modified on stock moves "
+"that have already been processed (except by the Administrator)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Productions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Return lines"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.model,name:stock.model_report_stock_lines_date
-#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
 msgstr "Date degli Inventari"
 
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
 msgstr "STOCK_PRINT_PREVIEW"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND"
-msgstr "STOCK_FIND"
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Message !"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in current pack"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1936,21 +3456,9 @@ msgid "Lot Inventory"
 msgstr "Inventario Lotti"
 
 #. module: stock
-#: help:stock.location,chained_auto_packing:0
-msgid ""
-"This is used only if you selected a chained location type.\n"
-"The 'Automatic Move' value will create a stock move after the current one "
-"that will be validated automatically. With 'Manual Operation', the stock "
-"move has to be validated by a worker. With 'Automatic No Step Added', the "
-"location is replaced in the original move."
+#: view:stock.move:0
+msgid "Reason"
 msgstr ""
-"Utillizzato solo se è stata selezionata una tipologia di posizionamento "
-"concatenata.\n"
-"Il comando 'Movimento automatico' creerà un movimento nel magazzino il quale "
-"segue il corrente; questo sarà validato automaticamente. Con 'Operazione "
-"manuale' il movimento nel magazzino deve venire validato dall'utilizzatore. "
-"Con 'Automatic No Step Added' la locazione è rimpiazzata nel movimento "
-"originario ."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -1958,58 +3466,103 @@ msgid "Icon"
 msgstr "Icona"
 
 #. module: stock
-#: field:stock.tracking,name:0
-msgid "Tracking"
-msgstr "Tracciabilità"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
-#: wizard_button:stock.picking.make,init,make:0
+#: selection:stock.location,icon:0
+msgid "STOCK_ZOOM_IN"
+msgstr "STOCK_ZOOM_IN"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-week"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
+#: view:stock.move.track:0
+#: view:stock.split.into:0
 msgid "Ok"
 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 ""
-"Questo conto verrà utilizzato, al posto di quello predefinito, per valutare "
-"lo stock in ingresso"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
 msgstr "Clienti non europei"
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_components
-msgid "Components"
-msgstr "Componenti:"
+#: code:addons/stock/product.py:0
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge,init:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no inventory variation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories ?"
 msgstr "Vuoi incorporare inventari?"
 
 #. module: stock
-#: field:stock.picking,max_date:0
-msgid "Max. Planned Date"
-msgstr "Massima data pianificata"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Posted Inventory"
-msgstr "Inventario Assegnato"
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr "Tipo Punto di Stoccaggio Collegato"
 
 #. module: stock
+#: help:stock.picking,move_type:0
+msgid "It specifies goods to be delivered all at once or by direct delivery"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
 msgstr "Ricezione Merci"
 
 #. module: stock
-#: view:stock.location:0
-msgid "Stock Location"
-msgstr "Locazione magazzino"
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* Fixed Location: The chained location is taken from the next field: Chained "
+"Location if Fixed."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2017,10 +3570,16 @@ msgid "STOCK_MEDIA_PLAY"
 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 "Ordini di Consegna"
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is done."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2037,60 +3596,92 @@ msgstr ""
 "come destinazione per le merci inviate al partner"
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
 msgstr "Confermato"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "STOCK_MEDIA_PREVIOUS"
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
 msgid "Confirm"
 msgstr "Conferma"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Check Availability"
-msgstr "Controllo disponibilità"
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge,init:0
-#: model:ir.actions.wizard,name:stock.wizard_merge_inventory
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+#: view:stock.inventory.merge:0
 msgid "Merge inventories"
 msgstr "Unione Inventari"
 
-#. 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 "Struttura locazione magazzini"
-
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_DISCONNECT"
-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"
+msgid "terp-go-home"
 msgstr ""
-"Questo conto verrà auilizzato, al posto di quello predefinito, per la "
-"valutazione dello stock in uscita"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Confirm (Do Not Process Now)"
-msgstr "Confermato (Da non processare ora)"
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr "Locazione magazzino"
 
 #. module: stock
-#: field:stock.tracking,move_ids:0
-msgid "Moves Tracked"
-msgstr "Sposta tracciabilità"
+#: help:stock.location,scrap_location:0
+msgid ""
+"Check this box to allow using this location to put scrapped/damaged goods."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_relate_picking
+msgid "Related Picking"
+msgstr "Selezione collegata"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Unit Cost for this product line"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_category
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_categ_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,categ_id:0
+msgid "Product Category"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -2098,8 +3689,19 @@ msgid "Reporting"
 msgstr "Reportistica"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
-#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid " for the "
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to leave in the current pack"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
 msgid "Create invoice"
 msgstr "Crea Fattura"
 
@@ -2109,23 +3711,106 @@ msgid "STOCK_NETWORK"
 msgstr "STOCK_NETWORK"
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_configuration
-msgid "Configuration"
-msgstr "Configurazione"
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr "Clienti"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is cancelled."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "terp-project"
-msgstr "terp-project"
+msgid "terp-document-new"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
-#: model:ir.actions.act_window,name:stock.act_stock_location_2_stock_report_prodlots
-#: model:ir.actions.act_window,name:stock.action_stock_report_prodlots_form
-#: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
-#: view:stock.report.prodlots:0
-msgid "Stock by Lots"
-msgstr "Tracciabilità per lotti"
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr "Righe inventario di magazzino"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Process Document"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional info"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,location_id:0
+#: field:stock.fill.inventory,location_id:0
+#: field:stock.inventory.line,location_id:0
+#: report:stock.inventory.move:0
+#: view:stock.location:0
+#: view:stock.move:0
+#: field:stock.move.consume,location_id:0
+#: field:stock.move.scrap,location_id:0
+#: field:stock.picking,location_id:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr "Punto di Stoccaggio"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,auto_validate:0
@@ -2133,7 +3818,16 @@ msgid "Auto Validate"
 msgstr "Auto-Convalida"
 
 #. module: stock
-#: field:stock.location,chained_auto_packing:0
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr ""
+
+#. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic Move"
 msgstr "Movimento Automatico"
@@ -2144,10 +3838,26 @@ msgid "Virtual Stock Value"
 msgstr "Valore magazzino virtuale"
 
 #. module: stock
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
-msgid "Canceled"
-msgstr "Cancellato"
+#: selection:stock.location,icon:0
+msgid "terp-mail_delete"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+msgid ""
+"Technical field used to record the currency chosen by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-month"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2159,33 +3869,49 @@ msgstr "STOCK_GOTO_LAST"
 msgid "Invoiced"
 msgstr "Fatturato"
 
+#. module: stock
+#: field:stock.move,address_id:0
+msgid "Destination Address"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
 msgstr "STOCK_DIRECTORY"
 
 #. module: stock
-#: help:product.template,property_stock_production:0
-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"
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
 msgstr ""
-"Per questo prodotto (modello), questo Punto di Stoccaggio verrà utilizzato "
-"(al posto di quello predefinito) come Punto di Stoccaggio di provenienza per "
-"gli spostamenti di stock generati da ordini di produzione"
 
 #. module: stock
-#: view:stock.picking.move.wizard:0
-msgid "Add"
-msgstr "Aggiungi"
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
 
 #. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr ""
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,type:0
+#: view:stock.location:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Internal"
 msgstr "Interno"
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
@@ -2198,32 +3924,58 @@ msgid "STOCK_JUSTIFY_CENTER"
 msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree3
-#: model:ir.actions.act_window,name:stock.action_picking_tree8
-#: 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 "Prelievo confermato in attesa di disponibilità"
+#: help:report.stock.inventory,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Avaiable'.\n"
+" When the picking it done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
 
 #. module: stock
-#: field:stock.location,posy:0
-msgid "Shelves (Y)"
-msgstr "Scaffali (Y)"
+#: field:stock.move.split.lines,use_exist:0
+msgid "Existing Lot"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
-msgid "Set Stock to 0"
-msgstr "Setta disponibilità a 0"
+#: selection:stock.location,icon:0
+msgid "STOCK_MEDIA_PREVIOUS"
+msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: stock
-#: view:stock.location:0
-msgid "Localisation"
-msgstr "Localizzazione"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Do you want to set stocks to zero ?"
-msgstr "Impostare la disponibilità a zero ?"
+#: report:stock.picking.list:0
+msgid "weight"
+msgstr "peso"
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by procurements"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is ready to process."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -2236,14 +3988,56 @@ msgid "STOCK_REVERT_TO_SAVED"
 msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: stock
-#: field:product.product,track_production:0
-msgid "Track Production Lots"
-msgstr "Tracciabilità lotti di produzione"
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is scheduled"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
-msgid "Split in Two"
-msgstr "Dividi in Due"
+msgid "Check Availability"
+msgstr "Controllo disponibilità"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Not Available. Moves are not confirmed."
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_incoming:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"coming from a Supplier Location"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -2251,160 +4045,267 @@ msgid "Future Stock Moves"
 msgstr "Movimenti futuri di magazzino"
 
 #. module: stock
-#: help:product.template,property_stock_procurement:0
-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"
+#: selection:stock.location,icon:0
+msgid "terp-gtk-select-all"
 msgstr ""
-"Per questo prodotto (modello), questo Punto di Stoccaggio verrà utilizzato "
-"(al posto di quello predefinito), come Punto di Stoccaggio di provenienza "
-"per spostamenti di stock generati da approvvigionamenti"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_picking_move_wizard
-msgid "stock.picking.move.wizard"
-msgstr "stock.picking.move.wizard"
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr ""
 
 #. module: stock
+#: view:stock.move:0
+msgid "Extended options..."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: field:stock.ups.final,xmlfile:0
+msgid "XML File"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
 #: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.inventory.line,prod_lot_id:0
+#: report:stock.inventory.move:0
 #: field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines.exist,prodlot_id:0
 #: view:stock.production.lot:0
+#, python-format
 msgid "Production Lot"
 msgstr "Lotto di Produzione"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability
-#: model:ir.ui.menu,name:stock.next_id_62
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
 msgid "Traceability"
 msgstr "Tracciabilità"
 
 #. module: stock
-#: field:stock.picking,date:0
-msgid "Date Order"
-msgstr "Data ordine"
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr ""
 
 #. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Supplier Invoice"
-msgstr "Fattura Fornitore"
+#: selection:stock.location,icon:0
+msgid "terp-mail-message-new"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
+#: view:stock.picking:0
 msgid "Locations"
 msgstr "Punti di Stoccaggio"
 
-#. 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 ""
-"Data prevista per la movimentazione dei prodotti o la data reale se è già "
-"stato movimentato."
-
 #. module: stock
 #: view:stock.picking:0
 msgid "General Information"
 msgstr "Informazioni Generali"
 
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_DISCONNECT"
+msgstr "STOCK_DISCONNECT"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
 msgstr "terp-product"
 
-#. module: stock
-#: wizard_button:stock.partial_picking,end2,end:0
-msgid "Close"
-msgstr "Chiudi"
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_move_labels
-msgid "Print Item Labels"
-msgstr "Stampa Etichette"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Moves"
 msgstr "Spostamenti"
 
 #. module: stock
-#: field:stock.move,location_dest_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
 msgstr "Punto di Stoccaggio di Destinazione"
 
 #. module: stock
-#: wizard_button:stock.move.split,init,split:0
-msgid "Split"
-msgstr "Dividi"
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
+msgstr ""
 
 #. module: stock
-#: field:stock.location,account_id:0
-msgid "Inventory Account"
-msgstr "Contabilità Inventario"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "quantity."
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Set Stocks to Zero"
-msgstr "Imposta disponibiltà a zero"
+#: view:stock.move:0
+msgid "Expected"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
 msgstr "Produzione"
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_traceability_low
-msgid "Low Level"
-msgstr "Livello Basso"
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid ""
+"There are no products to return (only lines in Done state and not fully "
+"returned yet can be returned)!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
 msgstr "Descrizione"
 
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "May"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_INDENT"
-msgstr "STOCK_INDENT"
+msgid "STOCK_DIALOG_AUTHENTICATION"
+msgstr "STOCK_DIALOG_AUTHENTICATION"
 
 #. module: stock
-#: selection:stock.picking,type:0
-msgid "Delivery"
-msgstr "Consegna"
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"outgoing stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
 
 #. 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
+#: view:stock.tracking:0
 msgid "Upstream traceability"
 msgstr "Tracciabilita verso l alto"
 
+#. module: stock
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Produced Qty"
+msgstr ""
+
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
 msgid "Stock Input Account"
 msgstr "Contabilità Stock in Ingresso"
 
 #. module: stock
-#: field:stock.location,chained_location_type:0
-msgid "Chained Location Type"
-msgstr "Tipo Punto di Stoccaggio Collegato"
+#: view:stock.move:0
+msgid "Picking"
+msgstr ""
 
 #. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by production lots"
+msgstr "Stampa Magazzino da Lotti di Produzione"
+
+#. module: stock
+#: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
+#: view:stock.move:0
 msgid "Customer"
 msgstr "Cliente"
 
 #. 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 "Valori Localizzazione"
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Outgoing Deliveries"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
@@ -2417,14 +4318,32 @@ msgid "STOCK_JUSTIFY_RIGHT"
 msgstr "STOCK_JUSTIFY_RIGHT"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_inventory_line
-msgid "Inventory line"
-msgstr "Riga Inventario"
+#: selection:stock.location,icon:0
+msgid "terp-mrp"
+msgstr "terp-mrp"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Others info"
-msgstr "Altre informazioni"
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move.split.lines,action:0
+msgid "Keep in one lot"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price:"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2432,15 +4351,494 @@ msgid "STOCK_MEDIA_NEXT"
 msgstr "STOCK_MEDIA_NEXT"
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Move State"
-msgstr "Stato Spostamento"
+#: selection:stock.location,icon:0
+msgid "STOCK_REDO"
+msgstr "STOCK_REDO"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
 msgstr "Punto di Stoccaggio Fisico"
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#~ msgid "Fill Inventory for specific location"
+#~ msgstr "Inserimento Inventario per locazioni specifiche"
+
+#~ msgid "Latest Date of Inventory"
+#~ msgstr "Ultima Data di Inventario"
+
+#~ msgid "New Periodical Inventory"
+#~ msgstr "Nuovo Inventario Periodico"
+
+#~ msgid "Incoming Products"
+#~ msgstr "Prodotti in entrata"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Prodotti in uscita"
+
+#~ msgid "LIFO"
+#~ msgstr "LIFO"
+
 #~ msgid "Stock Management"
 #~ msgstr "Gestione Stock"
+
+#~ msgid "Revision"
+#~ msgstr "Revisione"
+
+#~ msgid "Return packing"
+#~ msgstr "Rientro Merci"
+
+#~ msgid "Packing list"
+#~ msgstr "Documento di Trasporto (DDT)"
+
+#~ msgid "Make Parcel"
+#~ msgstr "Crea Parcella"
+
+#~ msgid "Serial"
+#~ msgstr "Seriale"
+
+#~ msgid "Stock location"
+#~ msgstr "Punto di Stoccaggio"
+
+#~ msgid "Status"
+#~ msgstr "Stato"
+
+#~ msgid "Stock Properties"
+#~ msgstr "Proprietà Stock"
+
+#~ msgid "Make Picking"
+#~ msgstr "Crea Presa"
+
+#~ msgid "New Reception Packing"
+#~ msgstr "Nuova Ricezione Merci"
+
+#~ msgid "Date create"
+#~ msgstr "Data Creazione"
+
+#~ msgid "Date Created"
+#~ msgstr "Data creazione"
+
+#~ msgid "Allocation Method"
+#~ msgstr "Metodo di Allocazione"
+
+#~ msgid "Dest. Address"
+#~ msgstr "Indirizzo di Destinazione"
+
+#~ msgid "Input Packing List"
+#~ msgstr "Bolla Merci in Entrata"
+
+#~ msgid "Not from Packing"
+#~ msgstr "Non da Merci"
+
+#~ msgid "Validate"
+#~ msgstr "Convalida"
+
+#~ msgid "Fill From Unreceived Products"
+#~ msgstr "Prodotti non ricevuti"
+
+#~ msgid "Dest. Move"
+#~ msgstr "Destinazione Spostamento"
+
+#~ msgid "FIFO"
+#~ msgstr "FIFO"
+
+#~ msgid "Delivery Orders to Process"
+#~ msgstr "Ordini di Consegna da Processare"
+
+#~ msgid "Invoice Status"
+#~ msgstr "Stato Fattura"
+
+#~ msgid "Lots by location"
+#~ msgstr "Lotti per Punti di Stoccaggio"
+
+#~ msgid "Create invoices"
+#~ msgstr "Crea fatture"
+
+#~ msgid "Make packing"
+#~ msgstr "Prepara Confezioni"
+
+#~ msgid "Nearest"
+#~ msgstr "Più vicino"
+
+#~ msgid "Tiny sprl"
+#~ msgstr "Tiny Sprl"
+
+#~ msgid "Split move lines in two"
+#~ msgstr "Dividi Righe Spostamento in Due"
+
+#~ msgid "Return"
+#~ msgstr "Rientro"
+
+#~ msgid "Auto-Packing"
+#~ msgstr "Auto-Confezionamento"
+
+#~ msgid "Split move line"
+#~ msgstr "Divi Riga Spostamento"
+
+#~ msgid "Chained Delay (days)"
+#~ msgstr "Ritardo collegato (giorni)"
+
+#~ msgid ""
+#~ "This account will be used, instead of the default one, to value input stock"
+#~ msgstr ""
+#~ "Questo conto verrà utilizzato, al posto di quello predefinito, per valutare "
+#~ "lo stock in ingresso"
+
+#~ msgid "Delivery Orders"
+#~ msgstr "Ordini di Consegna"
+
+#~ msgid ""
+#~ "This account will be used, instead of the default one, to value output stock"
+#~ msgstr ""
+#~ "Questo conto verrà auilizzato, al posto di quello predefinito, per la "
+#~ "valutazione dello stock in uscita"
+
+#~ 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 ""
+#~ "Per questo prodotto (modello), questo Punto di Stoccaggio verrà utilizzato "
+#~ "(al posto di quello predefinito) come Punto di Stoccaggio di provenienza per "
+#~ "gli spostamenti di stock generati da ordini di produzione"
+
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Localisation"
+#~ msgstr "Localizzazione"
+
+#~ msgid "Split in Two"
+#~ msgstr "Dividi in Due"
+
+#~ 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 ""
+#~ "Per questo prodotto (modello), questo Punto di Stoccaggio verrà utilizzato "
+#~ "(al posto di quello predefinito), come Punto di Stoccaggio di provenienza "
+#~ "per spostamenti di stock generati da approvvigionamenti"
+
+#~ msgid "stock.picking.move.wizard"
+#~ msgstr "stock.picking.move.wizard"
+
+#~ msgid "Print Item Labels"
+#~ msgstr "Stampa Etichette"
+
+#~ msgid "Inventory Account"
+#~ msgstr "Contabilità Inventario"
+
+#~ msgid "Low Level"
+#~ msgstr "Livello Basso"
+
+#~ msgid "Delivery"
+#~ msgstr "Consegna"
+
+#~ msgid "Inventory line"
+#~ msgstr "Riga Inventario"
+
+#~ msgid "Others info"
+#~ msgstr "Altre informazioni"
+
+#~ msgid "Move State"
+#~ msgstr "Stato Spostamento"
+
+#~ msgid "Customer Refund"
+#~ msgstr "Resi da clienti"
+
+#~ msgid "Unreceived Products"
+#~ msgstr "Prodotti non Ricevuti"
+
+#~ msgid "Calendar of Deliveries"
+#~ msgstr "Calendario delle Spedizioni"
+
+#~ msgid "Customer Invoice"
+#~ msgstr "Fattura cliente"
+
+#~ msgid "Non Assigned Products:"
+#~ msgstr "Prodotti non assegnati"
+
+#~ msgid "Sub Products"
+#~ msgstr "Sotto prodotti"
+
+#~ msgid "Force to use a Production Lot during receptions"
+#~ msgstr "Forza l'uso dei lotti di produzione durante le ricezioni"
+
+#~ msgid "Stock Level 1"
+#~ msgstr "Magazzino Livello 1"
+
+#~ msgid "Force to use a Production Lot during production order"
+#~ msgstr "Forzare l'uso dei Lotti di Produzione durante l'ordine di produzione"
+
+#~ msgid "Track Incomming Lots"
+#~ msgstr "Tracciabilità Lotti in arrivo"
+
+#~ msgid "Tracking Lot"
+#~ msgstr "Tracciabilità Lotto"
+
+#~ msgid ""
+#~ "Tracking lot is the code that will be put on the logistical unit/pallet"
+#~ msgstr ""
+#~ "Tracciabilità lotto è il codice che sarà applicato alle confezioni/pallet in "
+#~ "spedizione"
+
+#~ msgid "Location Content (With children)"
+#~ msgstr "Contenuto Locazione (Con figli)"
+
+#~ msgid "All Stock Moves"
+#~ msgstr "Movimenti di tutti i magazzini"
+
+#~ msgid "New Internal Packing"
+#~ msgstr "Nuovo Imballaggio interno"
+
+#~ msgid "Finished products"
+#~ msgstr "Prodotti finiti"
+
+#~ msgid "Set to Zero"
+#~ msgstr "Imposta a Zero"
+
+#~ msgid "The packing has been successfully made !"
+#~ msgstr "L'imballaggio è stato creato con successo !"
+
+#~ msgid "Open Products"
+#~ msgstr "Prodotti Aperti"
+
+#~ msgid "Available Moves"
+#~ msgstr "Movimenti disponibili"
+
+#~ msgid "Internal Ref"
+#~ msgstr "Rif. interno"
+
+#~ msgid "Planned Date"
+#~ msgstr "Data Pianificata"
+
+#~ msgid "Created Date"
+#~ msgstr "Data di Creazione"
+
+#~ msgid "Set Stock to Zero"
+#~ msgstr "Imposta giacenza a zero"
+
+#~ msgid "Force to use a Production Lot during deliveries"
+#~ msgstr "Forza l'utilizzo di un lotto di produzione durante le consegne"
+
+#~ msgid "Stock Locations Structure"
+#~ msgstr "Struttura locazione magazzini"
+
+#~ msgid "Stock by Lots"
+#~ msgstr "Tracciabilità per lotti"
+
+#~ msgid "Moves Tracked"
+#~ msgstr "Sposta tracciabilità"
+
+#~ msgid "Confirm (Do Not Process Now)"
+#~ msgstr "Confermato (Da non processare ora)"
+
+#~ msgid "Set Stock to 0"
+#~ msgstr "Setta disponibilità a 0"
+
+#~ msgid "Do you want to set stocks to zero ?"
+#~ msgstr "Impostare la disponibilità a zero ?"
+
+#~ msgid "Confirmed Packing Waiting Availability"
+#~ msgstr "Prelievo confermato in attesa di disponibilità"
+
+#~ msgid "Close"
+#~ msgstr "Chiudi"
+
+#~ msgid "Set Stocks to Zero"
+#~ msgstr "Imposta disponibiltà a zero"
+
+#~ msgid "Date Order"
+#~ msgstr "Data ordine"
+
+#~ msgid "Track Production Lots"
+#~ msgstr "Tracciabilità lotti di produzione"
+
+#~ msgid "Tracking Number"
+#~ msgstr "Codice Tracciabilità"
+
+#~ msgid "Tracking/Serial"
+#~ msgstr "Tracciabilità/Numero di Serie"
+
+#~ msgid "Tracking"
+#~ msgstr "Tracciabilità"
+
+#~ 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 ""
+#~ "Per questo prodotto (modello), questo Punto di Stoccaggio verrà utilizzato "
+#~ "(al posto di quello predefinito), come Punto di Stoccaggio di provenienza "
+#~ "per gli spostamenti di magazzino generati dalle operazioni di inventario"
+
+#~ msgid "Move History"
+#~ msgstr "Cronologia movimenti"
+
+#~ msgid "Move lines"
+#~ msgstr "Righe movimenti"
+
+#~ msgid "Total :"
+#~ msgstr "Totale :"
+
+#~ msgid "Amount"
+#~ msgstr "Quantità"
+
+#~ msgid "Products Received"
+#~ msgstr "Prodotti Ricevuti"
+
+#~ msgid "Products Sent"
+#~ msgstr "Prodotti Spediti"
+
+#~ msgid "Packing result"
+#~ msgstr "Risultato imballaggio"
+
+#~ msgid "Include all childs for the location"
+#~ msgstr "Includere tutti i derivati per la locazione"
+
+#~ msgid "Product Id"
+#~ msgstr "Codice di identifizione di prodotto"
+
+#~ msgid "Available Packing"
+#~ msgstr "Imballaggio disponibile"
+
+#~ msgid "Packing Done"
+#~ msgstr "Imballaggio completato"
+
+#~ msgid "Periodical Inventory"
+#~ msgstr "Inventario periodico"
+
+#~ msgid "Draft Periodical Inventories"
+#~ msgstr "Imposta inventari periodici"
+
+#~ msgid "Origin Reference"
+#~ msgstr "Riferimento dell'origine"
+
+#~ msgid "Packing List"
+#~ msgstr "Lista Imballaggi"
+
+#~ msgid "Supplier Refund"
+#~ msgstr "Rimborso Fornitore"
+
+#~ msgid "Partial packing"
+#~ msgstr "Imballaggio parziale"
+
+#~ msgid "Supplier Invoice"
+#~ msgstr "Fattura Fornitore"
+
+#~ msgid ""
+#~ "Scheduled date for the movement of the products or real date if the move is "
+#~ "done."
+#~ msgstr ""
+#~ "Data prevista per la movimentazione dei prodotti o la data reale se è già "
+#~ "stato movimentato."
+
+#~ msgid "Locations' Values"
+#~ msgstr "Valori Localizzazione"
+
+#~ msgid "Future Stock Forecast"
+#~ msgstr "Previsione del magazzino"
+
+#~ msgid ""
+#~ "OpenERP Inventory 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 ""
+#~ "Il modulo di OpenERP che gestisce l'inventario può amministrare più "
+#~ "magazzini e strutture di stoccaggio multiple e complesse.\n"
+#~ "Grazie alla gestione con doppio accesso, il controllo sull'inventario è "
+#~ "potente e flessibile:\n"
+#~ "* Storia e pianificazione dei movimenti\n"
+#~ "* Svariati metodi di inventariamento (FIFO, LIFO, ...)\n"
+#~ "* Stima del magazzino (prezzo standard o medio, ...)\n"
+#~ "* Robustezza di fronte a divergenze dell'inventario\n"
+#~ "* Norme di riordino automatico (livelli del magazzino, JIT, ...)\n"
+#~ "* Supporto dei codici a barre\n"
+#~ "* Rivelazione rapida degli errori grazie al sistema di accesso doppio\n"
+#~ "* Tracciabilità (upstream/downstream, lotti di produzione, numeri di serie, "
+#~ "...)\n"
+#~ "    "
+
+#~ msgid "Units"
+#~ msgstr "Unità"
+
+#~ msgid "Components"
+#~ msgstr "Componenti:"
+
+#~ msgid "Max. Planned Date"
+#~ msgstr "Massima data pianificata"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancellato"
+
+#~ msgid "Future Delivery Orders"
+#~ msgstr "Ordini di consegna futuri"
+
+#~ msgid "Workshop"
+#~ msgstr "Officina/Laboratorio"
+
+#~ msgid "Track Outging Lots"
+#~ msgstr "Traccia i Lotti in uscita"
+
+#~ msgid ""
+#~ "This is used only if you selected a chained location type.\n"
+#~ "The 'Automatic Move' value will create a stock move after the current one "
+#~ "that will be validated automatically. With 'Manual Operation', the stock "
+#~ "move has to be validated by a worker. With 'Automatic No Step Added', the "
+#~ "location is replaced in the original move."
+#~ msgstr ""
+#~ "Utillizzato solo se è stata selezionata una tipologia di posizionamento "
+#~ "concatenata.\n"
+#~ "Il comando 'Movimento automatico' creerà un movimento nel magazzino il quale "
+#~ "segue il corrente; questo sarà validato automaticamente. Con 'Operazione "
+#~ "manuale' il movimento nel magazzino deve venire validato dall'utilizzatore. "
+#~ "Con 'Automatic No Step Added' la locazione è rimpiazzata nel movimento "
+#~ "originario ."
+
+#~ msgid "Stock Tracking Lots"
+#~ msgstr "Tracciabilità Lotti"
+
+#~ msgid "This account will be used to value the input stock"
+#~ msgstr "Questo conto verrà utilizzato per valorizzare lo stock in ingresso"
+
+#~ msgid "Tracking Lots"
+#~ msgstr "Tracciabilità Lotti"
+
+#~ msgid "This account will be used to value the output stock"
+#~ msgstr "Questo conto verrà utilizzato per valorizzare lo stock in uscita"
+
+#~ msgid "Draft Moves"
+#~ msgstr "Movimenti Bozza"
+
+#~ msgid ""
+#~ "This journal will be used for the accounting move generated by stock move"
+#~ msgstr ""
+#~ "Questo giornale verrà utilizzato i movimenti contabili generati dalle "
+#~ "movimentazioni di magazzino"
+
+#~ msgid "Track line"
+#~ msgstr "Linea Tracciabilità"
+
+#~ msgid "Move Lines"
+#~ msgstr "Movimenti"
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index f76326b6a82..d0d666c2dee 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-27 07:48+0000\n"
+"PO-Revision-Date: 2010-10-28 18:31+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-28 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-29 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -34,7 +34,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "Localizações encadeadas se afixado"
+msgstr "Сцепленное место хранения, если определено"
 
 #. module: stock
 #: view:stock.move:0
@@ -74,7 +74,7 @@ msgstr "Недопустимое имя модели в определении 
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr ""
+msgstr "Последние инвентаризации ТМЦ"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -193,6 +193,10 @@ msgid ""
 "value for all products in this category, it can also directly be set on each "
 "product."
 msgstr ""
+"При оценке запасов в реальном времени, корреспондирующие объекты в журнале "
+"для всех исходящих перемещений ТМЦ будут помещены на этот счет. Это значение "
+"по умолчанию для всех ТМЦ в этой категории, также его можно установить "
+"непосредственно для каждой ТМЦ."
 
 #. module: stock
 #: help:stock.move,address_id:0
@@ -330,7 +334,7 @@ msgstr ""
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "Внутреннее местоположение"
+msgstr "Внутреннее место хранения"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -414,7 +418,7 @@ msgstr "STOCK_QUIT"
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr ""
+msgstr "В кол-ве"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
@@ -462,7 +466,7 @@ msgstr "terp-hr"
 #: field:report.stock.inventory,location_type:0
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr "Тип месторасположения"
+msgstr "Тип места хранения"
 
 #. module: stock
 #: help:report.stock.move,type:0
@@ -604,7 +608,7 @@ msgstr ""
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
 msgid "Location Name"
-msgstr "Название местоположения"
+msgstr "Название места хранения"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -658,7 +662,7 @@ msgstr "terp-folder-blue"
 #. 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
@@ -684,7 +688,7 @@ msgstr "Получатель"
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr "Структура мест"
+msgstr "Структура мест хранения"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -712,6 +716,8 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
+"При оценке запасов в реальном времени, это бухгалтерский журнал в который "
+"будут автоматически добавляться записи при обработке перемещений ТМЦ."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
@@ -732,7 +738,7 @@ msgstr "STOCK_FIND_AND_REPLACE"
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Future Receptions"
-msgstr ""
+msgstr "Будущие приходы"
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -761,7 +767,7 @@ msgstr "Выполнить сейчас"
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "Адрес местоположения"
+msgstr "Адрес места хранения"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -782,7 +788,7 @@ msgstr "STOCK_MEDIA_REWIND"
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr ""
+msgstr "Место входа"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -812,18 +818,18 @@ msgstr "Снабжение"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Suppliers"
-msgstr ""
+msgstr "ИТ поставщики"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr ""
+msgstr "Черновик физической инвентаризации"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr ""
+msgstr "Место транзита для перемещений между компаниями"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -851,14 +857,14 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 #: view:stock.picking:0
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Входящие поставки"
 
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Scrap"
-msgstr ""
+msgstr "Брак"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -884,7 +890,7 @@ msgstr "Будущее Кол-во"
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr "Местоположения запасов"
+msgstr "Места хранения ТМЦ"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -941,6 +947,9 @@ 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 ""
+"Оставьте пустым, если место производства совпадает с местом хранения готовой "
+"продукции. Установите место, если есть определенное место производства. Это "
+"может быть место хранения партнера если вы используете субподряд."
 
 #. module: stock
 #: view:res.partner:0
@@ -955,7 +964,7 @@ 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
@@ -977,7 +986,7 @@ msgstr "terp-stock_symbol-selection"
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
-"Убрав отметку с активного поля, вы можете скрыть местоположение без его "
+"Убрав отметку с поля 'Активно', вы можете скрыть место хранения без его "
 "удаления."
 
 #. module: stock
@@ -1043,7 +1052,7 @@ msgstr "Движение запасов"
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "Расположение производства"
+msgstr "Место производства"
 
 #. module: stock
 #: help:stock.picking,address_id:0
@@ -1149,7 +1158,7 @@ msgstr "Поставщик"
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr ""
+msgstr "Дата исполнения"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1204,7 +1213,7 @@ msgstr "Номер партии"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "Метоположения партнера"
+msgstr "Мета хранения партнера"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1246,6 +1255,7 @@ msgstr "Европейские заказчики"
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
 msgstr ""
+"Задержка между первоначальным перемещением и сцепленным перемещением, в днях"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1255,7 +1265,7 @@ msgstr "terp-calendar"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr ""
+msgstr "Импорт инвентаризации ТМЦ из места хранения"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1284,9 +1294,9 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
-"Для текущей продукции, это местоположение будет использоваться (вместо "
-"местоположения по умолчанию), как источник местоположения для перемещения "
-"запасов, генерируемых заказами на производство"
+"Для текущей продукции, это место хранения будет использоваться (вместо места "
+"хранения по умолчанию), как источник места хранения для перемещения запасов, "
+"генерируемых заказами на производство"
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1319,7 +1329,7 @@ msgstr "STOCK_MEDIA_RECORD"
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 msgid "Chaining Type"
-msgstr ""
+msgstr "Тип сцепления"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
@@ -1369,7 +1379,7 @@ msgstr "Доп. инфо"
 #. module: stock
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr ""
+msgstr "Складской учет"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1427,7 +1437,7 @@ msgstr "Искать комплектацию запасов"
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Company is not specified in Location"
-msgstr "Компания не определена в местоположении"
+msgstr "Компания не определена в месте хранения"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1499,7 +1509,7 @@ msgstr "STOCK_GO_DOWN"
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "Местоположение клиента"
+msgstr "Место хранения заказчика"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1558,7 +1568,7 @@ msgstr "Дата заказа"
 #. module: stock
 #: field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr ""
+msgstr "Главное место хранения"
 
 #. module: stock
 #: help:stock.picking,state:0
@@ -1576,7 +1586,7 @@ msgstr ""
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
 msgstr ""
-"Оставьте это поле пустым, если это местоположение общее для всех компаний"
+"Оставьте это поле пустым, если это место хранения общее для всех компаний"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1615,7 +1625,7 @@ msgstr "terp-face-plain"
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr "Местоположение поставщика"
+msgstr "Место хранения поставщика"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1666,7 +1676,7 @@ msgstr "Валюта"
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr "Отслеживание производимых партий"
+msgstr "Отслеживать производимые партии"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
@@ -1775,7 +1785,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr ""
+msgstr "Свойства корреспондирующих мест хранения"
 
 #. module: stock
 #: view:stock.location:0
@@ -1840,7 +1850,7 @@ msgstr "STOCK_CANCEL"
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "Местоположение запасов"
+msgstr "Место хранения ТМЦ"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1936,7 +1946,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Inventory (with child locations)"
-msgstr ""
+msgstr "Инвентаризация (с подчиненными местами хранения)"
 
 #. module: stock
 #: view:stock.move:0
@@ -1989,7 +1999,7 @@ msgstr "Себестоимость"
 #: view:product.product:0
 #: field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr ""
+msgstr "Оценка запасов"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2008,8 +2018,8 @@ 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 ""
-"Это местоположение будет использоваться (вместо местоположения по "
-"умолчанию), как источник местоположения для продукции полученной вами от "
+"Это место хранения будет использоваться (вместо места хранения по "
+"умолчанию), как источник места хранения для продукции полученной вами от "
 "текущего партнера"
 
 #. module: stock
@@ -2050,7 +2060,7 @@ msgstr "Искать инвентаризацию"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by tracking lots"
-msgstr "Отчет о запасах по отслеживаемым партиям"
+msgstr "Отчет о ТМЦ по отслеживаемым партиям"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2137,9 +2147,9 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
-"Для текущей продукции, это местоположение будет использоваться (вместо "
-"местоположения по умолчанию), как источник местоположения для перемещения "
-"запасов, генерируемых в процессе инвентаризации"
+"Это место хранения будет использоваться (вместо места хранения по "
+"умолчанию), как источник для перемещения запасов, генерируемых в процессе "
+"инвентаризации"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -2257,7 +2267,7 @@ msgstr ""
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr "Анализ местоположения запасов"
+msgstr "Анализ места хранения ТМЦ"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2291,7 +2301,7 @@ msgstr ""
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr "Localizações encadeadas"
+msgstr "Сцепленные места хранения"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
@@ -2341,7 +2351,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.track_line_old
 #: view:stock.move.track:0
 msgid "Tracking a move"
-msgstr "Учет движения"
+msgstr "Отслеживать перемещение"
 
 #. module: stock
 #: view:product.product:0
@@ -2394,7 +2404,7 @@ msgstr ""
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr ""
+msgstr "Отслеживать входящие партии"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2478,7 +2488,7 @@ msgstr "Метод доставки"
 #: help:stock.move,location_dest_id:0
 #: help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Место хранения, где система будет хранить готовую продукцию."
 
 #. module: stock
 #: help:product.category,property_stock_variation:0
@@ -2486,6 +2496,8 @@ msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
 msgstr ""
+"При оценке запасов в реальном времени, этот счет будет содержать текущую "
+"оценку ТМЦ"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2555,6 +2567,8 @@ msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
+"Установите место хранения, если вы производите в определенном месте. Это "
+"может быть местом хранения партнера - субподрядчика."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -2641,7 +2655,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr ""
+msgstr "Определенное место хранения"
 
 #. module: stock
 #: constraint:ir.model:0
@@ -2859,6 +2873,10 @@ msgid ""
 "value for all products in this category, it can also directly be set on each "
 "product."
 msgstr ""
+"При оценке запасов в реальном времени, корреспондирующие объекты в журнале "
+"для всех входящих перемещений ТМЦ будут помещены на этот счет. Это значение "
+"по умолчанию для всех ТМЦ в этой категории, также его можно установить "
+"непосредственно для каждой ТМЦ."
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -2996,6 +3014,8 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
+"Если отмечено, ТМЦ находящиеся в подчиненных местах хранения будут также "
+"включены."
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -3096,7 +3116,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr "Виртуальные местоположения"
+msgstr "Виртуальные места хранения"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -3312,13 +3332,13 @@ msgstr ""
 #. module: stock
 #: report:lot.stock.overview:0
 msgid "Location Overview"
-msgstr "Обзор местоположения"
+msgstr "Обзор мест хранения"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
 #: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
-msgstr ""
+msgstr "ТМЦ по местам хранения"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -3360,7 +3380,7 @@ msgstr ""
 #: field:report.stock.move,location_id:0
 #: field:stock.move,location_id:0
 msgid "Source Location"
-msgstr "Местоположение источника"
+msgstr "Место хранения источника"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -3423,6 +3443,8 @@ msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
+"Количества, ед. изм., ТМЦ и места хранения не могут быть изменены в "
+"обработанных перемещениях ТМЦ (исключая администратора)"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -3558,7 +3580,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr ""
+msgstr "Тип сцепленного места хранения"
 
 #. module: stock
 #: help:stock.picking,move_type:0
@@ -3621,7 +3643,7 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
-"Это местоположение будет использоваться (вместо местоположения по "
+"Это место хранения будет использоваться (вместо места хранения по "
 "умолчанию), как место назначения продукции отправляемой этому партнеру"
 
 #. module: stock
@@ -3673,13 +3695,15 @@ msgstr ""
 #: field:product.product,location_id:0
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr "Местоположение запасов"
+msgstr "Место хранения ТМЦ"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
+"Отметьте, чтобы разрешить использование этого места хранения для "
+"бракованных/сломанных товаров."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3805,6 +3829,9 @@ msgid ""
 "incoming stock moves will be posted in this account. If not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"При оценке запасов в реальном времени, корреспондирующие объекты в журнале "
+"для всех входящих перемещений ТМЦ будут помещены на этот счет. Если он не "
+"установлен для ТМЦ, то будет использован из категории ТМЦ."
 
 #. module: stock
 #: view:stock.picking:0
@@ -3833,7 +3860,7 @@ msgstr ""
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
 msgid "Location"
-msgstr "Местоположение"
+msgstr "Место хранения"
 
 #. module: stock
 #: view:stock.move:0
@@ -3989,9 +4016,9 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by procurements"
 msgstr ""
-"Для текущей продукции, это местоположение будет использоваться (вместо "
-"местоположения по умолчанию), как источник местоположения для перемещения "
-"запасов, генерируемых в процессе снабжения"
+"Это место хранения будет использоваться (вместо места хранения по "
+"умолчанию), как источник для перемещения запасов, генерируемых в процессе "
+"снабжения"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -4051,7 +4078,7 @@ msgstr "запланировано"
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr ""
+msgstr "Сцепленная компания"
 
 #. module: stock
 #: view:stock.picking:0
@@ -4070,6 +4097,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Насильно указать партию изделий для всех перемещений, содержащих этот товар "
+"и поступающих из места хранения поставщика"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -4146,7 +4175,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_location_form
 #: view:stock.picking:0
 msgid "Locations"
-msgstr "Расположения"
+msgstr "Места хранения"
 
 #. module: stock
 #: view:stock.picking:0
@@ -4178,7 +4207,7 @@ msgstr "Перемещения тоаров"
 #: field:report.stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr "Местоположение назначения"
+msgstr "Место назначения"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
@@ -4251,6 +4280,9 @@ msgid ""
 "outgoing stock moves will be posted in this account. If not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"При оценке запасов в реальном времени, корреспондирующие объекты в журнале "
+"для всех входящих перемещений ТМЦ будут помещены на этот счет. Если он не "
+"установлен для ТМЦ, то будет использован из категории ТМЦ."
 
 #. module: stock
 #: view:stock.tracking:0
@@ -4260,7 +4292,7 @@ msgstr ""
 #. module: stock
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr ""
+msgstr "Содержимое места хранения"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -4306,7 +4338,7 @@ msgstr ""
 #: field:stock.location,scrap_location:0
 #: view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr ""
+msgstr "Место хранения брака"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -4375,7 +4407,7 @@ msgstr ""
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr ""
+msgstr "Опционально: следующее перемещение ТМЦ, при перемещении по цепочке"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -4396,7 +4428,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr "Физические местоположения"
+msgstr "Физические места хранения"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 507f475a13e..91ded919ced 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -83,11 +83,11 @@
                 <separator orientation="vertical"/>
                 <filter string="Done"
                     name="done"
-                    icon="terp-check"
+                    icon="terp-dialog-close"
                     domain="[('state','=','done')]"
                     help = "Completed Stock-Moves"/>
                 <filter string="Todo"
-                    icon="terp-stock"
+                    icon="terp-gtk-go-back-rtl"
                     domain="[('state','in',('assigned','waiting','confirmed'))]"
                     help = "Future Stock-Moves"/>
 
@@ -100,28 +100,6 @@
                 <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter name="group_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
-                    <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
-                    <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}" help="Shipping type specify, goods coming in or going out"/>
-                    <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day Planned"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}" help="Month Planned"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"  help="Year Planned"/>
-                </group>
-                <newline/>
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="location_id" />
                     <field name="location_dest_id" />
@@ -132,6 +110,28 @@
                     <newline/>
                     <field name="date"/>
                 </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter name="group_partner" string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
+                    <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Type" name="group_type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}" help="Shipping type specify, goods coming in or going out"/>
+                    <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day Planned"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}" help="Month Planned"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"  help="Year Planned"/>
+                </group>
             </search>
         </field>
     </record>
@@ -207,20 +207,6 @@
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." >
-                    <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
-                    <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                     <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter name="group_company" string="Company" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                    <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                </group>
-                <newline/>
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="partner_id" context="{'contact_display':'partner'}"/>
                     <field name="product_categ_id" />
@@ -230,6 +216,20 @@
                     <field name="date"/>
                     <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                 </group>
+                <newline/>
+                <group expand="1" string="Group By..." >
+                    <filter string="Partner" name="group_partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
+                    <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                     <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_company" string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                    <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9e3de5fca7c..dfe01760d1a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -476,9 +476,9 @@
                 <search string="Stock Locations">
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
-                    <filter icon="terp-go-home" name="customer"
+                    <filter icon="terp-personal" name="customer"
                         string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations" />
-                    <filter icon="terp-go-home" name="supplier"
+                    <filter icon="terp-personal" name="supplier"
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
                     <field name="name"/>
@@ -758,23 +758,21 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
+                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="address_id"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'address_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
                         <filter string="Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
-                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -962,14 +960,14 @@
                    </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1176,18 +1174,19 @@
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
+                        <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
+                    </group>
+					<newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
-                    </group>
-                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
-                        <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1248,7 +1247,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1391,9 +1390,9 @@
                     <separator colspan="4"/>
                     <field name="state"/>
                     <group col="4" colspan="2">
+                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                         <button name="force_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_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
                     </group>
                 </form>
@@ -1410,7 +1409,7 @@
                     <group col="14" colspan="4">
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-check" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
+                        <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                         <separator orientation="vertical"/>
@@ -1461,12 +1460,15 @@
         ====================================
         Reception Picking (By Stock Move)
         ====================================
-
+			<!--  from stock_partial_move_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>
-            <field eval="6" name="priority"/>
+            <field name="priority" eval="6" />
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel')" string="Moves">
                     <field name="picking_id" string="Reference"/>
@@ -1521,6 +1523,7 @@
                 </tree>
             </field>
         </record>
+	
 
         <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>
@@ -1604,26 +1607,26 @@
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
                         <field name="partner_id" string="Partner"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Supplier" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
-                    </group>
                 </search>
             </field>
         </record>
@@ -1639,27 +1642,26 @@
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
                         <field name="partner_id" string="Partner"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Customer" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
-                    </group>
                 </search>
             </field>
         </record>
@@ -1672,7 +1674,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock'))"/>
+            <field name="context" eval="'{\'search_default_receive\':1, \'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
             <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
             <field name="help">You will find here the list of all products you are waiting for, according to your preceding purchase orders. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index a8327e50d0f..ba39f172f22 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -23,164 +23,124 @@ from osv import fields, osv
 from tools.translate import _
 import time
 
+
+class stock_partial_move_memory(osv.osv_memory):
+    _name = "stock.move.memory"
+    _rec_name = 'product_id'
+    _columns = {
+        'product_id' : fields.many2one('product.product', string="Product", required=True, readonly=True),
+        'quantity' : fields.float("Quantity", required=True),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True, readonly=True),
+        'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot'),
+        'move_id' : fields.many2one('stock.move', "Move"),
+        'wizard_id' : fields.many2one('stock.partial.move', string="Wizard"),
+        'cost' : fields.float("Cost", help="Unit Cost for this product line", readonly=True),
+        'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed", readonly=True),
+    }
+    
 class stock_partial_move(osv.osv_memory):
     _name = "stock.partial.move"
     _description = "Partial Move"
     _columns = {
         'date': fields.datetime('Date', required=True),
         'type': fields.char("Type", size=3),
+        'product_moves' : fields.one2many('stock.move.memory', 'wizard_id', 'Moves'),
      }
-
+    
     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={}
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
-            if m.state in ('done', 'cancel'):
+            context = {}
+        for move in move_obj.browse(cr, uid, context.get('active_ids', [])):
+            if move.state in ('done', 'cancel'):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
-
-            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 'move%s_prodlot_id'%(m.id) not in self._columns:
-                self._columns['move%s_prodlot_id'%(m.id)] = fields.many2one('stock.production.lot', string="Lot")
-                
-            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("Cost", help="Unit Cost for this product line")
-                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", help="Currency in which Unit cost is expressed")
+            
         return res
+    
+    
+    def __create_partial_move_memory(self, move):
+        move_memory = {
+            'product_id' : move.product_id.id,
+            'quantity' : move.product_qty,
+            'product_uom' : move.product_uom.id,
+            'prodlot_id' : move.prodlot_id.id,
+            'move_id' : move.id,
+        }
+        if move.picking_id.type == 'in':
+            move_memory.update({
+                'cost' : move.product_id.standard_price,
+                'currency' : move.product_id.company_id.currency_id.id,
+            })
+        return move_memory
 
-    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)
+    def __get_active_stock_moves(self, cr, uid, context=None):
         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="2"/>
-                        <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,
-                    },
-                    'move%s_prodlot_id'%(m.id): {
-                            'string': _('Production Lot'),
-                            'type': 'many2one',
-                            'relation': 'stock.production.lot',
-                        }                    
-                })
+        if not context:
+            context = {}
+               
+        res = []
+        for move in move_obj.browse(cr, uid, context.get('active_ids', [])):
+            if move.state in ('done', 'cancel'):
+                continue           
+            res.append(self.__create_partial_move_memory(move))
+            
+        return res
+    
+    _defaults = {
+        'product_moves' : __get_active_stock_moves,
+        'date' : time.strftime('%Y-%m-%d %H:%M:%S'),
+    }
+    
 
-                _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" />
-                    <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]"  groups="base.group_extended" />                    
-                """%(m.id, m.id, 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': _('Cost'),
-                            'type' : 'float',
-                            'help': _('Unit Cost for this product line'),
-                        },
-                        'move%s_product_currency'%(m.id): {
-                            'string': _('Currency'),
-                            'type' : 'many2one',
-                            'relation': 'res.currency',
-                            'help': _("Currency in which Unit Cost is expressed"),
-                        }
-                    })
-                    _moves_arch_lst += """
-                        <field name="move%s_product_price" />
-                        <field name="move%s_product_currency" nolabel="1"/>
-                    """%(m.id, m.id)
-                _moves_arch_lst += """
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        height = 2 * 25;
+        message = {
+                'title' : _('Deliver Products'),
+                'info' : _('Delivery Information'),
+                'button' : _('Deliver'),
+                }
+        if context:
+            height = (len(context.get('active_ids', [])) + 1) * 25  
+            if context.get('product_receive', False):
+                message = {
+                    'title' : _('Receive Products'),
+                    'info' : _('Receive Information'),
+                    'button' : _('Receive'),
+                }
+        message['height'] = height       
+                
+        
+        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        _moves_fields = result['fields']
+        _moves_fields.update({'product_moves' : 
+                            { 
+                                'relation': 'stock.move.memory',
+                                'type' : 'one2many',
+                                'string' : 'Product Moves',
+                            }
+                            })
+        
+        _moves_arch_lst = """
+                <form string="%(title)s">
+                    <separator colspan="4" string="%(info)s"/>
+                    <field name="date" colspan="2"/>
+                    <separator colspan="4" string="Move Detail"/>
+                    <field name="product_moves" colspan="4" nolabel="1" width="550" height="200" />
+                    <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="%(button)s"
+                            colspan="1" type="object" icon="gtk-apply" />
                     </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>"""
+                </form> """ % message
+        
         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={}
-        if 'date' in fields:
-            res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
-        move_ids = context.get('active_ids', [])
-        move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
-            if m.state in ('done', 'cancel'):
-                continue
-            res['type'] = m.picking_id and m.picking_id.type or ''
-            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 'move%s_prodlot_id'%(m.id) in fields:
-                    res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
-            if m.picking_id.type == 'in' and m.product_id.cost_method == 'average':
-                # Always use default product cost and currency from Product Form, 
-                # which belong to the Company owning the product
-                currency = m.product_id.company_id.currency_id.id
-                price = m.product_id.standard_price
-                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):
         """ Makes partial moves and pickings done.
         @param self: The object pointer.
@@ -190,32 +150,44 @@ class stock_partial_move(osv.osv_memory):
         @param context: A standard dictionary
         @return: A dictionary which of fields with values.
         """
+    
 
         move_obj = self.pool.get('stock.move')
+        
         move_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)
         partial_datas = {
             'delivery_date' : partial.date
         }
-        for m in move_obj.browse(cr, uid, move_ids):
-            if m.state in ('done', 'cancel'):
+        
+        p_moves = {}
+        for product_move in partial.product_moves:
+            p_moves[product_move.move_id.id] = product_move
+            
+        moves_ids_final = []
+        for move in move_obj.browse(cr, uid, move_ids):
+            if move.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,
-                'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id
+            if not p_moves.get(move.id, False):
+                continue
+            partial_datas['move%s' % (move.id)] = {
+                'product_id' : p_moves[move.id].product_id.id,
+                'product_qty' : p_moves[move.id].quantity,
+                'product_uom' : p_moves[move.id].product_uom.id,
+                'prodlot_id' : p_moves[move.id].prodlot_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
+            moves_ids_final.append(move.id)
+            if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
+                partial_datas['move%s' % (move.id)].update({
+                    'product_price' : p_moves[move.id].cost,
+                    'product_currency': p_moves[move.id].currency.id,
                 })
-        move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
+                
+                
+        move_obj.do_partial(cr, uid, moves_ids_final, partial_datas, context=context)
         return {}
 
 stock_partial_move()
-
+stock_partial_move_memory()
 # 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
index 457ddc34ff7..2df24fc9ce8 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -2,13 +2,49 @@
 <openerp>
     <data>
 
-        <act_window name="Deliver Products"
+        <act_window name="Deliver/Receive Products"
             res_model="stock.partial.move"
             src_model="stock.move"
             view_mode="form"
+            multi="True"
             target="new"
             key2="client_action_multi"
-            id="action_partial_move"/>
-
+            id="action_partial_move"></act_window>
+            
+		
+		<record id="stock_move_memory_tree" model="ir.ui.view">
+            <field name="name">stock.move.memory.tree</field>
+            <field name="model">stock.move.memory</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Product Moves">
+                    <field name="product_id" readonly="1" />
+                    <field name="quantity" ></field>
+                    <field name="product_uom"></field>
+                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]"  groups="base.group_extended" ></field>
+                    <field name="cost"></field>
+                    <field name="currency" ></field>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="stock_move_memory_form" model="ir.ui.view">
+            <field name="name">stock.move.memory.form</field>
+            <field name="model">stock.move.memory</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                   <field name="product_id" readonly="1" />
+                    <field name="quantity" ></field>
+                    <field name="product_uom"></field>
+                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" ></field>
+                    <field name="cost"></field>
+                    <field name="currency"></field>
+                </form>
+            </field>
+        </record>
+		
+     
+		
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 6f84e5ec12c..6b3b130b0dc 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -141,7 +141,7 @@ class stock_partial_picking(osv.osv_memory):
                 <button icon='gtk-cancel' special="cancel"
                     string="_Cancel" />
                 <button name="do_partial" string="_Validate"
-                    colspan="1" type="object" icon="gtk-apply" />
+                    colspan="1" type="object" icon="gtk-go-forward" />
             </group>
         </form>"""
         result['arch'] = _moves_arch_lst
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 8d8c3cd3790..aaf7e77c0b2 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -198,8 +198,8 @@
                     <field name="create_uid"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                        <separator orientation="vertical"/>
                        <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
@@ -302,8 +302,8 @@
                     <field name="product_id"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Warehouse " icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                        <separator orientation="vertical"/>
                     </group>
diff --git a/addons/survey/i18n/nl.po b/addons/survey/i18n/nl.po
new file mode 100644
index 00000000000..57487a0f57a
--- /dev/null
+++ b/addons/survey/i18n/nl.po
@@ -0,0 +1,1914 @@
+# Dutch 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: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-28 18:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <nl@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-10-29 05:29+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"You must enter one or more menu choices\\n                                 "
+"in column heading"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"'  \n"
+"\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
+"                            if key.split('_"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr ""
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_date:0
+#: field:survey.question,validation_maximum_date:0
+msgid "Maximum date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Maximum Required Answer you\\n                                     entered "
+"for your maximum is greater than the number of answer.\\n                    "
+"                  Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"'  \n"
+"\" + tools.ustr(que_rec['comment_valid_err_msg'])))\n"
+"\n"
+"                                resp_obj.write(cr, uid, resp_id, "
+"{'comment':val1})\n"
+"                                "
+"sur_name_read['store_ans'][resp_id].update({key1:val1})\n"
+"\n"
+"                        elif val1 and key1.split('_"
+msgstr ""
+
+#. module: survey
+#: selection:survey.request,state:0
+msgid "Wating Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr ""
+
+#. 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 ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.send.invitation.log:0
+msgid "Ok"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "You can not give answer because of survey is not open for answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_selection.py:0
+#: code:addons/survey/wizard/survey_send_invitation.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Maximum Required Answer you \\n                                    entered "
+"for your maximum is greater than the number of answer.\\n                    "
+"                 Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"                        elif (que_rec['required_type'] == 'all' and "
+"select_count < len(que_rec['answer_choice_ids'])) or \\n                     "
+"       (que_rec['required_type'] == 'at least' and select_count < "
+"que_rec['req_ans']) or \\n                            "
+"(que_rec['required_type'] == 'at most' and select_count > "
+"que_rec['req_ans']) or \\n                            "
+"(que_rec['required_type'] == 'exactly' and select_count != "
+"que_rec['req_ans']) or \\n                            "
+"(que_rec['required_type'] == 'a range' and (select_count < "
+"que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):\n"
+"                            for res in resp_id_list:\n"
+"                                sur_name_read['store_ans'].pop(res)\n"
+"                            raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"'  \n"
+"\" + tools.ustr(que_rec['comment_valid_err_msg'])))\n"
+"                                resp_obj.write(cr, uid, update, "
+"{'comment':val,'state': 'done'})\n"
+"                                "
+"sur_name_read['store_ans'][update].update({key:val})\n"
+"\n"
+"                        elif val and key.split('_"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"'  \n"
+"\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
+"\n"
+"                            if key1.split('_"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_type_form
+#: model:ir.model,name:survey.model_survey_type
+#: view:survey.type:0
+msgid "Survey Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_request_tree
+#: model:ir.ui.menu,name:survey.menu_survey_type_form1
+msgid "Survey Requests"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more column heading."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Send"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Watting Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"#Required Answer you entered \\n                                    is "
+"greater than the number of answer. \\n                                    "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr ""
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the comment is an invalid format, display this error message"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "Questions"
+msgstr ""
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one Answer per user"
+msgstr ""
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the choices do not add up correctly, display this error message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "You can not give answer for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"        return True\n"
+"\n"
+"    def action_new_question(self,cr, uid, ids, context):\n"
+"        \"\"\"\n"
+"        New survey.Question form.\n"
+"\n"
+"        @param self: The object pointer\n"
+"        @param cr: the current row, from the database cursor,\n"
+"        @param uid: the current user’s ID for security checks,\n"
+"        @param ids: List of survey.question.wiz IDs\n"
+"        @param context: A standard dictionary for contextual values\n"
+"        @return : Dictionary value for Open new survey.Qestion form.\n"
+"        \"\"\"\n"
+"        for key,val in context.items():\n"
+"            if type(key) == type(True):\n"
+"                context.pop(key)\n"
+"        view_id = self.pool.get('ir.ui.view"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"                    if que_rec['type'] in "
+"['multiple_choice_only_one_ans','single_textbox','comment'] and  "
+"que_rec['is_require_answer'] and select_count <= 0:\n"
+"                        for res in resp_id_list:\n"
+"                            sur_name_read['store_ans'].pop(res)\n"
+"                        raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"#Required Answer you entered is \\n                                    "
+"greater than the number of answer.\\n                                    "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \n"
+" Please enter an integer value "
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question']  + \"' \" + "
+"tools.ustr(que_rec['make_comment_field_err_msg'])))\n"
+"\n"
+"                    if que_rec['type'] == \"rating_scale\" and "
+"que_rec['rating_allow_one_column_require'] and len(selected_value) > "
+"len(list(set(selected_value))):\n"
+"                        for res in resp_id_list:\n"
+"                            sur_name_read['store_ans'].pop(res)\n"
+"                        raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
+#: view:survey:0
+#: view:survey.print.answer:0
+msgid "Print Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Waiting Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question']  + \"' \" + "
+"tools.ustr(que_rec['make_comment_field_err_msg'])))\n"
+"\n"
+"                if que_rec['type'] == \"rating_scale\" and "
+"que_rec['rating_allow_one_column_require'] and len(selected_value) > "
+"len(list(set(selected_value))):\n"
+"                    raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"                    elif (que_rec['required_type'] == 'all' and select_count "
+"< len(que_rec['answer_choice_ids'])) or \\n                        "
+"(que_rec['required_type'] == 'at least' and select_count < "
+"que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
+"== 'at most' and select_count > que_rec['req_ans']) or \\n                   "
+"     (que_rec['required_type'] == 'exactly' and select_count != "
+"que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
+"== 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count "
+"> que_rec['maximum_req_ans'])):\n"
+"                            raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + "
+"tools.ustr(que_rec['numeric_required_sum_err_msg'])))\n"
+"\n"
+"                    if que_rec['type'] in ['multiple_textboxes_diff_type', "
+"'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_ch"
+"oices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_te"
+"xtboxes','numerical_textboxes','date','date_and_time'] and "
+"que_rec['is_require_answer']:\n"
+"                        if matrix_list:\n"
+"                            if (que_rec['required_type'] == 'all' and "
+"len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \\n      "
+"                      (que_rec['required_type'] == 'at least' and "
+"len(list(set(matrix_list))) < que_rec['req_ans']) or \\n                     "
+"       (que_rec['required_type'] == 'at most' and "
+"len(list(set(matrix_list))) > que_rec['req_ans']) or \\n                     "
+"       (que_rec['required_type'] == 'exactly' and "
+"len(list(set(matrix_list))) != que_rec['req_ans']) or \\n                    "
+"        (que_rec['required_type'] == 'a range' and "
+"(len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or "
+"len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):\n"
+"                                for res in resp_id_list:\n"
+"                                    sur_name_read['store_ans'].pop(res)\n"
+"                                raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Maximum Required Answer is greater \\n                                    "
+"than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Minimum Required Answer\\n                                     you entered "
+"is greater than the number of answer.\\n                                    "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"\n"
+" you cannot select same answer more than one times'"
+msgstr ""
+
+#. module: survey
+#: help:survey.browse.answer,response_id:0
+msgid ""
+"If this field is empty, all answers of the selected survey will be print."
+msgstr ""
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr ""
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+#: view:survey.send.invitation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"        else:\n"
+"            resp_id_list = []\n"
+"            for update in click_update:\n"
+"                que_rec = que_obj.read(cr, uid , "
+"[int(sur_name_read['store_ans'][update]['question_id'])], [])[0]\n"
+"                res_ans_obj.unlink(cr, uid,res_ans_obj.search(cr, uid, "
+"[('response_id', '=', update)]))\n"
+"                surv_tbl_column_obj.unlink(cr, "
+"uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', "
+"update)]))\n"
+"                resp_id_list.append(update)\n"
+"                "
+"sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store"
+"_ans'][update]['question_id']}})\n"
+"                surv_name_wiz.write(cr, uid, "
+"[context.get('sur_name_id',False)], "
+"{'store_ans':sur_name_read['store_ans']})\n"
+"                select_count = 0\n"
+"                numeric_sum = 0\n"
+"                selected_value = []\n"
+"                matrix_list = []\n"
+"                comment_field = False\n"
+"                comment_value = False\n"
+"                response_list = []\n"
+"\n"
+"                for key, val in vals.items():\n"
+"                    ans_id_len = key.split('_"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Current"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \n"
+"Please enter an integer value "
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "Complete Survey Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr ""
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + "
+"tools.ustr(que_rec['numeric_required_sum_err_msg'])))\n"
+"\n"
+"                if not select_count:\n"
+"                    resp_obj.write(cr, uid, update, {'state': 'skip'})\n"
+"\n"
+"                if que_rec['type'] in "
+"['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_cho"
+"ices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_me"
+"nus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_a"
+"nd_time'] and que_rec['is_require_answer']:\n"
+"                    if matrix_list:\n"
+"                        if (que_rec['required_type'] == 'all' and "
+"len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \\n      "
+"                  (que_rec['required_type'] == 'at least' and "
+"len(list(set(matrix_list))) < que_rec['req_ans']) or \\n                     "
+"   (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > "
+"que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
+"== 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \\n   "
+"                     (que_rec['required_type'] == 'a range' and "
+"(len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or "
+"len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):\n"
+"                            raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr ""
+
+#. module: survey
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"You must enter one or more menu \\n                                choices "
+"in column heading (white spaces not allowed)"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
+#: model:ir.model,name:survey.model_survey_send_invitation_log
+msgid "survey.send.invitation.log"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"                if que_rec['type'] in "
+"['multiple_choice_only_one_ans','single_textbox','comment'] and  "
+"que_rec['is_require_answer'] and select_count <= 0:\n"
+"                    raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more answer."
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and related answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:0
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr ""
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Minimum Required Answer you\\n                                     entered "
+"is greater than the number of answer. \\n                                    "
+" Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 713f3dbf7a4..a78af4bf235 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -263,7 +263,7 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="Current" domain="[('state','in', ('draft', 'open'))]"/>
+                        <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]"/>
                         <separator orientation="vertical"/>
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
@@ -1064,10 +1064,10 @@
                      <field name="response" readonly="1"/>
                     <group colspan="4" col="6">
                      <field name="state"/>
-                         <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
+                        <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                        <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
                         <button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
                         <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
-                        <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/thunderbird/i18n/nl.po b/addons/thunderbird/i18n/nl.po
new file mode 100644
index 00000000000..10abd71b164
--- /dev/null
+++ b/addons/thunderbird/i18n/nl.po
@@ -0,0 +1,148 @@
+# Dutch 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: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-28 14:27+0000\n"
+"Last-Translator: Sam_inv <Unknown>\n"
+"Language-Team: Dutch <nl@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-10-29 05:29+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: thunderbird
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,plugin_file:0
+#: field:thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr ""
+
+#. module: thunderbird
+#: help:thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you’d like to add to your email and its "
+"attachments."
+msgstr ""
+
+#. module: thunderbird
+#: help:thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+"Thunderbird plug-in bestand. Sla dit bestand op en installeer deze plug-in "
+"in Thunderbird"
+
+#. module: thunderbird
+#: help:thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr ""
+
+#. module: thunderbird
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "title"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_partner
+msgid "Thunderbid mails"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
+msgid "Thunderbird Plug-In"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr ""
+
+#. module: thunderbird
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_installer
+msgid "thunderbird.installer"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,name:0
+#: field:thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Bestandsnaam"
+
+#. module: thunderbird
+#: field:thunderbird.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,description:0
+msgid "Description"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
+msgid "Thunderbird Plug-In Configuration"
+msgstr ""
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Skip"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr ""
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 0ef75eb4be6..a1c74fa5d11 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -231,7 +231,8 @@ sale_order_line()
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
     def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order=False, fiscal_position=False):
+            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+            name=False, price_unit=False, notes=False):
         warning = {}
         if not product:
             return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}