diff --git a/addons/account/account.py b/addons/account/account.py
index ac82f7fe026..54354b4ea90 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1144,6 +1144,7 @@ class account_move(osv.osv):
         return amount
 
     def _centralise(self, cr, uid, move, mode, context=None):
+        assert(mode in ('debit', 'credit'), 'Invalid Mode') #to prevent sql injection
         if context is None:
             context = {}
 
@@ -1191,10 +1192,7 @@ class account_move(osv.osv):
         else:
             line_id2 = 0
 
-        cr.execute('SELECT SUM('+mode+') '\
-                   'FROM account_move_line '\
-                   'WHERE move_id=%s AND id<>%s',
-                   (move.id, line_id2))
+        cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
         result = cr.fetchone()[0] or 0.0
         cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
         return True
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 6de3dabaa28..0e46944a436 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -45,7 +45,7 @@ class account_bank_statement(osv.osv):
             'type': 'ir.actions.act_window',
             'target': 'new',
             'nodestroy': True
-                }
+        }
 
     def _default_journal_id(self, cr, uid, context={}):
         if context.get('journal_id', False):
@@ -556,9 +556,9 @@ account_bank_statement_reconcile_line()
 
 class account_bank_statement_line(osv.osv):
 
-    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id,
-            context={}):
+    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context={}):
         res = {'value': {}}
+        
         if not partner_id:
             return res
         line = self.browse(cursor, user, line_id)
@@ -591,6 +591,10 @@ class account_bank_statement_line(osv.osv):
             balance = res_currency_obj.compute(cursor, user, company_currency_id,
                 currency_id, balance, context=context)
             res['value']['amount'] = balance
+        
+        if context.get('amount', 0) > 0:
+            res['value']['amount'] = context.get('amount')
+            
         return res
 
     def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index bceb1b3c857..fc10c58cc8f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -349,11 +349,15 @@
                    <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel','cancel'])]" help="Invoices"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id" default="uid"/>
+                        <field name="user_id" select="1" default="uid" widget="selection" string="Responsible">
+                            <filter domain="[('user_id','=',uid)]" help="Responsible" icon="terp-partner" separator="1"/>
+                        </field>
                         <field name="origin"/>
                         <field name="amount_total"/>
                     </group>
@@ -363,7 +367,7 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 6480178d1ae..fc622d8f0c0 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -34,7 +34,7 @@
             string="Taxes Report"/>
 
         <report id="report_account_voucher_new"
-            string="Voucher"
+            string="Print Voucher"
             model="account.move"
             name="account.move.voucher"
             rml="account/report/voucher_print.rml"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 809927dbabf..b686d9e30c7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -330,12 +330,12 @@
             <field name="arch" type="xml">
                 <form string="Account Journal">
                     <group colspan="4" col="6">
-                        <field name="name" select="1"/>
+                        <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
                         <field name="type" on_change="onchange_type(type)"/>
                         <field name="refund_journal" attrs="{'readonly':[('type','=','general'),('type','=','cash'),('type','=','situation')]}"/>
                     </group>
-					    <notebook colspan="4">
+                    <notebook colspan="4">
                         <page string="General Information">
                             <group colspan="2" col="2">
                                 <separator string="Journal View" colspan="4"/>
@@ -353,9 +353,10 @@
                                 <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             </group>
 
-							<group colspan="2" col="2">
-                                <separator string="Validations" colspan="4"/>
-                                <field name="allow_date" groups="base.group_extended"/>
+                            <group colspan="2" col="2">
+                                <separator string="Invoicing Data" colspan="4"/>
+                                <field name="invoice_sequence_id"/>
+                                <field name="group_invoice_lines"/>
                             </group>
 
                             <group colspan="2" col="2">
@@ -364,16 +365,18 @@
                                 <field name="user_id" groups="base.group_extended"/>
                                 <field name="currency"/>
                             </group>
+                            <group col="2" colspan="2">
+                                <group colspan="2" col="2">
+                                    <separator string="Validations" colspan="4"/>
+                                    <field name="allow_date" groups="base.group_extended"/>
+                                </group>
 
-                            <group colspan="2" col="2">
-                                <separator string="Other Configuration" colspan="4"/>
-                                <field name="centralisation" groups="base.group_extended"/>
-                                <field name="entry_posted"/>
-	                            <group colspan="2" col="2">
-	                                <separator string="Invoicing Data" colspan="4"/>
-	                                <field name="invoice_sequence_id"/>
-	                                <field name="group_invoice_lines"/>
-	                            </group>
+                                <group colspan="2" col="2">
+                                    <separator string="Other Configuration" colspan="4"/>
+                                    <field name="centralisation" groups="base.group_extended"/>
+                                    <field name="entry_posted"/>
+                                    <field name="update_posted"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Entry Controls" groups="base.group_extended">
@@ -394,6 +397,24 @@
         </record>
         <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
 
+        <record id="view_account_bank_statement_filter" model="ir.ui.view">
+            <field name="name">account.bank.statement.select</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Statement">
+                   <group col="10" colspan="4">
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Statement"/>
+                        <filter icon="terp-check" string="Poster" domain="[('state','=','confirm')]" help="Confirm confirm"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="journal_id"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
@@ -453,6 +474,7 @@
                     <newline/>
                     <field name="balance_start"/>
                     <field name="balance_end_real"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">
@@ -462,7 +484,7 @@
                                     <field name="ref"/>
                                     <field name="name"/>
                                     <field name="type"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, {'amount': amount})"/>
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
                                     <field name="amount"/>
                                     <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency, 'journal_id': parent.journal_id, 'date':date}" name="reconcile_id"/>
@@ -1000,6 +1022,7 @@
                     <field name="to_check" groups="base.group_extended"/>
                     <field name="amount"/>
                     <field name="state"/>
+                    <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -1010,11 +1033,12 @@
             <field name="arch" type="xml">
                 <form string="Journal Entries">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" colspan="4" readonly="True"/>
+                        <field name="name" select="1" readonly="True"/>
                         <field name="journal_id" select="1"/>
                         <field name="period_id"/>
                         <field name="type"/>
                         <field name="ref" select="1"/>
+                        <field name="date" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Entries Lines">
@@ -1089,15 +1113,20 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entries"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Entries"/>
                         <separator orientation="vertical"/>
+                        <filter icon="terp-camera_test" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
                         <field name="journal_id" select='1'/>
                         <field name="partner_id" select='1'/>
                     </group>
                     <newline/>
+                    <group col="10" colspan="4">
+                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
+                        <field name="period_id" widget="selection" context="{'period_id':self}"/>
+                    </group>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <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'}"/>
@@ -1144,8 +1173,8 @@
             <field name="domain">[('to_check','=',True)]</field>
         </record>
         <menuitem action="action_move_to_review" id="menu_action_move_to_review" parent="periodical_processing_journal_entries_validation"/>
-        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>
-        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
+<!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
+<!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
             <field name="name">Journal Vouchers</field>
@@ -1171,13 +1200,14 @@
         <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
 
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
-            <field name="name">Transaction Journal</field>
+            <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('journal_id.type', 'in', ['purchase', 'purchase_refund'])]</field>
+            <field name="context">{'journal_id':1}</field>
         </record>
 
         <menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
@@ -1225,7 +1255,7 @@
         <menuitem action="action_move_line_search_view3" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
         <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
 
-        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
+<!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
     <!--    <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
@@ -1240,13 +1270,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Statement">
-                    <field name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-                    <field name="currency"/>
-                    <newline/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+                        <field name="currency"/>
+                        <field name="balance_start"/>
+                        <field name="balance_end_real"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Select entries">
                             <field colspan="4" domain="[('statement_id', '=', False), ('journal_id', '=', journal_id)]" name="move_line_ids" nolabel="1" widget="many2many"/>
@@ -2215,6 +2246,23 @@
             parent="account.menu_finance_entries"
             sequence="5"/>
 
+        <record id="action_account_moves_all" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+        </record>
+
+        <menuitem
+            action="action_account_moves_all"
+            icon="STOCK_JUSTIFY_FILL"
+            id="menu_eaction_account_moves_all"
+            parent="account.menu_finance_entries"
+            sequence="4"
+        />
+
 
     </data>
 </openerp>
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 941a87b5fdc..4779ae32dd5 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-11 21:46+0000\n"
-"Last-Translator: Juan Eduardo Riva <juaneduardoriva@gmail.com>\n"
+"PO-Revision-Date: 2010-06-23 17:24+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -60,7 +61,7 @@ msgstr "Nombre de modelo inválido en la definición de acción."
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "La moneda utilizada para introducir asientos"
+msgstr "La divisa utilizada para introducir asientos."
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -456,7 +457,7 @@ msgstr "Estado"
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr "Facturas de abono de proveedor sin pagar"
+msgstr "Facturas rectificativas (abono) de proveedor sin pagar"
 
 #. module: account
 #: view:account.tax:0
@@ -1232,10 +1233,10 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"Permite seleccionar la forma en que la tasa de la moneda actual de las "
-"transacciones de salida se calcula. En la mayoría de los países el método "
-"legal es \"Promedio\", pero sólo unos pocos sistemas de software son capaces "
-"de gestionarlo. Por lo tanto, si la importación procede de otro sistema de "
+"Permite seleccionar la forma en que se calcula la tasa de la divisa actual "
+"en las transacciones de salida. En la mayoría de los países el método legal "
+"es \"Promedio\", pero sólo unos pocos sistemas de software son capaces de "
+"gestionarlo. Por lo tanto, si la importación procede de otro sistema de "
 "software, es posible que tenga que utilizar la tasa \"En fecha\". Las "
 "transacciones de entrada siempre utilizan la tasa \"En fecha\"."
 
@@ -1887,7 +1888,7 @@ msgstr "Fecha inicial"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "x Diario facturas de abono de gastos"
+msgstr "x Diario facturas rectificativas (abono) de gastos"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1914,7 +1915,7 @@ msgstr "Base imponible"
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Cuenta impuestos de factura"
+msgstr "Cuenta impuestos de facturas"
 
 #. module: account
 #: view:account.move.line:0
@@ -2026,7 +2027,7 @@ msgstr "Informe analítico de diario"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Facturas de abono de cliente"
+msgstr "Facturas rectificativas (abono) de cliente"
 
 #. module: account
 #: rml:account.vat.declaration:0
@@ -2047,7 +2048,7 @@ msgstr "Nombre diario-período"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "Nombre impuesto del caso"
+msgstr "Nombre código de impuesto"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2114,7 +2115,7 @@ msgstr "Comentario situacion fiscal"
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr "Periodo asientos de apertura"
+msgstr "Período asientos de apertura"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2145,7 +2146,7 @@ msgstr "Anterior"
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr "Moneda"
+msgstr "Divisa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -2225,7 +2226,7 @@ msgstr "Facturas de proveedor en borrador"
 #. module: account
 #: wizard_field:account.invoice.refund,init,period:0
 msgid "Force period"
-msgstr "Forzar periodo"
+msgstr "Forzar período"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -2306,7 +2307,7 @@ msgstr "Fecha factura"
 #: help:account.third_party_ledger.report,init,periods:0
 #: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr "Todos los periodos si está vacío"
+msgstr "Todos los períodos si está vacío."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2530,7 +2531,7 @@ msgstr "Asientos conciliados"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr "La cantidad en la moneda del diario"
+msgstr "El importe en la divisa del diario."
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2928,7 +2929,7 @@ msgstr "Estado abierto"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Created Entries"
-msgstr "Omitir el estado 'Borrador ' para los asientos creados"
+msgstr "Omitir estado 'Borrador ' al crear asientos"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -2964,7 +2965,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
 #: model:ir.actions.act_window,name:account.action_invoice_tree12
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12
 msgid "Draft Supplier Refunds"
-msgstr "Facturas de abono de proveedor en borrador"
+msgstr "Facturas rectificativas (abono) de proveedor en borrador"
 
 #. module: account
 #: model:process.node,name:account.process_node_accountingstatemententries0
@@ -3051,7 +3052,7 @@ msgstr "Tasa de divisas de salida"
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10
 msgid "Draft Customer Refunds"
-msgstr "Facturas de abono de cliente en borrador"
+msgstr "Facturas rectificativas (abono) de cliente en borrador"
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -3084,7 +3085,7 @@ msgstr "Documento"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "El movimiento de esta línea del asiento."
+msgstr "El asiento de este apunte."
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -3234,7 +3235,7 @@ msgstr "Diario de banco"
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date and Period"
-msgstr "Por fecha y periodo"
+msgstr "Por fecha y período"
 
 #. module: account
 #: view:account.account:0
@@ -3343,7 +3344,7 @@ msgstr "Nombre impuesto"
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid " Close states of Fiscal year and periods"
-msgstr " Cerrar estados de ejercicio fiscal y periodos"
+msgstr " Cerrar estados de ejercicio fiscal y períodos"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
@@ -3540,7 +3541,7 @@ msgstr "Titular de la cuenta bancaria"
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Filter on Periods"
-msgstr "Filtrar por periodos"
+msgstr "Filtrar por períodos"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
@@ -3608,7 +3609,7 @@ msgstr "Impreso"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
 msgid "New Supplier Refund"
-msgstr "Nueva factura de abono de proveedor"
+msgstr "Nueva factura rectificativa (abono) de proveedor"
 
 #. module: account
 #: view:account.model:0
@@ -3618,7 +3619,7 @@ msgstr "Modelo de asiento"
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
 msgid "With Currency"
-msgstr "Con moneda"
+msgstr "Con divisa"
 
 #. module: account
 #: view:account.account:0
@@ -3723,7 +3724,7 @@ msgstr "Codificación asiento"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr "Factura de abono"
+msgstr "Factura rectificativa (abono)"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
@@ -3869,7 +3870,7 @@ msgstr "Secuencia del asiento"
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Closed"
-msgstr "Cerrado"
+msgstr "Cierre"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
@@ -3925,7 +3926,7 @@ msgstr "Movimiento"
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr "Estos periodos se pueden solapar."
+msgstr "Estos períodos se pueden solapar."
 
 #. module: account
 #: help:product.template,property_account_expense:0
@@ -3953,7 +3954,7 @@ msgstr "Diarios financieros"
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Period"
-msgstr "Por periodo"
+msgstr "Por período"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4051,7 +4052,7 @@ msgstr "Cuenta a pagar"
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 msgid "Secondary Currency"
-msgstr "Moneda secundaria"
+msgstr "Divisa secundaria"
 
 #. module: account
 #: field:account.account,credit:0
@@ -4086,7 +4087,7 @@ msgstr ""
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Cuenta impuestos de devoluciones"
+msgstr "Cuenta impuestos de reintegros"
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -4166,7 +4167,7 @@ msgstr "Límite a pagar"
 #: wizard_field:account.partner.balance.report,init,state:0
 #: wizard_field:account.third_party_ledger.report,init,state:0
 msgid "Date/Period Filter"
-msgstr "Filtrar fecha/periodo"
+msgstr "Filtrar por fecha/período"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -4189,7 +4190,7 @@ msgstr "Secuencias de diarios separadas"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
 msgid "The currency of the journal"
-msgstr "La moneda del diario"
+msgstr "La divisa del diario"
 
 #. module: account
 #: view:account.journal.column:0
@@ -4432,7 +4433,7 @@ msgstr "Fijado"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "Facturas de abono"
+msgstr "Facturas rectificativas (abono)"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4502,7 +4503,7 @@ msgstr "Línea del modelo de asiento"
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr "Plantilla de impuesto"
+msgstr "Plantilla de impuestos"
 
 #. module: account
 #: help:account.model,name:0
@@ -4624,7 +4625,7 @@ msgstr "Por fecha"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "Facturas de abono de proveedor"
+msgstr "Facturas rectificativas (abono) de proveedor"
 
 #. module: account
 #: help:account.model.line,date:0
@@ -5129,7 +5130,7 @@ msgstr "Cuenta de ingresos en plantilla producto"
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
 msgstr ""
-"Fuerza a todos los movimientos de esta cuenta que tengan esta moneda "
+"Fuerza a todos los movimientos de esta cuenta que tengan esta divisa "
 "secundaria."
 
 #. module: account
@@ -5143,7 +5144,7 @@ msgstr "_Cancelar"
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Select Date-Period"
-msgstr "Seleccionar fecha-periodo"
+msgstr "Seleccionar fecha-período"
 
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
@@ -5172,7 +5173,7 @@ msgstr "Grupo de Impuestos"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
 msgid "New Customer Refund"
-msgstr "Nueva factura de abono de cliente"
+msgstr "Nueva factura rectificativa (abono) de cliente"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5370,7 +5371,7 @@ msgstr "Pagado"
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
 msgid "Unpaid Customer Refunds"
-msgstr "Facturas de abono de cliente sin pagar"
+msgstr "Facturas rectificativas (abono) de cliente sin pagar"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -5558,7 +5559,7 @@ msgstr "Saldo pendiente"
 #. module: account
 #: rml:account.invoice:0
 msgid "Refund"
-msgstr "Factura de abono"
+msgstr "Factura rectificativa (abono)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -5795,7 +5796,7 @@ msgstr ""
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr "Código caso"
+msgstr "Código"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -5811,7 +5812,7 @@ msgstr "Cuenta de ingresos"
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Periodo de apertura/cierre"
+msgstr "Período de apertura/cierre"
 
 #. module: account
 #: rml:account.analytic.account.balance:0
@@ -5919,7 +5920,7 @@ msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos"
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Refund"
-msgstr "Factura de abono de proveedor"
+msgstr "Factura rectificativa (abono) de proveedor"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 3ddd263d146..99660f05218 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-23 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index fd1b65708b2..c69b8008961 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -50,7 +50,7 @@
         </record>
     
         <record id="process_node_accountingentries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
@@ -72,7 +72,7 @@
   		</record>
     
         <record id="process_node_paymententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
@@ -83,7 +83,7 @@
         </record>
     
         <record id="process_node_reconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
@@ -105,7 +105,7 @@
         </record>
         
         <record id="process_node_accountingstatemententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 080cc5cb984..b3ec1676691 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -62,7 +62,7 @@
         </record>
         
         <record id="process_node_supplieraccountingentries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
@@ -72,7 +72,7 @@
         </record>
         
         <record id="process_node_supplierpaymentorder0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Payment Order&quot;&quot;&quot;" name="name"/>
@@ -83,7 +83,7 @@
         </record>
         
         <record id="process_node_supplierreconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 8226d60e975..22fe5f58d28 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:34+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
+"PO-Revision-Date: 2010-06-23 17:05+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -460,7 +461,7 @@ msgstr "Cuentas"
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 msgid "Print Budget"
-msgstr "Imprimir Presupuestos"
+msgstr "Imprimir presupuestos"
 
 #. module: account_budget
 #: view:account.analytic.account:0
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index 10dc951b3ae..96b1e86eeb9 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-25 16:54+0000\n"
-"Last-Translator: Paco Molinero <paco@byasl.com>\n"
+"PO-Revision-Date: 2010-06-23 17:09+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -351,7 +352,7 @@ msgstr "Total haber"
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
 msgid "Populate payment"
-msgstr "Propagar el pago"
+msgstr "Rellenar la orden"
 
 #. module: account_payment
 #: field:payment.order,user_id:0
diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
index c0dfed1c683..f6f721b93ef 100644
--- a/addons/account_voucher/voucher_report.xml
+++ b/addons/account_voucher/voucher_report.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <report id="report_account_voucher"
-            string="Vouchers"
+            string="Print Vouchers"
             model="account.voucher"
             name="voucher.cash_receipt.drcr"
             rml="account_voucher/report/report_voucher.rml"
@@ -11,7 +11,7 @@
             menu="True"/>
 
         <report id="report_account_voucher_amt"
-            string="Receipts"
+            string="Print Receipts"
             model="account.voucher"
             name="voucher.cash_amount"
             rml="account_voucher/report/report_voucher_amount.rml"
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 4cb85ca6ec9..1ab29f111ff 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -90,9 +90,7 @@
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
                         <field name="number" select='1'/>
-                        <field name="journal_id" select='1'/>
                         <field name="partner_id" select='1'/>
-                        <field name="period_id" select='1'/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
@@ -118,7 +116,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
-<!--            <field name="domain">[('journal_id.type','=','sale')]</field>-->
+            <field name="domain">[('journal_id.type','=','sale')]</field>
+            <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
         <menuitem id="menu_action_receipt_vou_voucher_list"
         action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>
@@ -130,11 +129,23 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
-<!--            <field name="domain">[('journal_id.type','=','purchase')]</field>-->
+            <field name="domain">[('journal_id.type','=','purchase')]</field>
+            <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
         <menuitem id="menu_action_pay_vou_voucher_list"
         action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/>
 
+        <!-- Journal Vouchers -->
+        <record model="ir.actions.act_window" id="action_voucher_list">
+            <field name="name">Journal Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+        </record>
+        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
+
 <!--        <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">-->
 <!--            <field name="name">Cash Receipt</field>-->
 <!--            <field name="res_model">account.voucher</field>-->
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index 654882aedc2..ee0853b10fc 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/i18n/el.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-10-18 06:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-06-24 02:48+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
 #: field:report.deposit.border,total_marge:0
 msgid "Total margin"
-msgstr ""
+msgstr "Συνολικό περιθώριο"
 
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "Κέντρο μηνυμάτων SMS: clickatell"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Ρύθμιση ως πρόχειρο"
 
 #. module: auction
 #: field:auction.deposit,partner_id:0
@@ -40,55 +40,55 @@ msgstr ""
 #: field:report.seller.auction,seller:0
 #: field:report.seller.auction2,seller:0
 msgid "Seller"
-msgstr ""
+msgstr "Πωλητής"
 
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Provisoire"
-msgstr ""
+msgstr "Προσωρινός"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Definitive (ordre catalogue)"
-msgstr ""
+msgstr "Οριστικά (κατάλογος παραγγελίας)"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
 msgid "My Encoded Objects Per Day"
-msgstr ""
+msgstr "Τα κωδικοποιημένα αντικείμενά μου ανά ημέρα"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot history"
-msgstr ""
+msgstr "Ιστορικό Lot"
 
 #. module: auction
 #: field:report.seller.auction,avg_estimation:0
 msgid "Avg estimation"
-msgstr ""
+msgstr "Υπολογισμός μέσου όρου"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
 #: field:report.auction.view2,obj_number:0
 msgid "# of Objects"
-msgstr ""
+msgstr "# αντικειμένων"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_action_bids_form
 msgid "Bids line"
-msgstr ""
+msgstr "Γραμμή προσφορών"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Deposit Form"
-msgstr ""
+msgstr "Φόρμα κατάθεσης"
 
 #. module: auction
 #: rml:auction.bids:0
@@ -103,81 +103,81 @@ msgstr ""
 #: field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
-msgstr ""
+msgstr "Αγοραστής"
 
 #. module: auction
 #: field:report.auction.view,nobjects:0
 #: field:report.buyer.auction,object:0
 msgid "No of objects"
-msgstr ""
+msgstr "Αριθμόες αντικειμένων"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_adjudication_tree
 msgid "Adjudication by Auction"
-msgstr ""
+msgstr "Δικάζεται από Δημοπρασία"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of paid items (based on invoices):"
-msgstr ""
+msgstr "# πληρωμένων αντικειμένων (βασισμένο στα τιμολόγια):"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot
 msgid "Numerotation (per lot)"
-msgstr ""
+msgstr "Αρίθμιση (ανα παρτίδα)"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Books, manuscripts, eso."
-msgstr ""
+msgstr "Αντίκες/Βιβλία, χειρόγραφα,κα."
 
 #. module: auction
 #: view:auction.deposit:0
 #: model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
-msgstr ""
+msgstr "Κατάθεση ορίων"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,amount:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Αξία Τιμολογίου"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Tin / Copper wares"
-msgstr ""
+msgstr "Αντίκες / τσίγκινα / χάλκινα σκεύη"
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer invoice reconciled"
-msgstr ""
+msgstr "Διασταύρωση τιμολογίων αγορών"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken
 msgid "Mark as taken away"
-msgstr ""
+msgstr "Σημαδέψτε καθώς αφαιρείται"
 
 #. module: auction
 #: xsl:report.auction.seller.list:0
 msgid "Inv."
-msgstr ""
+msgstr "Τιμ."
 
 #. module: auction
 #: field:auction.deposit.cost,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Ποσό"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_deposit_border
 #: model:ir.ui.menu,name:auction.menu_auction_deposit_border
 msgid "Deposit border"
-msgstr ""
+msgstr "Όριο κατάθεσης"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "VAT"
-msgstr ""
+msgstr "ΦΠΑ"
 
 #. module: auction
 #: view:auction.lots:0
@@ -187,58 +187,58 @@ msgstr ""
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Adjudication"
-msgstr ""
+msgstr "Δικαστική απόφαση"
 
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Αναλυτικός Λογαριασμός"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Unclassifieds"
-msgstr ""
+msgstr "Αταξινόμητα"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
 msgid "Objects by Auction"
-msgstr ""
+msgstr "Αντικείμενα σε Δημοπρασία"
 
 #. module: auction
 #: field:auction.lots,lot_num:0
 #: field:report.unclassified.objects,lot_num:0
 msgid "List Number"
-msgstr ""
+msgstr "Αριθμός καταλόγου"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
 msgid "Cost Name"
-msgstr ""
+msgstr "Όνομα κόστους"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antiques"
-msgstr ""
+msgstr "Αντίκες"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "State"
-msgstr ""
+msgstr "Κατάσταση"
 
 #. module: auction
 #: field:report.auction.estimation.adj.category,lot_type:0
 msgid "Object Type"
-msgstr ""
+msgstr "Τύπος αντικειμένου"
 
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "Μήνυμα SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Contemporary Art"
-msgstr ""
+msgstr "Σύγχρονη Τέχνη"
 
 #. module: auction
 #: view:auction.lots:0
diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po
index d52af74533a..6abb75f9b34 100644
--- a/addons/audittrail/i18n/el.po
+++ b/addons/audittrail/i18n/el.po
@@ -8,146 +8,148 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-10-18 06:58+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-06-24 02:58+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Ίχνος"
 
 #. module: audittrail
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Το όνομα του αντικειμένου πρέπει να ξεκινάει από x_ και να μην περιέχει "
+"ειδικούς χαρακτήρες!"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Καταγραφή"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "Εγγεγραμμένος"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "Παλιά τιμή: "
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Create"
-msgstr ""
+msgstr "Δημιουργώ"
 
 #. module: audittrail
 #: wizard_view:audittrail.view.log,init:0
 msgid "Audit Logs"
-msgstr ""
+msgstr "Καταγραφή ίχνους"
 
 #. module: audittrail
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "Κατάσταση"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Πρόχειρο"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "Παλιά τιμή"
 
 #. module: audittrail
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
 #. module: audittrail
 #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
 msgid "View log"
-msgstr ""
+msgstr "Προβολή  καταγραφής"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "audittrail.log.line"
-msgstr ""
+msgstr "audittrail.log.line"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "Μέθοδος"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,from:0
 msgid "Log From"
-msgstr ""
+msgstr "Καταγραφή απο"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "Ταυτότητα καταγραφής"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "Ταυτότητα πηγής"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Write"
-msgstr ""
+msgstr "Εγγραφή"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail
 msgid "Audittrails"
-msgstr ""
+msgstr "Audittrails"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "Γραμμές καταγραφής"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribe"
-msgstr ""
+msgstr "Εγγράφομαι"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Read"
-msgstr ""
+msgstr "Ανάγνωση"
 
 #. module: audittrail
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Αντικείμενο"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Κανόνες καταγραφής"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,to:0
 msgid "Log To"
-msgstr ""
+msgstr "Σύνδεση με"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "Νέα τιμή κειμένου: "
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
diff --git a/addons/base_module_quality/i18n/el.po b/addons/base_module_quality/i18n/el.po
new file mode 100644
index 00000000000..9ae13c3add3
--- /dev/null
+++ b/addons/base_module_quality/i18n/el.po
@@ -0,0 +1,187 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-24 02:30+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_module_quality
+#: field:module.quality.check,final_score:0
+msgid "Final Score (%)"
+msgstr "Τελικό σκορ (%)"
+
+#. module: base_module_quality
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Το όνομα του αντικειμένου πρέπει να ξεκινάει από x_ και να μην περιέχει "
+"ειδικούς χαρακτήρες!"
+
+#. module: base_module_quality
+#: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
+msgid "Base module quality"
+msgstr "Βασική Μονάδα Ποιότητας"
+
+#. module: base_module_quality
+#: field:module.quality.check,name:0
+msgid "Rated Module"
+msgstr "Βαθμολογημένη Μονάδα"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Detail"
+msgstr "Λεπτομέρεια"
+
+#. module: base_module_quality
+#: field:module.quality.detail,note:0
+msgid "Note"
+msgstr "Σημείωση"
+
+#. module: base_module_quality
+#: field:module.quality.detail,state:0
+msgid "State"
+msgstr "Κατάσταση"
+
+#. module: base_module_quality
+#: field:module.quality.detail,detail:0
+msgid "Details"
+msgstr "Λεπτομέρειες"
+
+#. module: base_module_quality
+#: field:module.quality.detail,ponderation:0
+msgid "Ponderation"
+msgstr "Συντελεστής"
+
+#. module: base_module_quality
+#: help:module.quality.detail,ponderation:0
+msgid ""
+"Some tests are more critical than others, so they have a bigger weight in "
+"the computation of final rating"
+msgstr ""
+"Μερικά τέστ είναι πιο σημαντικά απο κάποια άλλα και επομένως έχουν "
+"μεγαλύτερη βαρύτητα στον υπολογισμό της τελικής βαθμολογίας"
+
+#. module: base_module_quality
+#: view:module.quality.check:0
+#: field:module.quality.check,check_detail_ids:0
+msgid "Tests"
+msgstr "Tests"
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Skipped"
+msgstr "Προσπεράστηκε"
+
+#. module: base_module_quality
+#: help:module.quality.detail,state:0
+msgid ""
+"The test will be completed only if the module is installed or if the test "
+"may be processed on uninstalled module."
+msgstr ""
+"Το τεστ θα ολοκληρωθεί μόνο όταν η μονάδα εγκαθίσταται ή εάν το τέστ μπορεί "
+"να επεξεργαστεί σε απεγκαταστημένες μονάδες."
+
+#. module: base_module_quality
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_check
+msgid "module.quality.check"
+msgstr "μονάδα.ποιότητα.έλεγχος"
+
+#. module: base_module_quality
+#: field:module.quality.detail,name:0
+msgid "Name"
+msgstr "Όνομα"
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,module_file:0
+msgid "Save report"
+msgstr "Αποθήκευση αναφοράς"
+
+#. module: base_module_quality
+#: wizard_field:quality_detail_save,init,name:0
+msgid "File name"
+msgstr "Όνομα αρχείου"
+
+#. module: base_module_quality
+#: field:module.quality.detail,score:0
+msgid "Score (%)"
+msgstr "Σκόρ (%)"
+
+#. module: base_module_quality
+#: help:quality_detail_save,init,name:0
+msgid "Save report as .html format"
+msgstr "Αποθήκευση αναφοράς σε φορμάτ .html"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+#: field:module.quality.detail,summary:0
+msgid "Summary"
+msgstr "Περίληψη"
+
+#. module: base_module_quality
+#: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
+msgid "Report Save"
+msgstr "Αποθήκευση Αναφοράς"
+
+#. module: base_module_quality
+#: wizard_view:quality_detail_save,init:0
+msgid "Standard entries"
+msgstr "Τυπικές εγγραφές"
+
+#. module: base_module_quality
+#: view:module.quality.detail:0
+msgid "Save Report"
+msgstr "Αποθήκευση αναφοράς"
+
+#. module: base_module_quality
+#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
+msgid "Quality Check"
+msgstr "Έλεγχος ποιότητας"
+
+#. module: base_module_quality
+#: model:ir.model,name:base_module_quality.model_module_quality_detail
+msgid "module.quality.detail"
+msgstr "Μονάδα.ποιότητα.λεπτομέρεια"
+
+#. module: base_module_quality
+#: selection:module.quality.detail,state:0
+msgid "Done"
+msgstr "Ολοκληρώθηκε"
+
+#. module: base_module_quality
+#: view:module.quality.check:0
+#: view:module.quality.detail:0
+msgid "Result"
+msgstr "Αποτέλεσμα"
+
+#. module: base_module_quality
+#: wizard_button:quality_detail_save,init,end:0
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#. module: base_module_quality
+#: field:module.quality.detail,message:0
+msgid "Message"
+msgstr "Μήνυμα"
+
+#. module: base_module_quality
+#: field:module.quality.detail,quality_check_id:0
+msgid "Quality"
+msgstr "Ποιότητα"
diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po
index bca028a8103..fbb4ecf48fb 100644
--- a/addons/base_module_quality/i18n/es.po
+++ b/addons/base_module_quality/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 12:21+0000\n"
-"Last-Translator: jaredbetis <Unknown>\n"
+"PO-Revision-Date: 2010-06-23 17:16+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -71,8 +72,8 @@ msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
 msgstr ""
-"Algunos exámenes son analíticos que otros, por lo que tienen un mayor peso "
-"en la computación de la nota final"
+"Algunas pruebas son más críticas que otras, por lo que tienen un mayor peso "
+"en el cálculo de la valoración final."
 
 #. module: base_module_quality
 #: view:module.quality.check:0
diff --git a/addons/base_report_creator/i18n/el.po b/addons/base_report_creator/i18n/el.po
index 54cbef2e759..a914194a57b 100644
--- a/addons/base_report_creator/i18n/el.po
+++ b/addons/base_report_creator/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-06-15 07:18+0000\n"
-"Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
+"PO-Revision-Date: 2010-06-24 01:21+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -26,6 +26,9 @@ msgid ""
 "records.\n"
 " e.g. res_partner.id=3"
 msgstr ""
+"Δώστε μια έκφραση ιγα τον τομέα με βάση το πως θέλετε να φιλτράρετε τα "
+"αρχεία.\n"
+" π.χ. res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -50,7 +53,7 @@ msgstr "Mode Γραφήματος"
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -161,7 +164,7 @@ msgstr "Δημιουργία Μενού Αναφοράς"
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Form"
-msgstr ""
+msgstr "Φόρμα"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type3:0
diff --git a/addons/board_association/i18n/el.po b/addons/board_association/i18n/el.po
new file mode 100644
index 00000000000..35fcc48ad27
--- /dev/null
+++ b/addons/board_association/i18n/el.po
@@ -0,0 +1,71 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* board_association
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-24 01:15+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: GREECE\n"
+"X-Poedit-Language: Greek\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. module: board_association
+#: model:ir.ui.menu,name:board_association.menu_board_associations_manager
+msgid "Associations"
+msgstr "Συνεταιρισμοί"
+
+#. module: board_association
+#: model:ir.module.module,shortdesc:board_association.module_meta_information
+msgid "Dashboard for Associations"
+msgstr "Πίνακας για Συνεταιρισμούς"
+
+#. module: board_association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
+#. module: board_association
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_association.open_board_associations_manager
+msgid "Association Dashboard"
+msgstr "Πίνακας Συνεταιρισμών"
+
+#. module: board_association
+#: view:board.board:0
+msgid "My tasks"
+msgstr "Οι αναθέσεις μου"
+
+#. module: board_association
+#: view:board.board:0
+msgid "New members"
+msgstr "Νέα μέλη"
+
+#. module: board_association
+#: view:board.board:0
+msgid "Unpaid Invoices"
+msgstr "Απλήρωτα Τιμολόγια"
+
+#. module: board_association
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#. module: board_association
+#: view:board.board:0
+msgid "Next Events"
+msgstr "Επόμενα Συμβάντα"
+
+#. module: board_association
+#: view:board.board:0
+msgid "Registrations by Events"
+msgstr "Καταχωρήσεις ανά Συμβάν"
diff --git a/addons/board_auction/i18n/el.po b/addons/board_auction/i18n/el.po
new file mode 100644
index 00000000000..f99a794521e
--- /dev/null
+++ b/addons/board_auction/i18n/el.po
@@ -0,0 +1,125 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* board_auction
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-24 01:15+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: GREECE\n"
+"X-Poedit-Language: Greek\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. module: board_auction
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalid XML for View Architecture!"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "Αντικείμενα ανά Ημέρα"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Objects statistics"
+msgstr "Στατιστικά Αντικειμένων"
+
+#. module: board_auction
+#: model:ir.ui.menu,name:board_auction.menu_board_auction_manager
+msgid "Auction Manager"
+msgstr "Υπεύθυνος Δημοπρασίας"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Summary pointing by user"
+msgstr "Περίληψη χτυπημάτων ανά χρήστη"
+
+#. module: board_auction
+#: model:ir.ui.menu,name:board_auction.menu_board_auction
+msgid "Auction Member"
+msgstr "Μέλος Δημοπρασίας"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "My Latest Deposits"
+msgstr "Οι Τελευταίες Καταθέσεις μου"
+
+#. module: board_auction
+#: model:ir.actions.act_window,name:board_auction.open_board_auction
+msgid "Auction member board"
+msgstr "Πίνακας μέλους δημοπρασίας"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "Υπεύθυνος Δημοπρασίας "
+
+#. module: board_auction
+#: model:ir.module.module,shortdesc:board_auction.module_meta_information
+msgid "Board for Auction"
+msgstr "Πίνακας Δημοπρασίας"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Estimations/Adjudication"
+msgstr "Εκτιμήσεις/Κατακυρώσεις"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "Σύνολο Κατακυρώσεων"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Latest objects"
+msgstr "Τελευταία αντικείμενα"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "Τελευταίες καταθέσεις"
+
+#. module: board_auction
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Menu"
+msgstr "Μενού"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "My objects By Day"
+msgstr "Τα Ανικείμενά μου ανά Ημέρα"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "My board"
+msgstr "Ο Πίνακάς μου"
+
+#. module: board_auction
+#: model:ir.actions.act_window,name:board_auction.open_board_auction_manager
+msgid "Auction manager board"
+msgstr "Πίνακας Υπεύθυνου Δημοπρασίας"
+
+#. module: board_auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "Ελαχ./Επικ./Μέγ."
+
+#. module: board_auction
+#: view:board.board:0
+msgid "My Latest Objects"
+msgstr "Τα Τελευταία μου Αντικείμενα"
diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm_configuration/i18n/el.po
new file mode 100644
index 00000000000..e2f697e23fd
--- /dev/null
+++ b/addons/board_crm_configuration/i18n/el.po
@@ -0,0 +1,122 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* board_crm_configuration
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-24 01:16+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: GREECE\n"
+"X-Poedit-Language: Greek\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. module: board_crm_configuration
+#: model:ir.module.module,shortdesc:board_crm_configuration.module_meta_information
+msgid "Dashboard for CRM Configuration"
+msgstr "Πίνακας Ρυθμίσεων CRM"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+#: model:ir.ui.menu,name:board_crm_configuration.menu_board_statistics_dash
+msgid "Statistics Dashboard"
+msgstr "Πίνακας Στατιστικών Μεγεθών"
+
+#. module: board_crm_configuration
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_crm_configuration.act_oppor_categ
+msgid "Opportunities By Categories"
+msgstr "Ευκαιρίες ανά Κατηγορίες"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_crm_configuration.act_my_cases
+msgid "My Cases"
+msgstr "Τα Θέματά μου"
+
+#. module: board_crm_configuration
+#: model:ir.actions.act_window,name:board_crm_configuration.open_board_crm
+msgid "CRM Dashboard"
+msgstr "Πίνακας Αναφορών CRM"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+#: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm
+msgid "Connecting Dashboard"
+msgstr "Σύνδεση Πινάκων Αναφορών"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_crm_configuration.act_leads_month_user
+msgid "Leads Of The Month By User"
+msgstr "Σύνδεσμοι Μηνός ανά Χρήστη"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+#: view:report.crm.case.section.stage:0
+msgid "Leads By Stage"
+msgstr "Σύνδεσμοι ανά Στάδιο"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+msgid "My Meetings"
+msgstr "Οι Συσκέψεις μου"
+
+#. module: board_crm_configuration
+#: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm_config
+msgid "CRM Configuration"
+msgstr "Ρυθμίσεις CRM"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_crm_configuration.act_jobs_categ
+msgid "Jobs Requests Of The Month by Applied Job"
+msgstr "Αιτήσεις Εργασίας του Μήνα ανά Θέση Αίτησης"
+
+#. module: board_crm_configuration
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+msgid "My Sales Pipeline"
+msgstr "Το Κανάλι Πωλήσεών μου"
+
+#. module: board_crm_configuration
+#: view:report.crm.case.user:0
+msgid "Cases by User and Section"
+msgstr "Θέματα ανά Χρήστη και Τμήμα"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+msgid "My Leads By Stage"
+msgstr "Οι Σύνδεσμοί μου ανά Στάδιο"
+
+#. module: board_crm_configuration
+#: view:report.crm.case.categ:0
+msgid "Cases by Sections and Categories"
+msgstr "Θέματα ανά Τμήμα και Κατηγορίες"
+
+#. module: board_crm_configuration
+#: model:ir.actions.act_window,name:board_crm_configuration.open_board_statistical_dash
+msgid "CRM - Statistics Dashboard"
+msgstr "CRM - Πίνακας Στατιστικών Μεγεθών"
+
+#. module: board_crm_configuration
+#: view:board.board:0
+msgid "My Leads"
+msgstr "Οι Σύνδεσμοί μου"
diff --git a/addons/board_document/i18n/el.po b/addons/board_document/i18n/el.po
new file mode 100644
index 00000000000..338203acd35
--- /dev/null
+++ b/addons/board_document/i18n/el.po
@@ -0,0 +1,92 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* board_document
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-24 01:21+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: GREECE\n"
+"X-Poedit-Language: Greek\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. module: board_document
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
+#. module: board_document
+#: view:board.board:0
+msgid "New Files"
+msgstr "Νέα Αρχεία"
+
+#. module: board_document
+#: model:ir.actions.act_window,name:board_document.open_board_document_manager
+#: model:ir.ui.menu,name:board_document.menu_board_document_manager
+msgid "Document Dashboard"
+msgstr "Πίνακας Εγγραφών"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Wall of Shame"
+msgstr "Τείχος της Ντροπής"
+
+#. module: board_document
+#: view:board.board:0
+msgid "File Size by Month"
+msgstr "Μέγεθος Αρχείων ανά Μήνα"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Month"
+msgstr "Αρχεία ανά Μήνα"
+
+#. module: board_document
+#: model:ir.actions.act_window,name:board_document.open_board_document_manager1
+#: model:ir.ui.menu,name:board_document.menu_board_document_manager1
+msgid "Statistics by User"
+msgstr "Στατιστικά ανά Χρήστη"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Resource Type"
+msgstr "Αρχεία ανά Τύπο Προέλευσης"
+
+#. module: board_document
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#. module: board_document
+#: model:ir.module.module,shortdesc:board_document.module_meta_information
+msgid "Dashboard for Document Management"
+msgstr "Πίνακας Διαχείρισης Εγγραφών"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr "Αρχεία ανά Συνεργάτη"
+
+#. module: board_document
+#: model:ir.ui.menu,name:board_document.menu_board_document
+msgid "Document"
+msgstr "Έγγραφο"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "Αρχεία ανά Χρήστη"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Document board"
+msgstr "Πίνακας εγγράφου"
diff --git a/addons/board_project/i18n/el.po b/addons/board_project/i18n/el.po
new file mode 100644
index 00000000000..4b6cc7b8820
--- /dev/null
+++ b/addons/board_project/i18n/el.po
@@ -0,0 +1,142 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* board_project
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-24 01:22+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: GREECE\n"
+"X-Poedit-Language: Greek\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Σχεδιασμός Έργων μου"
+
+#. module: board_project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:board_project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Φύλλα Χρόνου Εργασίας"
+
+#. module: board_project
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.act_my_project
+msgid "My projects"
+msgstr "Τα Έργα μου"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Προθεσμίες Αναθέσεών μου"
+
+#. module: board_project
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Οι Αναθέσεις μου"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Κοινοποιημένες Σημειώσεις"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.open_board_project
+#: model:ir.ui.menu,name:board_project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Πίνακας Έργων"
+
+#. module: board_project
+#: model:ir.module.module,shortdesc:board_project.module_meta_information
+msgid "Board for project users"
+msgstr "Πίνακας Χρηστών Έργου"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr "Κανάλι Αναθέσεων"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Planning"
+msgstr "Ο Σχεδιασμός μου"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Οι λογαριασμοί μου προς τιμολόγηση"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.open_board_project_manager
+#: model:ir.ui.menu,name:board_project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Πίνακας Αναφορών Διευθυντή Έργου"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Οι Προθεσμίες μου"
+
+#. module: board_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
+
+#. module: board_project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Φύλλα χρόνου χρηστών"
+
+#. module: board_project
+#: model:ir.ui.menu,name:board_project.next_id_86
+msgid "Project"
+msgstr "Έργο"
+
+#. module: board_project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Πίνακας διευθυντή έργου"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Οι Ανοικτές Αναθέσεις μου"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Ο Πίνακάς μου"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Ο πίνακας αναθέσεών μου"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr "Το κανάλι μου"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Το Φύλλο Χρόνου μου"
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 00c8a0bd146..974671e9272 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-06-22 17:47+0000\n"
-"Last-Translator: Roberto Lizana <Unknown>\n"
+"PO-Revision-Date: 2010-06-23 17:20+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-23 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -84,7 +85,7 @@ msgstr "Costos previstos"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr "Requerimiento de trabajo a finalizar"
+msgstr "Cerrar solicitud de empleo"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -2291,7 +2292,7 @@ msgstr "Julio"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
 msgid "Prospecting"
-msgstr ""
+msgstr "Prospección"
 
 #. module: crm
 #: field:crm.case,partner_name2:0
@@ -2406,7 +2407,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "Buscar empleos"
 
 #. module: crm
 #: field:crm.case.history,log_id:0
@@ -2429,7 +2430,7 @@ msgstr "Restablecer a no confirmado"
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "Asistencia técnica"
 
 #. module: crm
 #: field:crm.case,email_cc:0
@@ -2447,7 +2448,7 @@ msgstr "Nota"
 #: field:report.crm.case.section.categ2,delay_close:0
 #: field:report.crm.case.section.stage,delay_close:0
 msgid "Delay Close"
-msgstr ""
+msgstr "Retrasar cierre"
 
 #. module: crm
 #: selection:crm.case,priority:0
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 6ad4af16266..c3533af2702 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -24,8 +24,12 @@
     'name': 'Customer & Supplier Relationship Management',
     'version': '1.0',
     'category': 'Generic Modules/CRM & SRM',
-    'description': """claim""",
-    'author': 'Tiny',
+    'description': """
+This modules allows you to track your customers/suppliers claims and flames.
+It is fully integrated with the email gateway so that you can create
+automatically new claims based on incoming emails.
+    """,
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['crm'],
     'init_xml': [
diff --git a/addons/crm_profiling/i18n/el.po b/addons/crm_profiling/i18n/el.po
index a3e475222a6..ce6a20ea15a 100644
--- a/addons/crm_profiling/i18n/el.po
+++ b/addons/crm_profiling/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-06-15 07:19+0000\n"
-"Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
+"PO-Revision-Date: 2010-06-24 01:23+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -51,7 +51,7 @@ msgstr "crm_profiling management"
 #. module: crm_profiling
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po
index 516fd61348b..9b425c31b89 100644
--- a/addons/document/i18n/el.po
+++ b/addons/document/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-24 01:24+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -106,7 +106,7 @@ msgstr "Επισυνάψεις"
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
 #. module: document
 #: selection:document.directory,type:0
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index d81d043d21c..c491e4daa8d 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-28 07:56+0000\n"
+"PO-Revision-Date: 2010-06-23 17:25+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -53,7 +53,7 @@ msgstr "¡Error! No puede crear directorios recursivos."
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_configuration
 msgid "Document Configuration"
-msgstr "Configuración documento"
+msgstr "Configuración de documentos"
 
 #. module: document
 #: view:ir.attachment:0
diff --git a/addons/document_webdav/i18n/el.po b/addons/document_webdav/i18n/el.po
new file mode 100644
index 00000000000..eaf94e5c066
--- /dev/null
+++ b/addons/document_webdav/i18n/el.po
@@ -0,0 +1,31 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-06-24 01:29+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Αυτό είναι ένα ολοκληρωνένο σύστημα διαχείρισης εγγράφων:\n"
+"\t * WebDav περιβάλλον\n"
+"\t * Γνησιότητα Χρήστη\n"
+"\t * Ευρετιριασμός εγγράφων\n"
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index 5d8ac960b3b..5d965fa1178 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-17 18:59+0000\n"
-"Last-Translator: Andreas Porevopoulos <Unknown>\n"
+"PO-Revision-Date: 2010-06-24 01:36+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -55,7 +55,7 @@ msgstr "Κυριακή"
 #. module: hr
 #: view:res.users:0
 msgid "Parents"
-msgstr ""
+msgstr "Μητρικοί"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
@@ -359,7 +359,7 @@ msgstr "Ημερ/νία Εκκίνησης"
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr ""
+msgstr "Μητρικοί χρήστες"
 
 #. module: hr
 #: field:hr.employee,address_id:0
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
index 2585bc5cb08..afdd0c4c3b8 100644
--- a/addons/hr_contract/i18n/el.po
+++ b/addons/hr_contract/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-05-16 08:14+0000\n"
-"Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
+"PO-Revision-Date: 2010-06-24 01:16+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -60,7 +60,7 @@ msgstr "Τύποι Αποδοχών"
 #. module: hr_contract
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
 #. module: hr_contract
 #: field:hr.contract,employee_id:0
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index 09c1a9cdd17..7ce942b3ff7 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-21 16:01+0000\n"
-"Last-Translator: Μάριος Ζηντίλης <m.zindilis@dmajor.org>\n"
+"PO-Revision-Date: 2010-06-24 01:34+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -109,6 +109,8 @@ msgid ""
 "Determine if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
 msgstr ""
+"Προσδιορίστε αν το προϊόν μπορεί να είναι ορατό στον κατάλογο των προϊόντων "
+"σε μια επιλογή από μια σειρά φύλλου δαπάνη HR."
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -204,7 +206,7 @@ msgstr "Απόδοση Εξόδων"
 #. module: hr_expense
 #: field:hr.expense.expense,journal_id:0
 msgid "Force Journal"
-msgstr ""
+msgstr "Force Journal"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_my_new
@@ -420,6 +422,8 @@ msgstr "Αποδοχή"
 #: rml:hr.expense:0
 msgid "This document must be dated and signed for reimbursement"
 msgstr ""
+"Το έγγραφο αυτό πρέπει να φέρει ημερομηνία και υπογραφή για την επιστροφή-"
+"αποζημείωση."
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_refuseexpense0
@@ -467,7 +471,7 @@ msgstr "Απορριφθέντα"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can be Expensed"
-msgstr ""
+msgstr "Μπορούν να δαπανηθούν"
 
 #. module: hr_expense
 #: rml:hr.expense:0
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index b6068435e11..2d0c0fa2310 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-19 13:38+0000\n"
-"Last-Translator: Andreas Porevopoulos <Unknown>\n"
+"PO-Revision-Date: 2010-06-24 02:09+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -424,6 +424,41 @@ msgid ""
 "                Administration / Users / Users\n"
 "            for example, you maybe will do it for the user 'admin'.\n"
 msgstr ""
+"Ανθρώπινο Δυναμικό: Εντοπισμός διακοπών και ροή εργασίας\n"
+"\n"
+"    Η μονάδα αυτή σας επιτρέπει να διαχειρίζεστε τα αιτήματα για ρεπό και "
+"τις αργίες. Για κάθε εργαζόμενο, μπορείτε επίσης να καθορίσετε έναν αριθμό "
+"διαθέσιμων ρεπό ανά κατάσταση διακοπών.\n"
+"\n"
+"    Σημειώστε ότι:\n"
+"    - Ένας συγχρονισμό με μια εσωτερική αντζέντα (χρήση της μονάδας CRM) "
+"είναι δυνατός: για να δημιουργηθεί αυτόματα μια περίπτωση, όταν ένα αίτημα "
+"διακοπών γίνεται αποδεκτό, θα πρέπει να συνδέσετε την κατάσταση διακοπών σε "
+"ένα τμήμα υπόθεσης. Μπορείτε να ρυθμίσετε αυτές τις πληροφορίες και το χρώμα "
+"προτίμησής σας στο\n"
+"                ΑΔ / Διαμόρφωση / Κατάσταση Διακοπών\n"
+"    - Ένας εργαζόμενος μπορεί να κάνει ένα αρνητικό αίτημα διακοπών (αίτηση "
+"διακοπών για -2 ημέρες για παράδειγμα), αυτό θεωρείται από το σύστημα ως "
+"ζήτηση για περισσότερες ημέρες αργιών. Θα αυξήσει τη συνολική διαθέσιμη "
+"κατάσταση διακοπών  (αν γίνει αποδεκτή η αίτηση).\n"
+"    - Υπάρχουν δύο τρόποι για να εκτυπώσετε τις διακοπές του εργαζομένου:\n"
+"        * Η πρώτη θα επιτρέψει να επιλεγούν εργαζόμενοι ανά τμήμα και "
+"χρησιμοποιείται κάνοντας κλικ στο στοιχείο του μενού που βρίσκεται στο\n"
+"                ΑΔ / Αίτηση Διακοπών / Εκτύπωση περίληψης διακοπών\n"
+"        * Ο δεύτερος θα σας επιτρέψει να επιλέξετε την έκθεση διακοπών για "
+"συγκεκριμένα άτομα. Πηγαίνετε στον κατάλογο\n"
+"                ΑΔ / Εργαζόμενοι / Εργαζόμενοι\n"
+"            στη συνέχεια, επιλέξτε αυτούς που θέλετε να επιλέξετε, κάντε "
+"κλικ στο εικονίδιο εκτύπωσης και επιλέξτε την επιλογή\n"
+"                «Συνοπτική Εκτύπωση των διακοπών των εργαζομένων»\n"
+"    Ο οδηγός σας επιτρέπει να επιλέξετε αν θέλετε να εκτυπώσετε είτε τις "
+"επιβεβαίομένες & Επικυρωμένες διακοπές ή μόνο τις Επικυρωμένες. Αυτές οι "
+"καταστάσεις πρέπει να καθοριστούν από ένα χρήστη από την ομάδα «ΑΔ» και με "
+"το ρόλο «διακοπές. Μπορείτε να ορίσετε τα χαρακτηριστικά αυτά στην καρτέλα "
+"ασφάλειας από τα δεδομένα ενός χρήστη στη\n"
+"                Διαχείριση / Χρήστες / Χρήστες\n"
+"            Για παράδειγμα, μπορείτε ίσως να το κάνετε για τον χρήστη "
+"'admin'.\n"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index 1640f3f6cc3..3a6afaac4ef 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-05 10:40+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-06-23 17:14+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -358,7 +358,7 @@ msgstr "Saldo pendiente"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Reinvoice Costs"
-msgstr "Refacturar costes"
+msgstr "Tipo de facturación"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 298064a2e23..99558a120ff 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-05-16 08:54+0000\n"
-"Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
+"PO-Revision-Date: 2010-06-24 02:09+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -45,7 +45,7 @@ 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
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 86eea3f7631..feeaa074b6d 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -395,9 +395,9 @@ class marketing_campaign_workitem(osv.osv):
                     'object': wi.activity_id,
                     'transition': wi.activity_id.to_ids
                 }
-                expr = eval(str(wi.activity_id.condition), eval_context)
-                if expr:
-                    try:
+                try:
+                    expr = eval(str(wi.activity_id.condition), eval_context)
+                    if expr:
                         result = True
                         if wi.campaign_id.mode in ('manual','active'):
                             result = self.pool.get('marketing.campaign.activity').process(
@@ -410,11 +410,10 @@ class marketing_campaign_workitem(osv.osv):
                             if type(result) == type({}) and 'error_msg' in result:
                                vals['error_msg'] = result['error_msg']
                             self.write(cr, uid, wi.id, vals)
-                    except Exception,e:
-                        self.write(cr, uid, wi.id, {'state': 'exception', 'error_msg': str(e)})
-                else :
-                    self.write(cr, uid, wi.id, {'state': 'cancelled'})
-
+                    else:
+                        self.write(cr, uid, wi.id, {'state': 'cancelled'})
+                except Exception,e:
+                    self.write(cr, uid, wi.id, {'state': 'exception', 'error_msg': str(e)})
         return True
 
     def process_all(self, cr, uid, camp_ids=None, context={}):
@@ -422,16 +421,19 @@ class marketing_campaign_workitem(osv.osv):
         if not camp_ids:
             camp_ids = camp_obj.search(cr, uid, [('state','=','running')], context=context)
         for camp in camp_obj.browse(cr, uid, camp_ids, context=context):
-            if camp.mode in ('test_realtime','active'):
-                workitem_ids = self.search(cr, uid, [('state', '=', 'todo'),
-                        ('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))])
-            elif camp.mode == 'test':
-                workitem_ids = self.search(cr, uid, [('state', '=', 'todo')])
-            else:
-                # manual states are not processed automatically
-                workitem_ids = []
-            if workitem_ids:
-                self.process(cr, uid, workitem_ids, context)
+            while True:
+                if camp.mode in ('test_realtime','active'):
+                    workitem_ids = self.search(cr, uid, [('state', '=', 'todo'),
+                            ('date','<=', time.strftime('%Y-%m-%d %H:%M:%S'))])
+                elif camp.mode == 'test':
+                    workitem_ids = self.search(cr, uid, [('state', '=', 'todo')])
+                else:
+                    # manual states are not processed automatically
+                    workitem_ids = []
+                if workitem_ids:
+                    self.process(cr, uid, workitem_ids, context)
+                else:
+                    break
 
     def preview(self, cr, uid, ids, context):
         res = {}
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index 590a1b47bc0..4853cb65e2c 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -26,13 +26,13 @@ class campaign_analysis(osv.osv): #{{{
     _description = "Campaign Analysis"
     _auto = False
     _rec_name = 'date'
-    
     def _total_cost(self, cr, uid, ids, field_name, arg, context={}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of case and section Data’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
         result = {}
         for ca_obj in self.browse(cr, uid, ids, context):
             wi_ids = self.pool.get('marketing.campaign.workitem').search(cr, uid,
@@ -41,7 +41,6 @@ class campaign_analysis(osv.osv): #{{{
                                 (ca_obj.campaign_id.fixed_cost / len(wi_ids))
             result[ca_obj.id] = total_cost
         return result
-            
     _columns = {
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), 
@@ -61,36 +60,33 @@ class campaign_analysis(osv.osv): #{{{
                     type='many2one', relation='res.country',string='Country'),
         'total_cost' : fields.function(_total_cost, string='Cost', method=True, 
                                     type="float" ),
-        'revenue': fields.float('Revenue',readonly=True),
-#        'case_id': fields.many2one('crm.lead', 'Opportunity', readonly=True),
-#        'count' : fields.integer('Count', readonly=True),
+        'revenue': fields.float('Revenue',digits=(16,2),readonly=True),
+        'count' : fields.integer('# of Actions', readonly=True),
     }
-    
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'campaign_analysis')
-        
         cr.execute("""
-                create or replace view campaign_analysis as (
-                select
-                    wi.id as id,
-                    to_char(wi.date, 'YYYY') as year,
-                    to_char(wi.date, 'MM') as month,
-                    wi.date as date,
-                    s.campaign_id as campaign_id,
-                    wi.activity_id as activity_id,
-                    wi.segment_id as segment_id,
-                    wi.partner_id as partner_id ,
-                    act.revenue as revenue
-                from
-                    marketing_campaign_workitem wi
-                    left join res_partner p on (p.id=wi.partner_id)
-                    left join marketing_campaign_segment s on (s.id=wi.segment_id)
-                    left join marketing_campaign_activity act on (act.id= wi.activity_id)
-                group by
-                    to_char(wi.date, 'YYYY'),to_char(wi.date, 'MM'),
-                    s.campaign_id,wi.activity_id,wi.segment_id,wi.partner_id,revenue,
-                    wi.date,wi.id
-                )
-            """)
-    
+            create or replace view campaign_analysis as (
+            select
+                min(wi.id) as id,
+                to_char(wi.date::date, 'YYYY') as year,
+                to_char(wi.date::date, 'MM') as month,
+                wi.date::date as date,
+                s.campaign_id as campaign_id,
+                wi.activity_id as activity_id,
+                wi.segment_id as segment_id,
+                wi.partner_id as partner_id ,
+                wi.state as state,
+                sum(act.revenue) as revenue,
+                count(*) as count
+            from
+                marketing_campaign_workitem wi
+                left join res_partner p on (p.id=wi.partner_id)
+                left join marketing_campaign_segment s on (s.id=wi.segment_id)
+                left join marketing_campaign_activity act on (act.id= wi.activity_id)
+            group by
+                s.campaign_id,wi.activity_id,wi.segment_id,wi.partner_id,wi.state,
+                wi.date::date
+            )
+        """)
 campaign_analysis() #}}}
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index d7827033809..fb83e12a225 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-	<record id="view_campaign_analysis_tree" model="ir.ui.view">
+    <data>
+    <record id="view_campaign_analysis_tree" model="ir.ui.view">
         <field name="name">campaign.analysis.tree</field>
         <field name="model">campaign.analysis</field>
         <field name="type">tree</field>
@@ -15,42 +15,52 @@
                 <field name="segment_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
-                <!--field name="case_id"/-->
-                <!--field name="count"/-->
+                <field name="count"/>
                 <field name="total_cost" string="Cost"/><!-- sum="Cost"/-->
                 <field name="revenue"/>
             </tree>
         </field>
     </record>
 
-	<record id="view_campaign_analysis_search" model="ir.ui.view">
+    <record id="view_campaign_analysis_search" model="ir.ui.view">
         <field name="name">campaign.analysis.search</field>
         <field name="model">campaign.analysis</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Marketing Reports">
-           		<group>
-	            	<filter icon="terp-go-year"
-	                    	string="This Year"
-	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
-	                <filter icon="terp-go-month"
-	                    	string="This Month"
-	                    	domain="[('month','=',time.strftime('%%m'))]"/>
-	                <separator orientation="vertical"/>
-		            <filter icon="terp-go-month"
-		            		string="Date"
-		            		domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
-	                <separator orientation="vertical"/>
-					<field name="campaign_id"/>
-					<field name="activity_id"/>
-					<field name="segment_id"/>
-	                <field name="partner_id"/>
-					<field name="country_id"/>
+                   <group>
+                    <filter icon="terp-go-year"
+                            string="This Year"
+                            domain="[('year','=',time.strftime('%%Y'))]"/>
+                    <filter icon="terp-go-month"
+                            string="This Month"
+                            domain="[('month','=',time.strftime('%%m'))]"/>
+                    <filter icon="terp-go-month"
+                            string="Today"
+                            domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl"
+                            string="To Do"
+                            domain="[('state','=','todo')]"/>
+                    <filter icon="terp-camera_test"
+                            string="Done"
+                            domain="[('state','=','done')]"/>
+                    <filter icon="terp-emblem-important"
+                            string="Exceptions"
+                            domain="[('state','=','exception')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="campaign_id"/>
+                    <field name="activity_id"/>
+                    <field name="segment_id"/>
+                    <field name="partner_id"/>
+                    <field name="country_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="10" col="12">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                     <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
+                    <filter string="State" icon="terp-stock_symbol-selection" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
@@ -60,17 +70,17 @@
         </field>
     </record>
 
-	<record id="action_campaign_analysis_all" model="ir.actions.act_window">
+    <record id="action_campaign_analysis_all" model="ir.actions.act_window">
         <field name="name">Campaigns</field>
         <field name="res_model">campaign.analysis</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree</field>
-        <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1}</field>
+        <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1, 'group_by_no_leaf':1}</field>
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
 
-	<menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
+    <menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
     <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index c2fe33b5681..afa393000d3 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-23 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 86e7a57dd53..9f28cff4594 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -543,16 +543,21 @@ class mrp_production(osv.osv):
             return {'value': {'location_dest_id': src}}
         return {}
 
-    def product_id_change(self, cr, uid, ids, product):
+    def product_id_change(self, cr, uid, ids, product, context=None):
         """ Finds UoM of changed product.
         @param product: Id of changed product.
         @return: Dictionary of values.
         """
         if not product:
-            return {}
-        res = self.pool.get('product.product').read(cr, uid, [product], ['uom_id'])[0]
-        uom = res['uom_id'] and res['uom_id'][0]
-        result = {'product_uom': uom}
+            return {'value': {
+                'product_uom': False,
+                'bom_id': False
+            }}
+        res = self.pool.get('product.product').browse(cr, uid, product, context=context)
+        result = {
+            'product_uom': res.uom_id and res.uom_id.id or False,
+            'bom_id': res.bom_ids and res.bom_ids[0].id or False
+        }
         return {'value': result}
 
     def bom_id_change(self, cr, uid, ids, product):
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index db9fac999eb..c278fc52afd 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-11 21:57+0000\n"
-"Last-Translator: Juan Eduardo Riva <juaneduardoriva@gmail.com>\n"
+"PO-Revision-Date: 2010-06-23 17:13+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -286,7 +287,8 @@ msgstr "Producto"
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
 msgid "From work order, define the cycles and hour for creating product"
-msgstr "Desde orden de trabajo, define los ciclos y hora para crear producto"
+msgstr ""
+"Desde orden de producción, define los ciclos y hora para crear producto"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
diff --git a/addons/olap/i18n/es.po b/addons/olap/i18n/es.po
index 944f8cb42e6..b7e1d5eeaea 100644
--- a/addons/olap/i18n/es.po
+++ b/addons/olap/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 05:24+0000\n"
-"PO-Revision-Date: 2010-06-08 14:19+0000\n"
-"Last-Translator: victor tejada yau <Unknown>\n"
+"PO-Revision-Date: 2010-06-23 17:27+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
@@ -53,6 +54,9 @@ msgid ""
 "qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
 "tablename.columnname)"
 msgstr ""
+"Debe proporcionar una expresión SQL válida. Asegúrese que contenga una "
+"función con un nombre de columna correcto como (sum,avg "
+"...)(tablename.columnname (+,- ...) tablename.columnname)"
 
 #. module: olap
 #: field:olap.cube.table,schema_id:0
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index daeb71ee863..2856cdc128c 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-07 17:27+0000\n"
-"Last-Translator: Edgardo Ramos Roque <Unknown>\n"
+"PO-Revision-Date: 2010-06-23 17:28+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -204,7 +205,7 @@ msgstr "Código"
 #: field:pos.order,date_validity:0
 #: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
-msgstr "Fecha validación"
+msgstr "Fecha caducidad"
 
 #. module: point_of_sale
 #: view:pos.order:0
diff --git a/addons/product_expiry/__init__.py b/addons/product_expiry/__init__.py
index 3b5500415c2..de4fe83ab83 100644
--- a/addons/product_expiry/__init__.py
+++ b/addons/product_expiry/__init__.py
@@ -19,7 +19,5 @@
 ##############################################################################
 
 import product_expiry
-import wizard
-import report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index fd95b310ad1..b03777ecec6 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name" : "Products date of expiry",
     "version" : "1.0",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Enterprise Specific Modules/Food Industries",
     "depends" : ["base", "account", "product", "stock"],
     "init_xml" : [],
@@ -31,11 +31,7 @@
  - removal date
  - alert date
 Used, for example, in food industries.''',
-    "update_xml" : [
-                    'security/ir.model.access.csv',
-                     "product_expiry_view.xml",
-                     "report/report_stock_view.xml", 
-                     "wizard/stock_partial_view.xml"],
+    "update_xml" : ["product_expiry_view.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/product_expiry/i18n/ca.po b/addons/product_expiry/i18n/ca.po
index 0ed0bfcab10..c4acce0421f 100644
--- a/addons/product_expiry/i18n/ca.po
+++ b/addons/product_expiry/i18n/ca.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-06-30 15:09+0000\n"
-"PO-Revision-Date: 2010-06-21 15:56+0000\n"
+"PO-Revision-Date: 2010-01-10 22:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@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-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-04-24 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -161,3 +161,20 @@ msgstr ""
 #: field:product.product,alert_time:0
 msgid "Product alert time"
 msgstr "Data alerta producte"
+
+#~ msgid "Alert date"
+#~ msgstr "Data alarma"
+
+#~ msgid ""
+#~ "Track different dates on products and lots. Used, for exampel, in food "
+#~ "industries: expiry date, alert date, date of removal, eso."
+#~ msgstr ""
+#~ "Gestiona diferents dates per a productes i lots. Utilitzat, per exemple, en "
+#~ "la indústria alimentària: Data de caducitat, data d'alarma, data "
+#~ "d'eliminació, ..."
+
+#~ msgid "DLUO"
+#~ msgstr "Data caducitat"
+
+#~ msgid "Removal date"
+#~ msgstr "Data eliminació"
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index 72a3aeec0e2..537d7ce26ef 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/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: 2009-06-30 15:09+0000\n"
-"PO-Revision-Date: 2010-06-21 15:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-04-29 04:43+0000\n"
+"Last-Translator: Rhubeni Lopes de Andrade <rhube.itsasecret@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-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-04-30 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -161,3 +161,20 @@ msgstr ""
 #: field:product.product,alert_time:0
 msgid "Product alert time"
 msgstr "Fecha alerta producto"
+
+#~ msgid "Alert date"
+#~ msgstr "Fecha alarma"
+
+#~ msgid ""
+#~ "Track different dates on products and lots. Used, for exampel, in food "
+#~ "industries: expiry date, alert date, date of removal, eso."
+#~ msgstr ""
+#~ "Gestiona distintas fechas para productos y lotes. Utilizado, por ejemplo, en "
+#~ "industria alimentaria: Fecha de caducidad, fecha de alarma, fecha de "
+#~ "eliminación, ..."
+
+#~ msgid "DLUO"
+#~ msgstr "Fecha caducidad"
+
+#~ msgid "Removal date"
+#~ msgstr "Fecha eliminación"
diff --git a/addons/product_expiry/i18n/fr.po b/addons/product_expiry/i18n/fr.po
index 45cf454a094..13a3e127700 100644
--- a/addons/product_expiry/i18n/fr.po
+++ b/addons/product_expiry/i18n/fr.po
@@ -1,20 +1,19 @@
-# French translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_expiry
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-06-30 15:09+0000\n"
-"PO-Revision-Date: 2010-06-21 15:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French <fr@li.org>\n"
+"PO-Revision-Date: 2010-01-04 18:19+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-04-24 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index ad9b8252d49..72f18412af4 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -21,21 +21,10 @@
 import datetime
 from osv import fields, osv
 import pooler
-import time
 
 class stock_production_lot(osv.osv):
     _name = 'stock.production.lot'
     _inherit = 'stock.production.lot'
-    def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
-            return []
-        result = []
-        for line in self.browse(cr, uid, ids, context):
-            if line.life_date:
-                result.append((line.id, (line.name or '')+' ('+line.life_date+')'))
-            else:
-                result.append((line.id, line.name))
-        return result
 
     def _get_date(dtype):
         """Return a function to compute the limit date for this type"""
@@ -52,24 +41,36 @@ class stock_production_lot(osv.osv):
                 # set date to False when no expiry time specified on the product
                 date = duration and (datetime.datetime.today()
                     + datetime.timedelta(days=duration))
-            return date and date.strftime('%Y-%m-%d')
+            return date and date.strftime('%Y-%m-%d %H:%M:%S')
         return calc_date
 
     _columns = {
-        'life_date': fields.date('End of Life Date',
+        'life_date': fields.datetime('End of Life Date',
             help='The date the lot may become dangerous and should not be consumed.'),
-        'use_date': fields.date('Best before Date',
+        'use_date': fields.datetime('Best before Date',
             help='The date the lot starts deteriorating without becoming dangerous.'),
-        'removal_date': fields.date('Removal Date',
+        'removal_date': fields.datetime('Removal Date',
             help='The date the lot should be removed.'),
-        'alert_date': fields.date('Alert Date'),
+        'alert_date': fields.datetime('Alert Date'),
     }
+    # Assign dates according to products data
+    def create(self, cr, uid, vals, context=None):
+        newid = super(stock_production_lot, self).create(cr, uid, vals, context=context)
+        obj = self.browse(cr, uid, newid, context=context)
+        towrite = []
+        for f in ('life_date','use_date','removal_date','alert_date'):
+            if not getattr(obj, f):
+                towrite.append(f)
+        context = context or {}
+        context['product_id'] = obj.product_id.id
+        self.write(cr, uid, [obj.id], self.default_get(cr, uid, towrite, context=context))
+        return newid
 
     _defaults = {
-   #     'life_date': _get_date('life_time'),
-   #     'use_date': _get_date('use_time'),
-   #     'removal_date': _get_date('removal_time'),
-   #     'alert_date': _get_date('alert_time'),
+        'life_date': _get_date('life_time'),
+        'use_date': _get_date('use_time'),
+        'removal_date': _get_date('removal_time'),
+        'alert_date': _get_date('alert_time'),
     }
 stock_production_lot()
 
diff --git a/addons/product_expiry/report/__init__.py b/addons/product_expiry/report/__init__.py
deleted file mode 100644
index a6006ed47b3..00000000000
--- a/addons/product_expiry/report/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import report_stock
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/product_expiry/report/report_stock.py b/addons/product_expiry/report/report_stock.py
deleted file mode 100644
index bef64eaffa6..00000000000
--- a/addons/product_expiry/report/report_stock.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-import tools
-from tools.sql import drop_view_if_exists
-
-class stock_report_prodlots(osv.osv):
-    _name = "stock.report.prodlots1"
-    _description = "Stock report by production lots"
-    _auto = False
-    _columns = {
-            'name': fields.float('Quantity', readonly=True),
-            'location_id': fields.many2one('stock.location', 'Location', readonly=True, select=True),
-            'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
-            'prodlot_id': fields.many2one('stock.production.lot', 'Production lot', readonly=True, select=True),
-            'life_date': fields.date('End of Life Date',
-            help='The date the lot may become dangerous and should not be consumed.'),
-            'use_date': fields.date('Best before Date',
-                help='The date the lot starts deteriorating without becoming dangerous.'),
-            'removal_date': fields.date('Removal Date',
-                help='The date the lot should be removed.'),
-            'alert_date': fields.date('Alert Date'),
-
-    }
-    
-    def init(self, cr):
-        drop_view_if_exists(cr, 'stock_report_prodlots1')
-        cr.execute("""
-            create or replace view stock_report_prodlots1 as (
-                    select max(id) as id,
-                    location_id,
-                    product_id,
-                    prodlot_id,
-                    life_date,
-                    use_date, 
-                    removal_date,
-                    alert_date,
-                    sum(qty) as name
-                from (
-                    select -max(sm.id) as id,
-                        sm.location_id,
-                        sm.product_id,
-                        sm.prodlot_id,
-                        spl.life_date,
-                        spl.use_date, 
-                        spl.removal_date,
-                        spl.alert_date,
-                        -sum(sm.product_qty /uo.factor) as qty
-                    from stock_move as sm
-                    left join stock_location sl
-                        on (sl.id = sm.location_id)
-                    left join stock_production_lot spl
-                        on (sm.prodlot_id=spl.id)
-                    left join product_uom uo
-                        on (uo.id=sm.product_uom)
-                    where state = 'done'
-                    group by sm.location_id, sm.product_id, sm.product_uom, sm.prodlot_id,
-                    spl.life_date,
-                    spl.use_date, 
-                    spl.removal_date,
-                    spl.alert_date
-
-                    union all
-                    select max(sm.id) as id,
-                        sm.location_dest_id as location_id,
-                        sm.product_id,
-                        sm.prodlot_id,
-                        spl.life_date,
-                        spl.use_date, 
-                        spl.removal_date,
-                        spl.alert_date,
-                        sum(sm.product_qty /uo.factor) as qty
-                    from stock_move as sm
-                    left join stock_location sl
-                        on (sl.id = sm.location_dest_id)
-                    left join stock_production_lot spl
-                        on (sm.prodlot_id=spl.id)
-                    left join product_uom uo
-                        on (uo.id=sm.product_uom)
-                    where sm.state = 'done'
-                    group by sm.location_dest_id, sm.product_id, sm.product_uom, sm.prodlot_id,
-                    spl.life_date,
-                    spl.use_date, 
-                    spl.removal_date,
-                    spl.alert_date
-
-                ) as report
-                group by location_id, product_id, prodlot_id, 
-                    life_date,
-                    use_date, 
-                    removal_date,
-                    alert_date
-            )""")
-        
-    def unlink(self, cr, uid, ids, context={}):
-        raise osv.except_osv(_('Error !'), _('You cannot delete any record!'))
-
-        
-stock_report_prodlots()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_expiry/report/report_stock_view.xml b/addons/product_expiry/report/report_stock_view.xml
deleted file mode 100644
index 68198e87dd3..00000000000
--- a/addons/product_expiry/report/report_stock_view.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-         <record id="view_stock_report_prodlots_filter" model="ir.ui.view">
-            <field name="name">stock.report.prodlots.filter</field>
-            <field name="model">stock.report.prodlots1</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Location">
-                    <group col="10" colspan="4">
-                        <filter icon="terp-go-home" name="internal_locations" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations"/>
-                        <filter icon="terp-go-home" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
-                        <filter icon="terp-go-home" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
-                        <separator orientation="vertical"/>
-                        <field name="location_id"/>
-                        <field name="product_id"/>
-                        <newline/>
-                        <field name="use_date" />
-                        <field name="life_date" string="End of Life" />
-                        <field name="alert_date" />
-                        <field name="removal_date" string="Removal D." />
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Location" icon="terp-go-home" domain="[]"  context="{'group_by':'location_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-
-        <record id="stock_report_prodlots_form" model="ir.ui.view">
-            <field name="name">stock.report.prodlots.view</field>
-            <field name="model">stock.report.prodlots1</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Stock by Lots">
-                    <field name="location_id"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id" groups="base.group_extended"/>
-                    <field name="name"/>
-                    <field name="use_date" />
-                    <field name="life_date" string="End of Life" />
-                    <field name="alert_date" />
-                    <field name="removal_date" string="Removal D." />
-                </form>
-            </field>
-        </record>
-
-        <record id="stock_report_prodlots_tree" model="ir.ui.view">
-            <field name="name">stock.report.prodlots.view</field>
-            <field name="model">stock.report.prodlots1</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Stock by Lots">
-                    <field name="location_id"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id" groups="base.group_extended"/>
-                    <field name="name"/>
-                    <field name="use_date" />
-                    <field name="life_date" string="End of Life" />
-                    <field name="alert_date" />
-                    <field name="removal_date" string="Removal D." />
-                </tree>
-            </field>
-        </record>
-
-        <record id="stock_report_prodlots_graph" model="ir.ui.view">
-            <field name="name">stock.report.prodlots.view</field>
-            <field name="model">stock.report.prodlots1</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Stock by Lots" type="bar">
-                    <field name="product_id"/>
-                    <field name="name"/>
-                </graph>
-            </field>
-        </record>
-
-
-        <record id="stock.action_stock_report_prodlots_form" model="ir.actions.act_window">
-            <field name="name">Inventory by Location</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.report.prodlots1</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'full':'1','search_default_internal_locations':1}</field>
-            <field name="search_view_id" ref="view_stock_report_prodlots_filter" />
-        </record>
-
-        <act_window
-            domain="[('product_id','=',active_id)]"
-            id="stock.act_product_product_2_stock_report_prodlots"
-            name="Stock by Lots"
-            res_model="stock.report.prodlots1"
-            src_model="product.product"
-            groups="base.group_extended"/>
-
-
-    </data>
-</openerp>
diff --git a/addons/product_expiry/security/ir.model.access.csv b/addons/product_expiry/security/ir.model.access.csv
deleted file mode 100644
index 76e47953190..00000000000
--- a/addons/product_expiry/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_report_prodlots1_manager","stock.report.prodlots1","model_stock_report_prodlots1","product.group_product_manager",1,1,1,1
-"access_stock_report_prodlots1_user","stock.report.prodlots1","model_stock_report_prodlots1","base.group_user",1,0,0,0
diff --git a/addons/product_expiry/wizard/__init__.py b/addons/product_expiry/wizard/__init__.py
deleted file mode 100644
index 2b1b55ed6e0..00000000000
--- a/addons/product_expiry/wizard/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import stock_partial
diff --git a/addons/product_expiry/wizard/stock_partial.py b/addons/product_expiry/wizard/stock_partial.py
deleted file mode 100644
index 6af52951613..00000000000
--- a/addons/product_expiry/wizard/stock_partial.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import datetime, time
-import wizard
-
-class stock_production_lot(osv.osv):
-    _inherit = "stock.production.lot"
-    def create(self, cr, uid, vals, context={}):
-        new_id = super(stock_production_lot, self).create(cr, uid, vals, context=context)
-        prodlot_obj = self.pool.get('stock.production.lot')
-        prod = prodlot_obj.browse(cr, uid, new_id, context=context)
-        res = {}
-        current_date = time.strftime('%Y-%m-%d %H:%M:%S')
-        if not prod.life_date:
-            date_life = (datetime.datetime.strptime(current_date, '%Y-%m-%d %H:%M:%S')  + datetime.timedelta(days=prod.product_id.life_time))
-            res['life_date'] = date_life.strftime('%Y-%m-%d')
-        if not prod.use_date:
-            date_use = (datetime.datetime.strptime(current_date, '%Y-%m-%d %H:%M:%S')  + datetime.timedelta(days=prod.product_id.use_time))
-            res['use_date'] = date_use.strftime('%Y-%m-%d')
-        if not prod.removal_date:
-            date_removal = (datetime.datetime.strptime(current_date, '%Y-%m-%d %H:%M:%S')  + datetime.timedelta(days=prod.product_id.removal_time))
-            res['removal_date'] = date_removal.strftime('%Y-%m-%d')
-        if not prod.alert_date:
-            date_alert = (datetime.datetime.strptime(current_date, '%Y-%m-%d %H:%M:%S') + datetime.timedelta(days=prod.product_id.alert_time))
-            res['alert_date'] = date_alert.strftime('%Y-%m-%d')
-        prodlot_obj.write(cr, uid, [prod.id], res)
-        return new_id
-stock_production_lot()
-
-class stock_move_split_lines_exist(osv.osv_memory):
-    _inherit = "stock.move.split.lines"
-    _columns = {
-        'date': fields.date('Expiry Date'),
-    }
-    # TODO: use this date instead of default one
-    def on_change_product(self, cr, uid, ids, product_id):
-        if not product_id:
-            return {'value':{'date': False}}
-        day_life = self.pool.get('product.product').browse(cr, uid, product_id).life_time
-        date_life = (datetime.datetime.now() + datetime.timedelta(days=day_life))
-        return {'value':
-            {'date': date_life.strftime('%Y-%m-%d')}
-        }
-stock_move_split_lines_exist()
diff --git a/addons/product_expiry/wizard/stock_partial_view.xml b/addons/product_expiry/wizard/stock_partial_view.xml
deleted file mode 100644
index d48a95c189c..00000000000
--- a/addons/product_expiry/wizard/stock_partial_view.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<openerp>    
-    <data>
-
-        <record id="view_split_in_lots" model="ir.ui.view">
-                <field name="name">Split in lots</field>
-                <field name="model">stock.move.split</field>
-                <field name="type">form</field>
-             <field name="inherit_id" ref="stock.view_split_in_lots"/>
-              <field name="arch" type="xml">
-              <data>
-                <xpath expr="//form/group/group/field[@name='line_ids']/tree/field[@name='name']"  position="replace">
-                  <field name="name" on_change="on_change_product(parent.product_id)"/>
-                </xpath>
-                <xpath expr="//form//group/group/field[@name='line_ids']/tree/field[@name='quantity']"  position="after">
-                  <field name="date"/>
-                </xpath>
-              </data>
-            </field>
-        </record>
-    </data>
-</openerp>    
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 5d7e8922520..bccabe95283 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -20,8 +20,8 @@
 {
     "name" : "Products Attributes & Manufacturers",
     "version" : "1.0",
-    "author" : "Tiny",
-    "category" : "Enterprise Specific Modules/Industries",
+    "author" : "OpenERP SA",
+    "category" : "Enterprise Specific Modules/Manufacturer Industries",
     "depends" : ["base", "account", "product", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
diff --git a/addons/product_manufacturer/i18n/fr_BE.po b/addons/product_manufacturer/i18n/fr_BE.po
index 2fc936e9dfc..11351ba679d 100644
--- a/addons/product_manufacturer/i18n/fr_BE.po
+++ b/addons/product_manufacturer/i18n/fr_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* product_electronic
+#	* product_manufacturer
 #
 msgid ""
 msgstr ""
@@ -15,88 +15,88 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
 msgid "A module that add manufacturers and attributes on the product form"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer product code"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: product_electronic
-#: view:product.electronic.attribute:0
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: product_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_electronic_attribute
 msgid "Product attributes"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Manufacturing data"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Product reference"
 msgstr ""
 
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
 msgid "Attribute"
 msgstr ""
 
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,product_id:0
 msgid "Product"
 msgstr ""
 
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Manufacturing Data"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Product name"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
 msgid "Attributes"
 msgstr ""
 
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
 msgid "Products Attributes & Manufacturers"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
 msgid "Manufacturer product name"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr ""
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_electronic.pot
similarity index 61%
rename from addons/product_manufacturer/i18n/product_manufacturer.pot
rename to addons/product_manufacturer/i18n/product_electronic.pot
index 2fc936e9dfc..11351ba679d 100644
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_electronic.pot
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* product_electronic
+#	* product_manufacturer
 #
 msgid ""
 msgstr ""
@@ -15,88 +15,88 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: product_electronic
-#: model:ir.module.module,description:product_electronic.module_meta_information
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
 msgid "A module that add manufacturers and attributes on the product form"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer product code"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: product_electronic
-#: view:product.electronic.attribute:0
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: product_electronic
-#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_electronic_attribute
 msgid "Product attributes"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Manufacturing data"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Product reference"
 msgstr ""
 
-#. module: product_electronic
-#: field:product.electronic.attribute,name:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
 msgid "Attribute"
 msgstr ""
 
-#. module: product_electronic
-#: field:product.electronic.attribute,product_id:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,product_id:0
 msgid "Product"
 msgstr ""
 
-#. module: product_electronic
-#: field:product.electronic.attribute,value:0
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
 msgid "Value"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Manufacturing Data"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 msgid "Product name"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: view:product.product:0
 #: field:product.product,attribute_ids:0
 msgid "Attributes"
 msgstr ""
 
-#. module: product_electronic
-#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
 msgid "Products Attributes & Manufacturers"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
 msgid "Manufacturer product name"
 msgstr ""
 
-#. module: product_electronic
+#. module: product_manufacturer
 #: field:product.product,manufacturer:0
 msgid "Manufacturer"
 msgstr ""
diff --git a/addons/product_manufacturer/product_manufacturer.py b/addons/product_manufacturer/product_manufacturer.py
index 78e951bf448..969b4ce69cf 100644
--- a/addons/product_manufacturer/product_manufacturer.py
+++ b/addons/product_manufacturer/product_manufacturer.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#
+#    
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,7 +14,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
 
@@ -24,26 +24,13 @@ class product_product(osv.osv):
     _inherit = 'product.product'
     _name = 'product.product'
     _columns = {
+        'manufacturer' : fields.many2one('res.partner', 'Manufacturer'),
+        'manufacturer_pname' : fields.char('Manufacturer Product Name', size=64),
+        'manufacturer_pref' : fields.char('Manufacturer Product Code', size=64),
         'attribute_ids': fields.one2many('product.manufacturer.attribute', 'product_id', 'Attributes'),
-        'manufacturer_ids': fields.one2many('res.partner.manufacturer', 'product_id', 'Manufacturers'),
     }
 product_product()
 
-class res_partner_manufacturer(osv.osv):
-    _name = 'res.partner.manufacturer'
-    _rec_name = 'manufacturer_id'
-    _columns = {
-        'manufacturer_id' : fields.many2one('res.partner', 'Manufacturer'),
-        'country_id' : fields.many2one('res.country', 'Country'),
-        'authorized' : fields.boolean('Authorized'),
-        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade'),
-    }
-    _defaults = {
-        'authorized': True,
-    }
-
-res_partner_manufacturer()
-
 class product_attribute(osv.osv):
     _name = "product.manufacturer.attribute"
     _description = "Product attributes"
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index cfd7f23ae8d..1d1f952cd4d 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -1,72 +1,56 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<record model="ir.ui.view" id="view_product_form_expiry">
-			<field name="name">product.normal.form</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="product.product_normal_form_view" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-					<page string="Manufacturing Data">
-						<separator string="Manufacturing data" colspan="4" />
-						<field name="manufacturer_ids" colspan="4" nolabel="1" widget="one2many_list"/>
+        <record model="ir.ui.view" id="view_product_form_expiry">
+            <field name="name">product.normal.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Manufacturer">
+                        <separator string="Manufacturer" colspan="4" />
+                        <field name="manufacturer" />
+                        <newline/>
+                        <field name="manufacturer_pname"/>
+                        <field name="manufacturer_pref"/>
 
-						<separator string="Attributes" colspan="4"/>
-						<field name="attribute_ids" colspan="4" nolabel="1" widget="one2many_list" />
-					</page>
-				</notebook>
-			</field>
-		</record>
+                        <separator string="Attributes" colspan="4"/>
+                        <field name="attribute_ids" colspan="4" nolabel="1">
+                            <tree string="Product Attributes" editable="bottom">
+                                <field name="name"/>
+                                <field name="value"/>
+                            </tree>
+                        </field>
+                    </page>
+                </notebook>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="product_manufacturer_attribute_tree_view">
-			<field name="name">product.manufacturer.attribute.tree</field>
-			<field name="model">product.manufacturer.attribute</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Product Template Name">
-					<field name="name"/>
-					<field name="value"/>
-				</tree>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="product_manufacturer_attribute_form_view">
-			<field name="name">product.manufacturer.attribute.form</field>
-			<field name="model">product.manufacturer.attribute</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Product Template Name">
-					<field name="name" select="1"/>
-					<field name="value" select="1"/>
-				</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="product_manufacturer_attribute_tree_view">
+            <field name="name">product.manufacturer.attribute.tree</field>
+            <field name="model">product.manufacturer.attribute</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Product Attributes" editable="bottom">
+                    <field name="name"/>
+                    <field name="value"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="product_manufacturer_attribute_form_view">
+            <field name="name">product.manufacturer.attribute.form</field>
+            <field name="model">product.manufacturer.attribute</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Product Template Name">
+                    <field name="name"/>
+                    <field name="value"/>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="product_manufacturer_manufact_tree_view">
-			<field name="name">res.partner.manufacturer.tree</field>
-			<field name="model">res.partner.manufacturer</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Manufacturers" editable="top">
-					<field name="manufacturer_id"/>
-					<field name="country_id"/>
-					<field name="authorized"/>
-				</tree>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="product_manufacturer_manufa_form_view">
-			<field name="name">res.partner.manufacturer.form</field>
-			<field name="model">res.partner.manufacturer</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Manufacturers">
-					<field name="manufacturer_id" colspan="4"/>
-					<field name="country_id"/>
-					<field name="authorized"/>
-				</form>
-			</field>
-		</record>
-	</data>
+    </data>
 </openerp>
 
diff --git a/addons/product_manufacturer/security/ir.model.access.csv b/addons/product_manufacturer/security/ir.model.access.csv
index 1d3f9af7a2b..6f07fb1dc94 100644
--- a/addons/product_manufacturer/security/ir.model.access.csv
+++ b/addons/product_manufacturer/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",,1,0,0,0
+"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,0,0,0
 "access_product_manufacturer_attribute_manager","product.manufacturer.attribute","model_product_manufacturer_attribute","product.group_product_manager",1,1,1,1
-"access_partner_manufacturer","res.partner.manufacturer","model_res_partner_manufacturer",,1,0,0,0
-"access_partner_manufacturer_manager","res.partner.manufacturer","model_res_partner_manufacturer","product.group_product_manager",1,1,1,1
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index bb4f8e0e411..175a17229bc 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-31 12:49+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-06-23 17:31+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -185,7 +185,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr "Mis tareas en proceso"
+msgstr "Mis tareas en progreso"
 
 #. module: project
 #: view:project.project:0
@@ -480,7 +480,7 @@ msgstr "Mis tareas pendientes"
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr "Tareas en proceso"
+msgstr "Tareas en progreso"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
@@ -1043,7 +1043,7 @@ msgstr "Trabajo realizado"
 #. module: project
 #: selection:project.project,state:0
 msgid "Running"
-msgstr "En proceso"
+msgstr "En progreso"
 
 #. module: project
 #: help:project.project,parent_id:0
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index 9bc8e50e76a..777b9212e77 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 19:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-23 17:32+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
@@ -24,4 +25,4 @@ msgstr "Parte de horas de proyectos"
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
 msgid "Related Timeline Id"
-msgstr "Id relacionado con el tiempo"
+msgstr "Id de la línea de tiempos asociada"
diff --git a/addons/report_analytic_planning/i18n/es.po b/addons/report_analytic_planning/i18n/es.po
new file mode 100644
index 00000000000..bf4ebb8ce76
--- /dev/null
+++ b/addons/report_analytic_planning/i18n/es.po
@@ -0,0 +1,347 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* report_analytic_planning
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-23 17:32+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-24 03:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "To:"
+msgstr "Hasta:"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Planificación por cuenta"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Resumen por proyecto"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Ctdad UdM"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: report_analytic_planning
+#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Estad. planificación"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
+
+#. module: report_analytic_planning
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
+
+#. module: report_analytic_planning
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: report_analytic_planning
+#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr "Estadísticas de planificación"
+
+#. module: report_analytic_planning
+#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
+msgid "Planning account stat"
+msgstr "Estad. cuenta planificación"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned hours"
+msgstr "Horas planeadas"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "Real"
+msgstr "Real"
+
+#. module: report_analytic_planning
+#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
+#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
+msgid "My Planning Statistics"
+msgstr "Mis estadísticas de planificación"
+
+#. module: report_analytic_planning
+#: model:ir.module.module,description:report_analytic_planning.module_meta_information
+msgid "Planning on analytic accounts."
+msgstr "Planificación a partir de cuentas analíticas."
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Nombre planificación"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "Quantities"
+msgstr "Cantidades"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "Planificación RRHH"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.stat.account,sum_amount_real:0
+#: field:report_account_analytic.planning.stat.user,sum_amount_real:0
+msgid "Timesheet"
+msgstr "Hoja de asistencia"
+
+#. module: report_analytic_planning
+#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning:0
+msgid "Planning Line"
+msgstr "Línea de planificación"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "Responsible:"
+msgstr "Responsable:"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning:0
+msgid "Quantities by Account"
+msgstr "Cantidades por cuenta"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "From:"
+msgstr "Desde:"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning:0
+msgid "Time by Account"
+msgstr "Tiempo por cuenta"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: report_analytic_planning
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning:0
+msgid "Time by User"
+msgstr "Tiempo por usuario"
+
+#. module: report_analytic_planning
+#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
+#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
+msgid "Planning Statistics of My Projects"
+msgstr "Estadísticas de planificación de mis proyectos"
+
+#. module: report_analytic_planning
+#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
+#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
+msgid "Current Planning"
+msgstr "Planificación actual"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Resumen por usuario"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning:0
+msgid "Analysis"
+msgstr "Análisis"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: rml:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.stat.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Timesheet"
+msgstr "Total hoja de servicios"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "Details of user's time by projects"
+msgstr "Detalle del tiempo del usuario por proyectos"
+
+#. module: report_analytic_planning
+#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
+msgid "Planning user stat"
+msgstr "Estad. planificación del usuario"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat.account,quantity:0
+#: field:report_account_analytic.planning.stat.user,quantity:0
+msgid "Planned"
+msgstr "Planificado"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Análisis planificación"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "["
+msgstr "["
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Líneas planificación"
+
+#. module: report_analytic_planning
+#: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
+msgid "Analytic planning - Reporting"
+msgstr "Informes - Planificación analítica"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+msgid "]"
+msgstr "]"
+
+#. module: report_analytic_planning
+#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
+#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
+msgid "My Planning"
+msgstr "Mi planificación"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,stat_user_ids:0
+msgid "Planning by user"
+msgstr "Planificación por usuario"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: report_analytic_planning
+#: rml:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,stat_account_ids:0
+msgid "Planning by account"
+msgstr "Planificación por cuenta"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning:0
+msgid "Quantities by User"
+msgstr "Cantidades por usuario"
+
+#. module: report_analytic_planning
+#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
+#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
+msgid "My Current Planning"
+msgstr "Mi planificación actual"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.stat.account,account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: report_analytic_planning
+#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
+#: model:ir.actions.report.xml,name:report_analytic_planning.report_planning
+#: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning
+#: model:ir.ui.menu,name:report_analytic_planning.next_id_85
+#: model:ir.ui.menu,name:report_analytic_planning.planning_main
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.stat.account,planning_id:0
+#: field:report_account_analytic.planning.stat.user,planning_id:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: report_analytic_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Planned"
+msgstr "Total planeado"
+
+#. module: report_analytic_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: report_analytic_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Estadísticas de planificación"
+
+#. module: report_analytic_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Abierto"
+
+#. module: report_analytic_planning
+#: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
+#: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
+msgid "New Planning"
+msgstr "Nueva planificación"
diff --git a/addons/report_task/i18n/es.po b/addons/report_task/i18n/es.po
new file mode 100644
index 00000000000..8bb396c5454
--- /dev/null
+++ b/addons/report_task/i18n/es.po
@@ -0,0 +1,269 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* report_task
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-23 17:33+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-24 03:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: report_task
+#: selection:report.closed.task,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: report_task
+#: model:ir.actions.act_window,name:report_task.action_project_task
+#: model:ir.ui.menu,name:report_task.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr "Tareas por usuario"
+
+#. module: report_task
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: report_task
+#: field:report.closed.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: report_task
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr "No hay tarea"
+
+#. module: report_task
+#: model:ir.module.module,shortdesc:report_task.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr "Informe de tareas por usuario para proyectos"
+
+#. module: report_task
+#: view:report.closed.task:0
+msgid "Delay"
+msgstr "Retraso"
+
+#. module: report_task
+#: selection:report.closed.task,priority:0
+msgid "Very Low"
+msgstr "Muy baja"
+
+#. module: report_task
+#: selection:report.closed.task,state:0
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: report_task
+#: selection:report.closed.task,priority:0
+msgid "Low"
+msgstr "Baja"
+
+#. module: report_task
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
+
+#. module: report_task
+#: field:report.closed.task,name:0
+msgid "Task summary"
+msgstr "Resumen de tarea"
+
+#. module: report_task
+#: selection:report.closed.task,state:0
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: report_task
+#: field:report.closed.task,state:0
+#: field:report.task.user.pipeline.open,task_state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: report_task
+#: selection:report.closed.task,priority:0
+msgid "Medium"
+msgstr "Media"
+
+#. module: report_task
+#: model:ir.actions.act_window,name:report_task.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:report_task.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr "Tiempo / Horas de tareas por mes"
+
+#. module: report_task
+#: field:report.closed.task,progress:0
+msgid "Progress (%)"
+msgstr "Progreso (%)"
+
+#. module: report_task
+#: field:report.closed.task,priority:0
+msgid "Importance"
+msgstr "Importancia"
+
+#. module: report_task
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: report_task
+#: model:ir.ui.menu,name:report_task.next_id_57
+msgid "Reporting"
+msgstr "Informe"
+
+#. module: report_task
+#: model:ir.module.module,description:report_task.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+"Proporciona estadísticas de tareas por usuario en proyectos para comprobar "
+"el trabajo encadenado de los usuarios."
+
+#. module: report_task
+#: field:report.task.user.pipeline.open,user_id:0
+#: field:report.timesheet.task.user,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: report_task
+#: model:ir.actions.act_window,name:report_task.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr "Tareas cerradas en los últimos 15 días"
+
+#. module: report_task
+#: selection:report.closed.task,priority:0
+msgid "Very urgent"
+msgstr "Muy urgente"
+
+#. module: report_task
+#: selection:report.closed.task,state:0
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: report_task
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "Horas de tarea"
+
+#. module: report_task
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: report_task
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "Horas de retraso"
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: report_task
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr "Número de tarea"
+
+#. module: report_task
+#: model:ir.model,name:report_task.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: report_task
+#: model:ir.model,name:report_task.model_report_task_user_pipeline_open
+msgid "Tasks by user and project"
+msgstr "Tareas por usuario y proyecto"
+
+#. module: report_task
+#: view:report.closed.task:0
+msgid "Planned"
+msgstr "Planificado"
+
+#. module: report_task
+#: selection:report.closed.task,state:0
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: report_task
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "Horario / Informe de horas de trabajo por mes"
+
+#. module: report_task
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr "Progreso de la tarea"
+
+#. module: report_task
+#: field:report.closed.task,date_close:0
+msgid "Date Closed"
+msgstr "Fecha de cierre"
+
+#. module: report_task
+#: field:report.closed.task,user_id:0
+msgid "Assigned to"
+msgstr "Asignado a"
+
+#. module: report_task
+#: field:report.closed.task,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: report_task
+#: model:ir.model,name:report_task.model_report_closed_task
+msgid "Closed Task Report"
+msgstr "Informe de tareas cerradas"
+
+#. module: report_task
+#: field:report.timesheet.task.user,name:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: report_task
+#: selection:report.closed.task,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: report_task
+#: field:report.closed.task,date_deadline:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: report_task
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "Horas del horario"
+
+#. module: report_task
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr "Tareas cerradas"
+
+#. module: report_task
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "Open"
+msgstr "Abrir"
+
+#. module: report_task
+#: field:report.closed.task,planned_hours:0
+msgid "Planned Hours"
+msgstr "Horas planeadas"
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 4aa9e9e6cf4..3c481e1f885 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-31 12:52+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-06-23 17:33+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -578,7 +578,7 @@ msgstr "Línea del pedido"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Packing Default Policy"
-msgstr "Política de envío por defecto"
+msgstr "Forma de envío por defecto"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
@@ -748,7 +748,7 @@ msgstr "Estado"
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Packing Policy"
-msgstr "Política de envío"
+msgstr "Forma de envío"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index c7a56f7ba2a..4b8113738fd 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-17 23:43+0000\n"
-"Last-Translator: mikel <Unknown>\n"
+"PO-Revision-Date: 2010-06-23 17:34+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -1086,7 +1087,7 @@ msgstr "Lotes seguimiento de stock"
 #: rml:lot.stock.overview_all:0
 #: field:stock.move,price_unit:0
 msgid "Unit Price"
-msgstr "Precio unidad"
+msgstr "Precio un."
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index c724740e553..70f2d3a33cd 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 17:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-23 17:34+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -120,4 +121,4 @@ msgstr "Retraso (días)"
 #. module: stock_location
 #: view:product.product:0
 msgid "Procurement & Locations"
-msgstr "Abastecimiento & Ubicaciones"
+msgstr "Abastecimiento y Ubicaciones"