update Bis 11-01

i18n/fr.po

+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* lefilament_link_sale_project
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-11 11:43+0000\n"
+"PO-Revision-Date: 2018-01-11 11:43+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_related_project_id
+msgid "Analytical account related"
+msgstr "Compte analytique lié"
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_project_view_form_create
+msgid "Create"
+msgstr "Créer"
+
+#. module: lefilament_link_sale_project
+#: model:ir.actions.act_window,name:lefilament_link_sale_project.lefilament_open_create_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_view_order_form
+msgid "Create project"
+msgstr "Créer projet"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_create_uid
+msgid "Created by"
+msgstr "Créé par"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_create_date
+msgid "Created on"
+msgstr "Créé le"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_project_config_settings_lf_tarif_jour
+msgid "Day Price"
+msgstr "Tarif jour"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_project_task_type_case_default
+msgid "Default step"
+msgstr "Étape par défaut"
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_project_view_form_create
+msgid "Discard"
+msgstr "Annuler"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_display_name
+msgid "Display Name"
+msgstr "Afficher nom"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_project_id
+msgid "Existing project"
+msgstr "Projet existant"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_id
+msgid "ID"
+msgstr "ID"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_sale_config_settings_project_task_type_id
+msgid "Initial step"
+msgstr "Étape initiale"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard___last_update
+msgid "Last Modified on"
+msgstr "Dernière modification le"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_write_uid
+msgid "Last Updated by"
+msgstr "Dernière mise à jour par"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_write_date
+msgid "Last Updated on"
+msgstr "Dernière mise à jour le"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_related_project_name
+msgid "New Analytical Account"
+msgstr "Nouveau compte analytique"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_project_name
+msgid "New project"
+msgstr "Nouveau projet"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_procurement_order
+msgid "Procurement"
+msgstr "Approvisionnement"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_product_template
+msgid "Product Template"
+msgstr "Modèle d'article'"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_product_product_link
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_template_product_link
+msgid "Product to be linked to the project"
+msgstr "Article à lier au projet"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_project_project
+msgid "Project"
+msgstr "Projet"
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefialement_edit_project
+msgid "Project Stages"
+msgstr "Étapes projet"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_product_project_task_type_id
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_template_project_task_type_id
+msgid "Project Task"
+msgstr "Tâche projet"
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_project_view_form_create
+msgid "Project to link"
+msgstr "Projet à  lier"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_sale_id
+msgid "Sale"
+msgstr "Vente"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_lefilament_sale_views_wizard
+msgid "Sale Project Assignment"
+msgstr "Affectation de projet de vente"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_sale_order
+msgid "Sales Order"
+msgstr "Bon de commande"
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_view_sales_config
+msgid "Task"
+msgstr "Tâche"
+
+#. module: lefilament_link_sale_project
+#: code:addons/lefilament_link_sale_project/models/procurement.py:58
+#, python-format
+msgid "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
+msgstr "Tâche Créée (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_project_task_type
+msgid "Task Stage"
+msgstr "Étape tâche"
+
+#. module: lefilament_link_sale_project
+#: code:addons/lefilament_link_sale_project/models/procurement.py:62
+#, python-format
+msgid "This task has been created from: <a href=# data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)"
+msgstr "Cette tâche a été créée à partir de: <a href=# data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+

i18n/lefilament_link_sale_project.pot

+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* lefilament_link_sale_project
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-11 11:43+0000\n"
+"PO-Revision-Date: 2018-01-11 11:43+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_related_project_id
+msgid "Analytical account related"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_project_view_form_create
+msgid "Create"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.actions.act_window,name:lefilament_link_sale_project.lefilament_open_create_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_view_order_form
+msgid "Create project"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_project_config_settings_lf_tarif_jour
+msgid "Day Price"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_project_task_type_case_default
+msgid "Default step"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_project_view_form_create
+msgid "Discard"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_project_id
+msgid "Existing project"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_id
+msgid "ID"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_sale_config_settings_project_task_type_id
+msgid "Initial step"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_related_project_name
+msgid "New Analytical Account"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_project_name
+msgid "New project"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_product_product_link
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_template_product_link
+msgid "Product to be linked to the project"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_project_project
+msgid "Project"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefialement_edit_project
+msgid "Project Stages"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_product_project_task_type_id
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_template_project_task_type_id
+msgid "Project Task"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_project_view_form_create
+msgid "Project to link"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_sale_id
+msgid "Sale"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_lefilament_sale_views_wizard
+msgid "Sale Project Assignment"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.ui.view,arch_db:lefilament_link_sale_project.lefilament_view_sales_config
+msgid "Task"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: code:addons/lefilament_link_sale_project/models/procurement.py:58
+#, python-format
+msgid "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_project_task_type
+msgid "Task Stage"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: code:addons/lefilament_link_sale_project/models/procurement.py:62
+#, python-format
+msgid "This task has been created from: <a href=# data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
+#. module: lefilament_link_sale_project
+#: model:ir.model,name:lefilament_link_sale_project.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+

models/product.py

@@ -9,5 +9,5 @@ class LeFilamentProductTemplate(models.Model):
     _inherit = 'product.template'
 
     project_task_type_id = fields.Many2one(
-        'project.task.type', 'Project Task Type')
-    product_link = fields.Boolean('Produit à lier au projet')
\ No newline at end of file
+        'project.task.type', 'Project Task')
+    product_link = fields.Boolean('Product to be linked to the project')
\ No newline at end of file

models/project_task_type.py

@@ -9,4 +9,4 @@ class ProjectTaskType(models.Model):
     _inherit = 'project.task.type'
 
     case_default = fields.Boolean(
-        string='Etape par défault')
+        string='Default step')

models/res_config.py

@@ -9,7 +9,7 @@ class ProjectLFConfiguration(models.TransientModel):
     _name = 'project.config.settings'
     _inherit = 'project.config.settings'
 
-    lf_tarif_jour = fields.Float('Tarif Jour')
+    lf_tarif_jour = fields.Float('Day Price')
 
     @api.multi
     def set_default_lf_tarif_jour(self):

models/sale_config_settings.py

@@ -14,21 +14,9 @@ class LeFilamentSaleConfiguration(models.TransientModel):
     _inherit = 'sale.config.settings'
 
     project_task_type_id = fields.Many2one(
-        'project.task.type', 'Etape initiale')
-
-    # type_ids = fields.Many2many('project.task.type', string='Tasks Stages')
+        'project.task.type', 'Initial step')
 
     @api.multi
     def set_project_task_type(self):
         return self.env['ir.values'].sudo().set_default(
             'sale.config.settings', 'project_task_type_id', self.project_task_type_id.id)
\ No newline at end of file
-
-    # @api.multi
-    # def set_project_type_ids(self):
-    # 	for type_id in self:
-    # 		self.env['ir.values'].sudo().set_default(
-    #         'sale.config.settings', 'type_ids', type_id.id)
-
-    # @api.multi
-    # def get_default_type_ids(self, field):
-    # 	return self.env['ir.values'].get_default('sale.config.settings', 'type_ids')
\ No newline at end of file

views/sale_config_settings_views.xml

@@ -6,9 +6,8 @@
             <field name="inherit_id" ref="sale.view_sales_config"/>
             <field name="arch" type="xml">
                 <div id="main" position="inside">
-                    <group string="Tâches">
+                    <group string="Task">
                         <field name="project_task_type_id" class="oe_inline"/>
-                        
                     </group>
                 </div>
             </field>

views/sale_views.xml

@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <header>
-                    <button name="%(lefilament_open_create_project)d" type="action" string="Créer un projet" attrs="{'invisible': ['|', ('project_project_id', '!=', False), ('state', '!=', 'sale')]}"/>
+                    <button name="%(lefilament_open_create_project)d" type="action" string="Create project" attrs="{'invisible': ['|', ('project_project_id', '!=', False), ('state', '!=', 'sale')]}"/>
                 </header>
             </field>
         </record>

wizard/sale_views_wizard.py

@@ -28,10 +28,10 @@ class LeFilamentSaleWizard(models.TransientModel):
         return self._default_sale_id().partner_id.name
 
     sale_id = fields.Many2one('sale.order', string='Sale', default=_default_sale_id)
-    project_id = fields.Many2one('project.project', string='Projet existant', default=_default_project_project_id)
-    project_name = fields.Char('Nouveau Projet', default=_default_project_name)
-    related_project_id = fields.Many2one('account.analytic.account', string='Compte Analytique', default=_default_related_project_id)
-    related_project_name = fields.Char('Nouveau Compte Analytique', default=_default_project_name)
+    project_id = fields.Many2one('project.project', string='Existing project', default=_default_project_project_id)
+    project_name = fields.Char('New project', default=_default_project_name)
+    related_project_id = fields.Many2one('account.analytic.account', string='Analytical account related', default=_default_related_project_id)
+    related_project_name = fields.Char('New Analytical Account', default=_default_project_name)
 
     @api.onchange('project_id')
     def onchange_project_id(self):
@@ -58,16 +58,16 @@ class LeFilamentSaleWizard(models.TransientModel):
                 date_plan = datetime.strptime(line.procurement_ids.date_planned,'%Y-%m-%d %H:%M:%S')
                 date_deadline = (date_plan.date() + relativedelta(years=int(line.procurement_ids.product_qty))).strftime('%Y-%m-%d')
                 stage = line.product_id.project_task_type_id
+                name_task = sale_id.partner_id.name + " - " + stage.name
             else:
                 stage = stage_new
                 project_id = project_id_new
-                date_deadline = line.procurement_ids.date_planned
-            # planned_hours = line.procurement_ids._convert_qty_company_hours()
+                date_deadline = False
+                name_task = line.name.split('\n', 1)[0]
             project_date = self.env['project.project'].browse(project_id)
             project_date.lf_total_budget = project_date.lf_total_budget + line.price_subtotal
             project_date.lf_tarif_jour = lf_tarif_jour
             planned_hours = (line.price_subtotal / lf_tarif_jour) * lf_heures_jour
-            first_line = line.name.split('\n', 1)[0]
             description_line = "<p>"
             i = 1
             for line_name in line.name:
@@ -76,7 +76,7 @@ class LeFilamentSaleWizard(models.TransientModel):
                 else:
                     description_line = description_line + line_name
             task = self.env['project.task'].create({
-                'name': first_line,
+                'name': name_task,
                 'date_deadline': date_deadline,
                 'planned_hours': planned_hours,
                 'remaining_hours': planned_hours,

wizard/sale_views_wizard.xml

@@ -7,7 +7,7 @@
             <field name="name">lefilament.project.view.form.create</field>
             <field name="model">lefilament.sale.views.wizard</field>
             <field name="arch" type="xml">
-                <form string="Lien Projet">
+                <form string="Project to link">
                     <sheet>
                         <group>
                             <group>
@@ -31,7 +31,7 @@
         </record>
 
 		<record id="lefilament_open_create_project" model="ir.actions.act_window">
-            <field name="name">Créer un Projet</field>
+            <field name="name">Create project</field>
             <field name="res_model">lefilament.sale.views.wizard</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>