bemade_fsm: added a test for task template descriptions. Added description to subtask tree on task form view for easier editing by technicians.
This commit is contained in:
Marc Durepos
parent
617abd2067
commit
cf89585fae
4 changed files with 59 additions and 47 deletions
|
|
@ -6,8 +6,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 15.0+e\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2023-08-29 15:04+0000\n"
|
||||
"PO-Revision-Date: 2023-08-29 15:04+0000\n"
|
||||
"POT-Creation-Date: 2023-10-02 20:26+0000\n"
|
||||
"PO-Revision-Date: 2023-10-02 20:26+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -28,7 +28,6 @@ msgstr ""
|
|||
" <span groups=\"account.group_show_line_subtotals_tax_included\">\n"
|
||||
" Prix</span>"
|
||||
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model_terms:ir.ui.view,arch_db:bemade_fsm.workorder_page_signature_block
|
||||
msgid ""
|
||||
|
|
@ -57,7 +56,7 @@ msgstr ""
|
|||
#. module: bemade_fsm
|
||||
#: model_terms:ir.ui.view,arch_db:bemade_fsm.workorder_page_sale_order_table
|
||||
msgid "<strong>Taxes</strong>"
|
||||
msgstr "<strong>Taxes</strong>"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model_terms:ir.ui.view,arch_db:bemade_fsm.workorder_page_sale_order_table
|
||||
|
|
@ -120,7 +119,7 @@ msgstr "Bloqué"
|
|||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_project_task__allow_billable
|
||||
msgid "Can be billed"
|
||||
msgstr "Facturable"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,help:bemade_fsm.field_res_partner__is_site_contact
|
||||
|
|
@ -128,7 +127,6 @@ msgstr "Facturable"
|
|||
msgid ""
|
||||
"Check if the contact is a site contact, otherwise it is a not in that list"
|
||||
msgstr ""
|
||||
"Vérifier si le contact est un contact du site, sinon ne pas l'inclure dans la liste"
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,help:bemade_fsm.field_bemade_fsm_equipment__tag_ids
|
||||
|
|
@ -136,8 +134,8 @@ msgid ""
|
|||
"Classify and analyze your equipment categories like: Boiler, Laboratory, "
|
||||
"Waste water, Pure water"
|
||||
msgstr ""
|
||||
"Classifier et analyser vos catégories d'équipements comme : Chaudière, Laboratoire, "
|
||||
"Eaux usées, Eau pure"
|
||||
"Classifier et analyser vos catégories d'équipements comme : Chaudière, "
|
||||
"Laboratoire, Eaux usées, Eau pure"
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.ui.menu,name:bemade_fsm.menu_service_client_equipment
|
||||
|
|
@ -261,6 +259,11 @@ msgstr "Livré"
|
|||
msgid "Description"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model_terms:ir.ui.view,arch_db:bemade_fsm.view_task_form2_inherit
|
||||
msgid "Description/Comments"
|
||||
msgstr "Description/Commentaires"
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model_terms:ir.ui.view,arch_db:bemade_fsm.fsm_equipment_view_tree
|
||||
msgid "Details"
|
||||
|
|
@ -283,7 +286,7 @@ msgstr "Employés assignés aux tâches créées à partir de ce gabarit."
|
|||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_project_task__planned_date_end
|
||||
msgid "End Date"
|
||||
msgstr "Date de fin"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.actions.act_window,name:bemade_fsm.action_window_equipment
|
||||
|
|
@ -300,7 +303,7 @@ msgstr "Équipement désservi"
|
|||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_res_partner__equipment_count
|
||||
msgid "Equipment Count"
|
||||
msgstr "Nombre d'équipements"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_bemade_fsm_equipment__complete_name
|
||||
|
|
@ -450,11 +453,9 @@ msgstr "En cours"
|
|||
#: model:ir.model.fields,help:bemade_fsm.field_bemade_fsm_visit__is_invoiced
|
||||
#: model:ir.model.fields,help:bemade_fsm.field_sale_order_line__is_fully_delivered_and_invoiced
|
||||
msgid ""
|
||||
"Indicates whether a line or all the lines in a section have be enentirely"
|
||||
" delivered and invoiced."
|
||||
"Indicates whether a line or all the lines in a section have been entirely "
|
||||
"delivered and invoiced."
|
||||
msgstr ""
|
||||
"Indique si une ligne ou toutes les lignes dans une section ont été entièrement livrées"
|
||||
"et facturées."
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,help:bemade_fsm.field_bemade_fsm_visit__is_completed
|
||||
|
|
@ -463,7 +464,8 @@ msgid ""
|
|||
"Indicates whether a line or all the lines in a section have been entirely "
|
||||
"delivered."
|
||||
msgstr ""
|
||||
"Indique si une ligne ou toutes les lignes dans une section ont été entièrement livrées."
|
||||
"Indique si une ligne ou toutes les lignes dans une section ont été "
|
||||
"entièrement livrées."
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_project_task_template__planned_hours
|
||||
|
|
@ -499,7 +501,7 @@ msgstr "Est un abonné"
|
|||
#: model:ir.model.fields,field_description:bemade_fsm.field_res_partner__is_site_contact
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_res_users__is_site_contact
|
||||
msgid "Is a site contact"
|
||||
msgstr "Est un contact du site"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_bemade_fsm_visit__label
|
||||
|
|
@ -558,17 +560,6 @@ msgstr "Erreur de livraison de message"
|
|||
msgid "Messages"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: code:addons/bemade_fsm/models/task.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Modifying the planned start or end time on a task is not permitted when that"
|
||||
" task already has planning records associated to it. Please modify or delete"
|
||||
" the planning records instead."
|
||||
msgstr ""
|
||||
"Modifier la date planifiée pour le début ou la fin d'une tâche nest pas permis quand"
|
||||
" cette tâche est déjà associée à des enregistrements de planification. Veuillez"
|
||||
" plutôt modifier ou supprimer les planifications associées."
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_bemade_fsm_equipment__my_activity_date_deadline
|
||||
msgid "My Activity Deadline"
|
||||
|
|
@ -682,8 +673,8 @@ msgid ""
|
|||
"Products planned as field service will have travel time considered in "
|
||||
"planning."
|
||||
msgstr ""
|
||||
"Les produits planifiés comme service terrain auront leur temps de voyagement considéré"
|
||||
" lors de la planification."
|
||||
"Les produits planifiés comme service terrain auront leur temps de voyagement"
|
||||
" considéré lors de la planification."
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model_terms:ir.ui.view,arch_db:bemade_fsm.task_template_search_view
|
||||
|
|
@ -726,7 +717,7 @@ msgstr "Section de commande de vente"
|
|||
#: model:ir.model,name:bemade_fsm.model_sale_order
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_bemade_fsm_visit__sale_order_id
|
||||
msgid "Sales Order"
|
||||
msgstr "Commande de vente"
|
||||
msgstr "Commande de ventes"
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model,name:bemade_fsm.model_sale_order_line
|
||||
|
|
@ -769,12 +760,12 @@ msgstr "Contacts sur site :"
|
|||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_res_partner__equipment_ids
|
||||
msgid "Site Equipment"
|
||||
msgstr "Équipements du site"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,field_description:bemade_fsm.field_project_task__planned_date_begin
|
||||
msgid "Start Date"
|
||||
msgstr "Date de début"
|
||||
msgstr ""
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model_terms:ir.ui.view,arch_db:bemade_fsm.workorder_page_tasks_table
|
||||
|
|
@ -860,8 +851,9 @@ msgstr "Gabarits pour nouvelles tâches"
|
|||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,help:bemade_fsm.field_sale_order__default_equipment_ids
|
||||
msgid "The default equipment to service for new sale order lines."
|
||||
msgstr "L'équipement à désservir par défaut pour les nouveaux articles de commande de"
|
||||
" ventes."
|
||||
msgstr ""
|
||||
"L'équipement à désservir par défaut pour les nouveaux articles de commande "
|
||||
"de ventes."
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model:ir.model.fields,help:bemade_fsm.field_bemade_fsm_visit__so_section_id
|
||||
|
|
@ -869,22 +861,14 @@ msgid ""
|
|||
"The section on the sale order that represents the labour and parts for this "
|
||||
"visit"
|
||||
msgstr ""
|
||||
"La section sur la commande de vente représentant la main d'oeuvre et les pièces pour"
|
||||
" cette visite"
|
||||
"La section sur la commande de vente représentant la main d'oeuvre et les "
|
||||
"pièces pour cette visite"
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model_terms:ir.actions.act_window,help:bemade_fsm.task_template_act_window
|
||||
msgid "There are no task templates, click above to create one."
|
||||
msgstr "Il n'existe aucun gabarit de tâche, cliquez ci-dessus pour en créer une."
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: code:addons/bemade_fsm/models/sale_order.py:0
|
||||
#, 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)"
|
||||
"Il n'existe aucun gabarit de tâche, cliquez ci-dessus pour en créer une."
|
||||
|
||||
#. module: bemade_fsm
|
||||
#: model_terms:ir.ui.view,arch_db:bemade_fsm.workorder_page_sale_order_table
|
||||
|
|
|
|||
|
|
@ -270,3 +270,20 @@ class TestSalesOrder(BemadeFSMBaseTest):
|
|||
self.assertTrue("It even spans multiple lines." in task.description)
|
||||
self.assertTrue("One could find this annoying in a task name."
|
||||
in task.description)
|
||||
|
||||
def test_subtask_templates_no_description_if_blank_on_template(self):
|
||||
so = self._generate_sale_order()
|
||||
template = self._generate_task_template(structure=[5], names=['Parent', 'Child'])
|
||||
template.description = ""
|
||||
template.subtasks[0].description = "Some fixed description"
|
||||
for t in template.subtasks[1:]:
|
||||
t.description = ""
|
||||
product = self._generate_product(task_template=template)
|
||||
sol = self._generate_sale_order_line(sale_order=so, product=product)
|
||||
|
||||
so.action_confirm()
|
||||
|
||||
task = sol.task_id
|
||||
self.assertEqual(task.child_ids[0].description, template.subtasks[0].description)
|
||||
for t in task.child_ids[1:]:
|
||||
self.assertFalse(t.description)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='project_id']" position="after">
|
||||
<field name="task_template_id"
|
||||
attrs="{'invisible': [('service_tracking', 'not in', ('task_global_project', 'task_in_project'))]}"/>
|
||||
attrs="{'invisible': [('service_tracking', 'not in', ('task_global_project', 'task_in_project'))]}"
|
||||
domain="[('parent', '=', False)]"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='planning_enabled']" position="after">
|
||||
<field name="is_field_service"/>
|
||||
|
|
|
|||
|
|
@ -38,6 +38,16 @@
|
|||
</button>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_task_form2_inherit" model="ir.ui.view">
|
||||
<field name="inherit_id" ref="project.view_task_form2"/>
|
||||
<field name="model">project.task</field>
|
||||
<field name="name">bemade_fsm.project_task.form2</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='child_ids']/tree//field[@name='name']" position="after">
|
||||
<field name="description" string="Description/Comments"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
<!-- Add parent_id = false to domain for My Tasks, All Tasks: To Schedule, All Tasks and To Invoice-->
|
||||
<record id="industry_fsm.project_task_action_fsm" model="ir.actions.act_window">
|
||||
<field name="domain">[('is_fsm', '=', True),
|
||||
|
|
|
|||
Loading…
Reference in a new issue