From 7e7b416c2e5ce945c5c1dfad06c7a4bce4e271d1 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Fri, 12 Jan 2018 16:50:38 +0100
Subject: [PATCH] update bis 12-01
---
i18n/fr.po | 29 +++++++++++++--------------
i18n/lefilament_link_sale_project.pot | 15 +++++++-------
models/sale_order.py | 22 ++++++++++++--------
3 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/i18n/fr.po b/i18n/fr.po
index 4e98eab..556de65 100644
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,8 +6,8 @@ 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"
+"POT-Creation-Date: 2018-01-12 14:08+0000\n"
+"PO-Revision-Date: 2018-01-12 14:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ 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"
+msgstr "Nom affiché"
#. module: lefilament_link_sale_project
#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_lefilament_sale_views_wizard_project_id
@@ -79,7 +79,7 @@ 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"
+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
@@ -109,13 +109,7 @@ 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"
+msgstr "Modèle d'article"
#. module: lefilament_link_sale_project
#: model:ir.model,name:lefilament_link_sale_project.model_project_project
@@ -125,7 +119,7 @@ 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"
+msgstr "Etapes de projet"
#. module: lefilament_link_sale_project
#: model:ir.model.fields,field_description:lefilament_link_sale_project.field_product_product_project_task_type_id
@@ -167,7 +161,7 @@ msgstr "Tâche Créée (%s): <a href=# data-oe-model=project.task data-oe-id=%d>
#. module: lefilament_link_sale_project
#: model:ir.model,name:lefilament_link_sale_project.model_project_task_type
msgid "Task Stage"
-msgstr "Étape tâche"
+msgstr "Étape de tâche"
#. module: lefilament_link_sale_project
#: code:addons/lefilament_link_sale_project/models/procurement.py:62
@@ -175,13 +169,18 @@ msgstr "Étape tâche"
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.ui.view,arch_db:lefilament_link_sale_project.lefilament_view_order_form
+msgid "Update tasks"
+msgstr "Mise à jour des tâches"
+
#. module: lefilament_link_sale_project
#: model:ir.model,name:lefilament_link_sale_project.model_project_config_settings
msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
#. module: lefilament_link_sale_project
#: model:ir.model,name:lefilament_link_sale_project.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
diff --git a/i18n/lefilament_link_sale_project.pot b/i18n/lefilament_link_sale_project.pot
index c6e0bc2..4f4c90b 100644
--- a/i18n/lefilament_link_sale_project.pot
+++ b/i18n/lefilament_link_sale_project.pot
@@ -6,8 +6,8 @@ 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"
+"POT-Creation-Date: 2018-01-12 15:01+0000\n"
+"PO-Revision-Date: 2018-01-12 15:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -111,12 +111,6 @@ msgstr ""
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"
@@ -175,6 +169,11 @@ msgstr ""
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.ui.view,arch_db:lefilament_link_sale_project.lefilament_view_order_form
+msgid "Update tasks"
+msgstr ""
+
#. module: lefilament_link_sale_project
#: model:ir.model,name:lefilament_link_sale_project.model_project_config_settings
msgid "project.config.settings"
diff --git a/models/sale_order.py b/models/sale_order.py
index 44eeea4..a2c7bd7 100644
--- a/models/sale_order.py
+++ b/models/sale_order.py
@@ -2,7 +2,6 @@
# © 2017 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
from odoo import api, fields, models, _
from datetime import datetime
from dateutil.relativedelta import relativedelta
@@ -21,9 +20,16 @@ class SaleOrder(models.Model):
lf_heures_jour = self.env['ir.values'].get_default('project.config.settings', 'lf_heures_jour')
sale_project_id = order.project_project_id
sale_task_ids = order.tasks_ids
+ project_id = sale_project_id.id
+ project_total_budget = 0
for line in order.order_line:
task_id_refer = self.env['project.task'].search([('sale_line_id', '=', line.id)])
- if not task_id_refer:
+ if task_id_refer:
+ if not line.product_id.project_id:
+ project_total_budget = project_total_budget + line.price_subtotal
+ planned_hours = (line.price_subtotal / lf_tarif_jour) * lf_heures_jour
+ task_id_refer.planned_hours = planned_hours
+ else:
if line.product_id.track_service == 'project':
if line.product_id.project_id:
project = line.product_id.project_id
@@ -40,12 +46,9 @@ class SaleOrder(models.Model):
project_id = sale_project_id.id
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
+ project_total_budget = project_total_budget + line.price_subtotal
planned_hours = (line.price_subtotal / lf_tarif_jour) * lf_heures_jour
description_line = "<p>"
- i = 1
for line_name in line.name:
if line_name == '\n':
description_line = description_line + "</p><p>"
@@ -65,5 +68,8 @@ class SaleOrder(models.Model):
'stage_id': stage.id,
'sale_line_id': line.id
})
- order.tasks_ids = self.env['project.task'].search([('sale_line_id', 'in', order.order_line.ids)])
- order.tasks_count = len(order.tasks_ids)
\ No newline at end of file
+ project_date = self.env['project.project'].browse(project_id)
+ project_date.lf_tarif_jour = lf_tarif_jour
+ project_date.lf_total_budget = project_total_budget
+ order.tasks_ids = self.env['project.task'].search([('sale_line_id', 'in', order.order_line.ids)])
+ order.tasks_count = len(order.tasks_ids)
\ No newline at end of file
--
GitLab