Merge lp:~openerp-dev/openobject-addons/trunk-bug-817361-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have changed the make_invoices method inorder to open customer invoices form when merging/grouping two or more invoices.

Thanks & Regards,
Devnani Bharat R.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Not Working:
1. Opens direct Form view now (List view should be open first)
2. Why you have removed domain and search_view_id ?
3. 'res_id': newinv and newinv[0] or False, => No need to add this line as domain will do the same thing.

Thanks,
Mustafa

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-817361-bde]

4904. By Bharat Devnani (Open ERP) on 2011-08-02

[IMP] improved the make_invoices function in sale_make_invoice.py inorder to open customer invoice when grouping more than one Invoices

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

I have improved the make_invoices function in sale_make_invoice.py inorder to open customer invoice when grouping more than one Invoices.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Line number 28: you have assigned Tree Id on Search_view ..

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-817361-bde]

4905. By Bharat Devnani (Open ERP) on 2011-08-08

[IMP] assigned search_id in search_view_id

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

I have assigned search_id in search_view_id.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-817361-bde]

4906. By Purnendu Singh (OpenERP) on 2011-08-12

[MERGE] merge with main addons

4907. By Purnendu Singh (OpenERP) on 2011-08-12

[FIX] sale: updated bde(OpenERP) patch as the date was still missing from the created invoice

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-817361-bde]

4908. By Bharat Devnani (Open ERP) on 2011-09-15

[MERGE] merged with main addons

Unmerged revisions

4908. By Bharat Devnani (Open ERP) on 2011-09-15

[MERGE] merged with main addons

4907. By Purnendu Singh (OpenERP) on 2011-08-12

[FIX] sale: updated bde(OpenERP) patch as the date was still missing from the created invoice

4906. By Purnendu Singh (OpenERP) on 2011-08-12

[MERGE] merge with main addons

4905. By Bharat Devnani (Open ERP) on 2011-08-08

[IMP] assigned search_id in search_view_id

4904. By Bharat Devnani (Open ERP) on 2011-08-02

[IMP] improved the make_invoices function in sale_make_invoice.py inorder to open customer invoice when grouping more than one Invoices

4903. By Bharat Devnani (Open ERP) on 2011-08-01

[FIX] account : changed the make_invoices method inorder to open customer invoices form when merging/grouping the two or more invoices

=== modified file 'account/partner_view.xml'
--- account/partner_view.xml	2011-08-15 14:21:41 +0000
+++ account/partner_view.xml	2011-09-15 12:39:08 +0000
@@ -97,6 +97,7 @@
                         <form string="Bank account">
                             <field name="state"/>
                             <newline/>
+<<<<<<< TREE
                             <field name="acc_number"/>
                             <newline/>
                             <group name="owner" colspan="2" col="2">
@@ -115,6 +116,23 @@
                                 <field name="bank_name"/>
                                 <field name="bank_bic"/>
                             </group>
+=======
+                            <field name="acc_number" attrs="{'invisible':[('state','!=','bank')]}"/>
+                            <newline/>
+                            <field name="bank"/>
+                            <newline/>
+                            <field name="sequence"/>
+                            <field colspan="4" name="name"/>
+                            <separator colspan="4" string="Bank account owner"/>
+                            <field colspan="4" name="owner_name"/>
+                            <field colspan="4" name="street"/>
+                            <newline/>
+                            <field name="zip"/>
+                            <field name="city"/>
+                            <newline/>
+                            <field completion="1" name="country_id"/>
+                            <field name="state_id"/>
+>>>>>>> MERGE-SOURCE
                         </form>
                         <tree string="Bank Details">
                             <field name="sequence" invisible="1"/>

=== modified file 'account_cancel/i18n/sv.po'
--- account_cancel/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ account_cancel/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-03 04:37+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information

=== modified file 'account_invoice_layout/i18n/ca.po'
--- account_invoice_layout/i18n/ca.po	2011-09-05 05:59:33 +0000
+++ account_invoice_layout/i18n/ca.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:26+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-08 04:36+0000\n"
+"X-Generator: Launchpad (build 13613)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0

=== modified file 'analytic_journal_billing_rate/i18n/fi.po'
--- analytic_journal_billing_rate/i18n/fi.po	2011-09-05 05:59:33 +0000
+++ analytic_journal_billing_rate/i18n/fi.po	2011-09-15 12:39:08 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Finnish translation for openobject-addons
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the openobject-addons package.
@@ -95,3 +96,102 @@
 #: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
 msgid "Timesheet Line"
 msgstr "Tuntilistan rivi"
+=======
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-08-08 07:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-09 04:50+0000\n"
+"X-Generator: Launchpad (build 13628)\n"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default invoicing rate for "
+"a specific journal on a given account. This is mostly used when a user "
+"encodes his timesheet: the values are retrieved and the fields are auto-"
+"filled... but the possibility to change these values is still available.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the account data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr "Analyyttinen päiväkirja"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr "Lasku"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr "Veloitushinta päiväkirjoittain tälle analyyttiselle tilille"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analyyttinen tili"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr "Suhdetaulu päiväkirjojen ja veloituhintojen välillä"
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr "Veloitushinta päiväkirjoittain"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid ""
+"Analytic Journal Billing Rate, Define the default invoicing rate for a "
+"specific journal"
+msgstr ""
+"Analyyttisen päiväkirjan veloitushinta, määrittele oletushinta tietylle "
+"päiväkirjalle"
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr "Laskutushinta"
+
+#. module: analytic_journal_billing_rate
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Tuntilistan rivi"
+>>>>>>> MERGE-SOURCE

=== modified file 'association/i18n/sv.po'
--- association/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ association/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-03 04:37+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0

=== modified file 'auction/i18n/ca.po'
--- auction/i18n/ca.po	2011-09-05 05:59:33 +0000
+++ auction/i18n/ca.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:29+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-07 04:37+0000\n"
+"X-Generator: Launchpad (build 13613)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu

=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py	2011-08-22 17:16:59 +0000
+++ base_action_rule/base_action_rule.py	2011-09-15 12:39:08 +0000
@@ -275,10 +275,17 @@
             'object_description': hasattr(obj, 'description') and obj.description or False,
             'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/',
             'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and \
+<<<<<<< TREE
                                      obj.user_id.user_email) or '/',
             'object_user_phone': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and \
                                      obj.partner_address_id.phone) or '/',
             'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/',
+=======
+                                     obj.user_id.user_email) or '/',
+            'object_user_phone': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and \
+                                     obj.partner_address_id.phone) or '/',
+            'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/', 
+>>>>>>> MERGE-SOURCE
             'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\
                                          obj.partner_address_id.email) or '/',
         }

=== modified file 'base_action_rule/i18n/sv.po'
--- base_action_rule/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ base_action_rule/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:53+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0

=== modified file 'base_calendar/i18n/sv.po'
--- base_calendar/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ base_calendar/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0

=== modified file 'base_iban/base_iban.py'
--- base_iban/base_iban.py	2011-08-15 14:21:41 +0000
+++ base_iban/base_iban.py	2011-09-15 12:39:08 +0000
@@ -126,7 +126,39 @@
         if default_iban_check(iban_country):
             iban_example = iban_country in _ref_iban and _ref_iban[iban_country] + ' \nWhere A = Account number, B = National bank code, S = Branch code, C = account No, N = branch No, K = National check digits....' or ''
             return _('The IBAN does not seem to be correct. You should have entered something like this %s'), (iban_example)
+<<<<<<< TREE
         return _('The IBAN is invalid, it should begin with the country code'), ()
+=======
+        return _('The IBAN is invalid, It should begin with the country code'), ()
+
+    def name_get(self, cr, uid, ids, context=None):
+        res = []
+        to_check_ids = []
+        for val in self.browse(cr, uid, ids, context=context):
+            if val.state=='iban':
+                iban = _pretty_iban(val.iban or '')
+                bic = val.bank.bic or ''
+                res.append((val.id, _('IBAN: %s / BIC: %s') % (iban, bic)))
+            else:
+                to_check_ids.append(val.id)
+        res += super(res_partner_bank, self).name_get(cr, uid, to_check_ids, context=context)
+        return res
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+    #overwrite the search method in order to search not only on bank type == basic account number but also on type == iban
+        res = super(res_partner_bank,self).search(cr, uid, args, offset, limit, order, context=context, count=count)
+        if filter(lambda x:x[0]=='acc_number' ,args):
+            #get the value of the search
+            iban_value = filter(lambda x:x[0]=='acc_number' ,args)[0][2]
+            #get the other arguments of the search
+            args1 =  filter(lambda x:x[0]!='acc_number' ,args)
+            #add the new criterion
+            args1 += [('iban','ilike',iban_value)]
+            #append the results to the older search
+            res += super(res_partner_bank,self).search(cr, uid, args1, offset, limit,
+                order, context=context, count=count)
+        return res
+>>>>>>> MERGE-SOURCE
 
     def get_bban_from_iban(self, cr, uid, ids, context=None):
         '''

=== modified file 'base_iban/base_iban_view.xml'
--- base_iban/base_iban_view.xml	2011-08-15 14:21:41 +0000
+++ base_iban/base_iban_view.xml	2011-09-15 12:39:08 +0000
@@ -2,5 +2,60 @@
 <openerp>
     <data>
 
+<<<<<<< TREE
+=======
+        <record id="view_partner_bank_iban_form" model="ir.ui.view">
+            <field name="name">res.partner.bank.form.iban.inherit</field>
+            <field name="model">res.partner.bank</field>
+            <field name="inherit_id" ref="base.view_partner_bank_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="after">
+                    <newline/>
+                    <field name="iban"/>
+                    <newline/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_partner_abnk_iban_tree" model="ir.ui.view">
+            <field name="name">res.partner.bank.tree.iban.inherit</field>
+            <field name="model">res.partner.bank</field>
+            <field name="inherit_id" ref="base.view_partner_bank_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="after">
+                    <field name="iban"/>
+                </field>
+            </field>
+        </record>
+
+    <!-- view for res.partner -->
+        <record id="view_partner_iban_form" model="ir.ui.view">
+            <field name="name">res.partner.form.iban.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="after">
+                    <newline/>
+                    <field name="iban" attrs="{'invisible':[('state','!=','iban')]}"/>
+                    <newline/>
+                </field>
+            </field>
+        </record>
+        <record id="view_partner_iban_list" model="ir.ui.view">
+            <field name="name">res.partner.form.iban.inherit.list</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                	<field name="iban"/>
+                </xpath>
+            </field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'base_module_record/i18n/sv.po'
--- base_module_record/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ base_module_record/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:10+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,category:0

=== modified file 'base_setup/base_setup_views.xml'
--- base_setup/base_setup_views.xml	2011-09-12 14:49:25 +0000
+++ base_setup/base_setup_views.xml	2011-09-15 12:39:08 +0000
@@ -73,6 +73,7 @@
         <field name="action_id" ref="action_base_setup_installer"/>
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">2</field>
+<<<<<<< TREE
     </record>
 
     <record id="action_start_configurator" model="ir.actions.server">
@@ -91,6 +92,75 @@
     </record>
 
      <!-- Import or create customers configartion view  -->
+=======
+    </record>
+
+    <record id="action_start_configurator" model="ir.actions.server">
+      <field name="name">Start Configuration</field>
+      <field name="model_id" ref="base.model_ir_actions_todo"/>
+      <field name="state">code</field>
+      <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = obj.pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
+    </record>
+    
+    <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="100"/>
+    <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
+      <field name="name">Add More Features</field>
+      <field name="resource">ir.ui.menu</field>
+      <field name="user_id" ref="base.user_root"/>
+      <field name="res_id" ref="menu_view_base_module_configuration"/>
+    </record>
+<!--     Migrate data from another application Conf Wiz-->
+
+    <record id="view_migrade_application_installer_modules" model="ir.ui.view">
+        <field name="name">migrade.application.installer.modules.form</field>
+        <field name="model">migrade.application.installer.modules</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.res_config_installer"/>
+        <field name="arch" type="xml">
+            <data>
+                <form position="attributes">
+                    <attribute name="string">Migrate data from another application</attribute>
+                </form>
+                <separator string="title" position="attributes">
+                     <attribute name="string">Migrate data from another application</attribute>
+                </separator>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">Import data from other applications. Following the selected application, you can import more or less type of data matching to OpenERP objects. Choose the application and then the data you want to import in OpenERP</attribute>
+                </xpath>
+                <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Configure</attribute>
+                </xpath>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
+                </xpath>
+                <group colspan="8">
+                    <field name="import_saleforce"/>
+                    <field name="import_sugarcrm"/>
+                    <field name="sync_google_contact"/>
+                    <field name="quickbooks_ippids"/>
+                </group>
+            </data>
+        </field>
+    </record>
+
+    <record id="action_migrade_application_installer_modules" model="ir.actions.act_window">
+	     <field name="name">Migrate data from another application</field>
+	     <field name="type">ir.actions.act_window</field>
+	     <field name="res_model">migrade.application.installer.modules</field>
+	     <field name="view_id" ref="view_migrade_application_installer_modules"/>
+	     <field name="view_type">form</field>
+	     <field name="view_mode">form</field>
+	     <field name="target">new</field>
+   </record>
+
+   <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_migrade_application_installer_modules"/>
+      <field name="category_id" ref="base.category_administration_config"/>
+  </record>
+
+          <!-- Import or create customers configartion view  -->
+
+>>>>>>> MERGE-SOURCE
 	 <record id="action_import_create_installer" model="ir.actions.act_window">
 	     <field name="name">Import or Create Customers</field>
 	     <field name="type">ir.actions.act_window</field>
@@ -103,9 +173,16 @@
 	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
 	    <field name="category_id" ref="base.category_administration_config"/>
+<<<<<<< TREE
     </record>
 
      <!-- Define default users preferences-->
+=======
+    </record>
+
+	<!--        Define default users preferences-->
+
+>>>>>>> MERGE-SOURCE
      <record id="view_user_preferences_config_form" model="ir.ui.view">
           <field name="name">Set default users preferences</field>
           <field name="model">user.preferences.config</field>
@@ -164,12 +241,29 @@
           <field name="action_id" ref="action_config_access_other_user"/>
           <field name="category_id" ref="base.category_administration_config"/>
           <field name="sequence">1000</field>
+<<<<<<< TREE
           <field name="state">done</field>
       </record>
 
 
       <!--   Specify Your Terminology Config Wiz-->
      <record id="base_setup_terminology_form" model="ir.ui.view">
+=======
+          <field name="state">done</field>
+      </record>
+
+      <!--   register Upload Logo configuration wizard  -->
+
+      <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
+          <field name="action_id" ref="action_res_company_logo"/>
+          <field name="category_id" ref="base.category_administration_config"/>
+          <field name="state">done</field>
+      </record>
+
+            <!--        Specify Your Terminology Config Wiz-->
+
+     <record id="view_partner_terminology_config_form" model="ir.ui.view">
+>>>>>>> MERGE-SOURCE
           <field name="name">Specify Your Terminology</field>
           <field name="model">base.setup.terminology</field>
           <field name="type">form</field>
@@ -198,7 +292,11 @@
           </field>
       </record>
       <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
+<<<<<<< TREE
           <field name="name">Specify Your Terminology for Customers</field>
+=======
+          <field name="name">Customer / Partner / Patient ?</field>
+>>>>>>> MERGE-SOURCE
           <field name="type">ir.actions.act_window</field>
           <field name="res_model">base.setup.terminology</field>
           <field name="view_type">form</field>
@@ -225,6 +323,7 @@
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">1</field>
+<<<<<<< TREE
     </record>
     <!--   register Upload Logo configuration wizard  -->
     <record id="base_setup_company_logo_action" model="ir.actions.act_window">
@@ -240,6 +339,8 @@
         <field name="action_id" ref="base_setup_company_logo_action"/>
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="state">done</field>
+=======
+>>>>>>> MERGE-SOURCE
     </record>
 
   </data>

=== modified file 'base_synchro/i18n/sv.po'
--- base_synchro/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ base_synchro/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base_synchro
 #: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro

=== modified file 'base_vat/i18n/cs.po'
--- base_vat/i18n/cs.po	2011-09-05 05:59:33 +0000
+++ base_vat/i18n/cs.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:10+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-08 04:36+0000\n"
+"X-Generator: Launchpad (build 13613)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:87

=== modified file 'board/board_view.xml'
--- board/board_view.xml	2011-08-30 09:57:31 +0000
+++ board/board_view.xml	2011-09-15 12:39:08 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+<<<<<<< TREE
 
       <record id="action_application_tiles" model="ir.actions.client">
         <field name="name">Applications Tiles</field>
@@ -61,6 +62,41 @@
         <field name="view_mode">form</field>
         <field name="view_id" ref="view_board_homepage"/>
       </record>
+=======
+
+      <record id="action_application_tiles" model="ir.actions.client">
+        <field name="name">Applications Tiles</field>
+        <field name="tag">board.home.applications</field>
+      </record>
+      <record id="action_res_widgets_display" model="ir.actions.client">
+        <field name="name">Homepage Widgets</field>
+        <field name="tag">board.home.widgets</field>
+      </record>
+      <record id="view_board_homepage" model="ir.ui.view">
+        <field name="name">Homepage Board</field>
+        <field name="model">board.board</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+          <form string="">
+            <hpaned>
+              <child1>
+                <action name="%(action_application_tiles)d"/>
+              </child1>
+              <child2>
+                <action name="%(action_res_widgets_display)d"/>
+              </child2>
+            </hpaned>
+          </form>
+        </field>
+      </record>
+      <record id="homepage_action" model="ir.actions.act_window">
+        <field name="name">Home Page</field>
+        <field name="res_model">board.board</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_board_homepage"/>
+      </record>
+>>>>>>> MERGE-SOURCE
 
 <!--  Board Tree View  -->
 
@@ -137,8 +173,13 @@
 
         <menuitem
             action="action_view_board_list_form"
+<<<<<<< TREE
             id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
 
+=======
+            id="menu_view_board_form" parent="base.reporting_menu" groups="base.group_no_one" sequence="1"/>
+
+>>>>>>> MERGE-SOURCE
         <act_window context="{'view': active_id}" id="dashboard_open"
             multi="True" name="Open Dashboard" res_model="board.board"
             src_model="board.board" />

=== modified file 'board/i18n/sv.po'
--- board/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ board/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:33+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: board
 #: view:res.log.report:0

=== modified file 'caldav/i18n/sv.po'
--- caldav/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ caldav/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: caldav
 #: view:basic.calendar:0

=== modified file 'crm/crm.py'
--- crm/crm.py	2011-09-13 13:28:43 +0000
+++ crm/crm.py	2011-09-15 12:39:08 +0000
@@ -183,11 +183,16 @@
             context = {}
         if not context.get('portal'):
             return False
+<<<<<<< TREE
         # was user.address_id.id, but address_id has been removed
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if hasattr(user, 'partner_address_id') and user.partner_address_id:
             return user.partner_address_id
         return False
+=======
+        # was user.address_id.id, but address_id has been removed
+        return False
+>>>>>>> MERGE-SOURCE
 
     def _get_default_partner(self, cr, uid, context=None):
         """Gives id of partner for current user
@@ -198,10 +203,15 @@
         if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+<<<<<<< TREE
         if hasattr(user, 'partner_address_id') and user.partner_address_id:
             return user.partner_address_id
         return user.company_id.partner_id.id
 
+=======
+        return user.company_id.partner_id.id
+    
+>>>>>>> MERGE-SOURCE
     def _get_default_email(self, cr, uid, context=None):
         """Gives default email address for current user
         :param context: if portal in context is false return false anyway
@@ -209,8 +219,13 @@
         if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+<<<<<<< TREE
         return user.user_email
 
+=======
+        return user.user_email
+    
+>>>>>>> MERGE-SOURCE
     def _get_default_user(self, cr, uid, context=None):
         """Gives current user id
        :param context: if portal in context is false return false anyway

=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml	2011-09-06 08:08:46 +0000
+++ crm/crm_view.xml	2011-09-15 12:39:08 +0000
@@ -397,10 +397,60 @@
                 <field name="arch" type="xml">
                     <group name="default_filters" position="inside">
                         <field name="context_section_id" completion="1" widget="selection"/>
-                    </group>
-                </field>
-        </record>
-
+<<<<<<< TREE
+                    </group>
+                </field>
+        </record>
+
+=======
+                    </group>
+                </field>
+        </record>
+
+        <!-- Inherit View From Partner  -->
+
+        <record id="view_partners_form_crm1" model="ir.ui.view">
+                <field name="name">view.res.partner.form.crm.inherited1</field>
+                <field name="model">res.partner</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="base.view_partner_form"/>
+                <field eval="18" name="priority"/>
+                <field name="arch" type="xml">
+                    <field name="user_id" position="after">
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
+                    </field>
+                </field>
+        </record>
+
+        <record id="view_partners_tree_crm2" model="ir.ui.view">
+                <field name="name">view.res.partner.tree.crm.inherited2</field>
+                <field name="model">res.partner</field>
+                <field name="type">tree</field>
+                <field name="inherit_id" ref="base.view_partner_tree"/>
+                <field eval="18" name="priority"/>
+                <field name="arch" type="xml">
+                    <field name="country" position="after">
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
+                    </field>
+                </field>
+        </record>
+
+        <record id="view_partners_form_crm3" model="ir.ui.view">
+                <field name="name">view.res.partner.search.crm.inherited3</field>
+                <field name="model">res.partner</field>
+                <field name="type">search</field>
+                <field name="inherit_id" ref="base.view_res_partner_filter"/>
+                <field eval="18" name="priority"/>
+                <field name="arch" type="xml">
+                    <field name="category_id" position="after">
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
+                    </field>
+                </field>
+        </record>
+>>>>>>> MERGE-SOURCE
         <!-- menu for the working time -->
         <menuitem action="resource.action_resource_calendar_form" id="menu_action_resource_calendar_form" parent="resource.menu_resource_config" sequence="1"/>
 

=== modified file 'crm/i18n/ca.po'
--- crm/i18n/ca.po	2011-09-05 05:59:33 +0000
+++ crm/i18n/ca.po	2011-09-15 12:39:08 +0000
@@ -7,14 +7,23 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-08-17 21:32+0000\n"
+=======
+"PO-Revision-Date: 2011-08-06 11:01+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:06+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-07 04:37+0000\n"
+"X-Generator: Launchpad (build 13613)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: crm
 #: view:crm.lead.report:0

=== modified file 'crm/i18n/sv.po'
--- crm/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ crm/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:08+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: crm
 #: view:crm.lead.report:0

=== modified file 'crm/security/crm_security.xml'
--- crm/security/crm_security.xml	2011-08-15 14:21:41 +0000
+++ crm/security/crm_security.xml	2011-09-15 12:39:08 +0000
@@ -13,11 +13,15 @@
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Sales / Manager</field>
+<<<<<<< TREE
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record model="res.users" id="base.user_admin">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
+=======
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+>>>>>>> MERGE-SOURCE
     </record>
 
     <record id="crm_rule_personal_lead" model="ir.rule">

=== modified file 'email_template/i18n/fi.po'
--- email_template/i18n/fi.po	2011-09-05 05:59:33 +0000
+++ email_template/i18n/fi.po	2011-09-15 12:39:08 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Finnish translation for openobject-addons
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the openobject-addons package.
@@ -1351,3 +1352,1320 @@
 #, python-format
 #~ msgid "Copy of template "
 #~ msgstr "Mallipohjan kopio "
+=======
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-08-08 10:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-09 04:50+0000\n"
+"X-Generator: Launchpad (build 13628)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Poista pysyvästi sähköpostit lähetyksen jälkeen"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "Sähköpostitilin konfiguraatio"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+"useita kohteita sisältävät sähköpostit jotka on tallennettu lähetettyihin "
+"sähköposteihin"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"Sinullle ei ole määritelty henkilökohtaisia sähköpostitilejä. \n"
+"Pyydä joko pääkäyttäjää pakottamaan tili tälle pohjalle tai hanki itsellesi "
+"henkilökohtainen sähköpostitili."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr "Henkilökohtaiset sähköpostit"
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr "Raportin tiedostonnimi"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content  "
+msgstr "Sähköpostin sisältö  "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Sähköpostin lähetysvelho"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr "Pelkkä teksti & HTML ilman liitteitä"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+"Valitse kenttä mallista jota haluat käyttää.\n"
+"Jos sillä on suhdekenttä, voit valita sen allaolevasta laatikosta\n"
+"(huom! Jos arvoja ei ole, varmista että olet valilnnut oikean mallin)"
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Sisältö"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr "Tietueen poisto epäonnistui"
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: [e-mail]"
+msgstr ""
+"Valitse jos tämä sähköpostitili ei kuulu tietylle käyttäjälle vaan koko "
+"organisaatiolle. esim. [e-mail]"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Lähetä nyt"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "Sopimaton"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Sähköpostitilit"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Lähetä kaikki sähköpostit"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Määrittele käyttäjänimi SMTP palvelimella, jos palvelin vaatii "
+"käyttäjätunnuksen, muuten jätä tyhjäksi"
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr "Palvelimen viite sähköpostille"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Hyväksytty"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+"kopio-viestistä osoitteet, pilkulla erotettuna. viitteitä voidaan käyttää "
+"esim. ${object.email_cc}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr "Tili"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "HTML koodi"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<[e-mail]>"
+msgstr ""
+"Kuvausta käytetään lähettäjän nimenä lähettäjän sähköpostin ohessa, jos sitä "
+"ei ole jo määritelty sähköpostissa esim. Jaska Jokunen <[e-mail]>"
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "Sähköpostitili"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr ""
+"sähköpostin lähettäminen epäonnistui yhdelle tai useammalle kohteelle"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+"Lisää tähän kaikki liitteet nykyiselle dokumentille, jotka haluat "
+"sisällyttää sähköpostiin"
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+"Sähköpostin oletuskieli. Viitteitä voidaan käyttää tässä, esim. "
+"${object.partner_id.lang}"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+"Kun valitset viitekentät, tämä kenttä määrittelee alatason arvon jota voit "
+"käyttää."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Velho valmis"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Vastausosoite"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr "Poista toiminto"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Hyväksy tunnus"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr "Viitattu dokumentti"
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr "Täydellinen onnistuminen"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr "Sekä HTML että teksti (yhdistetty)"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr "Automaatinen poisto"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr "Sekä HTML että teksti (vaihtoehtoiset)"
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr "Pyydettyjen sähköpostien määrä"
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Vakiorunko (teksti)"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Liitetiedostot"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Lähettäjän osoite"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr "Varoitus"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Tilit"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Runko (teksti)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr "Yrityksen sähköpostit"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+"Osoite joihin vastaanottajien tulisi vastata, jos eri kuin lähettäjän "
+"osoite. Viitteitä voidaan käyttää."
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "aihe"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr "Syy: %s"
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "Lähettäjä"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Mallipohja"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+"Sähköposti tililtä %s epäonnistui. Todennäköinen syys: palvelimen "
+"lähetysvirhe\n"
+" Kuvaus: %s"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr "Syötä yksinkertainen kenttä"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr "Runko (html)"
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+"Piilokopion vastaanottajien osoitteet, pilkulla erotettuina. Viitteitä "
+"voidaan käyttää esim. ${object.email_bcc}"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Mallipohjan esikatselu"
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr "Runko (teksti- vain web client)"
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr "Tila"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Ohjatun toiminnon nappi"
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: '[e-mail]' or 'John Doe <[e-mail]>'"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr "Resurssi"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr "Lähtevä testiyhteys epäonnistui"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr "Sähköpostit lähetetty onnistuneesti tililtä %s."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr "Vakiorunko"
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr "Sähköpostin tekstiversio"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr " (sähköpostin liite)"
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr "Lähetetyt"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Testaa lähtevä yhteys"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+"Vastausosoite joihin vastaanottajien tulisi vastata, jos eri kuin lähettäjän "
+"osoiste. Viitteitä voidaan käyttää, esim. ${object.email_reply_to}"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr "Lomakkeen sivupöydän nappi joka käynnistää toiminnon"
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Käyttäjätunnus"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr "Lisää allekirjoitukseni sähköpostiin"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Raportti"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Alatason kenttä"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Kehittynyt"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Omat sähköpostit"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Palvelin"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+"Valitse tämä jos haluat liittää sähköposteihin erityisen seurantamerkin, "
+"jolloin voit identifioida ja seurata linkkejä takaisin liittyvään "
+"resurssiin. Tämä on hyödyllistä esim. CRM liidien yhteydessä."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr "Runko (Raw html)"
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Allekirjoitus"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "Valinnat"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "Palvelimen tiedot"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s                       \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:48
+#, python-format
+msgid "Error sending mail: %s"
+msgstr ""
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:104
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr ""
+>>>>>>> MERGE-SOURCE

=== modified file 'email_template/i18n/sv.po'
--- email_template/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ email_template/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-03 04:37+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: email_template
 #: help:email_template.account,auto_delete:0

=== modified file 'event/i18n/ru.po'
--- event/i18n/ru.po	2011-09-05 05:59:33 +0000
+++ event/i18n/ru.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:04+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-03 04:37+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: event
 #: view:event.event:0

=== modified file 'fetchmail/i18n/fi.po'
--- fetchmail/i18n/fi.po	2011-09-05 05:59:33 +0000
+++ fetchmail/i18n/fi.po	2011-09-15 12:39:08 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Finnish translation for openobject-addons
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the openobject-addons package.
@@ -312,3 +313,319 @@
 
 #~ msgid "Email Servers"
 #~ msgstr "sähköpostipalvelimet"
+=======
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-08-04 10:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+"Varoitus! Tietoja valitulle mallille ei voitu luoda\n"
+"Ole hyvä ja valitse voimassaoleva malli"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Hyväksy"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Ei vahvistettu"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Käyttäjätunnus"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP palvelimet"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+"OpenObject malli. Luo tiedot tästä mallista.\n"
+"Valitse objekti jolla on attribuutit message_new. (uusi viesti)"
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Lisää liitetiedostot ?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "Sähköpostien määrä"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Odotetaan vahvistusta"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Salasana"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "Sähköpostit"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Hae sähköpostipalvelimia"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Palvelin ja kirjautuminen"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "Automaattivastaus?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "sähköpostivälittäjän viesti"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Aseta luonnokseksi"
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Viestit"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Palvelin"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Prosessin parametri"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "IAMP palvelin"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Malli"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP palvelin"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "Varoitus! Ei voi olla kahta palvelinkonfiguraatiota!"
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Palvelimen tyyppi"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Kirjautumistiedot"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Palvelimen tiedot"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr "Syötää sähköposteja liitteineen jos tosi (true)."
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "POP palvelin"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Portti"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+"Sähköpostipalvelimen toiminto. Suoritetaan kun sähköpostia haetaan "
+"palvelimelta."
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Prioriteetti välillä 0 ... 10. Määrittelee prosessointijärjestyksen"
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr "Sähköpostipalvelimen toiminto"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Palvelimen prioriteetti"
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Sähköpostipalvelin"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Hae sähköpostit"
+
+#~ msgid "Email Servers"
+#~ msgstr "sähköpostipalvelimet"
+>>>>>>> MERGE-SOURCE

=== modified file 'hr/security/hr_security.xml'
--- hr/security/hr_security.xml	2011-08-24 15:11:43 +0000
+++ hr/security/hr_security.xml	2011-09-15 12:39:08 +0000
@@ -2,13 +2,24 @@
 <openerp>
 <data noupdate="1">
 
+<<<<<<< TREE
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / HR Officer</field>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
+=======
+    <record id="base.group_hr_user" model="res.groups">
+        <field name="name">Human Resources / Officer</field>
+    </record>
+>>>>>>> MERGE-SOURCE
     <record id="base.group_hr_manager" model="res.groups">
+<<<<<<< TREE
         <field name="name">Human Resources / HR Manager</field>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
+=======
+        <field name="name">Human Resources / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
+>>>>>>> MERGE-SOURCE
     </record>
 
 </data>

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-09-11 13:50:25 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-09-15 12:39:08 +0000
@@ -144,7 +144,11 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <tree colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Leaves">
+=======
+                <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves">
+>>>>>>> MERGE-SOURCE
                     <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>

=== modified file 'hr_holidays/i18n/ca.po'
--- hr_holidays/i18n/ca.po	2011-09-05 05:59:33 +0000
+++ hr_holidays/i18n/ca.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-07 04:37+0000\n"
+"X-Generator: Launchpad (build 13613)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0

=== modified file 'hr_recruitment/hr_recruitment_demo.xml'
--- hr_recruitment/hr_recruitment_demo.xml	2011-08-27 23:31:30 +0000
+++ hr_recruitment/hr_recruitment_demo.xml	2011-09-15 12:39:08 +0000
@@ -131,47 +131,93 @@
         <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
         <field eval="'6630125'" name="partner_phone"/>
     </record>
-
-    <record id="hr_case_programmer" model="hr.applicant">
-        <field name="partner_address_id" ref="base.res_partner_address_14"/>
-        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-        <field name="type_id" ref="degree_bac5"/>
-        <field name="partner_id" ref="base.res_partner_15"/>
-        <field eval="'3'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'Shane Williams'" name="partner_name"/>
-        <field eval="'open'" name="state"/>
-        <field eval="1.15" name="duration"/>
-        <field eval="'[e-mail]'" name="partner_name2"/>
-        <field eval="'9812398524'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field name="categ_id" ref="categ_job2"/>
-        <field name="stage_id" ref="stage_job4"/>
-        <field eval="'Programmer'" name="name"/>
-        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
-        <field eval="'6630125'" name="partner_phone"/>
-        <field name="job_id" ref="hr.job_jr_appli"/>
-	    <field eval="11000.0" name="salary_expected"/>
-    </record>
-
-    <record id="hr_case_advertisement" model="hr.applicant">
-        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
-        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-        <field name="type_id" ref="degree_licenced"/>
-        <field name="partner_id" ref="base.res_partner_11"/>
-        <field eval="'4'" name="priority"/>
-        <field name="user_id" ref="base.user_root"/>
-        <field eval="'David Armstrong'" name="partner_name"/>
-        <field eval="'done'" name="state"/>
-        <field eval="'[e-mail]'" name="partner_name2"/>
-        <field eval="'9925741564'" name="partner_mobile"/>
-        <field eval="1" name="active"/>
-        <field eval="2.20" name="duration"/>
-        <field name="categ_id" ref="categ_job1"/>
-        <field name="stage_id" ref="stage_job5"/>
-        <field eval="'Advertisement'" name="name"/>
-        <field eval="'25968745'" name="partner_phone"/>
-	    <field eval="11000.0" name="salary_expected"/>
-    </record>
+<<<<<<< TREE
+
+    <record id="hr_case_programmer" model="hr.applicant">
+        <field name="partner_address_id" ref="base.res_partner_address_14"/>
+        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="partner_id" ref="base.res_partner_15"/>
+        <field eval="'3'" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field eval="'Shane Williams'" name="partner_name"/>
+        <field eval="'open'" name="state"/>
+        <field eval="1.15" name="duration"/>
+        <field eval="'[e-mail]'" name="partner_name2"/>
+        <field eval="'9812398524'" name="partner_mobile"/>
+        <field eval="1" name="active"/>
+        <field name="categ_id" ref="categ_job2"/>
+        <field name="stage_id" ref="stage_job4"/>
+        <field eval="'Programmer'" name="name"/>
+        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
+        <field eval="'6630125'" name="partner_phone"/>
+        <field name="job_id" ref="hr.job_jr_appli"/>
+	    <field eval="11000.0" name="salary_expected"/>
+    </record>
+
+    <record id="hr_case_advertisement" model="hr.applicant">
+        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="partner_id" ref="base.res_partner_11"/>
+        <field eval="'4'" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field eval="'David Armstrong'" name="partner_name"/>
+        <field eval="'done'" name="state"/>
+        <field eval="'[e-mail]'" name="partner_name2"/>
+        <field eval="'9925741564'" name="partner_mobile"/>
+        <field eval="1" name="active"/>
+        <field eval="2.20" name="duration"/>
+        <field name="categ_id" ref="categ_job1"/>
+        <field name="stage_id" ref="stage_job5"/>
+        <field eval="'Advertisement'" name="name"/>
+        <field eval="'25968745'" name="partner_phone"/>
+	    <field eval="11000.0" name="salary_expected"/>
+    </record>
+=======
+
+    <record id="hr_case_programmer" model="hr.applicant">
+        <field model="res.partner.canal" name="canal_id" search="[('name','=','E-mail')]"/>
+        <field name="partner_address_id" ref="base.res_partner_address_14"/>
+        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="partner_id" ref="base.res_partner_15"/>
+        <field eval="'3'" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field eval="'Shane Williams'" name="partner_name"/>
+        <field eval="'open'" name="state"/>
+        <field eval="1.15" name="duration"/>
+        <field eval="'[e-mail]'" name="partner_name2"/>
+        <field eval="'9812398524'" name="partner_mobile"/>
+        <field eval="1" name="active"/>
+        <field name="categ_id" ref="categ_job2"/>
+        <field name="stage_id" ref="stage_job4"/>
+        <field eval="'Programmer'" name="name"/>
+        <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
+        <field eval="'6630125'" name="partner_phone"/>
+        <field name="job_id" ref="hr.job_jr_appli"/>
+	    <field eval="11000.0" name="salary_expected"/>
+    </record>
+
+    <record id="hr_case_advertisement" model="hr.applicant">
+        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+        <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="partner_id" ref="base.res_partner_11"/>
+        <field eval="'4'" name="priority"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field eval="'David Armstrong'" name="partner_name"/>
+        <field eval="'done'" name="state"/>
+        <field eval="'[e-mail]'" name="partner_name2"/>
+        <field eval="'9925741564'" name="partner_mobile"/>
+        <field eval="1" name="active"/>
+        <field eval="2.20" name="duration"/>
+        <field name="categ_id" ref="categ_job1"/>
+        <field name="stage_id" ref="stage_job5"/>
+        <field eval="'Advertisement'" name="name"/>
+        <field eval="'25968745'" name="partner_phone"/>
+	    <field eval="11000.0" name="salary_expected"/>
+    </record>
+>>>>>>> MERGE-SOURCE
 </data>
 </openerp>

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2011-09-12 12:27:58 +0000
+++ mail/mail_message.py	2011-09-15 12:39:08 +0000
@@ -32,9 +32,159 @@
 from osv import osv
 from osv import fields
 from tools.translate import _
+<<<<<<< TREE
 from tools.safe_eval import literal_eval
 
 _logger = logging.getLogger('mail')
+=======
+import logging
+import xmlrpclib
+
+_logger = logging.getLogger('mailgate')
+
+class mailgate_thread(osv.osv):
+    '''
+    Mailgateway Thread
+    '''
+    _name = 'mailgate.thread'
+    _description = 'Mailgateway Thread'
+
+    _columns = {
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', readonly=True),
+    }
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        """
+        Overrides orm copy method.
+        @param self: the object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: Id of mailgate thread
+        @param default: Dictionary of default values for copy.
+        @param context: A standard dictionary for contextual values
+        """
+        if default is None:
+            default = {}
+
+        default.update({
+            'message_ids': [],
+            'date_closed': False,
+            'date_open': False
+        })
+        return super(mailgate_thread, self).copy(cr, uid, id, default, context=context)
+
+    def message_new(self, cr, uid, msg, context):
+        raise Exception, _('Method is not implemented')
+
+    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
+        raise Exception, _('Method is not implemented')
+
+    def message_followers(self, cr, uid, ids, context=None):
+        """ Get a list of emails of the people following this thread
+        """
+        res = {}
+        if isinstance(ids, (str, int, long)):
+            ids = [long(ids)]
+        for thread in self.browse(cr, uid, ids, context=context):
+            l=[]
+            for message in thread.message_ids:
+                l.append((message.user_id and message.user_id.user_email) or '')
+                l.append(message.email_from or '')
+                l.append(message.email_cc or '')
+            res[thread.id] = l
+        return res
+
+    def msg_send(self, cr, uid, id, *args, **argv):
+        raise Exception, _('Method is not implemented')
+
+    def history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, \
+                    email_from=False, message_id=False, references=None, attach=None, email_cc=None, \
+                    email_bcc=None, email_date=None, context=None):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param cases: a browse record list
+        @param keyword: Subject of the history item
+        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
+        @param email: Email-To / Recipient address
+        @param email_from: Email From / Sender address if any
+        @param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
+        @param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To addresses if any
+        @param email_date: Email Date string if different from now, in server Timezone
+        @param details: Description, Details of case history if any
+        @param atach: Attachment sent in email
+        @param context: A standard dictionary for contextual values"""
+        if context is None:
+            context = {}
+        if attach is None:
+            attach = []
+
+        if email_date:
+            edate = parsedate(email_date)
+            if edate is not None:
+                email_date = time.strftime('%Y-%m-%d %H:%M:%S', edate)
+
+        # The mailgate sends the ids of the cases and not the object list
+
+        if all(isinstance(case_id, (int, long)) for case_id in cases):
+            cases = self.browse(cr, uid, cases, context=context)
+
+        att_obj = self.pool.get('ir.attachment')
+        obj = self.pool.get('mailgate.message')
+
+        for case in cases:
+            attachments = []
+            for att in attach:
+                att_ids = att_obj.search(cr, uid, [('name','=',att[0]), ('res_id', '=', case.id)])
+                if att_ids:
+                    attachments.append(att_ids[0])
+                else:
+                    attachments.append(att_obj.create(cr, uid, {'res_model':case._name,'res_id':case.id, 'name': att[0], 'datas': base64.encodestring(att[1])}))
+
+            partner_id = hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False
+            if not partner_id and case._name == 'res.partner':
+                partner_id = case.id
+            data = {
+                'name': keyword,
+                'user_id': uid,
+                'model' : case._name,
+                'partner_id': partner_id,
+                'res_id': case.id,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'message_id': message_id,
+                'description': details,
+                'attachment_ids': [(6, 0, attachments)]
+            }
+
+            if history:
+                for param in (email, email_cc, email_bcc):
+                    if isinstance(param, list):
+                        param = ", ".join(param)
+
+                data = {
+                    'name': subject or _('History'),
+                    'history': True,
+                    'user_id': uid,
+                    'model' : case._name,
+                    'res_id': case.id,
+                    'date': email_date or time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'description': details or (hasattr(case, 'description') and case.description or False),
+                    'email_to': email,
+                    'email_from': email_from or \
+                        (hasattr(case, 'user_id') and case.user_id and case.user_id.user_email),
+                    'email_cc': email_cc,
+                    'email_bcc': email_bcc,
+                    'partner_id': partner_id,
+                    'references': references,
+                    'message_id': message_id,
+                    'attachment_ids': [(6, 0, attachments)]
+                }
+
+            obj.create(cr, uid, data, context=context)
+        return True
+mailgate_thread()
+>>>>>>> MERGE-SOURCE
 
 def format_date_tz(date, tz=None):
     if not date:

=== modified file 'mrp/i18n/sv.po'
--- mrp/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ mrp/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:39+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0

=== modified file 'mrp_operations/i18n/sv.po'
--- mrp_operations/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ mrp_operations/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:35+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form

=== modified file 'mrp_repair/i18n/sv.po'
--- mrp_repair/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ mrp_repair/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:42+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-03 04:37+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: mrp_repair
 #: view:mrp.repair:0

=== modified file 'multi_company/i18n/sv.po'
--- multi_company/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ multi_company/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-03 04:37+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo

=== modified file 'point_of_sale/i18n/sv.po'
--- point_of_sale/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ point_of_sale/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:05+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:39+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0

=== modified file 'procurement/i18n/sv.po'
--- procurement/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ procurement/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:50+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: procurement
 #: view:make.procurement:0

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2011-09-13 16:29:07 +0000
+++ project/project_view.xml	2011-09-15 12:39:08 +0000
@@ -618,9 +618,15 @@
          <field name="type">form</field>
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
+<<<<<<< TREE
             <group name="default_filters" position="inside">
                 <field name="context_project_id" context="{'user_preference':True}" widget="selection"/>
             </group>
+=======
+            <group name="default_filters" position="inside">
+                <field name="context_project_id" context="{'user_prefence':True}" widget="selection"/>
+            </group>
+>>>>>>> MERGE-SOURCE
        </field>
     </record>
     <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>

=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2011-09-14 12:58:14 +0000
+++ project_issue/project_issue.py	2011-09-15 12:39:08 +0000
@@ -118,6 +118,7 @@
                         hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
                                 datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
                                 datetime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S'))
+<<<<<<< TREE
                 elif field in ['days_since_creation']:
                     if issue.create_date:
                         days_since_creation = datetime.today() - datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
@@ -130,6 +131,14 @@
                         inactive_days = datetime.today() - datetime.strptime(issue.date_action_last, '%Y-%m-%d %H:%M:%S')
                         res[issue.id][field] = inactive_days.days
                     continue
+=======
+                elif field in ['inactivity_days']:
+                    res[issue.id][field] = 0
+                    if issue.date_action_last:
+                        inactive_days = datetime.today() - datetime.strptime(issue.date_action_last, '%Y-%m-%d %H:%M:%S')
+                        res[issue.id][field] = inactive_days.days
+                    continue
+>>>>>>> MERGE-SOURCE
                 if ans:
                     resource_id = False
                     if issue.user_id:
@@ -224,9 +233,15 @@
                                 multi='compute_day', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
                                 multi='compute_day', type="float", store=True),
+<<<<<<< TREE
         'inactivity_days': fields.function(_compute_day, string='Days since last action', \
                                 multi='compute_day', type="integer", help="Difference in days between last action and current date"),
         'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+=======
+        'inactivity_days': fields.function(_compute_day, string='Days since last action', \
+                                multi='compute_day', type="integer", help="Difference in days between last action and current date"),
+        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+>>>>>>> MERGE-SOURCE
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
         'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2011-09-14 12:58:14 +0000
+++ project_issue/project_issue_view.xml	2011-09-15 12:39:08 +0000
@@ -149,7 +149,11 @@
                             <field name="write_date" />
                             <field name="date_closed"/>
                             <field name="date_open"/>
+<<<<<<< TREE
                             <field name="date_action_last"/>
+=======
+                            <field name="last_action_date"/>
+>>>>>>> MERGE-SOURCE
                             </group>
                             <group colspan="2" col="2">
                             <separator string="Statistics" colspan="2" col="2"/>
@@ -157,8 +161,12 @@
                             <field name="day_close"/>
                             <field name="working_hours_open" widget="float_time"/>
                             <field name="working_hours_close" widget="float_time"/>
+<<<<<<< TREE
                             <field name="inactivity_days"/>
                             <field name="days_since_creation"/>
+=======
+                            <field name="inactivity_days"/>
+>>>>>>> MERGE-SOURCE
                             </group>
                             <group colspan="2" col="2">
                             <separator string="References" colspan="2"/>
@@ -219,6 +227,10 @@
                             <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
                         </field>
                         <field name="project_id"/>
+<<<<<<< TREE
+=======
+                        <field name="version_id" widget="selection"/>
+>>>>>>> MERGE-SOURCE
                         <field name="id"/>
                     </group>
                     <newline/>

=== modified file 'project_mailgate/project_mailgate.py'
--- project_mailgate/project_mailgate.py	2011-09-07 22:38:59 +0000
+++ project_mailgate/project_mailgate.py	2011-09-15 12:39:08 +0000
@@ -52,6 +52,7 @@
             'description': msg['body_text'],
         })
         act = 'do_'+default_act
+<<<<<<< TREE
 
         maps = { 
             'cost':'planned_hours',
@@ -83,6 +84,49 @@
             task_followers.add(task.user_id.user_email)
             followers[task.id] = filter(None, task_followers)
         return followers
+=======
+        if 'state' in msg_actions:
+            if msg_actions['state'] in ['draft', 'close', 'cancel', 'open', 'pending']:
+                act = 'do_' + msg_actions['state']
+
+        for k1, k2 in [('cost', 'planned_hours')]:
+            try:
+                data[k2] = float(msg_actions[k1])
+            except:
+                pass
+
+        if 'priority' in msg_actions:
+            if msg_actions['priority'] in ('1', '2', '3', '4', '5'):
+                data['priority'] = msg_actions['priority']
+
+        self.write(cr, uid, [id], data)
+        getattr(self, act)(cr, uid, [id])
+        return True
+
+    def message_followers(self, cr, uid, ids, context=None):
+        res = []
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        for task in self.browse(cr, uid, select, context=context):
+            user_email = (task.user_id and task.user_id.user_email) or False
+            res += [(user_email, False, False, task.priority)]
+        if isinstance(ids, (str, int, long)):
+            return len(res) and res[0] or False
+        return res
+
+    def msg_send(self, cr, uid, id, *args, **argv):
+        return True
+
+    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
+        mailgate_pool = self.pool.get('mailgate.thread')
+        return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
+                                       subject=subject, email=email, \
+                                       details=details, email_from=email_from,\
+                                       message_id=message_id, attach=attach, \
+                                       context=context)
+>>>>>>> MERGE-SOURCE
 
     def do_draft(self, cr, uid, ids, context=None):
         res = super(project_tasks, self).do_draft(cr, uid, ids, context)

=== modified file 'project_scrum/i18n/sv.po'
--- project_scrum/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ project_scrum/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:03+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-03 04:37+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0

=== modified file 'purchase/i18n/sv.po'
--- purchase/i18n/sv.po	2011-09-05 05:59:33 +0000
+++ purchase/i18n/sv.po	2011-09-15 12:39:08 +0000
@@ -13,8 +13,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:02+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-05 04:39+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0

=== modified file 'report_webkit_sample/i18n/fi.po'
--- report_webkit_sample/i18n/fi.po	2011-09-05 05:59:33 +0000
+++ report_webkit_sample/i18n/fi.po	2011-09-15 12:39:08 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Finnish translation for openobject-addons
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the openobject-addons package.
@@ -141,3 +142,148 @@
 #: report:report.webkitaccount.invoice:76
 msgid "Total"
 msgstr "Kokonaismäärä"
+=======
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-08-01 06:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-03 04:37+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "Webkit lasku"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:35
+msgid "Supplier Invoice"
+msgstr "Toimittajan lasku"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Unit Price"
+msgstr "Yksikköhinta"
+
+#. module: report_webkit_sample
+#: model:ir.module.module,description:report_webkit_sample.module_meta_information
+msgid ""
+"Samples for Webkit Report Engine (report_webkit module).\n"
+"\n"
+"    A sample invoice report is included in this module, as well as a wizard "
+"to\n"
+"    add Webkit Report entries on any Document in the system.\n"
+"      \n"
+"    You have to create the print buttons by calling the wizard. For more "
+"details see:\n"
+"        http://files.me.com/nbessi/06n92k.mov \n"
+"                    "
+msgstr ""
+
+#. module: report_webkit_sample
+#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
+msgid "Webkit Report Samples"
+msgstr "Webkit esimerkkiraportit"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Disc.(%)"
+msgstr "Alennus (%)"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:22
+msgid "Fax"
+msgstr "Faksi"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Document"
+msgstr "Dokumentti"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Price"
+msgstr "Hinta"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Invoice Date"
+msgstr "Laskun päivämäärä"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "QTY"
+msgstr "Määrä"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:64
+msgid "Base"
+msgstr "Pohja"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:44
+msgid "Partner Ref."
+msgstr "Kumppanin viite"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:49
+msgid "Taxes"
+msgstr "Verot"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:64
+msgid "Amount"
+msgstr "Määrä"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:28
+msgid "VAT"
+msgstr "ALV"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:37
+msgid "Refund"
+msgstr "Palautus"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:19
+msgid "Tel"
+msgstr "Puh"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:25
+msgid "E-mail"
+msgstr "Sähköposti"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:33
+msgid "Invoice"
+msgstr "Lasku"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:39
+msgid "Supplier Refund"
+msgstr "Toimittajan hyvitys"
+
+#. module: report_webkit_sample
+#: report:report.webkitaccount.invoice:76
+msgid "Total"
+msgstr "Kokonaismäärä"
+>>>>>>> MERGE-SOURCE

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-09-15 08:54:54 +0000
+++ sale/sale.py	2011-09-15 12:39:08 +0000
@@ -105,11 +105,11 @@
                 procurement_order mp on (mp.move_id=m.id)
             WHERE
                 p.sale_id IN %s GROUP BY m.state, mp.state, p.sale_id, p.type''', (tuple(ids),))
-        
+
         for item in cr.dictfetchall():
             if item['move_state'] == 'cancel':
                 continue
-           
+
             if item['picking_type'] == 'in':#this is a returned picking
                 tmp[item['sale_order_id']]['total'] -= item['nbr'] or 0.0 # Deducting the return picking qty
                 if item['procurement_state'] == 'done' or item['move_state'] == 'done':
@@ -118,7 +118,7 @@
                 tmp[item['sale_order_id']]['total'] += item['nbr'] or 0.0
                 if item['procurement_state'] == 'done' or item['move_state'] == 'done':
                     tmp[item['sale_order_id']]['picked'] += item['nbr'] or 0.0
-                
+
         for order in self.browse(cr, uid, ids, context=context):
             if order.shipped:
                 res[order.id] = 100.0
@@ -418,7 +418,7 @@
             'comment': order.note,
             'payment_term': pay_term,
             'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
-            'date_invoice': context.get('date_invoice',False),
+            'date_invoice': context.get('date_inv',False),
             'company_id': order.company_id.id,
             'user_id': order.user_id and order.user_id.id or False
         }
@@ -710,7 +710,7 @@
                         'note': line.notes,
                         'company_id': order.company_id.id,
                     })
-                    
+
                 if line.product_id:
                     proc_id = self.pool.get('procurement.order').create(cr, uid, {
                         'name': line.name,
@@ -1047,7 +1047,7 @@
         if not packaging and product_obj.packaging:
             packaging = product_obj.packaging[0].id
             result['product_packaging'] = packaging
-        
+
         if packaging:
             default_uom = product_obj.uom_id and product_obj.uom_id.id
             pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context=context)
@@ -1129,7 +1129,7 @@
                      max(0,product_obj.qty_available), product_obj.uom_id.name)
             warning_msgs += _("Not enough stock ! : ") + warn_msg + "\n\n"
         # get unit price
-        
+
         if not pricelist:
             warn_msg = _('You have to select a pricelist or a customer in the sales form !\n'
                     'Please set one before choosing a product.')
@@ -1150,7 +1150,7 @@
         if warning_msgs:
             warning = {
                        'title': _('Configuration Error !'),
-                       'message' : warning_msgs  
+                       'message' : warning_msgs
                     }
         return {'value': result, 'domain': domain, 'warning': warning}
 
@@ -1212,6 +1212,7 @@
 
     def execute(self, cr, uid, ids, context=None):
         ir_values_obj = self.pool.get('ir.values')
+<<<<<<< TREE
         data_obj = self.pool.get('ir.model.data')
         menu_obj = self.pool.get('ir.ui.menu')
         module_obj = self.pool.get('ir.module.module')
@@ -1270,6 +1271,66 @@
                 pooler.restart_pool(cr.dbname, update_module=True)[1]
 
         ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)  
+=======
+        data_obj = self.pool.get('ir.model.data')
+        menu_obj = self.pool.get('ir.ui.menu')
+        module_obj = self.pool.get('ir.module.module')
+        module_upgrade_obj = self.pool.get('base.module.upgrade')
+        module_name = []
+        group_ids=[]
+        group_name = ['group_sale_salesman','group_sale_manager']
+
+        for name in group_name:
+            data_id = data_obj.name_search(cr, uid, name)
+            group_ids.append(data_obj.browse(cr,uid,data_id[0][0]).res_id)
+
+        wizard = self.browse(cr, uid, ids)[0]
+
+        if wizard.sale_orders:
+            menu_name = 'menu_invoicing_sales_order_lines'
+            data_id = data_obj.name_search(cr, uid, menu_name)
+            menu_id = data_obj.browse(cr,uid,data_id[0][0]).res_id
+            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_ids[0]),(4,group_ids[1])]})
+
+        if wizard.deli_orders:
+            menu_name = 'menu_action_picking_list_to_invoice'
+            data_id = data_obj.name_search(cr, uid, menu_name)
+            menu_id = data_obj.browse(cr,uid,data_id[0][0]).res_id
+            menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_ids[0]),(4,group_ids[1])]})
+
+        if wizard.task_work:
+            module_name.append('project_timesheet')
+            module_name.append('account_analytic_analysis')
+
+        if wizard.timesheet:
+            module_name.append('account_analytic_analysis')
+
+        if wizard.charge_delivery:
+            module_name.append('delivery')
+
+        if wizard.time_unit:
+            product_obj = self.pool.get('product.product')
+            product_id = product_obj.name_search(cr, uid, 'Employee')
+            product_obj.write(cr, uid, product_id[0][0], {'uom_id':wizard.time_unit.id})
+
+        if len(module_name):
+            module_ids = []
+            need_install = False
+            module_ids = []
+            for module in module_name:
+                data_id = module_obj.name_search(cr,uid,module)
+                module_ids.append(data_id[0][0])
+
+            for module in module_obj.browse(cr, uid, module_ids):
+                if module.state == 'uninstalled':
+                    module_obj.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
+                    need_install = True
+                    cr.commit()
+            if need_install:
+                pooler.restart_pool(cr.dbname, update_module=True)[1]
+
+        ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)
+>>>>>>> MERGE-SOURCE
 
 sale_config_picking_policy()
 

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2011-09-09 10:15:04 +0000
+++ sale/sale_view.xml	2011-09-15 12:39:08 +0000
@@ -240,9 +240,16 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator orientation="vertical"/>
+<<<<<<< TREE
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id">
+=======
+                    <field name="name" select="1"/>
+                    <field name="date_order" select="1" string="Order date"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id" select="1">
+>>>>>>> MERGE-SOURCE
                         <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
                     </field>
                     <newline/>
@@ -487,6 +494,7 @@
                 <form position="attributes">
                   <attribute name="string">Sales Application Configuration</attribute>
                 </form>
+<<<<<<< TREE
                 <group colspan="4" col="8" position="replace">
                     <group colspan="8">
                         <separator string="How do you generate your costumer invoice ?"/>
@@ -518,6 +526,39 @@
                             <field name="time_unit" widget="selection" domain="[('category_id','=',3)]" nolabel="1"/>
                         </group>
                     </group>
+=======
+                <group colspan="4" col="8" position="replace">
+                    <group colspan="8">
+                        <separator string="How do you generate your costumer invoice ?"/>
+                    </group>
+                    <group colspan="8" col="2">
+                        <label align="0.0" string="Based on Sales Orders" width="200" colspan="1"/>
+                        <field name="sale_orders" on_change="onchange_order(sale_orders,deli_orders)" nolabel="1"/>
+                        <label align="0.0" string="Based on Delivery Orders" width="200" colspan="1"/>
+                        <field name="deli_orders" on_change="onchange_order(sale_orders,deli_orders)" nolabel="1"/>
+                        <label align="0.0" string="Based on Task's Work" width="200" colspan="1"/>
+                        <field name="task_work" nolabel="1"/>
+                        <label align="0.0" string="Based on Timesheet" width="200" colspan="1"/>
+                        <field name="timesheet" nolabel="1"/>
+                    </group>
+                    <group colspan="8">
+                        <separator string="Options"/>
+                    </group>
+                    <group colspan="8">
+                        <group colspan="4" col="2" attrs="{'invisible':['|',('sale_orders','!=',True),('deli_orders','!=',True)]}">
+                            <label align="0.0" string="Main Method Based On" width="200" colspan="1"/>
+                            <field name="order_policy" nolabel="1"/>
+                        </group>
+                        <group colspan="4" col="2" attrs="{'invisible':[('sale_orders','!=',True), ('deli_orders','!=',True)]}">
+                            <label align="0.0" string="Do you charge the delivery" width="200" colspan="1"/>
+                            <field name="charge_delivery" nolabel="1"/>
+                        </group>
+                        <group colspan="4" col="2" attrs="{'invisible':[('task_work','=',False),('timesheet','=',False)]}">
+                            <label align="0.0" string="Main Working Time Unit" width="200" colspan="1"/>
+                            <field name="time_unit" widget="selection" domain="[('category_id','=',3)]" nolabel="1"/>
+                        </group>
+                    </group>
+>>>>>>> MERGE-SOURCE
                 </group>
                 <xpath expr="//button[@name=&quot;action_skip&quot;]" position="replace"/>
               </data>

=== modified file 'sale/security/sale_security.xml'
--- sale/security/sale_security.xml	2011-08-15 14:21:41 +0000
+++ sale/security/sale_security.xml	2011-09-15 12:39:08 +0000
@@ -9,6 +9,7 @@
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">Sales / User - All Leads</field>
+<<<<<<< TREE
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
@@ -20,6 +21,16 @@
     <record model="res.users" id="base.user_admin">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
+=======
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+    </record>
+
+>>>>>>> MERGE-SOURCE
     <record model="ir.ui.menu" id="base.menu_base_partner">
         <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
     </record>

=== modified file 'sale/wizard/sale_make_invoice.py'
--- sale/wizard/sale_make_invoice.py	2011-01-14 00:11:01 +0000
+++ sale/wizard/sale_make_invoice.py	2011-09-15 12:39:08 +0000
@@ -58,18 +58,22 @@
             for i in o.invoice_ids:
                 newinv.append(i.id)
 
-        res = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_invoice_filter')
+        form_id = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+        form_res = form_id and form_id[1] or False
+        tree_id = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
+        tree_res = tree_id and tree_id[1] or False
+        search_id = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_invoice_filter')
 
         return {
             'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
-            'name': 'Invoices',
+            'name': _('Customer Invoices'),
             'view_type': 'form',
             'view_mode': 'tree,form',
+            'views': [(tree_res, 'tree'), (form_res, 'form')],
             'res_model': 'account.invoice',
-            'view_id': False,
-            'context': "{'type': 'out_refund'}",
+            'context': "{'type': 'out_invoice'}",
             'type': 'ir.actions.act_window',
-            'search_view_id': res and res[1] or False
+            'search_view_id': search_id and search_id[1] or False,
         }
 
 sale_make_invoice()

=== modified file 'subscription/i18n/fi.po'
--- subscription/i18n/fi.po	2011-09-05 05:59:33 +0000
+++ subscription/i18n/fi.po	2011-09-15 12:39:08 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Finnish translation for openobject-addons
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the openobject-addons package.
@@ -337,3 +338,344 @@
 #: field:subscription.subscription,doc_lines:0
 msgid "Documents created"
 msgstr "Dokumentti luotu"
+=======
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-08-04 08:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-05 04:39+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+
+#. module: subscription
+#: field:subscription.subscription,doc_source:0
+#: field:subscription.subscription.history,document_id:0
+msgid "Source Document"
+msgstr "Lähdedokumentti"
+
+#. module: subscription
+#: field:subscription.document,model:0
+msgid "Object"
+msgstr "Objekti"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "This Week"
+msgstr "Tällä viikolla"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Search Subscription"
+msgstr "Hae tilausta"
+
+#. module: subscription
+#: field:subscription.subscription,date_init:0
+msgid "First Date"
+msgstr "Ensimmäinen päivä"
+
+#. module: subscription
+#: field:subscription.document.fields,field:0
+msgid "Field"
+msgstr "Kenttä"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription_history
+msgid "Subscription history"
+msgstr "Tilaushistoria"
+
+#. module: subscription
+#: selection:subscription.subscription,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "Current Date"
+msgstr "Nykyinen päivämäärä"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Weeks"
+msgstr "Viikot"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Today"
+msgstr "Tänään"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid "Error !"
+msgstr "Virhe !"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_subscription_form
+#: model:ir.ui.menu,name:subscription.menu_action_subscription_form
+#: view:subscription.subscription:0
+msgid "Subscriptions"
+msgstr "Tilaukset"
+
+#. module: subscription
+#: field:subscription.subscription,interval_number:0
+msgid "Interval Qty"
+msgstr "Välin määrä"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Stop"
+msgstr "Lopeta"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Set to Draft"
+msgstr "Aseta luonnokseksi"
+
+#. module: subscription
+#: model:ir.module.module,description:subscription.module_meta_information
+msgid ""
+"Module allows to create new documents and add subscription on that document."
+msgstr ""
+"Moduuli mahdollistaa uusien dokumenttien luomisen ja tilauksen liittämisen "
+"tähän dokumenttiin."
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Running"
+msgstr "Käynnissä olevat"
+
+#. module: subscription
+#: view:subscription.subscription.history:0
+msgid "Subscription History"
+msgstr "Tilaushistoria"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: subscription
+#: field:subscription.subscription,interval_type:0
+msgid "Interval Unit"
+msgstr "Välin yksikkö"
+
+#. module: subscription
+#: field:subscription.subscription.history,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: subscription
+#: field:subscription.subscription,exec_init:0
+msgid "Number of documents"
+msgstr "Dokumenttien määrä"
+
+#. module: subscription
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
+"Jos aktiivinen kenttä asetetaan tilaan epätosi (false) voit piilottaa "
+"tilauksen poistamatta sitä"
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Sale Order"
+msgstr "Myyntitilaus"
+
+#. module: subscription
+#: field:subscription.document,name:0
+#: field:subscription.subscription,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:44
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+
+#. module: subscription
+#: field:subscription.document,field_ids:0
+msgid "Fields"
+msgstr "Kentät"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,note:0
+#: field:subscription.subscription,notes:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Months"
+msgstr "Kuukaudet"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Days"
+msgstr "Päivät"
+
+#. module: subscription
+#: field:subscription.document,active:0
+#: field:subscription.subscription,active:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: subscription
+#: field:subscription.subscription,cron_id:0
+msgid "Cron Job"
+msgstr "Ajastimen tehtävä"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription
+#: field:subscription.subscription.history,subscription_id:0
+msgid "Subscription"
+msgstr "Tilaus"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: subscription
+#: help:subscription.subscription,cron_id:0
+msgid "Scheduler which runs on subscription"
+msgstr "Ajastin joka suoritetaan tilauksesta"
+
+#. module: subscription
+#: model:ir.ui.menu,name:subscription.config_recuuring_event
+#: model:ir.ui.menu,name:subscription.next_id_45
+msgid "Recurring Events"
+msgstr "Toistuvat tapahtumat"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Subsription Data"
+msgstr "Tilauksen tiedot"
+
+#. module: subscription
+#: help:subscription.subscription,note:0
+msgid "Description or Summary of Subscription"
+msgstr "Kuvaus tai yhteenveto tilauksesta"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document
+#: view:subscription.document:0
+#: field:subscription.document.fields,document_id:0
+msgid "Subscription Document"
+msgstr "Tilattu dokumentti"
+
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+"Jos aktiivinen kenttä asetetaan tilaan epätosi (false) voit piilottaa "
+"tilauksen poistamatta sitä"
+
+#. module: subscription
+#: help:subscription.document.fields,value:0
+msgid "Default value is considered for field when new document is generated."
+msgstr "Oletusarvo kentälle kun uusi dokumentti luodaan"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "False"
+msgstr "Epätosi"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Process"
+msgstr "Prosessi"
+
+#. module: subscription
+#: model:ir.module.module,shortdesc:subscription.module_meta_information
+msgid "Subscription and recurring operations"
+msgstr "Tilaukset ja toistuvat operaatiot"
+
+#. module: subscription
+#: help:subscription.subscription,doc_source:0
+msgid ""
+"User can choose the source document on which he wants to create documents"
+msgstr "Vot valita lähdedokumentin jonka perusteella dokumentti luodaan"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_document_form
+#: model:ir.ui.menu,name:subscription.menu_action_document_form
+msgid "Document Types"
+msgstr "Dokumenttityypit"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid "Wrong Source Document !"
+msgstr "Väärä lähdedokumentti"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document_fields
+#: view:subscription.document.fields:0
+msgid "Subscription Document Fields"
+msgstr "Tilatun dokumentin kentät"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: subscription
+#: selection:subscription.subscription.history,document_id:0
+msgid "Invoice"
+msgstr "Lasku"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:115
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"Ole hyvä ja syötä toinen lähdedokumentti.\n"
+"tätä ei ole olemassa !"
+
+#. module: subscription
+#: field:subscription.document.fields,value:0
+msgid "Default Value"
+msgstr "Oletusarvo"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,doc_lines:0
+msgid "Documents created"
+msgstr "Dokumentti luotu"
+>>>>>>> MERGE-SOURCE

=== modified file 'survey/i18n/cs.po'
--- survey/i18n/cs.po	2011-09-05 05:59:33 +0000
+++ survey/i18n/cs.po	2011-09-15 12:39:08 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-09-05 05:44+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-08 04:36+0000\n"
+"X-Generator: Launchpad (build 13613)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: survey
 #: view:survey.print:0

=== modified file 'thunderbird/i18n/fi.po'
--- thunderbird/i18n/fi.po	2011-09-05 05:59:33 +0000
+++ thunderbird/i18n/fi.po	2011-09-15 12:39:08 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Finnish translation for openobject-addons
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the openobject-addons package.
@@ -154,3 +155,161 @@
 "\n"
 "      "
 msgstr ""
+=======
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-08-04 09:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-05 04:40+0000\n"
+"X-Generator: Launchpad (build 13604)\n"
+
+#. module: thunderbird
+#: field:thunderbird.installer,plugin_file:0
+#: field:thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr "Thunderbird liitännäinen"
+
+#. module: thunderbird
+#: help:thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+"Thunderbird liitännäisen tiedosto. Tallenna tämä tiedosto ja asenna se "
+"liitännäiseksi thunderbirdissä."
+
+#. module: thunderbird
+#: help:thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Voit valita objektin jonka haluat liittää sähköpostiin ja sen liitteisiin."
+
+#. module: thunderbird
+#: help:thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr "Dokumentaatio - kuinka asennat thunderbird liitännäisen"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Sähköpostipalvelimen työkalut"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "_Close"
+msgstr "_Sulje"
+
+#. module: thunderbird
+#: field:thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Asennusohje"
+
+#. module: thunderbird
+#: field:thunderbird.installer,description:0
+msgid "Description"
+msgstr "Kuvaus"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "title"
+msgstr "otsikko"
+
+#. module: thunderbird
+#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In"
+msgstr "Thunderbird liitännäinen"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Tämä liitännäien sallii sinun linkittää sähköpostisi OpenERP dokumentteihin. "
+"Voit liittää sen mihin tahansa OpenERP:iin  tai luoda uuden."
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Thunderbird liitäntä"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_installer
+msgid "thunderbird.installer"
+msgstr ""
+
+#. module: thunderbird
+#: field:thunderbird.installer,name:0
+#: field:thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Tiedostonimi"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Asennus ja konfigurointivaiheet"
+
+#. module: thunderbird
+#: field:thunderbird.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguraation eteneminen"
+
+#. module: thunderbird
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
+#: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
+#: view:thunderbird.installer:0
+msgid "Thunderbird Plug-In Configuration"
+msgstr "Thunderbird liitännäisen konfiguraatio"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_thunderbird_partner
+msgid "Thunderbid Plugin Tools"
+msgstr "Thunderbird liitännäisen työkalut"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Configure"
+msgstr "Konfiguroi"
+
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Skip"
+msgstr "Ohita"
+
+#. module: thunderbird
+#: field:thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "kuva"
+
+#. module: thunderbird
+#: model:ir.module.module,description:thunderbird.module_meta_information
+msgid ""
+"\n"
+"      This module is required for the thuderbird plug-in to work\n"
+"      properly.\n"
+"      The Plugin allows you archive email and its attachments to the "
+"selected \n"
+"      OpenERP objects. You can select a partner, a task, a project, an "
+"analytical\n"
+"      account,or any other object and attach selected mail as eml file in \n"
+"      attachment of selected record. You can create Documents for crm Lead,\n"
+"      HR Applicant and project issue from selected mails.\n"
+"\n"
+"      "
+msgstr ""
+>>>>>>> MERGE-SOURCE