Skip to content

Commit

Permalink
90368: Adjustements configurator ui/translations (#13974)
Browse files Browse the repository at this point in the history
  • Loading branch information
kra-axelor authored Feb 17, 2025
1 parent 4e3974f commit 7f6d071
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion axelor-sale/src/main/resources/i18n/messages_fr.csv
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"Amount invoiced W.T.","Montant facturé HT",,
"Amount to be spread over the timetable","Montant restant à étaler sur l'échéancier",,
"An attribute with the same name already exists.","Un attribut avec le même nom existe déjà.",,
"An error occured during the duplication of sale order line. Therefore, only a simple copy has been made, please see tracebacks for more details.","Une erreur s'est produite lors de la duplication de la ligne de commande. Par conséquent, seule une simple copie a été faite, veuillez consulter les tracebacks pour plus de détails.",,
"An error occured during the duplication of sale order line. Therefore, only a simple copy has been made, please see tracebacks for more details.","Une erreur s'est produite lors de la duplication de la ligne de commande. Par conséquent, une simple copie à été faite sans rejouer les configurateurs, veuillez consulter les tracebacks pour plus de détails.",,
"Analytic distribution","Distribution analytique",,
"Analytic distribution required on sale order line","Exiger un modèle de répartition analytique sur les lignes de commande",,
"App",,,
Expand Down
32 changes: 16 additions & 16 deletions axelor-sale/src/main/resources/views/SaleOrderLine.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
icon="fa-exclamation-triangle"/>
<field name="sequence" if="__config__.app.getApp('sale')?.isDisplaySaleOrderLineNumber"
width="51"/>
<button name="configuratorEditBtn"
onClick="save,action-sale-order-line-view-regenerate-line"
if="__config__.app.getApp('sale')?.getEnableConfigurator()" readonlyIf="configurator == null"
icon="fa-pen-to-square"/>
<button name="configuratorDuplicateBtn"
onClick="save,action-sale-order-line-method-configurator-duplicate"
if="__config__.app.getApp('sale')?.getEnableConfigurator()" readonlyIf="configurator == null"
icon="fa-copy"/>
<button name="addToCartBtn" title="Add to cart"
onClick="action-sale-order-line-method-add-to-cart" icon="cart-plus-fill"
if="__config__.app.getApp('sale')?.getIsCartManagementEnabled()"
Expand Down Expand Up @@ -56,6 +48,14 @@
<hilite strong="true" color="success" if="availableStatusSelect == 1"/>
<hilite color="danger" strong="true" if="availableStatusSelect == 2"/>
</field>
<button name="configuratorEditBtn"
onClick="save,action-sale-order-line-view-regenerate-line"
if="__config__.app.getApp('sale')?.getEnableConfigurator()" readonlyIf="configurator == null"
icon="pencil-square" title="Configurator edit button"/>
<button name="configuratorDuplicateBtn"
onClick="save,action-sale-order-line-method-configurator-duplicate"
if="__config__.app.getApp('sale')?.getEnableConfigurator()" readonlyIf="configurator == null"
icon="fa-copy" title="Configurator duplicate button"/>
<field name="saleOrder.statusSelect" hidden="true"/>
<field name="saleOrder.orderBeingEdited" hidden="true"/>
<field name="product.productTypeSelect" hidden="true"/>
Expand All @@ -71,14 +71,6 @@

<field name="sequence" if="__config__.app.getApp('sale')?.isDisplaySaleOrderLineNumber"
width="51"/>
<button name="configuratorEditBtn"
onClick="save,action-sale-order-line-view-regenerate-line"
if="__config__.app.getApp('sale')?.getEnableConfigurator()" readonlyIf="configurator == null"
icon="fa-pen-to-square"/>
<button name="configuratorDuplicateBtn"
onClick="save,action-sale-order-line-method-configurator-duplicate"
if="__config__.app.getApp('sale')?.getEnableConfigurator()" readonlyIf="configurator == null"
icon="fa-copy"/>
<button name="addToCartBtn" title="Add to cart"
onClick="action-sale-order-line-method-add-to-cart" icon="cart-plus-fill"
if="__config__.app.getApp('sale')?.getIsCartManagementEnabled()"
Expand Down Expand Up @@ -135,6 +127,14 @@
<hilite strong="true" color="success" if="availableStatusSelect == 1"/>
<hilite color="danger" strong="true" if="availableStatusSelect == 2"/>
</field>
<button name="configuratorEditBtn"
onClick="save,action-sale-order-line-view-regenerate-line"
if="__config__.app.getApp('sale')?.getEnableConfigurator()" readonlyIf="configurator == null"
icon="pencil-square" title="Configurator edit button"/>
<button name="configuratorDuplicateBtn"
onClick="save,action-sale-order-line-method-configurator-duplicate"
if="__config__.app.getApp('sale')?.getEnableConfigurator()" readonlyIf="configurator == null"
icon="fa-copy" title="Configurator duplicate button"/>
<field name="saleOrder.priceList.nonNegotiable" hidden="true"/>
<field name="$nonNegotiable" hidden="true"/>
<field name="$nbDecimalDigitForUnitPrice" hidden="true"/>
Expand Down

0 comments on commit 7f6d071

Please sign in to comment.