Skip to content

Commit

Permalink
Anomaly RM#87739:Quality module : wrong translation in English for th…
Browse files Browse the repository at this point in the history
…e term default (#14001)
  • Loading branch information
vva-axelor authored and kra-axelor committed Feb 17, 2025
1 parent b90c290 commit 5c8856c
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<many-to-one name="responsiblePartner" title="Responsible partner"
ref="com.axelor.apps.base.db.Partner" required="true"/>
<string name="description" title="Description" large="true" multiline="true"/>
<many-to-many name="qiResolutionDefaultsSet" title="Defaults"
<many-to-many name="qiResolutionDefaultsSet" title="Defects"
ref="com.axelor.apps.quality.db.QIResolutionDefault" required="true"/>
<many-to-one name="qiAnalysis" ref="com.axelor.apps.quality.db.QIAnalysis"
title="Analysis"/>
Expand Down
6 changes: 3 additions & 3 deletions axelor-quality/src/main/resources/domains/QIResolution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

<one-to-one name="qi" ref="com.axelor.apps.quality.db.QualityImprovement"
title="Quality improvement" mappedBy="qiResolution" required="true" readonly="true"/>
<many-to-one name="defaultWrittenBy" title="Default written by"
<many-to-one name="defaultWrittenBy" title="Defect written by"
ref="com.axelor.auth.db.User"/>
<datetime name="defaultWrittenOn" title="Default written on"/>
<one-to-many name="qiResolutionDefaultsList" title="Defaults"
<datetime name="defaultWrittenOn" title="Defect written on"/>
<one-to-many name="qiResolutionDefaultsList" title="Defects"
ref="com.axelor.apps.quality.db.QIResolutionDefault" mappedBy="qiResolution"/>
<many-to-one name="decisionsWrittenBy" title="Decisions written by"
ref="com.axelor.auth.db.User"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ref="com.axelor.apps.quality.db.QIDecision" required="true"/>
<decimal name="quantity" title="Quantity"/>
<string name="description" title="Description" large="true"/>
<many-to-one name="qiResolutionDefault" title="Default"
<many-to-one name="qiResolutionDefault" title="Defect"
ref="com.axelor.apps.quality.db.QIResolutionDefault" required="true"/>
<integer name="responsible" title="Responsible" required="true"
selection="quality.qi.resolution.decision.responsible.select" default="1"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<string name="name" title="Name" required="true"/>
<many-to-one name="qiResolution" title="Resolution"
ref="com.axelor.apps.quality.db.QIResolution" required="true" readonly="true"/>
<many-to-one name="qiDefault" title="Default"
<many-to-one name="qiDefault" title="Defect"
ref="com.axelor.apps.quality.db.QIDefault" required="true"/>
<string name="description" title="Description" large="true"/>
<decimal name="quantity" title="Quantity"/>
Expand Down
2 changes: 1 addition & 1 deletion axelor-quality/src/main/resources/domains/QITask.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<decimal name="fixedAmount" title="Fixed amount"/>
<decimal name="directCost" title="Direct cost"/>
<decimal name="totalCost" title="Total Cost"/>
<many-to-many name="qiResolutionDefaultsSet" title="Defaults"
<many-to-many name="qiResolutionDefaultsSet" title="Defects"
ref="com.axelor.apps.quality.db.QIResolutionDefault" required="true"/>
<many-to-one name="qiAnalysis" ref="com.axelor.apps.quality.db.QIAnalysis"
title="Analysis"/>
Expand Down
22 changes: 7 additions & 15 deletions axelor-quality/src/main/resources/i18n/messages.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
"key","message","comment","context"
"0",,,
"1",,,
"2",,,
"3",,,
"4",,,
"5",,,
"Acceptance",,,
"Acceptance required",,,
"Accepted",,,
Expand Down Expand Up @@ -113,10 +107,10 @@
"Decisions",,,
"Decisions written by",,,
"Decisions written on",,,
"Default",,,
"Default written by",,,
"Default written on",,,
"Defaults",,,
"Defect",,,
"Defect written by",,,
"Defect written on",,,
"Defects",,,
"Description",,,
"Details",,,
"Detected by (internal)",,,
Expand Down Expand Up @@ -204,7 +198,7 @@
"Number of solved quality alerts by team",,,
"Objective",,,
"Observations",,,
"Observed defaults",,,
"Observed defects",,,
"Obsolete",,,
"On hold",,,
"Operation line",,,
Expand Down Expand Up @@ -250,8 +244,8 @@
"QI Decision distribution",,,
"QI Resolution Decision",,,
"QI Resolution Decisions",,,
"QI Resolution Default",,,
"QI Resolution Defaults",,,
"QI Resolution Defect",,,
"QI Resolution Defects",,,
"QI Task",,,
"QI Tasks",,,
"QIProcess.manager",,,
Expand All @@ -274,7 +268,6 @@
"Quality improvements",,,
"Quality process",,,
"Quality processes",,,
"Quality tag",,,
"Quality teams",,,
"QualityControl.coefficient",,,
"QualityControl.correctiveActions",,,
Expand Down Expand Up @@ -341,7 +334,6 @@
"Supplier delivery note line",,,
"System",,,
"Systematic",,,
"Tag color",,,
"Tags",,,
"Tasks",,,
"Team",,,
Expand Down
22 changes: 7 additions & 15 deletions axelor-quality/src/main/resources/i18n/messages_en.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
"key","message","comment","context"
"0",,,
"1",,,
"2",,,
"3",,,
"4",,,
"5",,,
"Acceptance",,,
"Acceptance required",,,
"Accepted",,,
Expand Down Expand Up @@ -113,10 +107,10 @@
"Decisions",,,
"Decisions written by",,,
"Decisions written on",,,
"Default",,,
"Default written by",,,
"Default written on",,,
"Defaults",,,
"Defect",,,
"Defect written by",,,
"Defect written on",,,
"Defects",,,
"Description",,,
"Details",,,
"Detected by (internal)",,,
Expand Down Expand Up @@ -204,7 +198,7 @@
"Number of solved quality alerts by team",,,
"Objective",,,
"Observations",,,
"Observed defaults",,,
"Observed defects",,,
"Obsolete",,,
"On hold",,,
"Operation line",,,
Expand Down Expand Up @@ -250,8 +244,8 @@
"QI Decision distribution",,,
"QI Resolution Decision",,,
"QI Resolution Decisions",,,
"QI Resolution Default",,,
"QI Resolution Defaults",,,
"QI Resolution Defect",,,
"QI Resolution Defects",,,
"QI Task",,,
"QI Tasks",,,
"QIProcess.manager",,,
Expand All @@ -274,7 +268,6 @@
"Quality improvements",,,
"Quality process",,,
"Quality processes",,,
"Quality tag",,,
"Quality teams",,,
"QualityControl.coefficient","Coefficient",,
"QualityControl.correctiveActions","CORRECTIVE ACTIONS",,
Expand Down Expand Up @@ -341,7 +334,6 @@
"Supplier delivery note line",,,
"System",,,
"Systematic",,,
"Tag color",,,
"Tags",,,
"Tasks",,,
"Team",,,
Expand Down
22 changes: 7 additions & 15 deletions axelor-quality/src/main/resources/i18n/messages_fr.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
"key","message","comment","context"
"0",,,
"1",,,
"2",,,
"3",,,
"4",,,
"5",,,
"Acceptance","Acceptation",,
"Acceptance required","Acceptation requise",,
"Accepted","Accepté",,
Expand Down Expand Up @@ -113,10 +107,10 @@
"Decisions","Décisions",,
"Decisions written by","Décisions rédigées par",,
"Decisions written on","Décisions rédigées le",,
"Default","Défaut",,
"Default written by","Défauts rédigés par",,
"Default written on","Défauts rédigés le",,
"Defaults","Défauts",,
"Defect","Défaut",,
"Defect written by","Défauts rédigés par",,
"Defect written on","Défauts rédigés le",,
"Defects","Défauts",,
"Description","Description",,
"Details","Précisions",,
"Detected by (internal)","Détecté par (interne)",,
Expand Down Expand Up @@ -204,7 +198,7 @@
"Number of solved quality alerts by team","Nombre d'alertes qualité résolues par équipe",,
"Objective","Objective",,
"Observations","Observations",,
"Observed defaults","Défauts observés",,
"Observed defects","Défauts observés",,
"Obsolete",,,
"On hold","En attente",,
"Operation line","Ligne de l'opération",,
Expand Down Expand Up @@ -250,8 +244,8 @@
"QI Decision distribution",,,
"QI Resolution Decision",,,
"QI Resolution Decisions",,,
"QI Resolution Default",,,
"QI Resolution Defaults",,,
"QI Resolution Defect",,,
"QI Resolution Defects",,,
"QI Task",,,
"QI Tasks",,,
"QIProcess.manager","Responsable",,
Expand All @@ -274,7 +268,6 @@
"Quality improvements","Améliorations qualité",,
"Quality process","Processus qualité",,
"Quality processes","Processus qualité",,
"Quality tag","Marque de qualité",,
"Quality teams","Équipes qualité",,
"QualityControl.coefficient","Coefficient",,
"QualityControl.correctiveActions","ACTIONS CORRECTIVES",,
Expand Down Expand Up @@ -341,7 +334,6 @@
"Supplier delivery note line","Ligne de BL fournisseur",,
"System","Système",,
"Systematic","Systématique",,
"Tag color","Couleur étiquette",,
"Tags","Etiquettes",,
"Tasks","Tâches",,
"Team","Equipe",,
Expand Down
4 changes: 2 additions & 2 deletions axelor-quality/src/main/resources/views/Menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@
<view type="form" name="qi-status-form"/>
</action-view>

<menuitem name="qi.default" parent="quality-improvement-configurations" title="Defaults"
<menuitem name="qi.default" parent="quality-improvement-configurations" title="Defects"
action="qi.default" order="300"/>

<action-view name="qi.default" title="Defaults"
<action-view name="qi.default" title="Defects"
model="com.axelor.apps.quality.db.QIDefault">
<view type="grid" name="qi-default-grid"/>
<view type="form" name="qi-default-form"/>
Expand Down
4 changes: 2 additions & 2 deletions axelor-quality/src/main/resources/views/QIDefault.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://axelor.com/xml/ns/object-views http://axelor.com/xml/ns/object-views/object-views_7.1.xsd">

<grid name="qi-default-grid" title="Defaults" model="com.axelor.apps.quality.db.QIDefault">
<grid name="qi-default-grid" title="Defects" model="com.axelor.apps.quality.db.QIDefault">
<field name="code"/>
<field name="name"/>
<field name="company"/>
Expand All @@ -12,7 +12,7 @@
<field name="isDocumentary"/>
</grid>

<form name="qi-default-form" title="Default" model="com.axelor.apps.quality.db.QIDefault">
<form name="qi-default-form" title="Defect" model="com.axelor.apps.quality.db.QIDefault">
<panel name="mainPanel">
<field name="code"/>
<field name="name"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://axelor.com/xml/ns/object-views http://axelor.com/xml/ns/object-views/object-views_7.1.xsd">

<grid name="qi-resolution-default-grid" title="QI Resolution Defaults"
<grid name="qi-resolution-default-grid" title="QI Resolution Defects"
model="com.axelor.apps.quality.db.QIResolutionDefault">
<field name="name"/>
<field name="qiDefault"/>
Expand All @@ -12,7 +12,7 @@
<field name="identification"/>
</grid>

<form name="qi-resolution-default-form" title="QI Resolution Default"
<form name="qi-resolution-default-form" title="QI Resolution Defect"
model="com.axelor.apps.quality.db.QIResolutionDefault">
<panel name="mainPanel">
<field name="name"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<editor x-viewer="true">
<field name="qi.qiIdentification.nonConformingQuantity" readonly="true"
hideIf="$get('qi.type') == 2"/>
<panel name="defaultPanel" title="Observed defaults" colSpan="12">
<panel name="defaultPanel" title="Observed defects" colSpan="12">
<field name="defaultWrittenBy" form-view="user-form" grid-view="user-grid"
onChange="action-quality-improvement-record-set-default-written-on"/>
<field name="defaultWrittenOn"/>
Expand Down
3 changes: 3 additions & 0 deletions changelogs/unreleased/87739.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
title: "QI Resolution: fixed wrong translation in English for the term default."
module: axelor-quality

0 comments on commit 5c8856c

Please sign in to comment.