Log session start time Tue Feb 07 08:41:12 CET 2017

Time Thread Level Category Message
28499984310 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28499984316 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28499984316 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28499984364 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28499984364 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28500344364 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28500344365 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28500344365 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28500344365 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28500344366 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28500344430 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28500345418 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28500345419 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28500345419 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28500345473 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28500345479 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28500345479 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28500345526 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28500345526 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28500705527 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28500705527 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28500705527 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28500705528 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28500705528 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28500705573 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28500706390 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28500706391 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28500706392 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28500706444 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28500706449 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28500706449 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28500706495 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28500706495 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28501066495 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28501066496 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28501066496 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28501066496 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28501066496 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28501066542 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28501067354 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28501067355 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28501067356 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28501067407 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28501067413 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28501067413 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28501067459 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28501067459 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28501427459 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28501427460 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28501427460 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28501427460 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28501427461 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28501427506 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28501428315 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28501428316 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28501428317 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28501428368 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28501428373 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28501428374 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28501428420 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28501428420 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28501788420 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28501788421 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28501788421 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28501788421 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28501788421 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28501788467 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28501789280 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28501789281 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28501789282 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28501789344 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28501789349 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Do a local copy of mimeMessage
28501789422 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28501789430 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox analzed mail===================================================
28501789430 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <title> GitLab </title> </head> <body> <style type="text/css"> img { max-width: 100%; height: auto; } </style> <div class="content"> <h3> Jacques Leroux pushed to branch STORE-561 at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a> </h3> <h4> Commits: </h4> <ul> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/a070b60eff7f799e128bd8f8416d162cf0c86e8d">a070b60e</a></strong> <div> <span>by Jacques Le Roux</span> <i>at 2017-02-07T08:02:03+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Fixes a bug in createServiceLoader implementation</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/f07352da5977d79e09153d392e47ca5bc1d6ff3b">f07352da</a></strong> <div> <span>by Jacques Le Roux</span> <i>at 2017-02-07T08:12:01+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Fixes a bug in meteo Removes now useless comments and such</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/79b111c4c78216ea933d29e272fc730f86a0f4d1">79b111c4</a></strong> <div> <span>by Jacques Le Roux</span> <i>at 2017-02-07T08:14:31+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Removes now useless comments and such</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/767c3d4dfbae4e0b7a4a24244a88e5eed130371c">767c3d4d</a></strong> <div> <span>by Jacques Le Roux</span> <i>at 2017-02-07T08:15:10+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Links to used images, for convenience</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/4b85bf8386835c4ad2739e094f0a8077ecb50bdd">4b85bf83</a></strong> <div> <span>by Jacques Le Roux</span> <i>at 2017-02-07T09:05:25+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Better places for meteo Seems that fail-widgets don't work in portlets Move error label to its place</pre> </li> </ul> <h4>7 changed files:</h4> <ul> <li class="file-stats"> <a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none"> hot-deploy/joblauncher/conceptionJobOFBiz.txt </a> </li> <li class="file-stats"> <a href="#ad29afc395839758d41094872298bd0d" style="text-decoration: none"> hot-deploy/joblauncher/config/JobLauncherErrorUiLabels.xml </a> </li> <li class="file-stats"> <a href="#c0b0bf6d71bc5fc7e6d50d69c8aa2413" style="text-decoration: none"> hot-deploy/joblauncher/config/JobLauncherUiLabels.xml </a> </li> <li class="file-stats"> <a href="#2ace16276b68c7d5aef163bb260bd9f7" style="text-decoration: none"> hot-deploy/joblauncher/minilang/JobLauncherServices.xml </a> </li> <li class="file-stats"> <a href="#4dfe7e78b540daa005ea4b5f0458c90d" style="text-decoration: none"> hot-deploy/joblauncher/widget/CommonScreens.xml </a> </li> <li class="file-stats"> <a href="#172f4bf093caeeba24730a1adff8f15a" style="text-decoration: none"> hot-deploy/joblauncher/widget/JobLauncherForms.xml </a> </li> <li class="file-stats"> <a href="#a453f91a0a4af7575917fad54f4ac1d0" style="text-decoration: none"> hot-deploy/joblauncher/widget/JobLauncherScreens.xml </a> </li> </ul> <h4>Changes:</h4> <li id="620f2ecad2bb6f74b2fcd0134963a841"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-0"> <strong> hot-deploy/joblauncher/conceptionJobOFBiz.txt </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/conceptionJobOFBiz.txt </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/conceptionJobOFBiz.txt </span><span style="color: #aaaaaa">@@ -81,3 +81,6 @@ Widget : </span> Questions: En cas d'erreurs/exceptions autres que celles dues au service lui même que faire? Pour l'instant pas de blocage... <span style="background: #ddffdd; color: #000000">+ +framework\images\webapp\images\neogia\ +framework\images\webapp\images\icons\famfamfam\ </span></code></pre> <br> </li> <li id="ad29afc395839758d41094872298bd0d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-1"> <strong> hot-deploy/joblauncher/config/JobLauncherErrorUiLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/config/JobLauncherErrorUiLabels.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/config/JobLauncherErrorUiLabels.xml </span><span style="color: #aaaaaa">@@ -9,6 +9,10 @@ </span> &lt;value xml:lang="en"&gt;This job launch request does not exist&lt;/value&gt; &lt;value xml:lang="fr"&gt;Cette demande de lancement d'un job pour ce service n'existe pas&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="JobLauncherMasterMissing"&gt; + &lt;value xml:lang="en"&gt;A job launch request is missing&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Une demande de lancement de job manque&lt;/value&gt; + &lt;/property&gt; </span> &lt;property key="JobLauncherNotAvailable"&gt; &lt;value xml:lang="en"&gt;This service is not available. Could be due to a planned deployment or a not yet resolved issue with the service.&lt;/value&gt; &lt;value xml:lang="fr"&gt;Ce service n'est pas disponible. Peut-être à cause d'un deploiement déjà planifié, ou un problème de ce service non encore résolu.&lt;/value&gt; <span style="color: #aaaaaa">@@ -18,7 +22,11 @@ </span> &lt;value xml:lang="fr"&gt;Ce service est en cours. Un seul lancement est permis&lt;/value&gt; &lt;/property&gt; &lt;property key="JobLauncherOnlyOneServiceAllowed"&gt; <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="en"&gt;A service of this kind already exists, nothing created&lt;/value&gt; - &lt;value xml:lang="fr"&gt;Un service de ce type existe déjà, rien de créé.&lt;/value&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="en"&gt;A launcher for this service already exists, nothing created&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Un lanceur pour ce service existe déjà, rien de créé.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="JobLauncherViewPermissionError"&gt; + &lt;value xml:lang="en"&gt;You are not allowed to view this page.&lt;/value&gt; + &lt;value xml:lang="zh"&gt;???????????&lt;/value&gt; </span> &lt;/property&gt; &lt;/resource&gt; \ No newline at end of file </code></pre> <br> </li> <li id="c0b0bf6d71bc5fc7e6d50d69c8aa2413"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-2"> <strong> hot-deploy/joblauncher/config/JobLauncherUiLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/config/JobLauncherUiLabels.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/config/JobLauncherUiLabels.xml </span><span style="color: #aaaaaa">@@ -14,10 +14,6 @@ </span> &lt;value xml:lang="it"&gt;Un modulo della famiglia di software open source Open For Business&lt;/value&gt; &lt;value xml:lang="zh"&gt;????OFBiz?????&lt;/value&gt; &lt;/property&gt; <span style="background: #ffdddd; color: #000000">- &lt;property key="JobLauncherViewPermissionError"&gt; - &lt;value xml:lang="en"&gt;You are not allowed to view this page.&lt;/value&gt; - &lt;value xml:lang="zh"&gt;???????????&lt;/value&gt; - &lt;/property&gt; </span> &lt;!-- Manual labels, alphabetically sorted --&gt; &lt;property key="JobLauncherEditServiceLoader"&gt; </code></pre> <br> </li> <li id="2ace16276b68c7d5aef163bb260bd9f7"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-3"> <strong> hot-deploy/joblauncher/minilang/JobLauncherServices.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/minilang/JobLauncherServices.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/minilang/JobLauncherServices.xml </span><span style="color: #aaaaaa">@@ -32,9 +32,9 @@ under the License. </span> serviceExists = dispatcher.getDispatchContext().serviceExists(serviceLoaderName) parameters.put("serviceExists", serviceExists?:null) &lt;/script&gt; <span style="background: #ffdddd; color: #000000">- &lt;!-- We don't want duplicated WE Masters, it's confusing... Not sure about the other params yet --&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;!-- We don't want duplicated WE Masters, it's confusing... Not sure about the other params yet, NIcolas suggested we could later use different estimatedSetupMillis (ie intervalle de sondage) --&gt; </span> &lt;entity-and list="masters" entity-name="WorkEffort"&gt; <span style="background: #ffdddd; color: #000000">- &lt;field-map field-name="serviceLoaderName"/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;field-map field-name="serviceLoaderName" from-field="parameters.serviceLoaderName"/&gt; </span> &lt;!-- &lt;field-map field-name="quantityToProduce"/&gt; &lt;field-map field-name="estimatedSetupMillis"/&gt; &lt;field-map field-name="sendNotificationEmail"/&gt; --&gt; </code></pre> <br> </li> <li id="4dfe7e78b540daa005ea4b5f0458c90d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-4"> <strong> hot-deploy/joblauncher/widget/CommonScreens.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/widget/CommonScreens.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/widget/CommonScreens.xml </span><span style="color: #aaaaaa">@@ -6,6 +6,7 @@ </span> &lt;section&gt; &lt;actions&gt; &lt;property-map resource="JobLauncherUiLabels" map-name="uiLabelMap" global="true"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property-map resource="JobLauncherErrorUiLabels" map-name="uiLabelMap" global="true"/&gt; </span> &lt;property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/&gt; &lt;set field="layoutSettings.companyName" from-field="uiLabelMap.JobLauncherCompanyName" global="true"/&gt; </code></pre> <br> </li> <li id="172f4bf093caeeba24730a1adff8f15a"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-5"> <strong> hot-deploy/joblauncher/widget/JobLauncherForms.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/widget/JobLauncherForms.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/widget/JobLauncherForms.xml </span><span style="color: #aaaaaa">@@ -106,10 +106,10 @@ </span> &lt;/actions&gt; &lt;!-- Normally only the 1st icons will be used. The idea is to not let the service fails too often. It's blocked when it fails and need an human intervention to be relaunched --&gt; &lt;field name="requestsHistory" title=" " use-when="${groovy: master.quantityProduced == 0 &amp;amp;&amp;amp; master.quantityRejected == 0}"&gt;&lt;display description="Nothing yet"/&gt;&lt;/field&gt; <span style="background: #ffdddd; color: #000000">- &lt;field name="requestsHistory" title=" " use-when="${groovy: weather &gt; 5}"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;field name="requestsHistory" title=" " use-when="${groovy: weather &gt; 5 || master.quantityRejected == 0}"&gt; </span> &lt;image value="/images/icons/famfamfam/weather_sun.png" alternate="Sun"/&gt; &lt;/field&gt; <span style="background: #ffdddd; color: #000000">- &lt;field name="requestsHistory" title=" " use-when="${groovy: weather &gt; 0 &amp;amp;&amp;amp; weather &amp;lt; 5}"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;field name="requestsHistory" title=" " use-when="${groovy: weather &gt; 0 &amp;amp;&amp;amp; weather &amp;lt; 5 &amp;amp;&amp;amp; master.quantityRejected != 0}"&gt; </span> &lt;image value="/images/icons/famfamfam/weather_cloudy.png" alternate="Cloudy"/&gt; &lt;/field&gt; &lt;field name="requestsHistory" title=" " use-when="${groovy: weather == 0 &amp;amp;&amp;amp; master.quantityProduced != 0 &amp;amp;&amp;amp; master.quantityRejected != 0}"&gt; <span style="color: #aaaaaa">@@ -129,7 +129,7 @@ </span> &lt;form name="FindLaunchRequests" type="single" target="FindLaunchRequests" title="" header-row-style="header-row" default-table-style="basic-table"&gt; &lt;alt-target use-when="test==null" target="FindFapiaoLaunchedJobs"/&gt; <span style="background: #ffdddd; color: #000000">- &lt;!-- &lt;field name="sequenceNum"&gt;&lt;text-find/&gt;&lt;/field&gt; --&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;!-- &lt;field name="sequenceNum"&gt;&lt;text-find/&gt;&lt;/field&gt; --&gt; &lt;!-- TODO to complete by using a sequenceNum in the WorkEffortAssoc to search--&gt; </span> &lt;field name="performSearch"&gt;&lt;hidden value="Y"/&gt;&lt;/field&gt; &lt;field name="noConditionFind"&gt;&lt;hidden value="Y"/&gt;&lt;!-- if this isn't there then with all fields empty no query will be done --&gt;&lt;/field&gt; &lt;!-- &lt;field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"&gt;&lt;submit button-type="button"/&gt;&lt;/field&gt; --&gt; <span style="color: #aaaaaa">@@ -138,7 +138,7 @@ </span> &lt;form name="ListLaunchRequests" type="list" use-row-submit="true" target="" title="" list-name="listIt" paginate-target="FindLaunchRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"&gt; &lt;actions&gt; <span style="background: #ffdddd; color: #000000">- &lt;set field="requestParams.workEffortIdFrom" from-field="workEffortId"/&gt;&lt;!-- Don't use requestParameters for now. Else it'll contains stuff from ListMasterJobs because of the include in DashBoard/main request --&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;set field="requestParams.workEffortIdFrom" from-field="workEffortId"/&gt; </span> &lt;service service-name="performFind" result-map="result" result-map-list="listIt"&gt; &lt;field-map field-name="inputFields" from-field="requestParams"/&gt; &lt;field-map field-name="entityName" value="WorkEffortMasterAndInstance"/&gt; <span style="color: #aaaaaa">@@ -158,8 +158,6 @@ </span> &lt;/entity-one&gt; &lt;/row-actions&gt; <span style="background: #ffdddd; color: #000000">- &lt;field name="currentStatusId" title="For test, to drop"&gt;&lt;display/&gt;&lt;/field&gt;&lt;!-- TODO To be removed, useful during test to choice the icons --&gt; - </span> &lt;!-- Because of OFBIZ-9200 we must use a different name than currentStatusId, not a problem here but globally weird --&gt; &lt;field name="currentStatus" title="${uiLabelMap.FormFieldTitle_currentStatusId}" use-when="${groovy:'JOB_MGMT_PENDING'.equals(currentStatusId)}"&gt; &lt;image value="/images/neogia/002_16.png" alternate="${statusItem.description}"/&gt; </code></pre> <br> </li> <li id="a453f91a0a4af7575917fad54f4ac1d0"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-6"> <strong> hot-deploy/joblauncher/widget/JobLauncherScreens.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/widget/JobLauncherScreens.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/widget/JobLauncherScreens.xml </span><span style="color: #aaaaaa">@@ -13,7 +13,7 @@ </span> &lt;include-screen name="DashBoard"/&gt; &lt;/decorator-section&gt; &lt;/decorator-screen&gt; <span style="background: #ffdddd; color: #000000">- &lt;include-screen name="ViewLaunchRequests"/&gt;&lt;!-- TODO Not its real place... WIP... --&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;include-screen name="ViewLaunchRequests"/&gt;&lt;!-- TODO Used for test... WIP... --&gt; </span> &lt;/widgets&gt; &lt;/section&gt; &lt;/screen&gt; <span style="color: #aaaaaa">@@ -21,7 +21,6 @@ </span> &lt;section&gt; &lt;actions&gt; &lt;set field="titleProperty" value="PageTitleScheduleJob"/&gt; <span style="background: #ffdddd; color: #000000">- &lt;!--set field="tabButtonItem" value="scheduleJob"/--&gt; </span> &lt;set field="scheduleServiceTarget" value="launchService"/&gt; &lt;set field="parameters.SERVICE_NAME" from-field="parameters.serviceLoaderName"/&gt; &lt;script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ScheduleJob.groovy"/&gt; <span style="color: #aaaaaa">@@ -161,39 +160,24 @@ </span> &lt;/section&gt; &lt;/screen&gt; <span style="background: #ffdddd; color: #000000">- &lt;screen name="ViewLaunchRequests"&gt;&lt;!-- this is supposed to be located in the screen from where the service will be called --&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;screen name="ViewLaunchRequests"&gt; </span> &lt;section&gt; &lt;actions&gt; <span style="background: #ffdddd; color: #000000">- -&lt;!-- TODO, to test, to drop --&gt; -&lt;set field="test" value="true"/&gt; - </span><span style="background: #ddffdd; color: #000000">+ &lt;set field="test" value="true"/&gt; </span> &lt;set field="workEffortId" from-field="parameters.workEffortId"/&gt; <span style="background: #ffdddd; color: #000000">- -&lt;!-- TODO workEffortId should be passed as parameter, default-value hardcoded for now for test convenience, to be dropped later... WIP... --&gt; -&lt;set field="workEffortId" from-field="parameters.workEffortId" default-value="17230" /&gt; - </span> &lt;entity-one value-field="master" entity-name="WorkEffort" /&gt; &lt;set field="viewIndex" from-field="parameters.VIEW_INDEX_1" type="Integer" default-value="0"/&gt; &lt;set field="viewSize" from-field="parameters.VIEW_SIZE_1" type="Integer" default-value="${master.quantityToProduce}"/&gt; <span style="background: #ffdddd; color: #000000">- </span> &lt;/actions&gt; &lt;widgets&gt; &lt;section&gt; &lt;widgets&gt; &lt;column-container&gt; &lt;column&gt; <span style="background: #ffdddd; color: #000000">- &lt;include-form name="ViewLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt; - -&lt;!-- TODO workEffortId should be passed as parameter, default-value hardcoded for now for test convenience, to be dropped later... WIP... --&gt; -&lt;label style="h3"&gt;* workEffortId hardcoded by default to ${workEffortId} to test. Pass the workEffortId parameters as a GET parameters else *&lt;/label&gt; - </span> &lt;screenlet title="${uiLabelMap.JobLauncherRequestsHistory}" collapsible="true" save-collapsed="true" name="ListLaunchRequests" navigation-form-name="ListLaunchRequests"&gt; <span style="background: #ffdddd; color: #000000">- -&lt;!-- &lt;include-form name="FindLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt; --&gt; &lt;!-- TODO to complete by using a sequenceNum in the WorkEffortAssoc to search--&gt; - </span> &lt;decorator-section name="search-options"&gt; <span style="background: #ddffdd; color: #000000">+ &lt;include-form name="ViewLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt; </span> &lt;include-form name="FindLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml"/&gt; &lt;/decorator-section&gt; &lt;decorator-section name="search-results"&gt; <span style="color: #aaaaaa">@@ -243,45 +227,37 @@ </span> &lt;screen name="FapiaoLaunchedJobs"&gt; &lt;section&gt; &lt;actions&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property-map resource="JobLauncherErrorUiLabels" map-name="uiLabelMap" global="true"/&gt; </span> &lt;property-map resource="JobLauncherUiLabels" map-name="uiLabelMap" global="true"/&gt; &lt;property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/&gt; &lt;set field="workEffortId" from-field="parameters.workEffortId"/&gt; <span style="background: #ffdddd; color: #000000">- -&lt;!-- TODO workEffortId should be passed as parameter, default-value hardcoded for now for test convenience, to be dropped later... WIP... --&gt; -&lt;set field="workEffortId" from-field="parameters.workEffortId" default-value="17230" /&gt; - </span> &lt;entity-one value-field="master" entity-name="WorkEffort" /&gt; &lt;set field="viewIndex" from-field="parameters.VIEW_INDEX_1" type="Integer" default-value="0"/&gt; &lt;set field="viewSize" from-field="parameters.VIEW_SIZE_1" type="Integer" default-value="${master.quantityToProduce}"/&gt; &lt;/actions&gt; &lt;widgets&gt; &lt;section&gt; <span style="background: #ddffdd; color: #000000">+ &lt;!-- &lt;condition&gt; + &lt;if-not-empty field="master"/&gt; + &lt;/condition&gt; --&gt; </span> &lt;widgets&gt; &lt;column-container&gt; &lt;column&gt; <span style="background: #ffdddd; color: #000000">- -&lt;!-- TODO workEffortId should be passed as parameter, default-value hardcoded for now for test convenience, to be dropped later... WIP... --&gt; -&lt;label style="h3"&gt;* workEffortId hardcoded by default to ${workEffortId} to test. Pass the workEffortId parameters as a GET parameters else *&lt;/label&gt; - - &lt;screenlet name="ListLaunchRequests" navigation-form-name="ListLaunchRequests"&gt; - -&lt;!-- &lt;include-form name="FindLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt; --&gt; &lt;!-- TODO to complete by using a sequenceNum in the WorkEffortAssoc to search--&gt; - - &lt;include-form name="ViewLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt; </span> &lt;decorator-section name="search-options"&gt; <span style="background: #ddffdd; color: #000000">+ &lt;include-form name="ViewLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt; </span> &lt;include-form name="FindLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml"/&gt; &lt;/decorator-section&gt; &lt;decorator-section name="search-results"&gt; &lt;include-form name="ListLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml"/&gt; &lt;/decorator-section&gt; <span style="background: #ffdddd; color: #000000">- &lt;/screenlet&gt; </span> &lt;/column&gt; &lt;/column-container&gt; &lt;/widgets&gt; <span style="background: #ddffdd; color: #000000">+ &lt;!-- &lt;fail-widgets&gt; + &lt;label style="h3"&gt;${uiLabelMap.JobLauncherMasterMissing}&lt;/label&gt; + &lt;/fail-widgets&gt; --&gt; </span> &lt;/section&gt; &lt;/widgets&gt; &lt;/section&gt; &lt;/screen&gt; <span style="background: #ffdddd; color: #000000">- - </span> &lt;/screens&gt; \ No newline at end of file </code></pre> <br> </li> </div> <div class="footer" style="margin-top: 10px"> <p style="color: #777; font-size: small"> ? <br> <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd">View it on GitLab</a>. <br> You're receiving this email because of your account on labs.nereide.fr. If you'd like to receive fewer emails, you can adjust your notification settings. </p> </div> </body> </html>
28501789434 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox ===============================================================
28501789435 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox message lines : 433
28501789435 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
28501789435 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <html lang="en">
28501789435 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <head>
28501789435 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
28501789436 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <title>
28501789436 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : GitLab
28501789436 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </title>
28501789436 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789436 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </head>
28501789436 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <body>
28501789437 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <style type="text/css">
28501789437 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : img {
28501789437 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : max-width: 100%; height: auto;
28501789437 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28501789437 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </style>
28501789437 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div class="content">
28501789438 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h3>
28501789438 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Jacques Leroux pushed to branch STORE-561
28501789438 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a>
28501789438 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </h3>
28501789438 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>
28501789438 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Commits:
28501789439 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </h4>
28501789439 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <ul>
28501789439 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28501789439 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/a070b60eff7f799e128bd8f8416d162cf0c86e8d">a070b60e</a></strong>
28501789439 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28501789439 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Jacques Le Roux</span>
28501789440 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-02-07T08:02:03+01:00</i>
28501789440 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28501789440 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Fixes a bug in createServiceLoader implementation</pre>
28501789440 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789440 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28501789440 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/f07352da5977d79e09153d392e47ca5bc1d6ff3b">f07352da</a></strong>
28501789441 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28501789441 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Jacques Le Roux</span>
28501789441 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-02-07T08:12:01+01:00</i>
28501789441 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28501789441 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Fixes a bug in meteo
28501789442 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Removes now useless comments and such</pre>
28501789442 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789442 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28501789442 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/79b111c4c78216ea933d29e272fc730f86a0f4d1">79b111c4</a></strong>
28501789442 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28501789442 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Jacques Le Roux</span>
28501789443 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-02-07T08:14:31+01:00</i>
28501789443 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28501789443 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Removes now useless comments and such</pre>
28501789443 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789443 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28501789443 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/767c3d4dfbae4e0b7a4a24244a88e5eed130371c">767c3d4d</a></strong>
28501789444 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28501789444 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Jacques Le Roux</span>
28501789444 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-02-07T08:15:10+01:00</i>
28501789444 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28501789444 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Links to used images, for convenience</pre>
28501789444 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789445 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28501789445 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/4b85bf8386835c4ad2739e094f0a8077ecb50bdd">4b85bf83</a></strong>
28501789445 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28501789445 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Jacques Le Roux</span>
28501789445 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-02-07T09:05:25+01:00</i>
28501789445 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28501789446 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Better places for meteo
28501789446 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Seems that fail-widgets don't work in portlets
28501789446 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Move error label to its place</pre>
28501789446 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789446 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </ul>
28501789446 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>7 changed files:</h4>
28501789447 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <ul>
28501789447 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28501789447 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none">
28501789448 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/conceptionJobOFBiz.txt
28501789448 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789448 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789448 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28501789449 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#ad29afc395839758d41094872298bd0d" style="text-decoration: none">
28501789449 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/config/JobLauncherErrorUiLabels.xml
28501789449 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789449 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789449 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28501789449 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#c0b0bf6d71bc5fc7e6d50d69c8aa2413" style="text-decoration: none">
28501789450 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/config/JobLauncherUiLabels.xml
28501789450 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789450 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789450 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28501789450 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#2ace16276b68c7d5aef163bb260bd9f7" style="text-decoration: none">
28501789450 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/minilang/JobLauncherServices.xml
28501789451 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789451 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789451 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28501789451 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#4dfe7e78b540daa005ea4b5f0458c90d" style="text-decoration: none">
28501789451 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/widget/CommonScreens.xml
28501789451 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789452 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789452 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28501789452 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#172f4bf093caeeba24730a1adff8f15a" style="text-decoration: none">
28501789452 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/widget/JobLauncherForms.xml
28501789452 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789452 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789453 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28501789453 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#a453f91a0a4af7575917fad54f4ac1d0" style="text-decoration: none">
28501789453 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/widget/JobLauncherScreens.xml
28501789453 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789453 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789453 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </ul>
28501789454 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>Changes:</h4>
28501789454 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="620f2ecad2bb6f74b2fcd0134963a841">
28501789454 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-0">
28501789454 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28501789454 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/conceptionJobOFBiz.txt
28501789454 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28501789455 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789455 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28501789455 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/conceptionJobOFBiz.txt
28501789455 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/conceptionJobOFBiz.txt
28501789455 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -81,3 +81,6 @@ Widget :
28501789456 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span>
28501789456 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Questions:
28501789456 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : En cas d'erreurs/exceptions autres que celles dues au service lui même que faire? Pour l'instant pas de blocage...
28501789456 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+
28501789456 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +framework\images\webapp\images\neogia\
28501789456 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +framework\images\webapp\images\icons\famfamfam\
28501789457 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span></code></pre>
28501789457 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789457 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789457 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789457 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="ad29afc395839758d41094872298bd0d">
28501789457 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-1">
28501789458 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28501789458 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/config/JobLauncherErrorUiLabels.xml
28501789458 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28501789458 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789458 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28501789458 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/config/JobLauncherErrorUiLabels.xml
28501789459 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/config/JobLauncherErrorUiLabels.xml
28501789459 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -9,6 +9,10 @@
28501789459 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;value xml:lang="en"&gt;This job launch request does not exist&lt;/value&gt;
28501789459 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;value xml:lang="fr"&gt;Cette demande de lancement d'un job pour ce service n'existe pas&lt;/value&gt;
28501789459 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/property&gt;
28501789459 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;property key="JobLauncherMasterMissing"&gt;
28501789460 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;value xml:lang="en"&gt;A job launch request is missing&lt;/value&gt;
28501789460 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;value xml:lang="fr"&gt;Une demande de lancement de job manque&lt;/value&gt;
28501789460 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/property&gt;
28501789460 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;property key="JobLauncherNotAvailable"&gt;
28501789460 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;value xml:lang="en"&gt;This service is not available. Could be due to a planned deployment or a not yet resolved issue with the service.&lt;/value&gt;
28501789461 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;value xml:lang="fr"&gt;Ce service n'est pas disponible. Peut-être à cause d'un deploiement déjà planifié, ou un problème de ce service non encore résolu.&lt;/value&gt;
28501789461 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -18,7 +22,11 @@
28501789461 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;value xml:lang="fr"&gt;Ce service est en cours. Un seul lancement est permis&lt;/value&gt;
28501789461 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/property&gt;
28501789461 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;property key="JobLauncherOnlyOneServiceAllowed"&gt;
28501789461 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="en"&gt;A service of this kind already exists, nothing created&lt;/value&gt;
28501789462 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : - &lt;value xml:lang="fr"&gt;Un service de ce type existe déjà, rien de créé.&lt;/value&gt;
28501789462 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="en"&gt;A launcher for this service already exists, nothing created&lt;/value&gt;
28501789462 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;value xml:lang="fr"&gt;Un lanceur pour ce service existe déjà, rien de créé.&lt;/value&gt;
28501789462 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/property&gt;
28501789462 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;property key="JobLauncherViewPermissionError"&gt;
28501789463 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;value xml:lang="en"&gt;You are not allowed to view this page.&lt;/value&gt;
28501789463 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;value xml:lang="zh"&gt;???????????&lt;/value&gt;
28501789463 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/property&gt;
28501789463 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/resource&gt;
28501789463 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : \ No newline at end of file
28501789463 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28501789464 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789464 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789464 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789464 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="c0b0bf6d71bc5fc7e6d50d69c8aa2413">
28501789464 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-2">
28501789464 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28501789465 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/config/JobLauncherUiLabels.xml
28501789465 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28501789465 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789465 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28501789465 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/config/JobLauncherUiLabels.xml
28501789465 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/config/JobLauncherUiLabels.xml
28501789466 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -14,10 +14,6 @@
28501789466 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;value xml:lang="it"&gt;Un modulo della famiglia di software open source Open For Business&lt;/value&gt;
28501789466 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;value xml:lang="zh"&gt;????OFBiz?????&lt;/value&gt;
28501789466 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/property&gt;
28501789466 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;property key="JobLauncherViewPermissionError"&gt;
28501789467 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : - &lt;value xml:lang="en"&gt;You are not allowed to view this page.&lt;/value&gt;
28501789467 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : - &lt;value xml:lang="zh"&gt;???????????&lt;/value&gt;
28501789467 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : - &lt;/property&gt;
28501789467 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span>
28501789467 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;!-- Manual labels, alphabetically sorted --&gt;
28501789467 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;property key="JobLauncherEditServiceLoader"&gt;
28501789468 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28501789468 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789468 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789468 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789468 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="2ace16276b68c7d5aef163bb260bd9f7">
28501789468 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-3">
28501789469 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28501789469 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/minilang/JobLauncherServices.xml
28501789469 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28501789469 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789469 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28501789469 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/minilang/JobLauncherServices.xml
28501789470 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/minilang/JobLauncherServices.xml
28501789470 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -32,9 +32,9 @@ under the License.
28501789470 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> serviceExists = dispatcher.getDispatchContext().serviceExists(serviceLoaderName)
28501789470 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : parameters.put("serviceExists", serviceExists?:null)
28501789470 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/script&gt;
28501789471 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;!-- We don't want duplicated WE Masters, it's confusing... Not sure about the other params yet --&gt;
28501789471 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;!-- We don't want duplicated WE Masters, it's confusing... Not sure about the other params yet, NIcolas suggested we could later use different estimatedSetupMillis (ie intervalle de sondage) --&gt;
28501789471 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;entity-and list="masters" entity-name="WorkEffort"&gt;
28501789471 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;field-map field-name="serviceLoaderName"/&gt;
28501789471 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;field-map field-name="serviceLoaderName" from-field="parameters.serviceLoaderName"/&gt;
28501789471 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;!-- &lt;field-map field-name="quantityToProduce"/&gt;
28501789472 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;field-map field-name="estimatedSetupMillis"/&gt;
28501789472 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;field-map field-name="sendNotificationEmail"/&gt; --&gt;
28501789472 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28501789472 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789472 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789473 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789473 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="4dfe7e78b540daa005ea4b5f0458c90d">
28501789473 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-4">
28501789473 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28501789473 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/widget/CommonScreens.xml
28501789473 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28501789474 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789474 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28501789474 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/widget/CommonScreens.xml
28501789474 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/widget/CommonScreens.xml
28501789474 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -6,6 +6,7 @@
28501789474 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;section&gt;
28501789475 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;actions&gt;
28501789475 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;property-map resource="JobLauncherUiLabels" map-name="uiLabelMap" global="true"/&gt;
28501789475 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;property-map resource="JobLauncherErrorUiLabels" map-name="uiLabelMap" global="true"/&gt;
28501789475 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/&gt;
28501789475 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789475 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;set field="layoutSettings.companyName" from-field="uiLabelMap.JobLauncherCompanyName" global="true"/&gt;
28501789476 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28501789476 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789476 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789476 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789476 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="172f4bf093caeeba24730a1adff8f15a">
28501789476 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-5">
28501789477 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28501789477 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/widget/JobLauncherForms.xml
28501789477 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28501789477 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789477 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28501789477 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/widget/JobLauncherForms.xml
28501789478 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/widget/JobLauncherForms.xml
28501789478 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -106,10 +106,10 @@
28501789478 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/actions&gt;
28501789478 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;!-- Normally only the 1st icons will be used. The idea is to not let the service fails too often. It's blocked when it fails and need an human intervention to be relaunched --&gt;
28501789478 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;field name="requestsHistory" title=" " use-when="${groovy: master.quantityProduced == 0 &amp;amp;&amp;amp; master.quantityRejected == 0}"&gt;&lt;display description="Nothing yet"/&gt;&lt;/field&gt;
28501789479 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;field name="requestsHistory" title=" " use-when="${groovy: weather &gt; 5}"&gt;
28501789479 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;field name="requestsHistory" title=" " use-when="${groovy: weather &gt; 5 || master.quantityRejected == 0}"&gt;
28501789479 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;image value="/images/icons/famfamfam/weather_sun.png" alternate="Sun"/&gt;
28501789479 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/field&gt;
28501789479 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;field name="requestsHistory" title=" " use-when="${groovy: weather &gt; 0 &amp;amp;&amp;amp; weather &amp;lt; 5}"&gt;
28501789480 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;field name="requestsHistory" title=" " use-when="${groovy: weather &gt; 0 &amp;amp;&amp;amp; weather &amp;lt; 5 &amp;amp;&amp;amp; master.quantityRejected != 0}"&gt;
28501789480 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;image value="/images/icons/famfamfam/weather_cloudy.png" alternate="Cloudy"/&gt;
28501789480 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/field&gt;
28501789480 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;field name="requestsHistory" title=" " use-when="${groovy: weather == 0 &amp;amp;&amp;amp; master.quantityProduced != 0 &amp;amp;&amp;amp; master.quantityRejected != 0}"&gt;
28501789480 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -129,7 +129,7 @@
28501789480 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span>
28501789481 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;form name="FindLaunchRequests" type="single" target="FindLaunchRequests" title="" header-row-style="header-row" default-table-style="basic-table"&gt;
28501789481 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;alt-target use-when="test==null" target="FindFapiaoLaunchedJobs"/&gt;
28501789481 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;!-- &lt;field name="sequenceNum"&gt;&lt;text-find/&gt;&lt;/field&gt; --&gt;
28501789481 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;!-- &lt;field name="sequenceNum"&gt;&lt;text-find/&gt;&lt;/field&gt; --&gt; &lt;!-- TODO to complete by using a sequenceNum in the WorkEffortAssoc to search--&gt;
28501789482 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;field name="performSearch"&gt;&lt;hidden value="Y"/&gt;&lt;/field&gt;
28501789482 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;field name="noConditionFind"&gt;&lt;hidden value="Y"/&gt;&lt;!-- if this isn't there then with all fields empty no query will be done --&gt;&lt;/field&gt;
28501789482 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;!-- &lt;field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"&gt;&lt;submit button-type="button"/&gt;&lt;/field&gt; --&gt;
28501789482 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -138,7 +138,7 @@
28501789483 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;form name="ListLaunchRequests" type="list" use-row-submit="true" target="" title="" list-name="listIt" paginate-target="FindLaunchRequests"
28501789483 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : odd-row-style="alternate-row" default-table-style="basic-table hover-bar"&gt;
28501789483 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;actions&gt;
28501789483 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;set field="requestParams.workEffortIdFrom" from-field="workEffortId"/&gt;&lt;!-- Don't use requestParameters for now. Else it'll contains stuff from ListMasterJobs because of the include in DashBoard/main request --&gt;
28501789484 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;set field="requestParams.workEffortIdFrom" from-field="workEffortId"/&gt;
28501789484 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;service service-name="performFind" result-map="result" result-map-list="listIt"&gt;
28501789484 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;field-map field-name="inputFields" from-field="requestParams"/&gt;
28501789484 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;field-map field-name="entityName" value="WorkEffortMasterAndInstance"/&gt;
28501789485 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -158,8 +158,6 @@
28501789485 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/entity-one&gt;
28501789485 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/row-actions&gt;
28501789485 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789485 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;field name="currentStatusId" title="For test, to drop"&gt;&lt;display/&gt;&lt;/field&gt;&lt;!-- TODO To be removed, useful during test to choice the icons --&gt;
28501789486 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789486 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;!-- Because of OFBIZ-9200 we must use a different name than currentStatusId, not a problem here but globally weird --&gt;
28501789486 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;field name="currentStatus" title="${uiLabelMap.FormFieldTitle_currentStatusId}" use-when="${groovy:'JOB_MGMT_PENDING'.equals(currentStatusId)}"&gt;
28501789486 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;image value="/images/neogia/002_16.png" alternate="${statusItem.description}"/&gt;
28501789486 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28501789486 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789487 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789487 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789487 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="a453f91a0a4af7575917fad54f4ac1d0">
28501789487 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd#diff-6">
28501789487 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28501789487 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/joblauncher/widget/JobLauncherScreens.xml
28501789488 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28501789488 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28501789488 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28501789488 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/joblauncher/widget/JobLauncherScreens.xml
28501789488 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/joblauncher/widget/JobLauncherScreens.xml
28501789489 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -13,7 +13,7 @@
28501789489 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;include-screen name="DashBoard"/&gt;
28501789489 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/decorator-section&gt;
28501789489 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/decorator-screen&gt;
28501789489 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;include-screen name="ViewLaunchRequests"/&gt;&lt;!-- TODO Not its real place... WIP... --&gt;
28501789489 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;include-screen name="ViewLaunchRequests"/&gt;&lt;!-- TODO Used for test... WIP... --&gt;
28501789490 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/widgets&gt;
28501789490 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/section&gt;
28501789490 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/screen&gt;
28501789490 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -21,7 +21,6 @@
28501789490 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;section&gt;
28501789490 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;actions&gt;
28501789491 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;set field="titleProperty" value="PageTitleScheduleJob"/&gt;
28501789491 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;!--set field="tabButtonItem" value="scheduleJob"/--&gt;
28501789491 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;set field="scheduleServiceTarget" value="launchService"/&gt;
28501789491 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;set field="parameters.SERVICE_NAME" from-field="parameters.serviceLoaderName"/&gt;
28501789491 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;script location="component://webtools/webapp/webtools/WEB-INF/actions/service/ScheduleJob.groovy"/&gt;
28501789491 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -161,39 +160,24 @@
28501789492 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/section&gt;
28501789492 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/screen&gt;
28501789492 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789492 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;screen name="ViewLaunchRequests"&gt;&lt;!-- this is supposed to be located in the screen from where the service will be called --&gt;
28501789492 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;screen name="ViewLaunchRequests"&gt;
28501789493 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;section&gt;
28501789493 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;actions&gt;
28501789493 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">-
28501789493 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;!-- TODO, to test, to drop --&gt;
28501789493 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;set field="test" value="true"/&gt;
28501789493 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789494 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ &lt;set field="test" value="true"/&gt;
28501789494 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;set field="workEffortId" from-field="parameters.workEffortId"/&gt;
28501789494 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">-
28501789494 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;!-- TODO workEffortId should be passed as parameter, default-value hardcoded for now for test convenience, to be dropped later... WIP... --&gt;
28501789494 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;set field="workEffortId" from-field="parameters.workEffortId" default-value="17230" /&gt;
28501789495 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789495 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;entity-one value-field="master" entity-name="WorkEffort" /&gt;
28501789495 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;set field="viewIndex" from-field="parameters.VIEW_INDEX_1" type="Integer" default-value="0"/&gt;
28501789495 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;set field="viewSize" from-field="parameters.VIEW_SIZE_1" type="Integer" default-value="${master.quantityToProduce}"/&gt;
28501789495 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">-
28501789495 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/actions&gt;
28501789496 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;widgets&gt;
28501789496 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;section&gt;
28501789496 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;widgets&gt;
28501789496 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;column-container&gt;
28501789496 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;column&gt;
28501789496 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;include-form name="ViewLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt;
28501789497 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789497 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;!-- TODO workEffortId should be passed as parameter, default-value hardcoded for now for test convenience, to be dropped later... WIP... --&gt;
28501789497 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;label style="h3"&gt;* workEffortId hardcoded by default to ${workEffortId} to test. Pass the workEffortId parameters as a GET parameters else *&lt;/label&gt;
28501789497 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789497 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;screenlet title="${uiLabelMap.JobLauncherRequestsHistory}" collapsible="true" save-collapsed="true" name="ListLaunchRequests"
28501789498 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : navigation-form-name="ListLaunchRequests"&gt;
28501789498 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">-
28501789498 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;!-- &lt;include-form name="FindLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt; --&gt; &lt;!-- TODO to complete by using a sequenceNum in the WorkEffortAssoc to search--&gt;
28501789498 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789498 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;decorator-section name="search-options"&gt;
28501789498 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;include-form name="ViewLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt;
28501789499 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;include-form name="FindLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml"/&gt;
28501789499 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/decorator-section&gt;
28501789499 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;decorator-section name="search-results"&gt;
28501789499 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -243,45 +227,37 @@
28501789499 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;screen name="FapiaoLaunchedJobs"&gt;
28501789500 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;section&gt;
28501789500 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;actions&gt;
28501789500 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;property-map resource="JobLauncherErrorUiLabels" map-name="uiLabelMap" global="true"/&gt;
28501789500 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;property-map resource="JobLauncherUiLabels" map-name="uiLabelMap" global="true"/&gt;
28501789500 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/&gt;
28501789501 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;set field="workEffortId" from-field="parameters.workEffortId"/&gt;
28501789501 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">-
28501789501 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;!-- TODO workEffortId should be passed as parameter, default-value hardcoded for now for test convenience, to be dropped later... WIP... --&gt;
28501789501 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;set field="workEffortId" from-field="parameters.workEffortId" default-value="17230" /&gt;
28501789501 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789501 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;entity-one value-field="master" entity-name="WorkEffort" /&gt;
28501789502 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;set field="viewIndex" from-field="parameters.VIEW_INDEX_1" type="Integer" default-value="0"/&gt;
28501789502 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;set field="viewSize" from-field="parameters.VIEW_SIZE_1" type="Integer" default-value="${master.quantityToProduce}"/&gt;
28501789502 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/actions&gt;
28501789502 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;widgets&gt;
28501789502 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;section&gt;
28501789502 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;!-- &lt;condition&gt;
28501789503 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;if-not-empty field="master"/&gt;
28501789503 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/condition&gt; --&gt;
28501789503 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;widgets&gt;
28501789503 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;column-container&gt;
28501789503 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;column&gt;
28501789503 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">-
28501789504 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;!-- TODO workEffortId should be passed as parameter, default-value hardcoded for now for test convenience, to be dropped later... WIP... --&gt;
28501789504 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;label style="h3"&gt;* workEffortId hardcoded by default to ${workEffortId} to test. Pass the workEffortId parameters as a GET parameters else *&lt;/label&gt;
28501789504 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789504 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : - &lt;screenlet name="ListLaunchRequests" navigation-form-name="ListLaunchRequests"&gt;
28501789504 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789505 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -&lt;!-- &lt;include-form name="FindLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt; --&gt; &lt;!-- TODO to complete by using a sequenceNum in the WorkEffortAssoc to search--&gt;
28501789505 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789505 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : - &lt;include-form name="ViewLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt;
28501789505 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;decorator-section name="search-options"&gt;
28501789505 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;include-form name="ViewLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml" /&gt;
28501789505 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;include-form name="FindLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml"/&gt;
28501789506 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/decorator-section&gt;
28501789506 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;decorator-section name="search-results"&gt;
28501789506 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;include-form name="ListLaunchRequests" location="component://joblauncher/widget/JobLauncherForms.xml"/&gt;
28501789506 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/decorator-section&gt;
28501789506 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- &lt;/screenlet&gt;
28501789507 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/column&gt;
28501789507 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/column-container&gt;
28501789507 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/widgets&gt;
28501789507 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;!-- &lt;fail-widgets&gt;
28501789507 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;label style="h3"&gt;${uiLabelMap.JobLauncherMasterMissing}&lt;/label&gt;
28501789507 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/fail-widgets&gt; --&gt;
28501789508 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/section&gt;
28501789508 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/widgets&gt;
28501789508 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/section&gt;
28501789508 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/screen&gt;
28501789508 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">-
28501789508 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : -
28501789509 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/screens&gt;
28501789509 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : \ No newline at end of file
28501789509 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28501789509 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789509 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789509 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28501789510 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789510 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28501789510 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div class="footer" style="margin-top: 10px">
28501789510 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <p style="color: #777; font-size: small">
28501789510 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : ?
28501789510 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789511 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/7fe9b887b9f4bae3f4e18b16e68541e703bc0389...4b85bf8386835c4ad2739e094f0a8077ecb50bdd">View it on GitLab</a>.
28501789511 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28501789511 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : You're receiving this email because of your account on labs.nereide.fr.
28501789511 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : If you'd like to receive fewer emails, you can
28501789511 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : adjust your notification settings.
28501789512 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28501789512 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </p>
28501789512 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28501789512 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </body>
28501789512 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </html>
28501789512 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Addon list[]
28501789563 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28501789564 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28502149564 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28502149564 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28502149564 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28502149565 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28502149565 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28502149610 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28502150424 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28502150425 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28502150425 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28502150473 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28502150479 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28502150479 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28502150524 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28502150525 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28502510525 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28502510526 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28502510526 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28502510526 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28502510526 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28502510572 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28502511411 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28502511412 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28502511412 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28502511473 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28502511478 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28502511478 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28502511525 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28502511525 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28502871525 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28502871526 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28502871526 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28502871526 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28502871526 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28502871572 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28502872390 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28502872391 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28502872392 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28502872449 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28502872454 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28502872454 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28502872505 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28502872506 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28503232506 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28503232506 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28503232507 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28503232507 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28503232507 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28503232553 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28503233365 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28503233366 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28503233366 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28503233675 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28503233681 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Do a local copy of mimeMessage
28503233744 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Do a local copy of mimeMessage
28503233779 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28503233785 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox analzed mail===================================================
28503233786 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <title> GitLab </title> </head> <body> <style type="text/css"> img { max-width: 100%; height: auto; } </style> <div class="content"> <h3> Nicolas Malin pushed to branch develop at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a> </h3> <h4> Commits: </h4> <ul> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/0ec11564d58ab9108cb06fc6fd6d9086e6230bf9">0ec11564</a></strong> <div> <span>by Leila</span> <i>at 2016-08-18T11:42:48+02:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Ajout champ comments en attendant les infos de RFID Prod</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/276d0b51956515cf014630ad732c718a0a0aee4e">276d0b51</a></strong> <div> <span>by Leila</span> <i>at 2016-08-18T16:29:41+02:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Maj du pdf de facture achat. Recuperation de l'orderNote lors de la creation de facture</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ceb9f34137ed6ef510c63c465b1339581340bc1d">ceb9f341</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-01-05T17:25:16+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">change the xml element from comments to Note like this &lt;oa:Note&gt;cde 4500071024 art 3012277&lt;/oa:Note&gt; (Partie ajoutée avec le commentaire saisi) --- &lt;oa:Note type="PriorityLevel"&gt;Normal&lt;/oa:Note&gt; (Partie envoyée par défaut lors d'un purchase)</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/68d038629e88677b3a29cf6ec44fbf4a52c049ed">68d03862</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-01-13T17:04:08+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Adapt the code to manage commentaire like this : * Avec commentaire : &lt;PurchaseOrderHeader&gt; &lt;ns:DocumentID&gt; &lt;ns:ID&gt;74231E1102&lt;/ns:ID&gt; &lt;/ns:DocumentID&gt; &lt;ns:Note&gt;Commentaire&lt;/ns:Note&gt; &lt;ns:Note type="PriorityLevel"&gt;Normal&lt;/ns:Note&gt; &lt;ns:Status&gt; &lt;ns:Description languageID="EN"&gt;Created&lt;/ns:Description&gt; &lt;/ns:Status&gt; &lt;ns:Party role="TechnicalParty"&gt; &lt;ns:PartyIDs&gt; * Sans commentaire : &lt;PurchaseOrderHeader&gt; &lt;ns:DocumentID&gt; &lt;ns:ID&gt;74231E1102&lt;/ns:ID&gt; &lt;/ns:DocumentID&gt; &lt;ns:Note type="PriorityLevel"&gt;Normal&lt;/ns:Note&gt; &lt;ns:Status&gt; &lt;ns:Description languageID="EN"&gt;Created&lt;/ns:Description&gt; &lt;/ns:Status&gt; &lt;ns:Party role="TechnicalParty"&gt; &lt;ns:PartyIDs&gt;</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/2764b8ce0f9d33467cbafba8bf5045ed828753c4">2764b8ce</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-01-13T17:11:54+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">remove unnecessary test</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/95ac90dbd2f5d900e9904d6b20fb5096f5fc8d5a">95ac90db</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-01-30T12:05:46+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">limit the comments size to 72 characters</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/0f96868f3965d8ecf6563cac086e041150f99a61">0f96868f</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-02-07T09:30:44+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-595' into 'develop' Store 595 See merge request !101</pre> </li> </ul> <h4>9 changed files:</h4> <ul> <li class="file-stats"> <a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none"> applications/accounting/entitydef/entitymodel.xml </a> </li> <li class="file-stats"> <a href="#ad29afc395839758d41094872298bd0d" style="text-decoration: none"> applications/accounting/servicedef/services_invoice.xml </a> </li> <li class="file-stats"> <a href="#c0b0bf6d71bc5fc7e6d50d69c8aa2413" style="text-decoration: none"> applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java </a> </li> <li class="file-stats"> <a href="#2ace16276b68c7d5aef163bb260bd9f7" style="text-decoration: none"> applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy </a> </li> <li class="file-stats"> <a href="#4dfe7e78b540daa005ea4b5f0458c90d" style="text-decoration: none"> applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl </a> </li> <li class="file-stats"> <a href="#172f4bf093caeeba24730a1adff8f15a" style="text-decoration: none"> applications/order/src/org/ofbiz/order/order/OrderReadHelper.java </a> </li> <li class="file-stats"> <a href="#a453f91a0a4af7575917fad54f4ac1d0" style="text-decoration: none"> hot-deploy/embisphere-portal/src/com/embisphere/portal/OrderOxylane.java </a> </li> <li class="file-stats"> <a href="#dffc348e63ffc0037c23afd36439222f" style="text-decoration: none"> hot-deploy/embisphere-portal/src/com/embisphere/portal/OxylanePortalService.java </a> </li> <li class="file-stats"> <a href="#f82b13d5e971dfa7a0cea839dd9d819c" style="text-decoration: none"> hot-deploy/embisphere/webapp/embisphere/WEB-INF/actions/invoice/EditInvoice.groovy </a> </li> </ul> <h4>Changes:</h4> <li id="620f2ecad2bb6f74b2fcd0134963a841"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-0"> <strong> applications/accounting/entitydef/entitymodel.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/entitydef/entitymodel.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/entitydef/entitymodel.xml </span><span style="color: #aaaaaa">@@ -1666,6 +1666,18 @@ under the License. </span> &lt;/relation&gt; &lt;/entity&gt; <span style="background: #ddffdd; color: #000000">+ &lt;view-entity entity-name="InvoiceAndNote" package-name="org.ofbiz.accounting.invoice" title="Invoice and related Note"&gt; + &lt;member-entity entity-alias="INV" entity-name="InvoiceNote"/&gt; + &lt;member-entity entity-alias="NDA" entity-name="NoteData"/&gt; + &lt;alias-all entity-alias="INV"/&gt; + &lt;alias-all entity-alias="NDA"&gt; + &lt;exclude field="noteId"/&gt; + &lt;/alias-all&gt; + &lt;view-link entity-alias="INV" rel-entity-alias="NDA"&gt; + &lt;key-map field-name="noteId"/&gt; + &lt;/view-link&gt; + &lt;/view-entity&gt; + </span> &lt;view-entity entity-name="InvoiceAndApplAndPayment" package-name="org.ofbiz.accounting.invoice" title="Invoice and related applications and payments"&gt; &lt;member-entity entity-alias="INV" entity-name="Invoice"/&gt; &lt;member-entity entity-alias="PAP" entity-name="PaymentApplication"/&gt; </code></pre> <br> </li> <li id="ad29afc395839758d41094872298bd0d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-1"> <strong> applications/accounting/servicedef/services_invoice.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/servicedef/services_invoice.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/servicedef/services_invoice.xml </span><span style="color: #aaaaaa">@@ -203,6 +203,21 @@ under the License. </span> &lt;auto-attributes mode="IN" include="pk" optional="false"/&gt; &lt;/service&gt; <span style="background: #ddffdd; color: #000000">+ &lt;service name="createInvoiceNote" engine="entity-auto" default-entity-name="InvoiceNote" invoke="create" auth="true"&gt; + &lt;description&gt;Create Invoice Note&lt;/description&gt; + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="pk" optional="false"/&gt; + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="nonpk" optional="true"/&gt; + &lt;/service&gt; + &lt;service name="updateInvoiceNote" engine="entity-auto" default-entity-name="InvoiceNote" invoke="update" auth="true"&gt; + &lt;description&gt;Update Invoice Note&lt;/description&gt; + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="pk" optional="false"/&gt; + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="nonpk" optional="true"/&gt; + &lt;/service&gt; + &lt;service name="deleteInvoiceNote" engine="entity-auto" default-entity-name="InvoiceNote" invoke="delete" auth="true"&gt; + &lt;description&gt;Delete Invoice Note&lt;/description&gt; + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="pk" optional="false"/&gt; + &lt;/service&gt; + </span> &lt;service name="createInvoiceRole" engine="simple" default-entity-name="InvoiceRole" location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="createInvoiceRole"&gt; &lt;description&gt;Create a new Invoice Role Record&lt;/description&gt; </code></pre> <br> </li> <li id="c0b0bf6d71bc5fc7e6d50d69c8aa2413"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-2"> <strong> applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java </span><span style="color: #aaaaaa">@@ -313,6 +313,10 @@ public class InvoiceServices { </span> List&lt;GenericValue&gt; orderTerms = orh.getOrderTerms(); createInvoiceTerms(delegator, dispatcher, invoiceId, orderTerms, userLogin, locale); <span style="background: #ddffdd; color: #000000">+ // order note to invoice note. + List&lt;GenericValue&gt; orderNotes = orh.getOrderHeaderNotes(false); + createInvoiceNotes(delegator, dispatcher, invoiceId, orderNotes, userLogin, locale); + </span> // billing accounts // List billingAccountTerms = null; // for billing accounts we will use related information <span style="color: #aaaaaa">@@ -3142,6 +3146,27 @@ public class InvoiceServices { </span> return adjAmount; } <span style="background: #ddffdd; color: #000000">+ /* Creates InvoiceNot entries for a list of notes*/ + private static void createInvoiceNotes(Delegator delegator, LocalDispatcher dispatcher, String invoiceId, List&lt;GenericValue&gt; notes, GenericValue userLogin, Locale locale) { + if (notes != null) { + for (GenericValue note : notes) { + Map&lt;String, Object&gt; createInvoiceNoteContext = FastMap.newInstance(); + createInvoiceNoteContext.put("userLogin", userLogin); + createInvoiceNoteContext.put("invoiceId", invoiceId); + createInvoiceNoteContext.put("noteId", note.get("noteId")); + Map&lt;String, Object&gt; createInvoiceNoteResult = null; + try { + createInvoiceNoteResult = dispatcher.runSync("createInvoiceNote", createInvoiceNoteContext); + } catch (GenericServiceException e) { + Debug.logError(e, "Service/other problem creating InvoiceNote from order header", module); + } + if (ServiceUtil.isError(createInvoiceNoteResult)) { + Debug.logError("Service/other problem creating InvoiceNote from order header", module); + } + } + } + } + </span> /* Creates InvoiceTerm entries for a list of terms, which can be BillingAccountTerms, OrderTerms, etc. */ private static void createInvoiceTerms(Delegator delegator, LocalDispatcher dispatcher, String invoiceId, List&lt;GenericValue&gt; terms, GenericValue userLogin, Locale locale) { if (terms != null) { </code></pre> <br> </li> <li id="2ace16276b68c7d5aef163bb260bd9f7"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-3"> <strong> applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy </span><span style="color: #aaaaaa">@@ -135,6 +135,9 @@ if (invoice) { </span> terms = invoice.getRelated("InvoiceTerm", null, null, false); context.terms = terms; <span style="background: #ddffdd; color: #000000">+ notes = delegator.findByAnd("InvoiceAndNote", [invoiceId : invoiceId], null, false); + context.notes = notes; + </span> paymentAppls = delegator.findByAnd("PaymentApplication", [invoiceId : invoiceId], null, false); context.payments = paymentAppls; </code></pre> <br> </li> <li id="4dfe7e78b540daa005ea4b5f0458c90d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-4"> <strong> applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl </span><span style="color: #aaaaaa">@@ -62,6 +62,31 @@ under the License. </span> &lt;/fo:table&gt; &lt;/#if&gt; <span style="background: #ddffdd; color: #000000">+ &lt;#-- list of notes --&gt; + &lt;#if notes?has_content&gt; + &lt;fo:table table-layout="fixed" width="100%" space-before="0.1in"&gt; + &lt;fo:table-column column-width="6.5in"/&gt; + + &lt;fo:table-header height="14px"&gt; + &lt;fo:table-row&gt; + &lt;fo:table-cell&gt; + &lt;fo:block font-weight="bold"&gt;${uiLabelMap.CommonComments}:&lt;/fo:block&gt; + &lt;/fo:table-cell&gt; + &lt;/fo:table-row&gt; + &lt;/fo:table-header&gt; + + &lt;fo:table-body&gt; + &lt;#list notes as note&gt; + &lt;fo:table-row&gt; + &lt;fo:table-cell&gt; + &lt;fo:block font-size ="10pt" font-weight="bold"&gt;${note.noteInfo!}&lt;/fo:block&gt; + &lt;/fo:table-cell&gt; + &lt;/fo:table-row&gt; + &lt;/#list&gt; + &lt;/fo:table-body&gt; + &lt;/fo:table&gt; + &lt;/#if&gt; + </span> &lt;fo:table table-layout="fixed" width="100%" space-before="0.2in"&gt; &lt;fo:table-column column-width="20mm"/&gt; &lt;fo:table-column column-width="85mm"/&gt; </code></pre> <br> </li> <li id="172f4bf093caeeba24730a1adff8f15a"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-5"> <strong> applications/order/src/org/ofbiz/order/order/OrderReadHelper.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java </span><span style="background: #ddffdd; color: #000000">+++ b/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java </span><span style="color: #aaaaaa">@@ -310,6 +310,30 @@ public class OrderReadHelper { </span> return orderPayments; } <span style="background: #ddffdd; color: #000000">+ public List&lt;GenericValue&gt; getOrderHeaderNotes() { + return getOrderHeaderNotes(null); + } + + public List&lt;GenericValue&gt; getOrderHeaderNotes(Boolean internalNote) { + Delegator delegator = orderHeader.getDelegator(); + String orderId = orderHeader.getString("orderId"); + Map&lt;String, Object&gt; findMap = UtilMisc.toMap("orderId", orderId); + if (UtilValidate.isNotEmpty(internalNote)) { + String internalNoteStr = "N"; + if (internalNote) { + internalNoteStr = "Y"; + } + findMap.put("internalNote", internalNoteStr); + } + List&lt;GenericValue&gt; notes = new ArrayList&lt;GenericValue&gt;(); + try { + notes = delegator.findByAnd("OrderHeaderNote", findMap, null, false); + } catch (GenericEntityException e) { + Debug.logError(e, module); + } + return notes; + } + </span> public List&lt;GenericValue&gt; getOrderStatuses() { if (orderStatuses == null) { try { </code></pre> <br> </li> <li id="a453f91a0a4af7575917fad54f4ac1d0"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-6"> <strong> hot-deploy/embisphere-portal/src/com/embisphere/portal/OrderOxylane.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-portal/src/com/embisphere/portal/OrderOxylane.java </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-portal/src/com/embisphere/portal/OrderOxylane.java </span><span style="color: #aaaaaa">@@ -40,6 +40,7 @@ public class OrderOxylane implements OrderInterface { </span> public static final String ORDER_PRIORITY = "OrderPriority"; public static final String ORDER_STATUS = "OrderStatus"; public static final String ORDER_DATE = "OrderDate"; <span style="background: #ddffdd; color: #000000">+ public static final String COMMENTS = "Note"; </span> public static final String CUSTOMER = "Customer"; public static final String SUPPLIER = "Supplier"; public static final String PARTY_NUMBER = "PartyId"; <span style="color: #aaaaaa">@@ -308,12 +309,14 @@ public class OrderOxylane implements OrderInterface { </span> result.put(ORDER_HEADER, UtilXml.elementValue(docId)); } } else if (e.getLocalName().equals("Note")) { <span style="background: #ffdddd; color: #000000">- // Note, type is given in attribute </span><span style="background: #ddffdd; color: #000000">+ // Note, type is given in attribute, if no attribute the note is a customer comment </span> String type = UtilXml.elementAttribute(e, "type", null); if (type != null) { if (type.equals("PriorityLevel")) { result.put(ORDER_PRIORITY, UtilXml.elementValue(e)); } <span style="background: #ddffdd; color: #000000">+ } else { + result.put(COMMENTS, UtilXml.elementValue(e)); </span> } } else if (e.getLocalName().equals("Status")) { // Status, defined with Description tags in various languages </code></pre> <br> </li> <li id="dffc348e63ffc0037c23afd36439222f"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-7"> <strong> hot-deploy/embisphere-portal/src/com/embisphere/portal/OxylanePortalService.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-portal/src/com/embisphere/portal/OxylanePortalService.java </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-portal/src/com/embisphere/portal/OxylanePortalService.java </span><span style="color: #aaaaaa">@@ -1121,6 +1121,12 @@ public class OxylanePortalService { </span> Debug.logWarning(e, module); cart.setOrderDate(UtilDateTime.nowTimestamp()); } <span style="background: #ddffdd; color: #000000">+ //set comment as public note + String comments = (String) parsedOrder.get(OrderOxylane.COMMENTS); + if (UtilValidate.isNotEmpty(comments)) { + cart.addOrderNote(comments); + } + </span> return cart; } } </code></pre> <br> </li> <li id="f82b13d5e971dfa7a0cea839dd9d819c"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-8"> <strong> hot-deploy/embisphere/webapp/embisphere/WEB-INF/actions/invoice/EditInvoice.groovy </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere/webapp/embisphere/WEB-INF/actions/invoice/EditInvoice.groovy </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere/webapp/embisphere/WEB-INF/actions/invoice/EditInvoice.groovy </span><span style="color: #aaaaaa">@@ -91,6 +91,7 @@ if (invoice) { </span> invoiceComments=StringUtil.wrapString(invoice.invoiceMessage); if (UtilValidate.isNotEmpty(invoiceComments) || UtilValidate.isNotEmpty(orderComments)) { context.comments = (orderComments?orderComments:"") + " " + (invoiceComments?invoiceComments:""); <span style="background: #ddffdd; color: #000000">+ if (context.comments.size() &gt; 75) context.comments = context.comments.substring(0,72) + "..."; </span> } supplier = delegator.findOne("PartyGroup", [partyId: supplierPartyId], true); </code></pre> <br> </li> </div> <div class="footer" style="margin-top: 10px"> <p style="color: #777; font-size: small"> ? <br> <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61">View it on GitLab</a>. <br> You're receiving this email because of your account on labs.nereide.fr. If you'd like to receive fewer emails, you can adjust your notification settings. </p> </div> </body> </html>
28503233789 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox ===============================================================
28503233790 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox message lines : 497
28503233790 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
28503233790 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <html lang="en">
28503233790 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <head>
28503233791 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
28503233791 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <title>
28503233791 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : GitLab
28503233791 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </title>
28503233791 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233791 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </head>
28503233792 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <body>
28503233792 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <style type="text/css">
28503233792 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : img {
28503233792 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : max-width: 100%; height: auto;
28503233792 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233793 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </style>
28503233793 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div class="content">
28503233793 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h3>
28503233793 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Nicolas Malin pushed to branch develop
28503233793 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a>
28503233793 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </h3>
28503233793 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>
28503233794 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Commits:
28503233794 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </h4>
28503233794 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <ul>
28503233794 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28503233794 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/0ec11564d58ab9108cb06fc6fd6d9086e6230bf9">0ec11564</a></strong>
28503233795 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28503233795 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Leila</span>
28503233795 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2016-08-18T11:42:48+02:00</i>
28503233795 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233795 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Ajout champ comments en attendant les infos de RFID Prod</pre>
28503233795 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233796 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28503233796 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/276d0b51956515cf014630ad732c718a0a0aee4e">276d0b51</a></strong>
28503233796 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28503233796 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Leila</span>
28503233796 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2016-08-18T16:29:41+02:00</i>
28503233796 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233797 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Maj du pdf de facture achat. Recuperation de l'orderNote lors de la creation de facture</pre>
28503233797 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233797 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28503233797 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ceb9f34137ed6ef510c63c465b1339581340bc1d">ceb9f341</a></strong>
28503233797 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28503233797 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Nicolas Malin</span>
28503233798 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-01-05T17:25:16+01:00</i>
28503233798 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233798 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">change the xml element from comments to Note
28503233798 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : like this
28503233798 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;oa:Note&gt;cde 4500071024 art 3012277&lt;/oa:Note&gt; (Partie ajoutée avec le commentaire saisi)
28503233798 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : ---
28503233799 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;oa:Note type="PriorityLevel"&gt;Normal&lt;/oa:Note&gt; (Partie envoyée par défaut lors d'un purchase)</pre>
28503233799 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233799 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28503233799 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/68d038629e88677b3a29cf6ec44fbf4a52c049ed">68d03862</a></strong>
28503233799 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28503233799 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Nicolas Malin</span>
28503233800 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-01-13T17:04:08+01:00</i>
28503233800 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233800 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Adapt the code to manage commentaire like this :
28503233800 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233800 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : * Avec commentaire :
28503233801 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233801 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;PurchaseOrderHeader&gt;
28503233801 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:DocumentID&gt;
28503233801 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:ID&gt;74231E1102&lt;/ns:ID&gt;
28503233801 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/ns:DocumentID&gt;
28503233801 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Note&gt;Commentaire&lt;/ns:Note&gt;
28503233802 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Note type="PriorityLevel"&gt;Normal&lt;/ns:Note&gt;
28503233802 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Status&gt;
28503233802 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Description languageID="EN"&gt;Created&lt;/ns:Description&gt;
28503233802 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/ns:Status&gt;
28503233802 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Party role="TechnicalParty"&gt;
28503233802 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:PartyIDs&gt;
28503233803 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233803 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : * Sans commentaire :
28503233803 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;PurchaseOrderHeader&gt;
28503233803 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:DocumentID&gt;
28503233803 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:ID&gt;74231E1102&lt;/ns:ID&gt;
28503233803 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/ns:DocumentID&gt;
28503233804 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Note type="PriorityLevel"&gt;Normal&lt;/ns:Note&gt;
28503233804 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Status&gt;
28503233804 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Description languageID="EN"&gt;Created&lt;/ns:Description&gt;
28503233804 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/ns:Status&gt;
28503233804 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:Party role="TechnicalParty"&gt;
28503233804 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;ns:PartyIDs&gt;</pre>
28503233805 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233805 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28503233805 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/2764b8ce0f9d33467cbafba8bf5045ed828753c4">2764b8ce</a></strong>
28503233805 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28503233805 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Nicolas Malin</span>
28503233806 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-01-13T17:11:54+01:00</i>
28503233806 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233806 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">remove unnecessary test</pre>
28503233806 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233806 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28503233806 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/95ac90dbd2f5d900e9904d6b20fb5096f5fc8d5a">95ac90db</a></strong>
28503233806 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28503233807 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Nicolas Malin</span>
28503233807 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-01-30T12:05:46+01:00</i>
28503233807 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233807 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">limit the comments size to 72 characters</pre>
28503233807 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233807 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28503233808 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/0f96868f3965d8ecf6563cac086e041150f99a61">0f96868f</a></strong>
28503233808 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28503233808 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Nicolas Malin</span>
28503233808 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-02-07T09:30:44+01:00</i>
28503233808 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233809 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-595' into 'develop'
28503233809 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233809 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Store 595
28503233809 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233809 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233809 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233810 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : See merge request !101</pre>
28503233810 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233810 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </ul>
28503233810 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>9 changed files:</h4>
28503233810 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <ul>
28503233810 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233811 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none">
28503233811 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/entitydef/entitymodel.xml
28503233811 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233811 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233811 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233811 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#ad29afc395839758d41094872298bd0d" style="text-decoration: none">
28503233812 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/servicedef/services_invoice.xml
28503233812 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233812 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233812 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233812 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#c0b0bf6d71bc5fc7e6d50d69c8aa2413" style="text-decoration: none">
28503233812 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
28503233813 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233813 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233813 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233813 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#2ace16276b68c7d5aef163bb260bd9f7" style="text-decoration: none">
28503233813 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
28503233813 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233814 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233814 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233814 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#4dfe7e78b540daa005ea4b5f0458c90d" style="text-decoration: none">
28503233814 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl
28503233814 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233814 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233815 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233815 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#172f4bf093caeeba24730a1adff8f15a" style="text-decoration: none">
28503233815 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
28503233815 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233815 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233815 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233816 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#a453f91a0a4af7575917fad54f4ac1d0" style="text-decoration: none">
28503233816 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/embisphere-portal/src/com/embisphere/portal/OrderOxylane.java
28503233816 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233816 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233816 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233817 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#dffc348e63ffc0037c23afd36439222f" style="text-decoration: none">
28503233817 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/embisphere-portal/src/com/embisphere/portal/OxylanePortalService.java
28503233817 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233817 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233817 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28503233817 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#f82b13d5e971dfa7a0cea839dd9d819c" style="text-decoration: none">
28503233818 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/embisphere/webapp/embisphere/WEB-INF/actions/invoice/EditInvoice.groovy
28503233818 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233818 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233818 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </ul>
28503233818 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>Changes:</h4>
28503233818 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="620f2ecad2bb6f74b2fcd0134963a841">
28503233819 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-0">
28503233819 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233819 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/entitydef/entitymodel.xml
28503233819 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233819 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233819 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233820 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/entitydef/entitymodel.xml
28503233820 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/entitydef/entitymodel.xml
28503233820 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -1666,6 +1666,18 @@ under the License.
28503233820 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/relation&gt;
28503233820 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/entity&gt;
28503233821 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233821 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;view-entity entity-name="InvoiceAndNote" package-name="org.ofbiz.accounting.invoice" title="Invoice and related Note"&gt;
28503233821 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;member-entity entity-alias="INV" entity-name="InvoiceNote"/&gt;
28503233821 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;member-entity entity-alias="NDA" entity-name="NoteData"/&gt;
28503233821 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;alias-all entity-alias="INV"/&gt;
28503233821 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;alias-all entity-alias="NDA"&gt;
28503233822 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;exclude field="noteId"/&gt;
28503233822 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/alias-all&gt;
28503233822 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;view-link entity-alias="INV" rel-entity-alias="NDA"&gt;
28503233822 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;key-map field-name="noteId"/&gt;
28503233822 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/view-link&gt;
28503233822 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/view-entity&gt;
28503233823 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233823 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;view-entity entity-name="InvoiceAndApplAndPayment" package-name="org.ofbiz.accounting.invoice" title="Invoice and related applications and payments"&gt;
28503233823 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;member-entity entity-alias="INV" entity-name="Invoice"/&gt;
28503233823 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;member-entity entity-alias="PAP" entity-name="PaymentApplication"/&gt;
28503233823 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233824 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233824 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233824 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233824 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="ad29afc395839758d41094872298bd0d">
28503233824 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-1">
28503233824 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233825 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/servicedef/services_invoice.xml
28503233825 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233825 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233825 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233825 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/servicedef/services_invoice.xml
28503233825 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/servicedef/services_invoice.xml
28503233826 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -203,6 +203,21 @@ under the License.
28503233826 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;auto-attributes mode="IN" include="pk" optional="false"/&gt;
28503233826 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/service&gt;
28503233826 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233826 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;service name="createInvoiceNote" engine="entity-auto" default-entity-name="InvoiceNote" invoke="create" auth="true"&gt;
28503233826 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;description&gt;Create Invoice Note&lt;/description&gt;
28503233827 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="pk" optional="false"/&gt;
28503233827 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="nonpk" optional="true"/&gt;
28503233827 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/service&gt;
28503233827 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;service name="updateInvoiceNote" engine="entity-auto" default-entity-name="InvoiceNote" invoke="update" auth="true"&gt;
28503233827 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;description&gt;Update Invoice Note&lt;/description&gt;
28503233828 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="pk" optional="false"/&gt;
28503233828 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="nonpk" optional="true"/&gt;
28503233828 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/service&gt;
28503233828 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;service name="deleteInvoiceNote" engine="entity-auto" default-entity-name="InvoiceNote" invoke="delete" auth="true"&gt;
28503233828 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;description&gt;Delete Invoice Note&lt;/description&gt;
28503233828 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;auto-attributes mode="IN" entity-name="InvoiceNote" include="pk" optional="false"/&gt;
28503233829 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/service&gt;
28503233829 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233829 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;service name="createInvoiceRole" engine="simple" default-entity-name="InvoiceRole"
28503233829 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="createInvoiceRole"&gt;
28503233829 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;description&gt;Create a new Invoice Role Record&lt;/description&gt;
28503233830 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233830 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233830 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233830 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233830 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="c0b0bf6d71bc5fc7e6d50d69c8aa2413">
28503233830 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-2">
28503233831 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233831 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
28503233831 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233831 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233831 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233831 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
28503233832 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
28503233832 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -313,6 +313,10 @@ public class InvoiceServices {
28503233832 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> List&lt;GenericValue&gt; orderTerms = orh.getOrderTerms();
28503233832 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : createInvoiceTerms(delegator, dispatcher, invoiceId, orderTerms, userLogin, locale);
28503233832 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233833 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ // order note to invoice note.
28503233833 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + List&lt;GenericValue&gt; orderNotes = orh.getOrderHeaderNotes(false);
28503233833 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + createInvoiceNotes(delegator, dispatcher, invoiceId, orderNotes, userLogin, locale);
28503233833 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233833 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> // billing accounts
28503233833 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : // List billingAccountTerms = null;
28503233834 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : // for billing accounts we will use related information
28503233834 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -3142,6 +3146,27 @@ public class InvoiceServices {
28503233834 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> return adjAmount;
28503233834 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233834 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233834 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ /* Creates InvoiceNot entries for a list of notes*/
28503233835 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + private static void createInvoiceNotes(Delegator delegator, LocalDispatcher dispatcher, String invoiceId, List&lt;GenericValue&gt; notes, GenericValue userLogin, Locale locale) {
28503233835 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + if (notes != null) {
28503233835 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + for (GenericValue note : notes) {
28503233835 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + Map&lt;String, Object&gt; createInvoiceNoteContext = FastMap.newInstance();
28503233835 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + createInvoiceNoteContext.put("userLogin", userLogin);
28503233835 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + createInvoiceNoteContext.put("invoiceId", invoiceId);
28503233836 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + createInvoiceNoteContext.put("noteId", note.get("noteId"));
28503233836 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + Map&lt;String, Object&gt; createInvoiceNoteResult = null;
28503233836 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + try {
28503233836 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + createInvoiceNoteResult = dispatcher.runSync("createInvoiceNote", createInvoiceNoteContext);
28503233836 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + } catch (GenericServiceException e) {
28503233837 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + Debug.logError(e, "Service/other problem creating InvoiceNote from order header", module);
28503233837 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233837 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + if (ServiceUtil.isError(createInvoiceNoteResult)) {
28503233837 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + Debug.logError("Service/other problem creating InvoiceNote from order header", module);
28503233837 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233837 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233838 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233838 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233838 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233838 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> /* Creates InvoiceTerm entries for a list of terms, which can be BillingAccountTerms, OrderTerms, etc. */
28503233838 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : private static void createInvoiceTerms(Delegator delegator, LocalDispatcher dispatcher, String invoiceId, List&lt;GenericValue&gt; terms, GenericValue userLogin, Locale locale) {
28503233838 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : if (terms != null) {
28503233839 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233839 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233839 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233839 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233839 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="2ace16276b68c7d5aef163bb260bd9f7">
28503233839 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-3">
28503233840 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233840 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
28503233840 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233840 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233840 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233841 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
28503233841 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy
28503233841 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -135,6 +135,9 @@ if (invoice) {
28503233841 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> terms = invoice.getRelated("InvoiceTerm", null, null, false);
28503233841 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : context.terms = terms;
28503233842 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233842 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ notes = delegator.findByAnd("InvoiceAndNote", [invoiceId : invoiceId], null, false);
28503233842 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + context.notes = notes;
28503233842 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233842 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> paymentAppls = delegator.findByAnd("PaymentApplication", [invoiceId : invoiceId], null, false);
28503233842 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : context.payments = paymentAppls;
28503233843 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233843 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233843 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233843 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233843 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233843 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="4dfe7e78b540daa005ea4b5f0458c90d">
28503233844 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-4">
28503233844 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233844 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl
28503233844 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233844 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233844 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233845 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl
28503233845 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl
28503233845 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -62,6 +62,31 @@ under the License.
28503233845 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;/fo:table&gt;
28503233845 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;/#if&gt;
28503233846 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233846 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ &lt;#-- list of notes --&gt;
28503233846 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;#if notes?has_content&gt;
28503233846 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:table table-layout="fixed" width="100%" space-before="0.1in"&gt;
28503233846 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:table-column column-width="6.5in"/&gt;
28503233846 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233847 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:table-header height="14px"&gt;
28503233847 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:table-row&gt;
28503233847 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:table-cell&gt;
28503233847 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:block font-weight="bold"&gt;${uiLabelMap.CommonComments}:&lt;/fo:block&gt;
28503233847 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/fo:table-cell&gt;
28503233847 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/fo:table-row&gt;
28503233848 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/fo:table-header&gt;
28503233848 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233848 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:table-body&gt;
28503233848 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;#list notes as note&gt;
28503233848 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:table-row&gt;
28503233848 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:table-cell&gt;
28503233849 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;fo:block font-size ="10pt" font-weight="bold"&gt;${note.noteInfo!}&lt;/fo:block&gt;
28503233849 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/fo:table-cell&gt;
28503233849 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/fo:table-row&gt;
28503233849 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/#list&gt;
28503233849 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/fo:table-body&gt;
28503233849 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/fo:table&gt;
28503233850 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + &lt;/#if&gt;
28503233850 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233850 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> &lt;fo:table table-layout="fixed" width="100%" space-before="0.2in"&gt;
28503233850 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;fo:table-column column-width="20mm"/&gt;
28503233850 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : &lt;fo:table-column column-width="85mm"/&gt;
28503233851 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233851 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233851 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233851 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233851 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="172f4bf093caeeba24730a1adff8f15a">
28503233851 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-5">
28503233852 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233852 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
28503233852 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233852 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233852 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233852 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
28503233853 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
28503233853 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -310,6 +310,30 @@ public class OrderReadHelper {
28503233853 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> return orderPayments;
28503233853 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233853 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233853 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ public List&lt;GenericValue&gt; getOrderHeaderNotes() {
28503233854 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + return getOrderHeaderNotes(null);
28503233854 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233854 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233854 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + public List&lt;GenericValue&gt; getOrderHeaderNotes(Boolean internalNote) {
28503233854 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + Delegator delegator = orderHeader.getDelegator();
28503233854 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + String orderId = orderHeader.getString("orderId");
28503233855 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + Map&lt;String, Object&gt; findMap = UtilMisc.toMap("orderId", orderId);
28503233855 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + if (UtilValidate.isNotEmpty(internalNote)) {
28503233855 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + String internalNoteStr = "N";
28503233855 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + if (internalNote) {
28503233855 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + internalNoteStr = "Y";
28503233855 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233856 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + findMap.put("internalNote", internalNoteStr);
28503233856 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233856 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + List&lt;GenericValue&gt; notes = new ArrayList&lt;GenericValue&gt;();
28503233856 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + try {
28503233856 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + notes = delegator.findByAnd("OrderHeaderNote", findMap, null, false);
28503233857 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + } catch (GenericEntityException e) {
28503233857 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + Debug.logError(e, module);
28503233857 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233857 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + return notes;
28503233857 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233857 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233858 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> public List&lt;GenericValue&gt; getOrderStatuses() {
28503233858 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : if (orderStatuses == null) {
28503233858 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : try {
28503233858 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233858 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233858 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233859 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233859 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="a453f91a0a4af7575917fad54f4ac1d0">
28503233859 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-6">
28503233859 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233859 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/embisphere-portal/src/com/embisphere/portal/OrderOxylane.java
28503233859 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233860 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233860 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233860 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-portal/src/com/embisphere/portal/OrderOxylane.java
28503233860 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-portal/src/com/embisphere/portal/OrderOxylane.java
28503233860 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -40,6 +40,7 @@ public class OrderOxylane implements OrderInterface {
28503233861 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> public static final String ORDER_PRIORITY = "OrderPriority";
28503233861 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : public static final String ORDER_STATUS = "OrderStatus";
28503233861 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : public static final String ORDER_DATE = "OrderDate";
28503233861 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ public static final String COMMENTS = "Note";
28503233861 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> public static final String CUSTOMER = "Customer";
28503233861 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : public static final String SUPPLIER = "Supplier";
28503233862 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : public static final String PARTY_NUMBER = "PartyId";
28503233862 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="color: #aaaaaa">@@ -308,12 +309,14 @@ public class OrderOxylane implements OrderInterface {
28503233862 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> result.put(ORDER_HEADER, UtilXml.elementValue(docId));
28503233862 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233862 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : } else if (e.getLocalName().equals("Note")) {
28503233863 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ffdddd; color: #000000">- // Note, type is given in attribute
28503233863 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+ // Note, type is given in attribute, if no attribute the note is a customer comment
28503233863 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> String type = UtilXml.elementAttribute(e, "type", null);
28503233863 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : if (type != null) {
28503233863 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : if (type.equals("PriorityLevel")) {
28503233863 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : result.put(ORDER_PRIORITY, UtilXml.elementValue(e));
28503233864 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233864 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ } else {
28503233864 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + result.put(COMMENTS, UtilXml.elementValue(e));
28503233864 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> }
28503233864 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : } else if (e.getLocalName().equals("Status")) {
28503233864 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : // Status, defined with Description tags in various languages
28503233865 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233865 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233865 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233865 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233865 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="dffc348e63ffc0037c23afd36439222f">
28503233865 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-7">
28503233866 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233866 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/embisphere-portal/src/com/embisphere/portal/OxylanePortalService.java
28503233866 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233866 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233866 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233866 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-portal/src/com/embisphere/portal/OxylanePortalService.java
28503233867 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-portal/src/com/embisphere/portal/OxylanePortalService.java
28503233867 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -1121,6 +1121,12 @@ public class OxylanePortalService {
28503233867 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> Debug.logWarning(e, module);
28503233867 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : cart.setOrderDate(UtilDateTime.nowTimestamp());
28503233867 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233868 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ //set comment as public note
28503233868 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + String comments = (String) parsedOrder.get(OrderOxylane.COMMENTS);
28503233868 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + if (UtilValidate.isNotEmpty(comments)) {
28503233868 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + cart.addOrderNote(comments);
28503233868 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : + }
28503233868 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : +
28503233869 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> return cart;
28503233869 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233869 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233869 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233869 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233869 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233870 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233870 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="f82b13d5e971dfa7a0cea839dd9d819c">
28503233870 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61#diff-8">
28503233870 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28503233870 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : hot-deploy/embisphere/webapp/embisphere/WEB-INF/actions/invoice/EditInvoice.groovy
28503233870 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28503233871 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28503233871 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28503233871 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere/webapp/embisphere/WEB-INF/actions/invoice/EditInvoice.groovy
28503233871 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere/webapp/embisphere/WEB-INF/actions/invoice/EditInvoice.groovy
28503233871 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -91,6 +91,7 @@ if (invoice) {
28503233872 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> invoiceComments=StringUtil.wrapString(invoice.invoiceMessage);
28503233872 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : if (UtilValidate.isNotEmpty(invoiceComments) || UtilValidate.isNotEmpty(orderComments)) {
28503233872 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : context.comments = (orderComments?orderComments:"") + " " + (invoiceComments?invoiceComments:"");
28503233872 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+ if (context.comments.size() &gt; 75) context.comments = context.comments.substring(0,72) + "...";
28503233872 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> }
28503233872 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233873 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : supplier = delegator.findOne("PartyGroup", [partyId: supplierPartyId], true);
28503233873 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </code></pre>
28503233873 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233873 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233873 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28503233873 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233874 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233874 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div class="footer" style="margin-top: 10px">
28503233874 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <p style="color: #777; font-size: small">
28503233874 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : ?
28503233874 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233874 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/compare/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c...0f96868f3965d8ecf6563cac086e041150f99a61">View it on GitLab</a>.
28503233875 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233875 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : You're receiving this email because of your account on labs.nereide.fr.
28503233875 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : If you'd like to receive fewer emails, you can
28503233875 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : adjust your notification settings.
28503233875 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233875 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </p>
28503233876 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233876 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </body>
28503233876 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </html>
28503233876 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Addon list[]
28503233878 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox analzed mail===================================================
28503233878 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <title> GitLab </title> </head> <body> <style type="text/css"> img { max-width: 100%; height: auto; } </style> <div class="content"> <h3> Nicolas Malin deleted branch STORE-595 at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a> </h3> </div> <div class="footer" style="margin-top: 10px"> <p style="color: #777; font-size: small"> ? <br> </p> </div> </body> </html>
28503233879 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox ===============================================================
28503233879 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox message lines : 30
28503233879 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
28503233879 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <html lang="en">
28503233879 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <head>
28503233879 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
28503233880 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <title>
28503233880 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : GitLab
28503233880 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </title>
28503233880 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233880 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </head>
28503233881 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <body>
28503233881 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <style type="text/css">
28503233881 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : img {
28503233881 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : max-width: 100%; height: auto;
28503233881 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28503233881 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </style>
28503233882 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div class="content">
28503233882 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h3>
28503233882 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Nicolas Malin deleted branch STORE-595
28503233882 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a>
28503233882 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </h3>
28503233882 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28503233883 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233883 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div class="footer" style="margin-top: 10px">
28503233883 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <p style="color: #777; font-size: small">
28503233883 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : ?
28503233883 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28503233883 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </p>
28503233884 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28503233884 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </body>
28503233884 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </html>
28503233884 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Addon list[]
28503233971 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28503233972 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28503593972 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28503593973 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28503593973 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28503593973 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28503593973 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28503594019 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28503594833 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28503594834 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28503594835 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28503594884 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28503594890 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28503594890 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28503594935 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28503594935 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28503954935 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28503954936 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28503954936 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28503954936 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28503954936 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28503954982 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28503955796 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28503955796 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28503955797 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28503955860 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28503955865 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28503955865 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no mail found
28503955916 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28503955916 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28504315916 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28504315917 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28504315917 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28504315917 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28504315917 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28504315963 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28504317812 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28504317813 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28504317814 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28504317862 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28504317868 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Do a local copy of mimeMessage
28504317893 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28504317895 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox analzed mail===================================================
28504317896 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <title> GitLab </title> </head> <body> <style type="text/css"> img { max-width: 100%; height: auto; } </style> <div class="content"> <h3> Julien Nicolas pushed to branch develop at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a> </h3> <h4> Commits: </h4> <ul> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/aa71160576bc77cf473b454a243a22491deea7df">aa711605</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-07T09:47:17+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Ajout de la branche STORE-778</pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none"> sprint.txt </a> </li> </ul> <h4>Changes:</h4> <li id="620f2ecad2bb6f74b2fcd0134963a841"> <a href="https://labs.nereide.fr/10923/PRO20200/commit/aa71160576bc77cf473b454a243a22491deea7df#diff-0"> <strong> sprint.txt </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/sprint.txt </span><span style="background: #ddffdd; color: #000000">+++ b/sprint.txt </span><span style="color: #aaaaaa">@@ -11,3 +11,4 @@ STORE-758 </span> STORE-603 STORE-764 STORE-755 <span style="background: #ddffdd; color: #000000">+STORE-778 </span></code></pre> <br> </li> </div> <div class="footer" style="margin-top: 10px"> <p style="color: #777; font-size: small"> ? <br> <a href="https://labs.nereide.fr/10923/PRO20200/commit/aa71160576bc77cf473b454a243a22491deea7df">View it on GitLab</a>. <br> You're receiving this email because of your account on labs.nereide.fr. If you'd like to receive fewer emails, you can adjust your notification settings. <script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://labs.nereide.fr/10923/PRO20200/commit/aa71160576bc77cf473b454a243a22491deea7df"}}</script> </p> </div> </body> </html>
28504317896 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox ===============================================================
28504317896 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox message lines : 76
28504317897 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
28504317897 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <html lang="en">
28504317897 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <head>
28504317897 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
28504317897 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <title>
28504317897 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : GitLab
28504317898 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </title>
28504317898 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28504317898 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </head>
28504317898 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <body>
28504317898 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <style type="text/css">
28504317898 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : img {
28504317899 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : max-width: 100%; height: auto;
28504317899 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : }
28504317899 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </style>
28504317899 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div class="content">
28504317899 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h3>
28504317899 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Julien Nicolas pushed to branch develop
28504317900 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a>
28504317900 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </h3>
28504317900 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>
28504317900 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : Commits:
28504317900 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </h4>
28504317900 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <ul>
28504317901 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li>
28504317901 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/aa71160576bc77cf473b454a243a22491deea7df">aa711605</a></strong>
28504317901 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div>
28504317901 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span>by Julien NICOLAS</span>
28504317901 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <i>at 2017-02-07T09:47:17+01:00</i>
28504317901 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28504317902 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="commit-message" style="white-space: pre-wrap">Ajout de la branche STORE-778</pre>
28504317902 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28504317902 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </ul>
28504317902 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>1 changed file:</h4>
28504317902 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <ul>
28504317902 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li class="file-stats">
28504317903 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none">
28504317903 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : sprint.txt
28504317903 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28504317903 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28504317903 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </ul>
28504317903 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <h4>Changes:</h4>
28504317904 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <li id="620f2ecad2bb6f74b2fcd0134963a841">
28504317904 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/commit/aa71160576bc77cf473b454a243a22491deea7df#diff-0">
28504317904 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <strong>
28504317904 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : sprint.txt
28504317904 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </strong>
28504317905 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </a>
28504317905 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <hr>
28504317905 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/sprint.txt
28504317905 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="background: #ddffdd; color: #000000">+++ b/sprint.txt
28504317905 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span><span style="color: #aaaaaa">@@ -11,3 +11,4 @@ STORE-758
28504317905 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span> STORE-603
28504317906 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : STORE-764
28504317906 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : STORE-755
28504317906 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <span style="background: #ddffdd; color: #000000">+STORE-778
28504317906 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </span></code></pre>
28504317906 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28504317906 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28504317907 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </li>
28504317907 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line :
28504317907 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28504317907 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <div class="footer" style="margin-top: 10px">
28504317907 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <p style="color: #777; font-size: small">
28504317907 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : ?
28504317908 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28504317908 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <a href="https://labs.nereide.fr/10923/PRO20200/commit/aa71160576bc77cf473b454a243a22491deea7df">View it on GitLab</a>.
28504317908 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <br>
28504317908 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : You're receiving this email because of your account on labs.nereide.fr.
28504317908 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : If you'd like to receive fewer emails, you can
28504317908 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : adjust your notification settings.
28504317909 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : <script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://labs.nereide.fr/10923/PRO20200/commit/aa71160576bc77cf473b454a243a22491deea7df"}}</script>
28504317909 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </p>
28504317909 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </div>
28504317909 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </body>
28504317909 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox -> line : </html>
28504317910 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Addon list[]
28504317961 Neogia dev-instance INFO org.apachextras.adr.engine.Engine No Addons modification found : STOP
28504317961 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask scheduling update process for instance : Neogia dev with delay : 6 Minutes
28504677961 Neogia dev-instance DEBUG org.apachextras.adr.task.UpdateTask lunching update process for instance :Neogia dev
28504677962 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN, Repository settings -Repository address : svn+ssh://labs.libre-entreprise.org/svnroot/ofbizaddons/branches/dev -User : neogia-commit -RSA file path : /opt/adr/.ssh/id_dsa -Port : 22 -Local path : /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/
28504677962 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository SVN minimum configuration done, check your self others parameters like user/passwd/port
28504677962 Neogia dev-instance INFO org.apachextras.adr.engine.Engine Check SVN status First
28504677963 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Calling system command '[svn, st, --non-interactive, --no-auth-cache, --username, neogia-commit, /opt/adr/ADR_HOME/svn_working_copy/neogia-dev/]' ...
28504678008 Neogia dev-instance DEBUG org.apachextras.adr.repository.SvnRepository Reading system command output ...
28504684388 Neogia dev-instance INFO org.apachextras.adr.engine.Engine UPDATE is begining
28504684389 Neogia dev-instance INFO org.apachextras.adr.engine.Engine MAIL check is begining
28504684389 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox call mail server with {mail.pop3.host=pop.ouvaton.coop, mail.debug=true, mail.pop3.port=110, mail.store.protocol=pop3}
28504684458 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox open mail inbox on read_write mode. status folder for open is now : true
28504684463 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Do a local copy of mimeMessage
28504685058 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox Do a local copy of mimeMessage
28504685091 Neogia dev-instance INFO org.apachextras.adr.updateMethod.CheckUpdateMailBox no command mail present
28504685187 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox analzed mail===================================================
28504685191 Neogia dev-instance DEBUG org.apachextras.adr.updateMethod.CheckUpdateMailBox <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <title> GitLab </title> </head> <body> <style type="text/css"> img { max-width: 100%; height: auto; } </style> <div class="content"> <h3> Nicolas Malin pushed to branch BirtImprovement at <a href="https://labs.nereide.fr/10923/PRO20200">10923 / PRO20200</a> </h3> <h4> Commits: </h4> <ul> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/bf7acb2821bb3a6555d567b9dd01040c6e2f3386">bf7acb28</a></strong> <div> <span>by MAline</span> <i>at 2016-12-09T14:43:55+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Correction de la recherche du context pour l'integration automatique : Recherche sur le itemSeqId.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/29997a6412c33357a274d23c57cbf4c0efde34d0">29997a64</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2016-12-12T12:47:24+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Finalize description resolution, implement new attribute appluMasterDescription on IntegrationRule to force after integTransactionItem treatment the value to put on transactionItem.description</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/eff8b3f91fdd248cd1dabfc05d91f164dcc22f89">eff8b3f9</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2016-12-12T15:08:37+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">add applyMasterDescription on IntegrationRule for FAPIAO_INVOICE for next prod updating</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/6ebc951d1f31c5b8fa1ab34bc4b3e45b14f782d2">6ebc951d</a></strong> <div> <span>by MAline</span> <i>at 2017-01-06T16:28:10+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-613: Traduction des libellés pour les méthode de livraison</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/d408369a6051dd6d5da1f4f8dc80b251b1a1649a">d408369a</a></strong> <div> <span>by MAline</span> <i>at 2017-01-06T17:23:40+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">replacement du fichier displayShippingInfo.groovy</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/e0d482c1a296cbd6f06e61c7c5ce86a47923e7ad">e0d482c1</a></strong> <div> <span>by MAline</span> <i>at 2017-01-16T16:42:20+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Le client peut créer modifier annuler la commande. Il n'a pas les droits pour créer les requêtes, calculer les adjustments... Pour ces services le login system est forcé!</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/4558ab77bb8f2dcdbb12ef6010cd35b450562e96">4558ab77</a></strong> <div> <span>by gpierre</span> <i>at 2017-01-20T10:14:15+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">ajout de label manquant sur l'intégration de commande</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/7950869af02611e74eace65323697a804a8276a6">7950869a</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-01-26T00:34:45+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-744 filtre sur les seuls statuts nécessaires.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/526caa938247132d020fc361a8892bf12426e158">526caa93</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-01-26T10:34:04+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">correction des noms des applications du partner</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/04bd7faec4462b6bf2cae90aa249e616cf445cfe">04bd7fae</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-01-26T21:49:58+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Ajout du filtre de statut de custRequest dans la gestion des demande d'activation de garantie</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ec0019d1241778a5185fb0b26f726ecd4b151d0b">ec0019d1</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-01-27T11:43:06+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">correct productStore linked</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/21feae8c111d76fb666ab8d9294dcf643abcebfa">21feae8c</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-27T11:50:45+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">FTL Macro, mandatory labels Add a FTL Macro to render HTML labels paired with inputs (might be mandatory fields)</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/9e7a515e4c991c000cc198991df2df1c71a29347">9e7a515e</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-27T11:51:06+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-715, Addresses in HTML panels</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/4ae80dbc7272fac74e26362b03430d0adc0c451e">4ae80dbc</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-27T11:51:06+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STOEZ-715, Carriers in HTML panels</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/f593d8221f59a4e0d86b6b20d8984b7a3c08ac66">f593d822</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-27T11:51:40+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-724, remove Welcome Message</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/b7fe100c812893f62b0fd8c821d2ce709e7f1a30">b7fe100c</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-27T11:51:40+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-725, add Enter Key to submit search</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/788b90f69c2f64dc18713acf4b4ea7e3eea71dd9">788b90f6</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-27T11:51:40+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-678, site width to 75%</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/1789d79b698acb7f7dc8ff8c3038509ef1051d50">1789d79b</a></strong> <div> <span>by Leila</span> <i>at 2017-01-27T14:31:21+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Maj des includes encodeItemForCommand</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/37642d969b13dd69490eabc6cea3272d93b7a2fb">37642d96</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-01-27T14:40:06+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">correction du typs de statut pour la gestion de la validation d'une demande</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/bafb3620c6369addc26c212bb05c593164f81479">bafb3620</a></strong> <div> <span>by Leila</span> <i>at 2017-01-27T15:18:44+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-715: Correction des divs adresse et livraison</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/dd5bdbdd03976bce254387cdbbad0d96e86b0413">dd5bdbdd</a></strong> <div> <span>by MAline</span> <i>at 2017-01-27T15:20:08+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">modification des libellés pour adaptation au front</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/2dd0f7d2332f66356f19de0d48ef1b7267e8321c">2dd0f7d2</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-01-27T16:09:57+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Ajout de la gestion du champ blDate dans l'import des informations de Divlato</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ebc585b0e151fde39ce1e7fd6f4f787de73b2c2c">ebc585b0</a></strong> <div> <span>by Leila</span> <i>at 2017-01-27T17:31:20+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-717: Ajout methode getActualValidationHours</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/b909ea5d96e8fe38e0f252cfe8e460190dbf6abb">b909ea5d</a></strong> <div> <span>by Leila</span> <i>at 2017-01-27T17:31:46+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-720 : Ajout de la priorité sur la creation et modification de commande</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/711562992a21be4d2bd8f0f8a525f0458955f015">71156299</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-01-27T17:34:03+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">déplacement du menu Partner Manager</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/fd664a9dfa20f3bf3603e8efe389288f13f8ab93">fd664a9d</a></strong> <div> <span>by Charles</span> <i>at 2017-01-27T17:46:09+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-720 : add modification from STORE-717 to avoid conflict</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/48b44dc2f9f8e643b47400e121c25a22f5a932ff">48b44dc2</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-30T09:23:38+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-704, Action Modal Add action modal helper</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/58b9da8d1c6239bee398db9ec105667a4052b54b">58b9da8d</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-01-30T11:17:41+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">The partition is always on 3 digits</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/d9228091083f049adee467359167f3730e476047">d9228091</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-30T15:46:40+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Implement optional country recovery from requestItem description, or story if CUST_EXCHGE_WARRANTY. The link existing between requestItem and inventoryItemAttribute is requestItem description to inventoryItem description (unsure, to validate). Unfinished, not tested.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/50c07ce299c05a52070a0daa896001c736b08947">50c07ce2</a></strong> <div> <span>by Leila</span> <i>at 2017-01-30T16:56:15+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Maj de la modification de commande pour permettre la suppression d'une ou plusieurs lignes de commande</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ba63d7754a96c76f7e9b0851ca1a25ab4dc35e94">ba63d775</a></strong> <div> <span>by Leila</span> <i>at 2017-01-30T16:59:04+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Ajout condition pour essayer de limiter les impacts sur manageEntityFromContents</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/532ee83c571c463329096550e92aeff820f4d443">532ee83c</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-30T17:04:26+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Improve Lookup callbacks Separate Callback and OnSelectCallback</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/e02d614b90829348db5f8c2e31e8cd0cb5695029">e02d614b</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-30T17:06:27+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-733, Loaders Implement loaders on: Login, OrderFollowUp, Encoding, ItemSharing, PlaceOrder, SearchInput</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/a226c2668c1315dfcb43048d014e09b8f41279ea">a226c266</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-30T17:07:01+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">The link existing between requestItem and inventoryItemAttribute is requestItem description to inventoryItem serialNumber, thx Julien. Unfinished, not tested.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/4db466a5194495435610e90c4339090ba3fd0d18">4db466a5</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-30T17:58:57+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">change the way partner country data is retrieved. Tested and ok in partner-BO</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/eeda232a9300c60aff8c45292af22199619ec521">eeda232a</a></strong> <div> <span>by Leila</span> <i>at 2017-01-30T18:08:17+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Correction ajout de produit lors de la modification</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/7f96662a389f83712ca9bd86852ceec5e0f26827">7f96662a</a></strong> <div> <span>by MAline</span> <i>at 2017-01-31T08:37:53+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Adaptation des libellés</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/6309511d51a569c470b83da557221f298d1d94b3">6309511d</a></strong> <div> <span>by Leila</span> <i>at 2017-01-31T09:46:49+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Correction quantite totale sur la commande classique pour tenir compte des produits annules</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/059abefc09f35108bc80333db6d9bd76d5a13d56">059abefc</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-31T09:55:34+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Add country info in CRM custom warranty list form.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/4a190f44ea289a7f348a9a2423720374045a5355">4a190f44</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-31T11:44:13+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Create new view to retrieve BL_Date and Pays attribute for inventoryItem. Fix missing package name.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/8526d229c2633ba93139d5fe937886b97548be96">8526d229</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-31T11:44:13+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Add BL_Date and Pays attribute in inventoryItem search and list form.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/9aff74448d6aee283dd3b134aee900b78f7ee0d4">9aff7444</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-31T11:44:13+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Add BL_Date needed label in separated specific label file, to avoid synchronization issue.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/5aa6552e8ca9c09e5d879dd0f92215ee5393402e">5aa6552e</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-31T11:58:26+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Change third step label in new product warranty activation process.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/1a22653b8589eaceea7cf5bdcd7f5fd9f3a54f02">1a22653b</a></strong> <div> <span>by Gil Portenseigne</span> <i>at 2017-01-31T12:18:56+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Delete status valid change from CRQ_PENDING to CRQ_SUBMITTED.</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/d016994ef005527fbb9db660fbc9bee610a08492">d016994e</a></strong> <div> <span>by Charles</span> <i>at 2017-01-31T14:39:43+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merged branch STORE-717 into IMPROVEMENTS-02022017</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ec9a85dc84852f08a48fd17e30e3acf9021cce98">ec9a85dc</a></strong> <div> <span>by Charles</span> <i>at 2017-01-31T15:01:51+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-720' Conflicts: hot-deploy/embitag-com/webapp/embitag-com/front/command/selectPaymentInformations.ftl</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/7c140095783e5d39c67e5e14b80d23807cabbf4a">7c140095</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-31T15:42:44+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-716, STORE-718, OrderPriority on Payment Add order priority selection on order payment page</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/08bafa17667ca41f8c9117ec92a7cd82566f7fa4">08bafa17</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-31T15:53:27+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">FIX STORE-733 OrderPaymentLabel Fix a mistake on loader label for 'Placing Order'</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/040dda34252ba41715bb5c3f76acb0f940de0f8b">040dda34</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-01-31T16:33:15+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-719, OrderPriority on OrderDetails Add control for OrderPriority when viewing order details. Also clean-up .groovy (spacing and imports)</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ee882fe22da3b98fe17b24dad3becd95d3db583b">ee882fe2</a></strong> <div> <span>by Leila</span> <i>at 2017-02-01T09:41:41+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-717: Maj du worker affichage du temps de modification restant</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/d5c91b50d1fc3363fae437c161eb1c3679a17529">d5c91b50</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-02-01T11:46:24+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">FIX, var name</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/62deeaa15883ed30cefb355db1c602e9eea7dc03">62deeaa1</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-02-01T11:46:24+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-315, STORE-706, item encoding Fix bug when adding a percent calculation making a dot. Add line edition feature</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/3e6b1ef9b56fd8895d43c7f4cb9988e3c438717d">3e6b1ef9</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-02-01T12:01:01+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-704 Improvements on the Action Help Modal</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/40d5b38053c53d175a15c85d7a46d20350da5cf8">40d5b380</a></strong> <div> <span>by Leila</span> <i>at 2017-02-01T12:16:01+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-717: Traduction des abbreviations Uom de temps</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/075da259507efd1f3eeae6f6c733efcfac51a322">075da259</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-02-01T12:16:34+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-716</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/adfa89ba0940a39c4be058085d7532bc6acd1a23">adfa89ba</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-02-01T14:52:52+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Fix JS quantity</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/f255b143b2096a6da3afeacb997264602f8433a5">f255b143</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T15:51:58+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-760 - Suppression de l'icone de loupe</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/f942692014f442cd3ce218e21b250a5429d0f8d3">f9426920</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T15:57:57+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-759 - Correction dans le menu principal FO</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/56a527c4c7fd6a716d10a870a932c0ba9883abba">56a527c4</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T16:17:19+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-759 - correction du menu déroulant</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ee7beac0ffe8bee1e94796a2934e50587d6c66fc">ee7beac0</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T16:41:54+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">ajout du bouton logout</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/9b8993f374deefb638abc8c4beec5ee15293e4c0">9b8993f3</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T16:44:16+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Correction du cookie de session pour éviter de se reloger trop souvent</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/b188834507380f245c178a59536f8b46101b0e8c">b1888345</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T16:50:31+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-761 - Suppression des informations inutiles du footer</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/9a9109df6ecd6f175f7d3313d1085f66dcea95e0">9a9109df</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T17:25:24+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge remote-tracking branch 'origin/STORE-602' into PartnerMergeBranchNoFF</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/15797a462c16d95a376c1b46252882a8c48ad5f8">15797a46</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T17:25:50+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge remote-tracking branch 'origin/STORE-628' into PartnerMergeBranchNoFF</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/9229be3f6f57c89e46786fb3bcabc247a1cae28c">9229be3f</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T17:25:56+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge remote-tracking branch 'origin/STORE-744' into PartnerMergeBranchNoFF</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/15692e627bdfc1bc319882870d8cd3fd69e07d06">15692e62</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T17:26:05+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge remote-tracking branch 'origin/STORE-762' into PartnerMergeBranchNoFF</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/81a4d35e1e3bc7ddcfeb00230a5bb246572998fe">81a4d35e</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T17:26:13+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge remote-tracking branch 'origin/STORE-385' into PartnerMergeBranchNoFF</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/c1aa0a40b9b77adfc4409eae642614613492fe05">c1aa0a40</a></strong> <div> <span>by Leila</span> <i>at 2017-02-01T17:27:23+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-647: Ajout de la delivery date</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/e377e2ce841d707e2ed7799278959ff5dcde7a7a">e377e2ce</a></strong> <div> <span>by Leila</span> <i>at 2017-02-01T17:27:23+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-647: Maj de la suppression</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/b7bc9c959515f212308428b3788e404199397a8e">b7bc9c95</a></strong> <div> <span>by Leila</span> <i>at 2017-02-01T17:27:23+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-647: Maj du script de recherche des demandes d'activation</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/beb6b28e3ac75655c2eef49c7801c595379596f8">beb6b28e</a></strong> <div> <span>by Grégoire Fruleux - Salto Consulting</span> <i>at 2017-02-01T17:35:24+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">STORE-706, Disable and Scroll Disable EAN input when editing. Scroll to inputs when editing</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/08a1eee0e7ef51ba2aebbe701c7b7d12b791542b">08a1eee0</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-01T17:47:23+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Suppression des branches STORE-731, STORE-602, STORE-628, STORE-744, STORE-762, STORE-385</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/0ef263735ae1bd92f425845e73e4a76ad575e661">0ef26373</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-02-01T20:34:48+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'TMA-398' into 'develop' The partition is always on 3 digits See merge request !92</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/d4c999b1531331ffaa153a7ccd803540c8fa2b74">d4c999b1</a></strong> <div> <span>by Charles STELTZLEN</span> <i>at 2017-02-02T09:35:13+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'IMPROVEMENTS-02022017' into 'develop' Improvements 02022017 See merge request !93</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/db2f0f0477c73700471bd8235cdcba45e5b990d9">db2f0f04</a></strong> <div> <span>by Charles STELTZLEN</span> <i>at 2017-02-02T09:52:09+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-613' into 'develop' Store 613 See merge request !94</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/6aeb2c6dd98b85a2b5c5e4e95dff9703640c6886">6aeb2c6d</a></strong> <div> <span>by Charles</span> <i>at 2017-02-02T09:54:21+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Remove merged branches STORE-613 STORE-506 IMPROVEMENTS-02022017 from sprint</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/1975abbe30c016921570683cb6e48f4fbfab6fb0">1975abbe</a></strong> <div> <span>by Charles STELTZLEN</span> <i>at 2017-02-02T10:03:50+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-663' into 'develop' Store 663 See merge request !95</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/52004b7ac584d1e3a1f95bba0c7cd287d6ae801d">52004b7a</a></strong> <div> <span>by Julien Nicolas</span> <i>at 2017-02-02T10:07:39+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-647' into 'develop' Store 647 See merge request !96</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/867352f8e7f3b4d61d6d166fc8a247699a3fa610">867352f8</a></strong> <div> <span>by Charles STELTZLEN</span> <i>at 2017-02-02T10:08:34+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-763' into 'develop' Store 763 See merge request !97</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/1f714d2418ea291eb8eee2c9976e582c56534268">1f714d24</a></strong> <div> <span>by Charles STELTZLEN</span> <i>at 2017-02-02T10:13:32+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'TMA-380' into 'develop' Le client peut créer modifier annuler la commande. Il n'a pas les droits pour cr? ?éer les requêtes, calculer les adjustments... Pour ces services le login system est forcé! See merge request !98</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/ea146830b76507fcd55da9926c56ccc6786f057a">ea146830</a></strong> <div> <span>by Charles</span> <i>at 2017-02-02T10:25:07+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Remove merged branches STORE-663 STORE-763 TMA-380</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/6caea94fbcd4cc6413603bd0a2bae82a646c9129">6caea94f</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-02T10:54:07+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">suppression de la branche PartnerMergeBranchNoFF</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/9b60ffba68fe209009743b34537d22af9d6e6cea">9b60ffba</a></strong> <div> <span>by Julien Nicolas</span> <i>at 2017-02-02T10:58:01+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-760' into 'develop' Store 760 See merge request !99</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/35fd1fe269cfcdf3545b786fdeedca3032f3da3a">35fd1fe2</a></strong> <div> <span>by Charles</span> <i>at 2017-02-03T14:09:47+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Add branches IMPROVEMENTS-02022017 and TMA-321-2 to sprint</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/5ff547de7bdb3cf7c93fc440134fb3da64f32cde">5ff547de</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-02-06T09:36:35+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'STORE-397' into 'develop' Store 397 See merge request !100</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/587436034aaedffb0a6e40a07fccddccea89b3d5">58743603</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-02-06T18:50:24+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">add BirtImprovement and remove TMA-398 and STORE-397</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/db2ab06ee4d3bb7fb6a8a404df1b5695d75c851c">db2ab06e</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-02-06T20:37:41+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">reallocate data after loading on the production update 2/2/17</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/e0adb8a4ae0761771cc23fe1763595ffdb1468a3">e0adb8a4</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-06T22:27:03+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Ajout des branches STORE-758, STORE-603, STORE-764, STORE-755</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/52ad7a2ddd0f85fedbbf8befb17141f8b5dee83c">52ad7a2d</a></strong> <div> <span>by Julien NICOLAS</span> <i>at 2017-02-06T22:50:33+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Mise en commentaire de la branche BirtImprovement qui m'empêche de faire une mise en préproduction</pre> </li> <li> <strong><a href="https://labs.nereide.fr/10923/PRO20200/commit/65aa31bb1df33d15157fe83e30b6741b5a55d24d">65aa31bb</a></strong> <div> <span>by Nicolas Malin</span> <i>at 2017-02-07T09:57:26+01:00</i> </div> <pre class="commit-message" style="white-space: pre-wrap">Merge branch 'develop' into BirtImprovement2 # Conflicts: # hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-103.xml</pre> </li> </ul> <h4>68 changed files:</h4> <ul> <li class="file-stats"> <a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none"> applications/naccounting/data/AccountingIntegData.xml </a> </li> <li class="file-stats"> <a href="#ad29afc395839758d41094872298bd0d" style="text-decoration: none"> applications/naccounting/entitydef/entitymodel-integ.xml </a> </li> <li class="file-stats"> <a href="#c0b0bf6d71bc5fc7e6d50d69c8aa2413" style="text-decoration: none"> applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegTransactionItemHelper.java </a> </li> <li class="file-stats"> <a href="#2ace16276b68c7d5aef163bb260bd9f7" style="text-decoration: none"> applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegTransactionItemWorker.java </a> </li> <li class="file-stats"> <a href="#4dfe7e78b540daa005ea4b5f0458c90d" style="text-decoration: none"> applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegrationRuleHelper.java </a> </li> <li class="file-stats"> <a href="#172f4bf093caeeba24730a1adff8f15a" style="text-decoration: none"> applications/naccounting/widget/accounting/accintegrationForms.xml </a> </li> <li class="file-stats"> <a href="#a453f91a0a4af7575917fad54f4ac1d0" style="text-decoration: none"> applications/order/servicedef/services.xml </a> </li> <li class="file-stats"> <a href="#dffc348e63ffc0037c23afd36439222f" style="text-decoration: none"> applications/order/src/org/ofbiz/order/order/OrderServices.java </a> </li> <li class="file-stats"> <a href="#f82b13d5e971dfa7a0cea839dd9d819c" style="text-decoration: none"> applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java </a> </li> <li class="file-stats"> <a href="#ba4d174bce4109eebf5db0040421eba2" style="text-decoration: none"> applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy </a> </li> <li class="file-stats"> <a href="#bbc2314e774c28d45e241dbe5d218f70" style="text-decoration: none"> <span class="new-file" style="color: #090"> + applications/product/config/ProductEmbiUiLabels.xml </span> </a> </li> <li class="file-stats"> <a href="#02c44bcb0c30e1642888c0330c8d112c" style="text-decoration: none"> applications/product/config/ProductEntityLabels.xml </a> </li> <li class="file-stats"> <a href="#5ddb4a7da6ac3ae899220a2054c79be0" style="text-decoration: none"> applications/product/webapp/facility/WEB-INF/web.xml </a> </li> <li class="file-stats"> <a href="#96c68c4d0376aa9733e6df1aff7dc9f8" style="text-decoration: none"> applications/product/widget/facility/CommonScreens.xml </a> </li> <li class="file-stats"> <a href="#e483fe4e07b9111852a8f4e3e4e61d16" style="text-decoration: none"> applications/product/widget/facility/FacilityForms.xml </a> </li> <li class="file-stats"> <a href="#54071697bdb74afd518e691935ab92ab" style="text-decoration: none"> framework/common/config/CommonEntityLabels.xml </a> </li> <li class="file-stats"> <a href="#879ee3b75b3b68112858e3c5a60c5a35" style="text-decoration: none"> <span class="new-file" style="color: #090"> + framework/images/webapp/images/css/images/modal_encoding_en_percent.png </span> </a> </li> <li class="file-stats"> <a href="#c980cac8551b1b1f8a4a5bb6e26a7f54" style="text-decoration: none"> <span class="new-file" style="color: #090"> + framework/images/webapp/images/css/images/modal_encoding_en_qty.png </span> </a> </li> <li class="file-stats"> <a href="#0456dbe6f74a19ea201dea7c0be35e3d" style="text-decoration: none"> <span class="new-file" style="color: #090"> + framework/images/webapp/images/css/images/modal_encoding_fr_percent.png </span> </a> </li> <li class="file-stats"> <a href="#36f20111c8470f8bf0a970af1aa5de94" style="text-decoration: none"> <span class="new-file" style="color: #090"> + framework/images/webapp/images/css/images/modal_encoding_fr_qty.png </span> </a> </li> <li class="file-stats"> <a href="#1c6f4778cb1e5e381e17e502561a0932" style="text-decoration: none"> framework/images/webapp/images/fieldlookup.js </a> </li> <li class="file-stats"> <a href="#eb9ceb07a63a2ccebe3dc5ed6d87d9a7" style="text-decoration: none"> framework/images/webapp/images/selectall.js </a> </li> <li class="file-stats"> <a href="#b150bb0039b44a462e2526f9f645591e" style="text-decoration: none"> framework/widget/templates/htmlFormMacroLibrary.ftl </a> </li> <li class="file-stats"> <a href="#0c08409ec4a7facc84b7b99ac6b35e60" style="text-decoration: none"> hot-deploy/embisphere-partner/config/EmbispherePartnerErrorLabels.xml </a> </li> <li class="file-stats"> <a href="#3252e9669561868c6dd243fbab40f81c" style="text-decoration: none"> hot-deploy/embisphere-partner/config/EmbispherePartnerUiLabels.xml </a> </li> <li class="file-stats"> <a href="#a2a75853fe5e7389f09f30a568592148" style="text-decoration: none"> hot-deploy/embisphere-partner/entitydef/entitymodel_view.xml </a> </li> <li class="file-stats"> <a href="#cc28d82bed8d943c98f0976e06156c3f" style="text-decoration: none"> hot-deploy/embisphere-partner/ofbiz-component.xml </a> </li> <li class="file-stats"> <a href="#1ce2d3a7bb8a17f983b57ace2a62bbfd" style="text-decoration: none"> hot-deploy/embisphere-partner/servicedef/services.xml </a> </li> <li class="file-stats"> <a href="#a18f57f424e83727097db04b11d0fe62" style="text-decoration: none"> hot-deploy/embisphere-partner/src/com/embisphere/EmbispherePartnerServices.java </a> </li> <li class="file-stats"> <a href="#ab61e68e6d6fbaba051c29c17ecea099" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner-bo/WEB-INF/actions/retrieveWarrantyInfos.groovy </a> </li> <li class="file-stats"> <a href="#fcd5059ef50e3743d096a7c2c5b49301" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner-bo/WEB-INF/web.xml </a> </li> <li class="file-stats"> <a href="#5cc1a8d475dda3d74e293a611f13d2ef" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner/assets/js/embipartner-warranty-1.js </a> </li> <li class="file-stats"> <a href="#6d7cea7ffe0d1cebb1f4ddab0e3b55fe" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner/common/footer.ftl </a> </li> <li class="file-stats"> <a href="#16380722c95decf018f07f1ccb1e43bf" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner/common/header.ftl </a> </li> <li class="file-stats"> <a href="#86cf3f30db27b029a930c9e36c1df594" style="text-decoration: none"> <span class="new-file" style="color: #090"> + hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/actions/findWarrantyActivationHistoricList.groovy </span> </a> </li> <li class="file-stats"> <a href="#72adb81b8c48849f7ca34195a50d212d" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/actions/retrieveWarrantyInfos.groovy </a> </li> <li class="file-stats"> <a href="#f0602bbdc119d3f5da6e11f6d0b0481d" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/findWarrantyActivation.ftl </a> </li> <li class="file-stats"> <a href="#4025122165d71e7e9085768dae4c8606" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/viewWarrantyActivation.ftl </a> </li> <li class="file-stats"> <a href="#9fd60dfbdacb712bedd7b5f7a0f4208b" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/warrantyActivationHistoricList.ftl </a> </li> <li class="file-stats"> <a href="#f36ce15c34c0f11bba2d039b15583548" style="text-decoration: none"> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/warrantyActivationStep1.ftl </a> </li> <li class="file-stats"> <a href="#cdeee905b03e063e474f1651a1776ec0" style="text-decoration: none"> hot-deploy/embisphere-partner/widget/embisphere-partner-bo/EmbispherePartnerForms.xml </a> </li> <li class="file-stats"> <a href="#0ddfe0d90acc8129c2d03cb0e178127d" style="text-decoration: none"> hot-deploy/embisphere-partner/widget/embisphere-partner/EmbispherePartnerScreens.xml </a> </li> <li class="file-stats"> <a href="#9010d24396055878d16253c3b16d655f" style="text-decoration: none"> hot-deploy/embisphere/data/EmbisphereSeedData.xml </a> </li> <li class="file-stats"> <a href="#eb43eb49763194a9a29713cd20c77b9b" style="text-decoration: none"> <span class="deleted-file" style="color: #b00"> ? hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-103.xml </span> </a> </li> <li class="file-stats"> <a href="#92341f460412b5ccbc84f5acc586422d" style="text-decoration: none"> <span class="deleted-file" style="color: #b00"> ? hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-340.xml </span> </a> </li> <li class="file-stats"> <a href="#69b75e7d0845e4562ef1e6c3d7f0c46b" style="text-decoration: none"> <span class="deleted-file" style="color: #b00"> ? hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-506.xml </span> </a> </li> <li class="file-stats"> <a href="#f783c3bf1259cb0e48240a6b2d83f095" style="text-decoration: none"> hot-deploy/embisphere/entitydef/entitymodel.xml </a> </li> <li class="file-stats"> <a href="#b00c41e1800419df4132e94fe5145fce" style="text-decoration: none"> hot-deploy/embisphere/widget/crm/CRMForms.xml </a> </li> <li class="file-stats"> <a href="#becd47e5186b47229fcf9c5334b3b1d7" style="text-decoration: none"> hot-deploy/embitag-com/config/FrontEmbitagUiLabels.xml </a> </li> <li class="file-stats"> <a href="#d6f939b130cc97d31dd4da1c771257b8" style="text-decoration: none"> <span class="new-file" style="color: #090"> + hot-deploy/embitag-com/config/LoadOrdersErrorUiLabels.xml </span> </a> </li> <li class="file-stats"> <a href="#805f514184cad0ad93cec748171eb52e" style="text-decoration: none"> hot-deploy/embitag-com/data/embitag-comTypeData.xml </a> </li> <li class="file-stats"> <a href="#9c4f99cdaa893fc819427fb660c76fdc" style="text-decoration: none"> hot-deploy/embitag-com/src/com/embitag/EmbitagCounterWorker.java </a> </li> <li class="file-stats"> <a href="#727c9cff31b9eba0a06af43d6db6aa3b" style="text-decoration: none"> hot-deploy/embitag-com/src/com/embitag/EmbitagOrderWorker.java </a> </li> <li class="file-stats"> <a href="#52cf925e6d841e51534f6c76dcc00e81" style="text-decoration: none"> hot-deploy/embitag-com/src/com/embitag/flow/instanceFlow/generic/GenericOagisFlow.java </a> </li> <li class="file-stats"> <a href="#bf9b0e377773f2e875b8f268a59f2676" style="text-decoration: none"> hot-deploy/embitag-com/src/com/embitag/front/FrontCartEvent.java </a> </li> <li class="file-stats"> <a href="#8488011c5b0c39c96e2b0905e6490262" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/actions/front/displayOrder.groovy </a> </li> <li class="file-stats"> <a href="#3f7e91e350823c32db1118ec53df8435" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/actions/front/displayPaymentInfo.groovy </a> </li> <li class="file-stats"> <a href="#f3e2f822d56d5a39d81e3a1aca8246c8" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/controllerFront.xml </a> </li> <li class="file-stats"> <a href="#d03f4acd220dcc624d78728b074fb7aa" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagEditPassword.ftl </a> </li> <li class="file-stats"> <a href="#5f083dacacb540b336621436df499c80" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagEditUser.ftl </a> </li> <li class="file-stats"> <a href="#70551b52d8c74f18b538c169505d01c3" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagForgotPassword.ftl </a> </li> <li class="file-stats"> <a href="#7ea3346b9ca18920568a910f181257d0" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagLogin.ftl </a> </li> <li class="file-stats"> <a href="#715604ae913d6ea24c688406674b6d01" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagRegisterUser.ftl </a> </li> <li class="file-stats"> <a href="#e557e26240b137493ec46a2aa35c4945" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/catalog/item/finalparent/modalItemToShare.ftl </a> </li> <li class="file-stats"> <a href="#763b511643bfa504f439c475f70394bd" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/catalog/rfid/rfidTagCatalogWrapper.ftl </a> </li> <li class="file-stats"> <a href="#d39fdd3f5ea3e29a0ba217115db3803b" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/command/encodeItemsForCommand.ftl </a> </li> <li class="file-stats"> <a href="#fd532056833b61ba6526c89290da858d" style="text-decoration: none"> <span class="new-file" style="color: #090"> + hot-deploy/embitag-com/webapp/embitag-com/front/command/modalActionHelp.ftl </span> </a> </li> <li class="file-stats"> <a href="#f680bdb56e76c80a59a48eea23fc6c80" style="text-decoration: none"> hot-deploy/embitag-com/webapp/embitag-com/front/command/selectPaymentInformations.ftl </a> </li> </ul> <h4>Changes:</h4> <li id="620f2ecad2bb6f74b2fcd0134963a841"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-0"> <strong> applications/naccounting/data/AccountingIntegData.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/naccounting/data/AccountingIntegData.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/naccounting/data/AccountingIntegData.xml </span><span style="color: #aaaaaa">@@ -62,6 +62,7 @@ </span> &lt;IntegEventType integEventTypeId="STOCK_PURCH_INV_ITPRM" parentIntegEventTypeId="STOCK_PURCH_INVOICE" description="Stock in / Discount" entityPkField="invoiceId" amountCustMethId="INTEG_INV_DISC_AMOUNT" viewEntityName="IntegrationPurchaseInvoiceAndSalesOrder"/&gt; &lt;IntegEventType integEventTypeId="FAPIAO_INVOICE" description="Consolidate Fapiao invoice" sequenceNum="100" entityPkField="invoiceId" viewEntityName="IntegrationPrintedFapiaoInvoiceView" personalPartyField="partyId"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;IntegrationRule integEventTypeId="FAPIAO_INVOICE" integrationRuleId="00001" fromDate="2001-01-01 00:00:00.0" productStoreId="EMBI_CN" applyMasterDescription="${invoiceId}"/&gt; </span> &lt;IntegEventType integEventTypeId="FAPIAO_INVOICE_ITPRO" parentIntegEventTypeId="FAPIAO_INVOICE" sequenceNum="101" description="Consolidate Fapiao Item product" entityPkField="invoiceId" viewEntityName="IntegrationInvoiceItemProductCategoryView"/&gt; &lt;IntegEventType integEventTypeId="FAPIAO_INVOICE_ITTAX" parentIntegEventTypeId="FAPIAO_INVOICE" sequenceNum="102" description="Consolidate Fapiao Item tax" entityPkField="invoiceId" viewEntityName="IntegrationPrintedFapiaoInvoiceTaxView"/&gt; &lt;IntegEventType integEventTypeId="FAPIAO_INVOICE_ITSHIP" parentIntegEventTypeId="FAPIAO_INVOICE" sequenceNum="103" description="Consolidate Fapiao Item shipment" entityPkField="invoiceId" viewEntityName="IntegrationInvoiceItemShipmentView"/&gt; </code></pre> <br> </li> <li id="ad29afc395839758d41094872298bd0d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-1"> <strong> applications/naccounting/entitydef/entitymodel-integ.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/naccounting/entitydef/entitymodel-integ.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/naccounting/entitydef/entitymodel-integ.xml </span><span style="color: #aaaaaa">@@ -371,6 +371,7 @@ </span> &lt;field name="bonId3" type="id"/&gt; &lt;field name="integEntrySequence" type="id"/&gt; &lt;field name="applyDescription" type="description"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="applyMasterDescription" type="description"/&gt; </span> &lt;field name="applyVoucherRef" type="description"/&gt; &lt;field name="debitCreditEnumId" type="id"/&gt; &lt;field name="aTypeEnumId" type="id"/&gt; </code></pre> <br> </li> <li id="c0b0bf6d71bc5fc7e6d50d69c8aa2413"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-2"> <strong> applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegTransactionItemHelper.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegTransactionItemHelper.java </span><span style="background: #ddffdd; color: #000000">+++ b/applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegTransactionItemHelper.java </span><span style="color: #aaaaaa">@@ -71,21 +71,29 @@ public class IntegTransactionItemHelper { </span> return ""; } <span style="background: #ffdddd; color: #000000">- - </span> public static Map&lt;String, Object&gt; getContext(GenericValue integTrIt, GenericValue integEventType) throws GenericEntityException { <span style="background: #ddffdd; color: #000000">+ return getContext(integTrIt, integEventType, null); + } + + public static Map&lt;String, Object&gt; getContext(GenericValue integTrIt, GenericValue integEventType, String itemSeqId) + throws GenericEntityException { </span> Map&lt;String, Object&gt; context = integTrIt.getAllFields(); <span style="background: #ffdddd; color: #000000">- List&lt;GenericValue&gt; values = integTrIt.getDelegator().findByAnd(integEventType.getString("viewEntityName"), UtilMisc.toMap(integEventType.getString("entityPkField"), integTrIt.get(integEventType.getString("entityPkField")))); </span><span style="background: #ddffdd; color: #000000">+ List&lt;GenericValue&gt; values = integTrIt.getDelegator().findByAnd(integEventType.getString("viewEntityName"), UtilMisc.toMap(integEventType.getString("entityPkField"), integTrIt.get(integEventType.getString("entityPkField"))), null, false); </span> if (UtilValidate.isNotEmpty(values)) { //#Bam# naccounting-integ-connector-payment : TODO analyse to found a better solution if ("IntegrationPaymentAndPartyView".equals(integEventType.getString("viewEntityName"))) { <span style="background: #ffdddd; color: #000000">- List&lt;GenericValue&gt; paymentApplications = EntityUtil.getFirst(values).getRelated("PaymentApplication"); </span><span style="background: #ddffdd; color: #000000">+ List&lt;GenericValue&gt; paymentApplications = EntityUtil.getFirst(values).getRelated("PaymentApplication", null, null, true); </span> String invoiceIds = ""; for (GenericValue paymentApplication : paymentApplications) { invoiceIds = invoiceIds + paymentApplication.getString("invoiceId") + ", "; } <span style="background: #ffdddd; color: #000000">- context.put("paidInvoiceIds", invoiceIds); </span><span style="background: #ddffdd; color: #000000">+ if (!invoiceIds.isEmpty()) { + context.put("paidInvoiceIds", invoiceIds.substring(0, invoiceIds.length() - 2)); + } + } + if (UtilValidate.isNotEmpty(itemSeqId)) { + values = EntityUtil.filterByAnd(values, UtilMisc.toMap("itemSeqId", itemSeqId)); </span> } context = EntityUtil.getFirst(values).getAllFields(); } </code></pre> <br> </li> <li id="2ace16276b68c7d5aef163bb260bd9f7"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-3"> <strong> applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegTransactionItemWorker.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegTransactionItemWorker.java </span><span style="background: #ddffdd; color: #000000">+++ b/applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegTransactionItemWorker.java </span><span style="color: #aaaaaa">@@ -75,7 +75,6 @@ public class IntegTransactionItemWorker { </span> / * Execute integration on list integTransactionItem * Associate it to transaction <span style="background: #ffdddd; color: #000000">- * @param delegator a &lt;code&gt;Delegator&lt;/code&gt; value </span> * @return a &lt;code&gt;Map&lt;/code&gt; value * */ public static void mergeAndIntegrateIntegTransactionItems(IntegrationHelper integHelper, <span style="color: #aaaaaa">@@ -220,8 +219,6 @@ public class IntegTransactionItemWorker { </span> / * specific procedure to integrate purchase invoice in help full. * use integration invoice but don't use error result <span style="background: #ffdddd; color: #000000">- * @param ctx - * @param context </span> * @return * public static Map quickIntegratePurchaseInvoice(DispatchContext ctx, Map context) { <span style="color: #aaaaaa">@@ -406,10 +403,6 @@ public class IntegTransactionItemWorker { </span> / * Create GenericValue from integTransactionItem and operate recursively on IntegrationEntrys <span style="background: #ffdddd; color: #000000">- * @param ctx a &lt;code&gt;DispatchContext&lt;/code&gt; value - * @param context a &lt;code&gt;Map&lt;/code&gt; value - * @param transaction an &lt;code&gt;AcctgTransaction&lt;/code&gt; value - * @return a &lt;code&gt;Map&lt;/code&gt; value </span> */ public static void toAcctgTransactionItem(IntegrationHelper integHelper, GenericValue integTrIt) throws GenericIntegrationException, GenericEntityException, GenericServiceException { <span style="color: #aaaaaa">@@ -467,6 +460,7 @@ public class IntegTransactionItemWorker { </span> boolean accountMandatory = integHelper.getInputHelpfull(); boolean reverseRule = false; integTrIt.put("description", ""); <span style="background: #ddffdd; color: #000000">+ String masterDescription = ""; </span> //Find all the IntegEventType related to the event //The one directly related and all the sons of it in the hierarchy <span style="color: #aaaaaa">@@ -552,13 +546,17 @@ public class IntegTransactionItemWorker { </span> } //Set description on integTrIt <span style="background: #ffdddd; color: #000000">- if (UtilValidate.isEmpty(integTrIt.get("description")) &amp;&amp; UtilValidate.isNotEmpty(rule.get("applyDescription"))) { - integTrIt.put("description", IntegrationRuleHelper.parseApplyDescription(rule, integTrIt, null)); </span><span style="background: #ddffdd; color: #000000">+ if (UtilValidate.isNotEmpty(rule.get("applyDescription"))) { + integTrIt.put("description", IntegrationRuleHelper.parseApplyDescription(rule, integTrIt, itemSeqId, null)); </span> } //force voucherRef on integTrIt if (UtilValidate.isNotEmpty(rule.getString("applyVoucherRef"))) { integTrIt.put("voucherRef", IntegrationRuleHelper.parseApplyVoucherRef(rule, integTrIt)); } <span style="background: #ddffdd; color: #000000">+ //Check if a master description is present + if (UtilValidate.isEmpty(masterDescription) &amp;&amp; UtilValidate.isNotEmpty(rule.getString("applyMasterDescription"))) { + masterDescription = IntegrationRuleHelper.parseApplyMasterDescription(rule, integTrIt); + } </span> //Check if rule apply on new line if (previousRule == null || UtilValidate.isEmpty(rule.get("integEntrySequence")) <span style="color: #aaaaaa">@@ -643,6 +641,9 @@ public class IntegTransactionItemWorker { </span> UtilProperties.getMessage(resource, "NaccountingIntegrationNoRuleMatchThisEntry", integHelper.getLocale())); } } <span style="background: #ddffdd; color: #000000">+ if (UtilValidate.isNotEmpty(masterDescription)) { + integTrIt.put("description", masterDescription); + } </span> if (! IntegTransactionItemHelper.isBalanced(integTrIt)) { try { tryBalance(integTrIt); </code></pre> <br> </li> <li id="4dfe7e78b540daa005ea4b5f0458c90d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-4"> <strong> applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegrationRuleHelper.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegrationRuleHelper.java </span><span style="background: #ddffdd; color: #000000">+++ b/applications/naccounting/src/org/ofbiz/naccounting/accintegration/IntegrationRuleHelper.java </span><span style="color: #aaaaaa">@@ -36,30 +36,42 @@ public class IntegrationRuleHelper { </span> public static final String module = IntegrationRuleHelper.class.getName(); public static final String resource = "NaccountingUiLabels"; <span style="background: #ddffdd; color: #000000">+ public static String parseApplyMasterDescription(GenericValue integRule, GenericValue integTrIt) + throws GenericEntityException { + return parseContextWithFlexibleField(integRule, integTrIt, null, null, "applyMasterDescription"); + } + + public static String parseApplyVoucherRef(GenericValue integRule, GenericValue integTrIt) + throws GenericEntityException { + return parseContextWithFlexibleField(integRule, integTrIt, null, null, "applyVoucherRef"); + } + </span> public static String parseApplyDescription(GenericValue integRule, GenericValue integTrIt, GenericValue entry) throws GenericEntityException { <span style="background: #ffdddd; color: #000000">- if (UtilValidate.isEmpty(integRule.getString("applyDescription"))) return ""; - FlexibleStringExpander description = FlexibleStringExpander.getInstance(integRule.getString("applyDescription")); - GenericValue ieType = integRule.getRelatedOne("IntegEventType", true); - Map context = IntegTransactionItemHelper.getContext(integTrIt, ieType); - if (entry != null) context.putAll(IntegrationEntryHelper.getContext(integRule.getDelegator(), integTrIt, entry, ieType)); - context.put("delegator", integTrIt.getDelegator()); - if (Debug.verboseOn()) Debug.logVerbose(" Parse Description : context " + context + ", description " + description + ", expand description " + description.expandString(context), module); - return description.expandString(context); </span><span style="background: #ddffdd; color: #000000">+ return parseContextWithFlexibleField(integRule, integTrIt, null, entry, "applyDescription"); </span> } <span style="background: #ffdddd; color: #000000">- public static String parseApplyVoucherRef(GenericValue integRule, GenericValue integTrIt) </span><span style="background: #ddffdd; color: #000000">+ public static String parseApplyDescription(GenericValue integRule, + GenericValue integTrIt, String itemSeqId, GenericValue entry) </span> throws GenericEntityException { <span style="background: #ffdddd; color: #000000">- if (UtilValidate.isEmpty(integRule.getString("applyVoucherRef"))) return ""; - FlexibleStringExpander voucherRef = FlexibleStringExpander.getInstance(integRule.getString("applyVoucherRef")); </span><span style="background: #ddffdd; color: #000000">+ return parseContextWithFlexibleField(integRule, integTrIt, itemSeqId, entry, "applyDescription"); + } + + private static String parseContextWithFlexibleField(GenericValue integRule, + GenericValue integTrIt, String itemSeqId, GenericValue entry, String flexibleFieldValue) + throws GenericEntityException { + if (UtilValidate.isEmpty(integRule.getString(flexibleFieldValue))) return ""; + FlexibleStringExpander description = FlexibleStringExpander.getInstance(integRule.getString(flexibleFieldValue)); </span> GenericValue ieType = integRule.getRelatedOne("IntegEventType", true); <span style="background: #ffdddd; color: #000000">- Map context = IntegTransactionItemHelper.getContext(integTrIt, ieType); </span><span style="background: #ddffdd; color: #000000">+ Map context = IntegTransactionItemHelper.getContext(integTrIt, ieType, itemSeqId); </span> context.put("delegator", integTrIt.getDelegator()); <span style="background: #ffdddd; color: #000000">- if (Debug.verboseOn()) Debug.logVerbose(" Parse Description : context " + context + ", description " + voucherRef + ", expand description " + voucherRef.expandString(context), module); - return voucherRef.expandString(context); </span><span style="background: #ddffdd; color: #000000">+ if (entry != null) context.putAll(IntegrationEntryHelper.getContext(integRule.getDelegator(), integTrIt, entry, ieType)); + if (Debug.verboseOn()) Debug.logVerbose(" Parse Flexible Field with : context " + context + ", field " + description + ", expand field " + description.expandString(context), module); + return description.expandString(context); </span> } <span style="background: #ddffdd; color: #000000">+ </span> public static boolean hasServiceValid(GenericValue integRule) { return UtilValidate.isNotEmpty(integRule.getString("customMethodId")); } </code></pre> <br> </li> <li id="172f4bf093caeeba24730a1adff8f15a"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-5"> <strong> applications/naccounting/widget/accounting/accintegrationForms.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/naccounting/widget/accounting/accintegrationForms.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/naccounting/widget/accounting/accintegrationForms.xml </span><span style="color: #aaaaaa">@@ -360,17 +360,18 @@ </span> &lt;/field&gt; &lt;field name="integEntrySequence"&gt;&lt;display /&gt;&lt;/field&gt; &lt;field name="applyDescription" &gt;&lt;display /&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="applyMasterDescription" &gt;&lt;display /&gt;&lt;/field&gt; </span> &lt;field name="customMethodId" title="${uiLabelMap.NaccountingServiceCustomMethodId}"&gt; &lt;display-entity entity-name="CustomMethod"/&gt; &lt;/field&gt; &lt;field name="applyVoucherRef"&gt;&lt;display/&gt;&lt;/field&gt; <span style="background: #ffdddd; color: #000000">- &lt;field name="deleteLink" title=" "&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;field name="deleteLink" title=" "&gt; </span> &lt;hyperlink target="DeleteIntegrationRule" description="${uiLabelMap.CommonDelete}" also-hidden="false" image-location="${iconsPurpose.Delete}" image-title="${uiLabelMap.IconsTooltips_Delete}" request-confirmation="true"&gt; &lt;parameter param-name="integEventTypeId" from-field="integEventTypeId"/&gt; &lt;parameter param-name="integrationRuleId" from-field="sequenceId"/&gt; &lt;/hyperlink&gt; &lt;/field&gt; <span style="background: #ffdddd; color: #000000">- &lt;field name="editLink" title=" "&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;field name="editLink" title=" "&gt; </span> &lt;hyperlink target="EditIntegrationRule" description="${uiLabelMap.CommonSelect}" also-hidden="false" image-location="${iconsPurpose.Edit}" image-title="${uiLabelMap.IconsTooltips_Edit}"&gt; &lt;parameter param-name="integEventTypeId"/&gt; &lt;parameter param-name="integrationRuleId"/&gt; <span style="color: #aaaaaa">@@ -442,6 +443,7 @@ </span> &lt;/field&gt; &lt;field name="integEntrySequence" &gt;&lt;text size="4"/&gt;&lt;/field&gt; &lt;field name="applyDescription" position="2"&gt;&lt;text size="50"/&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="applyMasterDescription" position="3"&gt;&lt;text size="50"/&gt;&lt;/field&gt; </span> &lt;field name="customMethodId" title="${uiLabelMap.NaccountingServiceCustomMethodId}" &gt; &lt;drop-down allow-empty="true"&gt; &lt;entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}"&gt; </code></pre> <br> </li> <li id="a453f91a0a4af7575917fad54f4ac1d0"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-6"> <strong> applications/order/servicedef/services.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/order/servicedef/services.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/order/servicedef/services.xml </span><span style="color: #aaaaaa">@@ -102,6 +102,7 @@ under the License. </span> &lt;attribute name="originFacilityId" type="String" mode="IN" optional="true"/&gt; &lt;attribute name="transactionId" type="String" mode="IN" optional="true"/&gt; &lt;attribute name="terminalId" type="String" mode="IN" optional="true"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;attribute name="priority" type="String" mode="IN" optional="true"/&gt; </span> &lt;attribute name="workEffortId" type="String" mode="IN" optional="true"/&gt; &lt;attribute name="autoOrderShoppingListId" type="String" mode="IN" optional="true"/&gt; &lt;attribute name="webSiteId" type="String" mode="IN" optional="true"/&gt; </code></pre> <br> </li> <li id="dffc348e63ffc0037c23afd36439222f"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-7"> <strong> applications/order/src/org/ofbiz/order/order/OrderServices.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/order/src/org/ofbiz/order/order/OrderServices.java </span><span style="background: #ddffdd; color: #000000">+++ b/applications/order/src/org/ofbiz/order/order/OrderServices.java </span><span style="color: #aaaaaa">@@ -537,6 +537,10 @@ public class OrderServices { </span> orderHeader.set("productStoreId", context.get("productStoreId")); } <span style="background: #ddffdd; color: #000000">+ if (UtilValidate.isNotEmpty(context.get("priority"))) { + orderHeader.set("priority", context.get("priority")); + } + </span> if (UtilValidate.isNotEmpty(context.get("transactionId"))) { orderHeader.set("transactionId", context.get("transactionId")); } <span style="color: #aaaaaa">@@ -1150,6 +1154,21 @@ public class OrderServices { </span> } // END inventory reservation <span style="background: #ddffdd; color: #000000">+ if (UtilValidate.isNotEmpty(context.get("priority"))) { + //setOrderReservationPriority + try { + Map&lt;String, Object&gt; serviceCtx = ctx.makeValidContext("setOrderReservationPriority", "IN", context); + serviceCtx.put("orderId", orderId); + Map&lt;String, Object&gt; serviceResult = dispatcher.runSync("setOrderReservationPriority", serviceCtx); + if (ServiceUtil.isError(serviceResult)) { + String errMsg = ServiceUtil.getErrorMessage(serviceResult); + resErrorMessages.addAll((Collection&lt;? extends String&gt;) UtilMisc.&lt;String, String&gt;toMap("reasonCode", "ReceiveInventoryServiceError", "description", errMsg)); + } + } catch (GeneralException e) { + return ServiceUtil.returnError(e.getMessage()); + } + } + </span> successResult.put("orderId", orderId); } catch (GenericEntityException e) { Debug.logError(e, "Problem with order storage or reservations", module); <span style="color: #aaaaaa">@@ -2674,6 +2693,17 @@ public class OrderServices { </span> LocalDispatcher dispatcher = ctx.getDispatcher(); Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); <span style="background: #ddffdd; color: #000000">+ GenericValue systemLogin=null; + try { + systemLogin=delegator.findOne("UserLogin", true, "userLoginId", "system"); + } catch (GenericEntityException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + if (UtilValidate.isEmpty(systemLogin)) { + systemLogin=userLogin; + } + </span> String orderId = (String) context.get("orderId"); String statusId = (String) context.get("statusId"); String changeReason = (String) context.get("changeReason"); <span style="color: #aaaaaa">@@ -2795,7 +2825,7 @@ public class OrderServices { </span> /* Map&lt;String, Object&gt; resp = dispatcher.runSync("changeOrderItemStatus", UtilMisc.&lt;String, Object&gt;toMap("orderId", orderId, "statusId", newItemStatusId, "userLogin", userLogin)); */ <span style="background: #ffdddd; color: #000000">- Map&lt;String, Object&gt; resp = dispatcher.runSync("changeOrderItemStatus", UtilMisc.&lt;String, Object&gt;toMap("orderId", orderId, "statusId", newItemStatusId, "userLogin", userLogin, "autoCancelPur", context.get("autoCancelPur"))); </span><span style="background: #ddffdd; color: #000000">+ Map&lt;String, Object&gt; resp = dispatcher.runSync("changeOrderItemStatus", UtilMisc.&lt;String, Object&gt;toMap("orderId", orderId, "statusId", newItemStatusId, "userLogin", systemLogin, "autoCancelPur", context.get("autoCancelPur"))); </span> //#Eam# auto-cancel-order-purchase if (ServiceUtil.isError(resp)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, </code></pre> <br> </li> <li id="f82b13d5e971dfa7a0cea839dd9d819c"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-8"> <strong> applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java </span><span style="background: #ddffdd; color: #000000">+++ b/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java </span><span style="color: #aaaaaa">@@ -118,6 +118,7 @@ public class ShoppingCart implements Iterable&lt;ShoppingCartItem&gt;, Serializable { </span> private String agreementId = null; private String quoteId = null; private String workEffortId = null; <span style="background: #ddffdd; color: #000000">+ private String priority = null; </span> private long nextItemSeq = 1; private String defaultItemDeliveryDate = null; <span style="color: #aaaaaa">@@ -210,6 +211,7 @@ public class ShoppingCart implements Iterable&lt;ShoppingCartItem&gt;, Serializable { </span> this.poNumber = cart.getPoNumber(); this.orderId = cart.getOrderId(); this.orderName = "Copy of " + cart.getOrderName(); <span style="background: #ddffdd; color: #000000">+ this.priority = cart.getPriority(); </span> this.workEffortId = cart.getWorkEffortId(); this.firstAttemptOrderId = cart.getFirstAttemptOrderId(); this.billingAccountId = cart.getBillingAccountId(); <span style="color: #aaaaaa">@@ -428,6 +430,14 @@ public class ShoppingCart implements Iterable&lt;ShoppingCartItem&gt;, Serializable { </span> return orderName; } <span style="background: #ddffdd; color: #000000">+ public void setPriority(String priority) { + this.priority = priority; + } + + public String getPriority() { + return priority; + } + </span> public void setWorkEffortId(String workEffortId) { this.workEffortId = workEffortId; } <span style="color: #aaaaaa">@@ -4180,6 +4190,7 @@ public class ShoppingCart implements Iterable&lt;ShoppingCartItem&gt;, Serializable { </span> result.put("transactionId", this.getTransactionId()); result.put("originFacilityId", this.getFacilityId()); result.put("terminalId", this.getTerminalId()); <span style="background: #ddffdd; color: #000000">+ result.put("priority", this.getPriority()); </span> result.put("workEffortId", this.getWorkEffortId()); result.put("autoOrderShoppingListId", this.getAutoOrderShoppingListId()); </code></pre> <br> </li> <li id="ba4d174bce4109eebf5db0040421eba2"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-9"> <strong> applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy </span><span style="background: #ddffdd; color: #000000">+++ b/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy </span><span style="color: #aaaaaa">@@ -133,7 +133,11 @@ if (orderHeader) { </span> // get the order total quantity included orderTotalQuantity = 0 for (GenericValue item: orderItemList ) { <span style="background: #ffdddd; color: #000000">- orderTotalQuantity += (int) item.get("quantity") </span><span style="background: #ddffdd; color: #000000">+ itemQuantity = item.quantity; + if (item.cancelQuantity) { + itemQuantity -= item.cancelQuantity; + } + orderTotalQuantity += (int) itemQuantity; </span> } context.put("orderTotalQuantity", orderTotalQuantity) </code></pre> <br> </li> <li id="bbc2314e774c28d45e241dbe5d218f70"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-10"> <strong> applications/product/config/ProductEmbiUiLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- /dev/null </span><span style="background: #ddffdd; color: #000000">+++ b/applications/product/config/ProductEmbiUiLabels.xml </span><span style="color: #aaaaaa">@@ -0,0 +1,26 @@ </span><span style="background: #ddffdd; color: #000000">+&lt;?xml version="1.0" encoding="UTF-8"?&gt; +&lt;!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--&gt; +&lt;resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt; + &lt;property key="FormFieldTitle_blDate"&gt; + &lt;value xml:lang="en"&gt;Delivery note date&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Date du bordereau de livraison&lt;/value&gt; + &lt;/property&gt; +&lt;/resource&gt; </span></code></pre> <br> </li> <li id="02c44bcb0c30e1642888c0330c8d112c"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-11"> <strong> applications/product/config/ProductEntityLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/product/config/ProductEntityLabels.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/product/config/ProductEntityLabels.xml </span><span style="color: #aaaaaa">@@ -4134,7 +4134,19 @@ </span> &lt;!--#Bam# portlet-order --&gt; &lt;property key="ShipmentMethodType.description.NO_SHIPPING"&gt; &lt;value xml:lang="en"&gt;No Shipment: You have to pickup your goods by your own.&lt;/value&gt; <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="fr"&gt;Pas de Livraison : vous devez récupérer vos marchandises par vos propres moyens.&lt;/value&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="fr"&gt;Pas de Livraison : vous devrez récupérer vos marchandises par vos propres moyens.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="ShipmentMethodType.description.ETC_SHIPPING"&gt; + &lt;value xml:lang="en"&gt;Economic delivery (2 to 5 days)&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Livraison Economique (2 à 5 jours)&lt;/value&gt; + &lt;/property&gt; + &lt;property key="ShipmentMethodType.description.PTC_SHIPPING"&gt; + &lt;value xml:lang="en"&gt;Priority delivery (1 to 2 days)&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Livraison Prioritaire (1 à 2 jours)&lt;/value&gt; + &lt;/property&gt; + &lt;property key="ShipmentMethodType.description.STC_SHIPPING"&gt; + &lt;value xml:lang="en"&gt;Economic delivery (2 to 5 days)&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Livraison Economique (2 à 5 jours)&lt;/value&gt; </span> &lt;/property&gt; &lt;property key="ShipmentMethodType.description.LOCAL_DELIVERY"&gt; &lt;value xml:lang="en"&gt;Local Delivery&lt;/value&gt; </code></pre> <br> </li> <li id="5ddb4a7da6ac3ae899220a2054c79be0"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-12"> <strong> applications/product/webapp/facility/WEB-INF/web.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/product/webapp/facility/WEB-INF/web.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/product/webapp/facility/WEB-INF/web.xml </span><span style="color: #aaaaaa">@@ -100,6 +100,10 @@ under the License. </span> &lt;/servlet-mapping&gt; &lt;session-config&gt; <span style="background: #ddffdd; color: #000000">+ &lt;cookie-config&gt; + &lt;http-only&gt;true&lt;/http-only&gt; + &lt;secure&gt;true&lt;/secure&gt; + &lt;/cookie-config&gt; </span> &lt;session-timeout&gt;60&lt;/session-timeout&gt; &lt;!-- in minutes --&gt; &lt;/session-config&gt; </code></pre> <br> </li> <li id="96c68c4d0376aa9733e6df1aff7dc9f8"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-13"> <strong> applications/product/widget/facility/CommonScreens.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/product/widget/facility/CommonScreens.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/product/widget/facility/CommonScreens.xml </span><span style="color: #aaaaaa">@@ -31,6 +31,7 @@ under the License. </span> &lt;property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/&gt; &lt;property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/&gt; &lt;property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property-map resource="ProductEmbiUiLabels" map-name="uiLabelMap" global="true"/&gt; </span> &lt;set field="layoutSettings.companyName" from-field="uiLabelMap.FacilityCompanyName" global="true"/&gt; &lt;set field="layoutSettings.companySubtitle" from-field="uiLabelMap.FacilityCompanySubtitle" global="true"/&gt; </code></pre> <br> </li> <li id="e483fe4e07b9111852a8f4e3e4e61d16"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-14"> <strong> applications/product/widget/facility/FacilityForms.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/applications/product/widget/facility/FacilityForms.xml </span><span style="background: #ddffdd; color: #000000">+++ b/applications/product/widget/facility/FacilityForms.xml </span><span style="color: #aaaaaa">@@ -88,6 +88,8 @@ under the License. </span> &lt;lookup target-form-name="LookupPartyName"/&gt; &lt;/field&gt; &lt;field name="lotId" title="${uiLabelMap.ProductLotId}"&gt;&lt;text/&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="country"&gt;&lt;text-find/&gt;&lt;/field&gt; + &lt;field name="blDate"&gt;&lt;text-find/&gt;&lt;/field&gt; </span> &lt;!-- the content of the softIdentifier field is converted from hex to int if it starts with "0x"; this is a nice example of using JavaScript in a form widget definition --&gt; &lt;field name="submitButton" title="${uiLabelMap.CommonFind}" event="onclick" action="javascript:var field=document.SearchInventoryItemsParams.softIdentifier;var tmp=field.value;if (tmp.substring(0, 2) == '0x') {tmp=parseInt(tmp, 16)};if (!isNaN(tmp)) {field.value=tmp};return true;"&gt; <span style="color: #aaaaaa">@@ -99,7 +101,7 @@ under the License. </span> &lt;actions&gt; &lt;service service-name="performFind" result-map="results" result-map-list="listIt"&gt; &lt;field-map field-name="inputFields" from-field="parameters"/&gt; <span style="background: #ffdddd; color: #000000">- &lt;field-map field-name="entityName" value="InventoryItemAndLocation"/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;field-map field-name="entityName" value="InvItLocCountryAndDate"/&gt; </span> &lt;field-map field-name="orderBy" value="statusId|quantityOnHandTotal|serialNumber"/&gt; &lt;field-map field-name="viewIndex" from-field="viewIndex"/&gt; &lt;field-map field-name="viewSize" from-field="viewSize"/&gt; <span style="color: #aaaaaa">@@ -137,6 +139,8 @@ under the License. </span> &lt;field name="binNumber" title="${uiLabelMap.ProductBinNumber}"&gt;&lt;display/&gt;&lt;/field&gt; &lt;field name="serialNumber"&gt;&lt;display/&gt;&lt;/field&gt; &lt;field name="softIdentifier"&gt;&lt;display/&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="country"&gt;&lt;display description="${countryLabel} [${country}]"/&gt;&lt;/field&gt; + &lt;field name="blDate"&gt;&lt;display/&gt;&lt;/field&gt; </span> &lt;field name="quantityOnHandTotal"&gt;&lt;display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/&gt;&lt;/field&gt; &lt;field name="transfer" title="${uiLabelMap.ProductTransfer}" entry-name="inventoryItemId" widget-style="buttontext"&gt; &lt;hyperlink target="TransferInventoryItem" description="${uiLabelMap.ProductTransfer}"&gt; </code></pre> <br> </li> <li id="54071697bdb74afd518e691935ab92ab"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-15"> <strong> framework/common/config/CommonEntityLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/framework/common/config/CommonEntityLabels.xml </span><span style="background: #ddffdd; color: #000000">+++ b/framework/common/config/CommonEntityLabels.xml </span><span style="color: #aaaaaa">@@ -16848,6 +16848,18 @@ </span> &lt;value xml:lang="zh"&gt;????&lt;/value&gt; &lt;value xml:lang="zh_TW"&gt;????&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="Uom.abbreviation.TF_day"&gt; + &lt;value xml:lang="en"&gt;d&lt;/value&gt; + &lt;value xml:lang="fr"&gt;j&lt;/value&gt; + &lt;/property&gt; + &lt;property key="Uom.abbreviation.TF_hr"&gt; + &lt;value xml:lang="en"&gt;h&lt;/value&gt; + &lt;value xml:lang="fr"&gt;h&lt;/value&gt; + &lt;/property&gt; + &lt;property key="Uom.abbreviation.TF_min"&gt; + &lt;value xml:lang="en"&gt;min&lt;/value&gt; + &lt;value xml:lang="fr"&gt;min&lt;/value&gt; + &lt;/property&gt; </span> &lt;property key="Uom.description.ADP"&gt; &lt;value xml:lang="ar"&gt;???????? ?????????&lt;/value&gt; &lt;value xml:lang="de"&gt;Peseta Andorra&lt;/value&gt; </code></pre> <br> </li> <li id="879ee3b75b3b68112858e3c5a60c5a35"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-16"> <strong> framework/images/webapp/images/css/images/modal_encoding_en_percent.png </strong> </a> <hr> <pre class="highlight"><code>Binary files /dev/null and b/framework/images/webapp/images/css/images/modal_encoding_en_percent.png differ </code></pre> <br> </li> <li id="c980cac8551b1b1f8a4a5bb6e26a7f54"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-17"> <strong> framework/images/webapp/images/css/images/modal_encoding_en_qty.png </strong> </a> <hr> <pre class="highlight"><code>Binary files /dev/null and b/framework/images/webapp/images/css/images/modal_encoding_en_qty.png differ </code></pre> <br> </li> <li id="0456dbe6f74a19ea201dea7c0be35e3d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-18"> <strong> framework/images/webapp/images/css/images/modal_encoding_fr_percent.png </strong> </a> <hr> <pre class="highlight"><code>Binary files /dev/null and b/framework/images/webapp/images/css/images/modal_encoding_fr_percent.png differ </code></pre> <br> </li> <li id="36f20111c8470f8bf0a970af1aa5de94"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-19"> <strong> framework/images/webapp/images/css/images/modal_encoding_fr_qty.png </strong> </a> <hr> <pre class="highlight"><code>Binary files /dev/null and b/framework/images/webapp/images/css/images/modal_encoding_fr_qty.png differ </code></pre> <br> </li> <li id="1c6f4778cb1e5e381e17e502561a0932"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-20"> <strong> framework/images/webapp/images/fieldlookup.js </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/framework/images/webapp/images/fieldlookup.js </span><span style="background: #ddffdd; color: #000000">+++ b/framework/images/webapp/images/fieldlookup.js </span><span style="color: #aaaaaa">@@ -190,9 +190,10 @@ var Lookup = function(options) { </span> presentation : options.presentation || "layer", defaultMinLength : options.defaultMinLength || "", defaultDelay : options.defaultDelay || "", <span style="background: #ffdddd; color: #000000">- lookupSelectCallback: options.lookupSelectCallback || "", </span><span style="background: #ddffdd; color: #000000">+ lookupCallback: options.lookupCallback || "", + lookupOnSelectCallback : options.lookupOnSelectCallback || "", </span> args : options.args || "" <span style="background: #ffdddd; color: #000000">- } </span><span style="background: #ddffdd; color: #000000">+ }; </span> function _init() { _lookupId = GLOBAL_LOOKUP_REF.createNextKey(); <span style="color: #aaaaaa">@@ -203,7 +204,7 @@ var Lookup = function(options) { </span> var dialogOpts = _createDialogOptions(_lookupContainer); // init Dialog and register <span style="background: #ffdddd; color: #000000">- // create an object with all Lookup Informationes that are needed </span><span style="background: #ddffdd; color: #000000">+ // create an object with all Lookup Information that are needed </span> var dialogRef = _lookupContainer.dialog(dialogOpts); // setting up global variabels, for external access <span style="color: #aaaaaa">@@ -212,7 +213,7 @@ var Lookup = function(options) { </span> this.formName = options.formName; this.target = null; this.presentation = options.presentation; <span style="background: #ffdddd; color: #000000">- this.showDescription = (options.showDescription == "true") ? true : false; </span><span style="background: #ddffdd; color: #000000">+ this.showDescription = options.showDescription == "true"; </span> if (options.dialogOptionalTarget != null) { this.target2 = null; } <span style="color: #aaaaaa">@@ -249,16 +250,17 @@ var Lookup = function(options) { </span> if (options.ajaxUrl != "") { // write the new input box id in the ajaxUrl Array options.ajaxUrl = options.ajaxUrl.replace(options.ajaxUrl.substring(0, options.ajaxUrl.indexOf(",")), _newInputBoxId); <span style="background: #ffdddd; color: #000000">- new ajaxAutoCompleter(options.ajaxUrl, (options.showDescription == "true") ? true : false, options.defaultMinLength, options.defaultDelay, - options.formName, options.args, options.lookupSelectCallback); </span><span style="background: #ddffdd; color: #000000">+ new ajaxAutoCompleter(options.ajaxUrl, options.showDescription == "true", options.defaultMinLength, options.defaultDelay, + options.formName, options.args, options.lookupCallback, options.lookupOnSelectCallback); </span> } } function _createDialogOptions(_lookupContainer) { var positioning = _positioning(); <span style="background: #ddffdd; color: #000000">+ // Keep declaration redundancy for code readability </span> var dialogOpts = { <span style="background: #ffdddd; color: #000000">- modal : (options.modal == "true") ? true : false, </span><span style="background: #ddffdd; color: #000000">+ modal : options.modal == "true", </span> bgiframe : true, autoOpen : false, height : parseInt(options.height), <span style="color: #aaaaaa">@@ -275,20 +277,28 @@ var Lookup = function(options) { </span> function _positioning() { var positioning = null; <span style="background: #ffdddd; color: #000000">- if (options.position == "topleft") { - positioning = [ 'left', 'top' ]; - } else if (options.position == "topcenter") { - positioning = [ 'center', 'top' ]; - } else if (options.position == "topright") { - positioning = [ 'right', 'top' ]; - } else if (options.position == "center") { - positioning = 'center'; - } else if (options.position == "left") { - positioning = 'left'; - } else if (options.position == "right") { - positioning = 'right'; - } else { - positioning = [ 'left', 'top' ]; </span><span style="background: #ddffdd; color: #000000">+ switch (options.position) { + case "topleft": + positioning = ["left", "top"]; + break; + case "topcenter": + positioning = ["center", "top"]; + break; + case "topright": + positioning = ["right", "top"]; + break; + case "left": + positioning = ["left"]; + break; + case "center": + positioning = ["center"]; + break; + case "right": + positioning = ["right"]; + break; + default: + positioning = ["left", "top"]; + break; </span> } return positioning; <span style="color: #aaaaaa">@@ -343,7 +353,7 @@ var Lookup = function(options) { </span> * need a reference to lookup_1, this reference is set here */ <span style="background: #ffdddd; color: #000000">- var prevLookup = null </span><span style="background: #ddffdd; color: #000000">+ var prevLookup = null; </span> if (ACTIVATED_LOOKUP) { prevLookup = ACTIVATED_LOOKUP; } <span style="color: #aaaaaa">@@ -364,13 +374,13 @@ var Lookup = function(options) { </span> if (ACTIVATED_LOOKUP &amp;&amp; ACTIVATED_LOOKUP == _lookupId) { GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).dialogRef.dialog("close"); } <span style="background: #ffdddd; color: #000000">- } </span><span style="background: #ddffdd; color: #000000">+ }; </span> jQuery(".ui-widget-overlay").click(_backgroundCloseClickEvent); } function _dialogClose() { <span style="background: #ffdddd; color: #000000">- jQuery(".ui-widget-overlay").unbind("click", _backgroundCloseClickEvent) </span><span style="background: #ddffdd; color: #000000">+ jQuery(".ui-widget-overlay").unbind("click", _backgroundCloseClickEvent); </span> var prevLookup = null; if (ACTIVATED_LOOKUP) { </code></pre> <br> </li> <li id="eb9ceb07a63a2ccebe3dc5ed6d87d9a7"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-21"> <strong> framework/images/webapp/images/selectall.js </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/framework/images/webapp/images/selectall.js </span><span style="background: #ddffdd; color: #000000">+++ b/framework/images/webapp/images/selectall.js </span><span style="color: #aaaaaa">@@ -443,7 +443,7 @@ function ajaxSubmitFormUpdateAreas(form, areaCsvString) { </span> ajaxUpdateAreas(areaCsvString); } waitSpinnerHide(); <span style="background: #ffdddd; color: #000000">- } </span><span style="background: #ddffdd; color: #000000">+ }; </span> jQuery.ajax({ type: "POST", <span style="color: #aaaaaa">@@ -469,7 +469,7 @@ function ajaxUploadFormUpdateAreas(form, areaCsvString) { </span> */ jQuery('#content-messages').removeClass('errorMessage').fadeOut('fast'); //#Eam# ET-18 <span style="background: #ffdddd; color: #000000">- } </span><span style="background: #ddffdd; color: #000000">+ }; </span> updateFunction = function(data) { if (data._ERROR_MESSAGE_LIST_ != undefined || data._ERROR_MESSAGE_ != undefined) { //#Bam# ET-18 <span style="color: #aaaaaa">@@ -499,19 +499,34 @@ function ajaxUploadFormUpdateAreas(form, areaCsvString) { </span> ajaxUpdateAreas(areaCsvString); } waitSpinnerHide(); <span style="background: #ffdddd; color: #000000">- } </span><span style="background: #ddffdd; color: #000000">+ }; </span> jQuery("#fields_" + form).upload(jQuery("#" + form).attr("action"), function(data) {updateFunction(data)}, 'json'); } / Enable auto-completion for text elements, with a possible span of tooltip class showing description. <span style="background: #ffdddd; color: #000000">- * @param areaCsvString The area CSV string. The CSV string is a flat array in the - * form of: areaId, target, target parameters [, areaId, target, target parameters...]. </span><span style="background: #ddffdd; color: #000000">+ * @param areaCsvString The area CSV string. The CSV string is a flat array in the form of: areaId, target, target parameters [, areaId, target, target parameters...]. + * @param showDescription If we show the description in the dialog + * @param defaultMinLength The jQuery UI autocomplete default minLength before search being performed + * @param defaultDelay The jQuery UI autocomplete default delay between keystroke and search being performed + * @param formName The associated form name </span> */ function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, defaultDelay, formName){ <span style="background: #ffdddd; color: #000000">- return new ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, defaultDelay, formName, null); </span><span style="background: #ddffdd; color: #000000">+ return new ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, defaultDelay, formName, null, null, null); // args, callback, selectCallback </span> } <span style="background: #ffdddd; color: #000000">-function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, defaultDelay, formName, args, callback){ </span><span style="background: #ddffdd; color: #000000">+ +/ + * Enable auto-completion for text elements, with a possible span of tooltip class showing description. + * @param areaCsvString The area CSV string. The CSV string is a flat array in the form of: areaId, target, target parameters [, areaId, target, target parameters...]. + * @param showDescription If we show the description in the dialog + * @param defaultMinLength The jQuery UI autocomplete default minLength before search being performed + * @param defaultDelay The jQuery UI autocomplete default delay between keystroke and search being performed + * @param formName The associated form name + * @param args Table of parameters to use for the request + * @param callback Callback function when the request is done + * @param selectCallback Callback function when an item is selected + */ +function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, defaultDelay, formName, args, callback, selectCallback){ </span> var areaArray = areaCsvString.replace(/&amp;amp;/g, '&amp;').split(","); var numAreas = parseInt(areaArray.length / 3); <span style="color: #aaaaaa">@@ -546,12 +561,11 @@ function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, def </span> beforeSend: function (jqXHR, settings) { //If LAST_AUTOCOMP_REF is not null means an existing ajax auto-completer request is in progress, so need to abort them to prevent inconsistent behavior of autocompleter if (LAST_AUTOCOMP_REF != null &amp;&amp; LAST_AUTOCOMP_REF.readyState != 4) { <span style="background: #ffdddd; color: #000000">- var oldRef = LAST_AUTOCOMP_REF; - oldRef.abort(); </span><span style="background: #ddffdd; color: #000000">+ LAST_AUTOCOMP_REF.abort(); </span> //Here we are aborting the LAST_AUTOCOMP_REF so need to call the response method so that auto-completer pending request count handle in proper way response( [] ); } <span style="background: #ffdddd; color: #000000">- LAST_AUTOCOMP_REF= jqXHR; </span><span style="background: #ddffdd; color: #000000">+ LAST_AUTOCOMP_REF = jqXHR; // Update the LAST_AUTOCOMP_REF with the current jqXHR </span> }, success: function(data) { // reset the autocomp field <span style="color: #aaaaaa">@@ -562,14 +576,18 @@ function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, def </span> if (typeof autocomp != 'undefined') { jQuery.each(autocomp, function(index, item){ item.label = jQuery("&lt;div&gt;").html(item.label).text(); <span style="background: #ffdddd; color: #000000">- }) </span><span style="background: #ddffdd; color: #000000">+ }); </span> // autocomp is the JSON Object which will be used for the autocomplete box response(autocomp); } <span style="background: #ddffdd; color: #000000">+ + if (typeof callback === "function") { + callback(); + } </span> }, <span style="background: #ffdddd; color: #000000">- error: function(xhr, reason, exception) { - if(exception != 'abort') { - alert("An error occurred while communicating with the server:\n\n\nreason=" + reason + "\n\nexception=" + exception); </span><span style="background: #ddffdd; color: #000000">+ error: function(jqXHR, textStatus, errorThrown) { + if(errorThrown != 'abort') { + alert("An error occurred while communicating with the server:\n\n\nreason=" + textStatus + "\n\nexception=" + errorThrown); </span> } } }); <span style="color: #aaaaaa">@@ -579,8 +597,8 @@ function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, def </span> jQuery("#" + areaArray[0]).val(ui.item.value); // setting a text field if (showDescription &amp;&amp; (ui.item.value != undefined &amp;&amp; ui.item.value != '')) { setLookDescription(areaArray[0], ui.item.label, areaArray[2], formName, showDescription); <span style="background: #ffdddd; color: #000000">- if (typeof callback === "function") { - callback(ui.item); </span><span style="background: #ddffdd; color: #000000">+ if (typeof selectCallback === "function") { + selectCallback(ui.item); </span> } } } <span style="color: #aaaaaa">@@ -613,12 +631,12 @@ function setLookDescription(textFieldId, description, params, formName, showDesc </span> var lookupWrapperEl = jQuery("#" + textFieldId).closest('.field-lookup'); if (lookupWrapperEl.length) { if (start == -1 &amp;&amp; showDescription) { <span style="background: #ffdddd; color: #000000">- var start = description.indexOf(' '); </span><span style="background: #ddffdd; color: #000000">+ start = description.indexOf(' '); </span> if (start != -1 &amp;&amp; description.indexOf('&lt;script type="text/javascript"&gt;') == -1) { description = description.substring(start); } } <span style="background: #ffdddd; color: #000000">- tooltipElement = jQuery("#" + textFieldId + '_lookupDescription') </span><span style="background: #ddffdd; color: #000000">+ tooltipElement = jQuery("#" + textFieldId + '_lookupDescription'); </span> if (!tooltipElement.length) { tooltipElement = jQuery("&lt;span id='" + textFieldId + "_lookupDescription' class='tooltip'&gt;&lt;/span&gt;"); } </code></pre> <br> </li> <li id="b150bb0039b44a462e2526f9f645591e"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-22"> <strong> framework/widget/templates/htmlFormMacroLibrary.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/framework/widget/templates/htmlFormMacroLibrary.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/framework/widget/templates/htmlFormMacroLibrary.ftl </span><span style="color: #aaaaaa">@@ -657,8 +657,10 @@ Parameter: showDescription, String, optional - If the showDescription parameter </span> Parameter: initiallyCollapsed, Not used. Parameter: lastViewName, String, optional - If the ajaxEnabled parameter is true, the contents of lastViewName will be appended to the Ajax URL. Parameter: placeholder, String, optional - If not empty, specifies a short hint that describes the expected value of an input field <span style="background: #ddffdd; color: #000000">+Parameter: lookupCallback, Function, optional - A JS function called when the lookup request has finished +Parameter: lookupOnSelectCallback, Function, optional - A JS function called when an item is selected from the dropdown. It will receive the selected item as parameter </span> --&gt; <span style="background: #ffdddd; color: #000000">-&lt;#macro renderLookupField name formName fieldFormName className="" alert="false" value="" size="" maxlength="" id="" event="" action="" readonly=false autocomplete="" descriptionFieldName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled=javaScriptEnabled presentation="layer" width="" height="" position="" fadeBackground="true" clearText="" showDescription="" initiallyCollapsed="" lastViewName="main" placeholder="" lookupCallback=""&gt; </span><span style="background: #ddffdd; color: #000000">+&lt;#macro renderLookupField name formName fieldFormName className="" alert="false" value="" size="" maxlength="" id="" event="" action="" readonly=false autocomplete="" descriptionFieldName="" targetParameterIter=[] imgSrc="" ajaxUrl="" ajaxEnabled=javaScriptEnabled presentation="layer" width="" height="" position="" fadeBackground="true" clearText="" showDescription="" initiallyCollapsed="" lastViewName="main" placeholder="" lookupCallback="" lookupOnSelectCallback=""&gt; </span> &lt;#if Static["org.ofbiz.widget.ModelWidget"].widgetBoundaryCommentsEnabled(context)&gt; &lt;!-- @renderLookupField --&gt; &lt;/#if&gt; <span style="color: #aaaaaa">@@ -738,7 +740,10 @@ Parameter: placeholder, String, optional - If not empty, specifies a short hint </span> defaultMinLength : "${defaultMinLength!2}", defaultDelay : "${defaultDelay!300}", &lt;#if lookupCallback?has_content&gt; <span style="background: #ffdddd; color: #000000">- lookupSelectCallback: ${lookupCallback}, </span><span style="background: #ddffdd; color: #000000">+ lookupCallback: ${lookupCallback}, + &lt;/#if&gt; + &lt;#if lookupOnSelectCallback?has_content&gt; + lookupOnSelectCallback: ${lookupOnSelectCallback}, </span> &lt;/#if&gt; args : &lt;#rt/&gt; <span style="color: #aaaaaa">@@ -767,7 +772,7 @@ Parameter: placeholder, String, optional - If not empty, specifies a short hint </span> style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void(0);" <span style="background: #ffdddd; color: #000000">- onclick="javascript:document.${formName}.${name}.value=''; </span><span style="background: #ddffdd; color: #000000">+ onclick="document.${formName}.${name}.value=''; </span> jQuery('#' + jQuery('#${id}_clear').next().attr('id').replace('_button','') + '_${id}_lookupDescription').html(''); &lt;#if descriptionFieldName?has_content&gt;document.${formName}.${descriptionFieldName}.value='';&lt;/#if&gt;"&gt; &lt;#if clearText?has_content&gt;${clearText}&lt;#else&gt;${uiLabelMap.CommonClear}&lt;/#if&gt; </code></pre> <br> </li> <li id="0c08409ec4a7facc84b7b99ac6b35e60"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-23"> <strong> hot-deploy/embisphere-partner/config/EmbispherePartnerErrorLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/config/EmbispherePartnerErrorLabels.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/config/EmbispherePartnerErrorLabels.xml </span><span style="color: #aaaaaa">@@ -25,8 +25,12 @@ </span> &lt;value xml:lang="fr"&gt;Oh non ! Un problème est survenu lors de la création du client&lt;/value&gt; &lt;/property&gt; &lt;property key="EmbiErrorCustRequestDateNotInPast"&gt; <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="en"&gt;Invoice date cannot be in the past&lt;/value&gt; - &lt;value xml:lang="fr"&gt;La date de la facturation ne peut pas être dans le passé&lt;/value&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="en"&gt;Invoice date cannot be in the future&lt;/value&gt; + &lt;value xml:lang="fr"&gt;La date de la facturation est incorrecte&lt;/value&gt; + &lt;/property&gt; + &lt;property key="EmbiErrorCustRequestDeliveryDateNotInPast"&gt; + &lt;value xml:lang="en"&gt;Delivery date cannot be in the future&lt;/value&gt; + &lt;value xml:lang="fr"&gt;La date de réception est incorrecte&lt;/value&gt; </span> &lt;/property&gt; &lt;property key="EmbiErrorCustRequestExchangeProduct"&gt; &lt;value xml:lang="en"&gt;Product is not the same as warranty item&lt;/value&gt; </code></pre> <br> </li> <li id="3252e9669561868c6dd243fbab40f81c"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-24"> <strong> hot-deploy/embisphere-partner/config/EmbispherePartnerUiLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/config/EmbispherePartnerUiLabels.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/config/EmbispherePartnerUiLabels.xml </span><span style="color: #aaaaaa">@@ -35,13 +35,13 @@ </span> &lt;value xml:lang="en"&gt;New warranty activation&lt;/value&gt; &lt;/property&gt; &lt;property key="EmbiPartnerMenuWarrantyMyWarranties"&gt; <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="en"&gt;My warranty activation&lt;/value&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="en"&gt;My warranty activations&lt;/value&gt; </span> &lt;/property&gt; &lt;property key="EmbiPartnerMenuWarrantyNewExchange"&gt; &lt;value xml:lang="en"&gt;New product exchange declaration&lt;/value&gt; &lt;/property&gt; &lt;property key="EmbiPartnerMenuWarrantyMyExchanges"&gt; <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="en"&gt;My product exchange declaration&lt;/value&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="en"&gt;My product exchange declarations&lt;/value&gt; </span> &lt;/property&gt; <span style="color: #aaaaaa">@@ -84,7 +84,7 @@ </span> &lt;value xml:lang="en"&gt;Product information&lt;/value&gt; &lt;/property&gt; &lt;property key="EmbiPartnerPageHeaderBreadCrumbWAStep3"&gt; <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="en"&gt;Warranty activation&lt;/value&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="en"&gt;Warranty activation requested&lt;/value&gt; </span> &lt;/property&gt; &lt;property key="EmbiPartnerPageHeaderBreadCrumbStatusDraft"&gt; &lt;value xml:lang="en"&gt;Draft&lt;/value&gt; <span style="color: #aaaaaa">@@ -201,6 +201,10 @@ </span> &lt;property key="EmbiPartnerFormFieldCondition"&gt; &lt;value xml:lang="en"&gt;Condition&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="EmbiPartnerFormFieldDeliveryDate"&gt; + &lt;value xml:lang="en"&gt;Delivery date&lt;/value&gt; + &lt;value xml:lang="en"&gt;Date de réception&lt;/value&gt; + &lt;/property&gt; </span> &lt;property key="EmbiPartnerFormFieldEndCustomer"&gt; &lt;value xml:lang="en"&gt;End customer&lt;/value&gt; &lt;/property&gt; <span style="color: #aaaaaa">@@ -305,6 +309,10 @@ </span> &lt;property key="EmbiPartnerTableHeaderCreated"&gt; &lt;value xml:lang="en"&gt;Created&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="EmbiPartnerTableHeaderDelivered"&gt; + &lt;value xml:lang="en"&gt;Delivered&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Reçu&lt;/value&gt; + &lt;/property&gt; </span> &lt;property key="EmbiPartnerTableHeaderInvoiceNumber"&gt; &lt;value xml:lang="en"&gt;Request number&lt;/value&gt; &lt;/property&gt; </code></pre> <br> </li> <li id="a2a75853fe5e7389f09f30a568592148"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-25"> <strong> hot-deploy/embisphere-partner/entitydef/entitymodel_view.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/entitydef/entitymodel_view.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/entitydef/entitymodel_view.xml </span><span style="color: #aaaaaa">@@ -12,12 +12,14 @@ </span> &lt;view-entity entity-name="WarrantyActivationDetail" package-name="org.ofbiz.order.request"&gt; &lt;member-entity entity-alias="CRQ" entity-name="CustRequest"/&gt; &lt;member-entity entity-alias="CRQP" entity-name="CustRequestParty"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;member-entity entity-alias="CRQA" entity-name="CustRequestAttribute"/&gt; </span> &lt;member-entity entity-alias="GRP" entity-name="PartyGroup"/&gt; &lt;member-entity entity-alias="CRQIT" entity-name="CustRequestItem"/&gt; &lt;alias-all entity-alias="CRQ" group-by="true" /&gt; &lt;alias name="description" field="description" entity-alias="CRQIT" function="max" /&gt; &lt;alias name="groupName" field="groupName" entity-alias="GRP" function="max" /&gt; &lt;alias name="serialNumber" field="description" entity-alias="CRQIT" group-by="true"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;alias name="deliveryDate" field="attrValue" entity-alias="CRQA" group-by="true"/&gt; </span> &lt;alias name="customerCompanyName" field="groupName" entity-alias="GRP" group-by="true" /&gt; &lt;view-link entity-alias="CRQ" rel-entity-alias="CRQP"&gt; &lt;key-map field-name="custRequestId" rel-field-name="custRequestId"/&gt; <span style="color: #aaaaaa">@@ -28,6 +30,12 @@ </span> &lt;view-link entity-alias="CRQP" rel-entity-alias="GRP"&gt; &lt;key-map field-name="partyId" rel-field-name="partyId"/&gt; &lt;/view-link&gt; <span style="background: #ddffdd; color: #000000">+ &lt;view-link entity-alias="CRQ" rel-entity-alias="CRQA" rel-optional="true"&gt; + &lt;key-map field-name="custRequestId" rel-field-name="custRequestId"/&gt; + &lt;entity-condition&gt; + &lt;condition-expr entity-alias="CRQA" field-name="attrName" value="deliveryDate"/&gt; + &lt;/entity-condition&gt; + &lt;/view-link&gt; </span> &lt;view-link entity-alias="CRQ" rel-entity-alias="CRQIT" rel-optional="true"&gt; &lt;key-map field-name="custRequestId" rel-field-name="custRequestId"/&gt; &lt;/view-link&gt; </code></pre> <br> </li> <li id="cc28d82bed8d943c98f0976e06156c3f"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-26"> <strong> hot-deploy/embisphere-partner/ofbiz-component.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/ofbiz-component.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/ofbiz-component.xml </span><span style="color: #aaaaaa">@@ -33,17 +33,19 @@ </span> &lt;!-- web applications; will be mounted when using the embedded container --&gt; &lt;webapp name="embisphere-partner" <span style="background: #ffdddd; color: #000000">- title="Embisphere Partner" </span><span style="background: #ddffdd; color: #000000">+ title="Partner Front" </span> server="default-server" location="webapp/embisphere-partner" base-permission="EMBI-PARTNER" <span style="background: #ddffdd; color: #000000">+ app-bar-display="false" </span> mount-point="/embisphere-partner"/&gt; &lt;webapp name="embisphere-partner-bo" <span style="background: #ffdddd; color: #000000">- title="Embisphere Partner BO" </span><span style="background: #ddffdd; color: #000000">+ title="Partner Manager" </span> server="default-server" location="webapp/embisphere-partner-bo" base-permission="EMBI-PARTNER" <span style="background: #ddffdd; color: #000000">+ position="95" </span> mount-point="/embisphere-partner-bo"/&gt; &lt;/ofbiz-component&gt; </code></pre> <br> </li> <li id="1ce2d3a7bb8a17f983b57ace2a62bbfd"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-27"> <strong> hot-deploy/embisphere-partner/servicedef/services.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/servicedef/services.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/servicedef/services.xml </span><span style="color: #aaaaaa">@@ -10,6 +10,7 @@ </span> &lt;attribute name="operation" mode="IN" type="String"/&gt; &lt;attribute name="invoiceNumber" mode="IN" type="String"/&gt; &lt;attribute name="invoiceDate" mode="IN" type="String"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;attribute name="deliveryDate" mode="IN" type="String"/&gt; </span> &lt;attribute name="customerCompanyId" mode="IN" type="String" optional="true"/&gt; &lt;attribute name="customerCompanyName" mode="IN" type="String" optional="true"/&gt; &lt;attribute name="customerTypeId" mode="IN" type="String" optional="true"/&gt; <span style="color: #aaaaaa">@@ -44,6 +45,7 @@ </span> &lt;attribute name="fromPartyId" mode="IN" type="String"/&gt; &lt;attribute name="invoiceNumber" mode="IN" type="String" optional="true"/&gt; &lt;attribute name="invoiceDate" mode="IN" type="Timestamp" optional="true"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;attribute name="deliveryDate" mode="IN" type="Timestamp" optional="true"/&gt; </span> &lt;attribute name="customerCompanyId" mode="IN" type="String" optional="true"/&gt; &lt;attribute name="customerCompanyName" mode="IN" type="String" optional="true"/&gt; &lt;attribute name="customerTypeId" mode="IN" type="String" optional="true"/&gt; <span style="color: #aaaaaa">@@ -127,6 +129,7 @@ </span> &lt;attribute name="custRequestId" mode="OUT" type="String" optional="true"/&gt; &lt;attribute name="statusId" mode="OUT" type="String" optional="true"/&gt; &lt;attribute name="invoiceDate" mode="OUT" type="String" optional="true"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;attribute name="deliveryDate" mode="OUT" type="String" optional="true"/&gt; </span> &lt;attribute name="customerCompanyId" mode="OUT" type="String" optional="true"/&gt; &lt;attribute name="customerCompanyName" mode="OUT" type="String" optional="true"/&gt; &lt;attribute name="customerTypeId" mode="OUT" type="String" optional="true"/&gt; </code></pre> <br> </li> <li id="a18f57f424e83727097db04b11d0fe62"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-28"> <strong> hot-deploy/embisphere-partner/src/com/embisphere/EmbispherePartnerServices.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/src/com/embisphere/EmbispherePartnerServices.java </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/src/com/embisphere/EmbispherePartnerServices.java </span><span style="color: #aaaaaa">@@ -35,7 +35,6 @@ import java.util.Map; </span> import java.util.Set; import java.util.TimeZone; <span style="background: #ffdddd; color: #000000">-import org.apache.tools.ant.taskdefs.Sleep; </span> import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; <span style="color: #aaaaaa">@@ -49,9 +48,6 @@ import org.ofbiz.entity.condition.EntityCondition; </span> import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityJoinOperator; import org.ofbiz.entity.condition.EntityOperator; <span style="background: #ffdddd; color: #000000">-import org.ofbiz.entity.model.DynamicViewEntity; -import org.ofbiz.entity.model.ModelKeyMap; -import org.ofbiz.entity.util.EntityFindOptions; </span> import org.ofbiz.entity.util.EntityListIterator; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.util.EntityUtilProperties; <span style="color: #aaaaaa">@@ -91,10 +87,12 @@ public class EmbispherePartnerServices { </span> String operation = (String) context.get("operation"); String invoiceNumber = (String) context.get("invoiceNumber"); String invoiceDateStr = (String) context.get("invoiceDate"); <span style="background: #ddffdd; color: #000000">+ String deliveryDateStr = (String) context.get("deliveryDate"); </span> String statusId = (String) context.get("statusId"); String custRequestId = (String) context.get("custRequestId"); Timestamp invoiceDate = null; <span style="background: #ddffdd; color: #000000">+ Timestamp deliveryDate = null; </span> if (! "CRQ_DRAFT".equals(statusId)) { <span style="color: #aaaaaa">@@ -115,6 +113,18 @@ public class EmbispherePartnerServices { </span> } } } <span style="background: #ddffdd; color: #000000">+ if (UtilValidate.isNotEmpty(deliveryDateStr)) { + try { + deliveryDate = UtilDateTime.stringToTimeStamp(deliveryDateStr, "dd-MM-yyyy", tz, locale); + } catch (ParseException e) { + e.printStackTrace(); + try { + deliveryDate = UtilDateTime.stringToTimeStamp(deliveryDateStr, "dd/MM/yyyy", tz, locale); + } catch (ParseException e1) { + e1.printStackTrace(); + } + } + } </span> String customerCompanyId = (String) context.get("customerCompanyId"); String customerCompanyName = (String) context.get("customerCompanyName"); String customerTypeId = (String) context.get("customerTypeId"); <span style="color: #aaaaaa">@@ -219,6 +229,12 @@ public class EmbispherePartnerServices { </span> .returnError(UtilProperties.getMessage(resourceError, "EmbiErrorCustRequestDateNotInPast", locale)); } <span style="background: #ddffdd; color: #000000">+ // Check if delivery Date is in the past + if (deliveryDate.after(nowTimestamp)) { + return ServiceUtil + .returnError(UtilProperties.getMessage(resourceError, "EmbiErrorCustRequestDeliveryDateNotInPast", locale)); + } + </span> // Check warranty type if ("CUST_MAINT_WARRANTY".equals(customerTypeId) &amp;&amp; UtilValidate.isEmpty(warehouseNumber)) { return ServiceUtil.returnError( <span style="color: #aaaaaa">@@ -394,6 +410,22 @@ public class EmbispherePartnerServices { </span> Debug.log(e, errorMessage, module); return ServiceUtil.returnError(errorMessage); } <span style="background: #ddffdd; color: #000000">+ + //Add delivery date + try { + Map&lt;String, Object&gt; serviceCtx = dctx.makeValidContext("createCustRequestAttribute", "IN", context); + serviceCtx.put("custRequestId", custRequestId); + serviceCtx.put("attrName", "deliveryDate"); + serviceCtx.put("attrValue", deliveryDateStr); + Map&lt;String, Object&gt; serviceResult = dispatcher.runSync("createCustRequestAttribute", serviceCtx); + if (ServiceUtil.isError(serviceResult)) { + return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult)); + } + } catch (GenericServiceException e) { + String errorMessage = UtilProperties.getMessage(resourceError, "EmbiErrorCreatingCustRequest", locale); + Debug.log(e, errorMessage, module); + return ServiceUtil.returnError(errorMessage); + } </span> } result.put("custRequestId", custRequestId); <span style="color: #aaaaaa">@@ -562,6 +594,7 @@ public class EmbispherePartnerServices { </span> Map&lt;String, Object&gt; context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); <span style="background: #ddffdd; color: #000000">+ TimeZone tz = (TimeZone) context.get("timeZone"); </span> Locale locale = (Locale) context.get("locale"); Map&lt;String, Object&gt; result = ServiceUtil .returnSuccess(UtilProperties.getMessage(resource, "EmbiPartnerCustRequestSuccesfullyCreated", locale)); <span style="color: #aaaaaa">@@ -671,7 +704,26 @@ public class EmbispherePartnerServices { </span> } } <span style="background: #ffdddd; color: #000000">- Timestamp requiredByDate = custRequest.getTimestamp("openDate"); </span><span style="background: #ddffdd; color: #000000">+ Timestamp requiredByDate = custRequest.getTimestamp("openDateTime"); + try { + GenericValue custRequestAttr = delegator.findOne("CustRequestAttribute", UtilMisc.toMap("custRequestId", custRequestId, "attrName", "deliveryDate"), true); + if (UtilValidate.isNotEmpty(custRequestAttr)) { + String deliveryDateTimeStr = custRequestAttr.getString("attrValue"); + try { + requiredByDate = UtilDateTime.stringToTimeStamp(deliveryDateTimeStr, "dd-MM-yyyy", tz, locale); + } catch (ParseException e) { + e.printStackTrace(); + try { + requiredByDate = UtilDateTime.stringToTimeStamp(deliveryDateTimeStr, "dd/MM/yyyy", tz, locale); + } catch (ParseException e1) { + e1.printStackTrace(); + } + } + } + } catch (GenericEntityException e2) { + e2.printStackTrace(); + } + </span> // Retrieve warranty feature BigDecimal numberSpecified = BigDecimal.valueOf(12); try { <span style="color: #aaaaaa">@@ -785,6 +837,7 @@ public class EmbispherePartnerServices { </span> public static Map&lt;String, Object&gt; partnerUpdateWarrantyRequest(DispatchContext dctx, Map&lt;String, Object&gt; context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); <span style="background: #ddffdd; color: #000000">+ TimeZone tz = (TimeZone) context.get("timeZone"); </span> Locale locale = (Locale) context.get("locale"); Map&lt;String, Object&gt; result = ServiceUtil.returnSuccess(); GenericValue userLogin = (GenericValue) context.get("userLogin"); <span style="color: #aaaaaa">@@ -792,6 +845,7 @@ public class EmbispherePartnerServices { </span> String partnerPartyId = (String) context.get("fromPartyId"); String invoiceNumber = (String) context.get("invoiceNumber"); Timestamp invoiceDate = (Timestamp) context.get("invoiceDate"); <span style="background: #ddffdd; color: #000000">+ Timestamp deliveryDate = (Timestamp) context.get("deliveryDate"); </span> String statusId = (String) context.get("statusId"); String customerCompanyId = (String) context.get("customerCompanyId"); String customerCompanyName = (String) context.get("customerCompanyName"); <span style="color: #aaaaaa">@@ -800,6 +854,7 @@ public class EmbispherePartnerServices { </span> String warehouseNumber = (String) context.get("warehouseNumber"); String countryGeoId = (String) context.get("countryGeoId"); boolean createSubscription = false ; <span style="background: #ddffdd; color: #000000">+ boolean updateDeliveryDate = false ; </span> if (!"CUST_EXCHGE_WARRANTY".equals(customerTypeId)) { // Check mandatory fields <span style="color: #aaaaaa">@@ -909,7 +964,7 @@ public class EmbispherePartnerServices { </span> updateCustRequest = true; } Timestamp currentInvoiceDate = custRequest.getTimestamp("openDateTime"); <span style="background: #ffdddd; color: #000000">- if (currentInvoiceDate.equals(currentInvoiceDate) == false) { </span><span style="background: #ddffdd; color: #000000">+ if (currentInvoiceDate.equals(invoiceDate) == false) { </span> if (updatedFields != "") { updatedFields = updatedFields + ", "; } <span style="color: #aaaaaa">@@ -917,6 +972,34 @@ public class EmbispherePartnerServices { </span> updateCustRequest = true; } <span style="background: #ddffdd; color: #000000">+ Timestamp currentDeliveryDate = null; + try { + GenericValue custRequestAttr = delegator.findOne("CustRequestAttribute", UtilMisc.toMap("custRequestId", custRequestId, "attrName", "deliveryDate"), true); + if (UtilValidate.isNotEmpty(custRequestAttr)) { + String deliveryDateTimeStr = custRequestAttr.getString("attrValue"); + try { + currentDeliveryDate = UtilDateTime.stringToTimeStamp(deliveryDateTimeStr, "dd-MM-yyyy", tz, locale); + } catch (ParseException e) { + e.printStackTrace(); + try { + currentDeliveryDate = UtilDateTime.stringToTimeStamp(deliveryDateTimeStr, "dd/MM/yyyy", tz, locale); + } catch (ParseException e1) { + e1.printStackTrace(); + } + } + } + if (currentDeliveryDate.equals(deliveryDate) == false) { + if (updatedFields != "") { + updatedFields = updatedFields + ", "; + } + updatedFields = updatedFields + "Delivery date changed from " +currentDeliveryDate+" to " + deliveryDate; + updateCustRequest = true; + updateDeliveryDate = true; + } + } catch (GenericEntityException e2) { + e2.printStackTrace(); + } + </span> //Check Warehouse String currentWarehouseContactMechId = custRequest.getString("fulfillContactMechId"); if (UtilValidate.isNotEmpty(currentWarehouseContactMechId)) { <span style="color: #aaaaaa">@@ -1109,6 +1192,25 @@ public class EmbispherePartnerServices { </span> return ServiceUtil.returnError(errorMessage); } <span style="background: #ddffdd; color: #000000">+ if (updateDeliveryDate) { + String deliveryDateStr = UtilDateTime.timeStampToString(deliveryDate, "dd/MM/yyyy", tz, locale); + try { + Map&lt;String, Object&gt; serviceCtx = dctx.makeValidContext("updateCustRequestAttribute", "IN", custRequest); + serviceCtx.put("userLogin", userLogin); + serviceCtx.put("custRequestId", custRequestId); + serviceCtx.put("attrName", "deliveryDate"); + serviceCtx.put("attrValue", deliveryDateStr); + Map&lt;String, Object&gt; serviceResult = dispatcher.runSync("updateCustRequestAttribute", serviceCtx); + if (ServiceUtil.isError(serviceResult)) { + return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResult)); + } + } catch (GenericServiceException e) { + String errorMessage = UtilProperties.getMessage(resourceError, "EmbiErrorUpdatingCustRequest", locale); + Debug.log(e, errorMessage, module); + return ServiceUtil.returnError(errorMessage); + } + } + </span> if(createSubscription) { // if status changing require to create subscription if ("CUST_EXCHGE_WARRANTY".equals(customerTypeId)) { <span style="color: #aaaaaa">@@ -1981,6 +2083,14 @@ public class EmbispherePartnerServices { </span> result.put("invoiceDate", openDateTimeStr); result.put("customerTypeId", custRequest.getString("custRequestCategoryId")); <span style="background: #ddffdd; color: #000000">+ //Retrieve deliveryDate + String deliveryDateTimeStr = null; + GenericValue custRequestAttr = delegator.findOne("CustRequestAttribute", UtilMisc.toMap("custRequestId", custRequestId, "attrName", "deliveryDate"), true); + if (UtilValidate.isNotEmpty(custRequestAttr)) { + deliveryDateTimeStr = custRequestAttr.getString("attrValue"); + } + result.put("deliveryDate", deliveryDateTimeStr); + </span> List&lt;GenericValue&gt; requestCustomers = custRequest.getRelated("CustRequestParty", UtilMisc.toMap("custRequestId", custRequestId, "roleTypeId", "END_USER_CUSTOMER"), null, true); <span style="color: #aaaaaa">@@ -2413,6 +2523,12 @@ public class EmbispherePartnerServices { </span> // Remove item custRequestItem.remove(); } <span style="background: #ddffdd; color: #000000">+ + List&lt;GenericValue&gt; custRequestAttributes = delegator.findByAnd("CustRequestAttribute", UtilMisc.toMap("custRequestId", custRequestId), null, false); + for (GenericValue custRequestAttribute : custRequestAttributes) { + custRequestAttribute.remove(); + } + </span> GenericValue custRequestToDelete = delegator.findOne("CustRequest", UtilMisc.toMap("custRequestId", custRequestId), false); if (UtilValidate.isNotEmpty(custRequestToDelete)) { Map&lt;String, Object&gt; deleteCustRequestContext = dctx.makeValidContext("deleteCustRequest", "IN", context); </code></pre> <br> </li> <li id="ab61e68e6d6fbaba051c29c17ecea099"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-29"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner-bo/WEB-INF/actions/retrieveWarrantyInfos.groovy </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner-bo/WEB-INF/actions/retrieveWarrantyInfos.groovy </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner-bo/WEB-INF/actions/retrieveWarrantyInfos.groovy </span><span style="color: #aaaaaa">@@ -1,8 +1,10 @@ </span><span style="background: #ffdddd; color: #000000">-import org.ofbiz.base.util.UtilDateTime; </span> import org.ofbiz.base.util.UtilMisc; <span style="background: #ddffdd; color: #000000">+import org.ofbiz.entity.GenericValue; </span> import org.ofbiz.base.util.UtilValidate; <span style="background: #ffdddd; color: #000000">-import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.base.util.Debug; </span><span style="background: #ddffdd; color: #000000">+import org.ofbiz.entity.util.EntityUtil + +import java.text.ParseException; + </span> String custRequestId = (String) parameters.get("custRequestId"); if (UtilValidate.isEmpty(custRequestId)) { <span style="color: #aaaaaa">@@ -25,6 +27,24 @@ if (UtilValidate.isNotEmpty(custRequests)) { </span> context.put("internalComment", custRequest.getString("internalComment")); context.put("reason", custRequest.getString("reason")); <span style="background: #ddffdd; color: #000000">+ GenericValue custRequestAttr = delegator.findOne("CustRequestAttribute", UtilMisc.toMap("custRequestId", custRequestId, "attrName", "deliveryDate"), true); + if (UtilValidate.isNotEmpty(custRequestAttr)) { + deliveryDateStr = custRequestAttr.getString("attrValue"); + if (UtilValidate.isNotEmpty(deliveryDateStr)) { + try { + deliveryDate = UtilDateTime.stringToTimeStamp(deliveryDateStr, "dd-MM-yyyy", timeZone, locale); + } catch (ParseException e) { + e.printStackTrace(); + try { + deliveryDate = UtilDateTime.stringToTimeStamp(deliveryDateStr, "dd/MM/yyyy", timeZone, locale); + } catch (ParseException e1) { + e1.printStackTrace(); + } + } + context.putAt("deliveryDate", deliveryDate); + } + } + </span> List&lt;GenericValue&gt; requestCustomers = custRequest.getRelated("CustRequestParty", UtilMisc.toMap("custRequestId", custRequestId, "roleTypeId", "END_USER_CUSTOMER"), null, true); if (UtilValidate.isNotEmpty(requestCustomers)) { requestCustomers = EntityUtil.filterByDate(requestCustomers); <span style="color: #aaaaaa">@@ -82,6 +102,33 @@ if (UtilValidate.isNotEmpty(custRequests)) { </span> } } <span style="background: #ddffdd; color: #000000">+ //optional country recovery from requestItem description, or story if CUST_EXCHGE_WARRANTY + List&lt;GenericValue&gt; relatedInventoryItems = delegator.findByAnd("InventoryItem", UtilMisc.toMap("serialNumber", requestItem.description)) + GenericValue relatedInventoryItem = EntityUtil.getFirst(relatedInventoryItems) + if (relatedInventoryItem) { + country = "" + countryExchange = "" + GenericValue countryNameGV = delegator.findOne("InventoryItemAttribute", true, UtilMisc.toMap("inventoryItemId", relatedInventoryItem.inventoryItemId, "attrName","paysLibelle")) + if (countryNameGV) country += countryNameGV.attrValue + " " + GenericValue countryGV = delegator.findOne("InventoryItemAttribute", true, UtilMisc.toMap("inventoryItemId", relatedInventoryItem.inventoryItemId, "attrName","pays")) + if (countryGV) country += "[" +countryGV.attrValue + "]" + itemInfos.put("country", country) + + if ("CUST_EXCHGE_WARRANTY".equals(customerTypeId)) { + relatedInventoryItems = delegator.findByAnd("InventoryItem", UtilMisc.toMap("serialNumber", requestItem.story)) + relatedInventoryItem = EntityUtil.getFirst(relatedInventoryItems) + + countryNameGV = delegator.findOne("InventoryItemAttribute", true, UtilMisc.toMap("inventoryItemId", relatedInventoryItem.inventoryItemId, "attrName","paysLibelle")) + if (countryNameGV) countryExchange += countryNameGV.attrValue + " " + + countryGV = delegator.findOne("InventoryItemAttribute", true, UtilMisc.toMap("inventoryItemId", relatedInventoryItem.inventoryItemId, "attrName","pays")) + if (countryGV) countryExchange += "[" +countryGV.attrValue + "]" + } + itemInfos.put("countryExchange", countryExchange) + + } + + </span> warrantyLinesList.add(itemInfos); } context.put("warrantyLinesList", warrantyLinesList); </code></pre> <br> </li> <li id="fcd5059ef50e3743d096a7c2c5b49301"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-30"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner-bo/WEB-INF/web.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner-bo/WEB-INF/web.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner-bo/WEB-INF/web.xml </span><span style="color: #aaaaaa">@@ -49,7 +49,13 @@ </span> &lt;/servlet&gt; &lt;servlet-mapping&gt;&lt;servlet-name&gt;ControlServlet&lt;/servlet-name&gt;&lt;url-pattern&gt;/control/*&lt;/url-pattern&gt;&lt;/servlet-mapping&gt; <span style="background: #ffdddd; color: #000000">- &lt;session-config&gt;&lt;session-timeout&gt;60&lt;/session-timeout&gt;&lt;!-- in minutes --&gt;&lt;/session-config&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;session-config&gt; + &lt;cookie-config&gt; + &lt;http-only&gt;true&lt;/http-only&gt; + &lt;secure&gt;true&lt;/secure&gt; + &lt;/cookie-config&gt; + &lt;session-timeout&gt;60&lt;/session-timeout&gt; &lt;!-- in minutes --&gt; + &lt;/session-config&gt; </span> &lt;welcome-file-list&gt; &lt;welcome-file&gt;index.jsp&lt;/welcome-file&gt; </code></pre> <br> </li> <li id="5cc1a8d475dda3d74e293a611f13d2ef"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-31"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/assets/js/embipartner-warranty-1.js </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner/assets/js/embipartner-warranty-1.js </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/assets/js/embipartner-warranty-1.js </span><span style="color: #aaaaaa">@@ -3,112 +3,122 @@ var warrantyActivationStep1 = (function ($) { </span> / =============================================== / / =================== GLOBALS =================== / / =============================================== / <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> var settings = { tgtInvoiceNumber: "invoiceNumber", <span style="background: #ffdddd; color: #000000">- tgtInvoiceDate: "invoiceDate", </span><span style="background: #ddffdd; color: #000000">+ tgtInvoiceDate: "invoiceDate", + tgtDeliveryDate: "deliveryDate", </span> tgtCustEntId: "customerCompanyId", tgtCustEntNameLookup: "0_lookupId_customerCompanyName", <span style="background: #ffdddd; color: #000000">- tgtCustRequestId: "custRequestId", - tgtStatusId: "statusId", - tgtCustTypeId: "customerTypeId", - tgtCustGeoId: "countryGeoId", </span><span style="background: #ddffdd; color: #000000">+ tgtCustRequestId: "custRequestId", + tgtStatusId: "statusId", + tgtCustTypeId: "customerTypeId", + tgtCustGeoId: "countryGeoId", </span> tgtWarehouseLookup: "1_lookupId_warehouseNumber", tgtWarehouseLabel: "storeLabel", <span style="background: #ffdddd; color: #000000">- tgtWarehouseMechId: "warehouseContactMechId", </span><span style="background: #ddffdd; color: #000000">+ tgtWarehouseMechId: "warehouseContactMechId", </span> tgtSubmit: "btnSubmit", <span style="background: #ffdddd; color: #000000">- tgtDraft: "btnDraf", </span><span style="background: #ddffdd; color: #000000">+ tgtDraft: "btnDraf", </span> tgtFormWAStep1: "formWAStep1", <span style="background: #ffdddd; color: #000000">- tgtInvoiceExists: "invoiceAlreadyExists", - </span><span style="background: #ddffdd; color: #000000">+ tgtInvoiceExists: "invoiceAlreadyExists", + </span> blCustomerType: false, blInvoiceNumber: false, blInvoiceDate: false, <span style="background: #ddffdd; color: #000000">+ blDeliveryDate: false, </span> blCompany: false, blWarehouse: false, blCountry: false }; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> var selectors = { $InvoiceNumber: undefined, <span style="background: #ffdddd; color: #000000">- $InvoiceDate: undefined, </span><span style="background: #ddffdd; color: #000000">+ $InvoiceDate: undefined, + $DeliveryDate: undefined, </span> $CustEntId: undefined, $CustEntNameLookup: undefined, <span style="background: #ffdddd; color: #000000">- $CustTypeId: undefined, - $CustRequestId: undefined, - $StatusId: undefined, - $CustGeoId: undefined, </span><span style="background: #ddffdd; color: #000000">+ $CustTypeId: undefined, + $CustRequestId: undefined, + $StatusId: undefined, + $CustGeoId: undefined, </span> $WarehouseLookup: undefined, $WarehouseLabel: undefined, <span style="background: #ffdddd; color: #000000">- $WarehouseMechId: undefined, </span><span style="background: #ddffdd; color: #000000">+ $WarehouseMechId: undefined, </span> $Submit: undefined, <span style="background: #ffdddd; color: #000000">- $Draft: undefined, </span><span style="background: #ddffdd; color: #000000">+ $Draft: undefined, </span> $FormWAStep1: undefined, <span style="background: #ffdddd; color: #000000">- $InvoiceExists: undefined </span><span style="background: #ddffdd; color: #000000">+ $InvoiceExists: undefined </span> }; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> var i18n = { lblWarehouse: "", lblWarehouseOptional: "" }; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> / =============================================== / / =============== FUNCTIONALITIES =============== / / =============================================== / <span style="background: #ffdddd; color: #000000">- - / - SubmissionButton - / - var _unlockSubmitButton = function () { - _validateCustomerType(); </span><span style="background: #ddffdd; color: #000000">+ + / + SubmissionButton + / + var _unlockSubmitButton = function () { + _validateCustomerType(); </span> _validateInvoiceNumber(); _validateInvoiceDate(); <span style="background: #ddffdd; color: #000000">+ _validateDeliveryDate(); </span> _validateCustomerCountry(); <span style="background: #ffdddd; color: #000000">- if (settings.blCustomerType &amp;&amp; settings.blInvoiceNumber &amp;&amp; settings.blInvoiceDate &amp;&amp; settings.blCompany &amp;&amp; settings.blWarehouse &amp;&amp; settings.blCountry) { </span><span style="background: #ddffdd; color: #000000">+ if (settings.blCustomerType &amp;&amp; settings.blInvoiceNumber &amp;&amp; settings.blInvoiceDate &amp;&amp; settings.blDeliveryDate &amp;&amp; settings.blCompany &amp;&amp; settings.blWarehouse &amp;&amp; settings.blCountry) { </span> setSelectorsAttribute("disabled", false, selectors.$Submit, selectors.$Draft); } else { setSelectorsAttribute("disabled", true, selectors.$Submit, selectors.$Draft); } <span style="background: #ffdddd; color: #000000">- }; - - / - Validators - / - var _validateCustomerType = function () { </span><span style="background: #ddffdd; color: #000000">+ }; + + / + Validators + / + var _validateCustomerType = function () { </span> settings.blCustomerType = false; if ( selectors.$CustTypeId.val() !== undefined &amp;&amp; selectors.$CustTypeId.val() !== "" ) settings.blCustomerType = true; }; <span style="background: #ffdddd; color: #000000">- - var _validateInvoiceNumber = function () { - settings.blInvoiceNumber = false; </span><span style="background: #ddffdd; color: #000000">+ + var _validateInvoiceNumber = function () { + settings.blInvoiceNumber = false; </span> if ( selectors.$InvoiceNumber.val() !== undefined &amp;&amp; selectors.$InvoiceNumber.val() !== "" ) settings.blInvoiceNumber = true; <span style="background: #ffdddd; color: #000000">- }; - - var _validateInvoiceDate = function () { - settings.blInvoiceDate = false; </span><span style="background: #ddffdd; color: #000000">+ }; + + var _validateInvoiceDate = function () { + settings.blInvoiceDate = false; </span> if ( selectors.$InvoiceDate.val() !== undefined &amp;&amp; selectors.$InvoiceDate.val() !== "" ) settings.blInvoiceDate = true; <span style="background: #ffdddd; color: #000000">- }; - - var _validateCustomerCountry = function () { - settings.blCountry = false; </span><span style="background: #ddffdd; color: #000000">+ }; + + var _validateDeliveryDate = function () { + settings.blDeliveryDate = false; + if ( selectors.$DeliveryDate.val() !== undefined &amp;&amp; selectors.$DeliveryDate.val() !== "" ) + settings.blDeliveryDate = true; + }; + + var _validateCustomerCountry = function () { + settings.blCountry = false; </span> if ( selectors.$CustGeoId.val() !== undefined &amp;&amp; selectors.$CustGeoId.val() !== "") settings.blCountry = true; <span style="background: #ffdddd; color: #000000">- }; - - / * - InvoiceNumber - * / - var _checkInvoiceNumber = function (value) { - settings.blInvoiceNumber = false; </span><span style="background: #ddffdd; color: #000000">+ }; + + / * + InvoiceNumber + * / + var _checkInvoiceNumber = function (value) { + settings.blInvoiceNumber = false; </span> doAjaxCall("embiPartnerCheckWarrantyInvoice", "POST", false, {"custRequestName":value}, _invoiceNumberSuccessCallback); <span style="background: #ffdddd; color: #000000">- }; - - var _invoiceNumberSuccessCallback = function (data) { - if (data.responseMessage == "success") { </span><span style="background: #ddffdd; color: #000000">+ }; + + var _invoiceNumberSuccessCallback = function (data) { + if (data.responseMessage == "success") { </span> settings.blInvoiceNumber = true; if(data.alreadyExists){ selectors.$InvoiceExists.show(); <span style="color: #aaaaaa">@@ -137,6 +147,12 @@ var warrantyActivationStep1 = (function ($) { </span> selectors.$InvoiceDate.datepicker("option", "disabled", true); settings.blInvoiceDate = true; } <span style="background: #ddffdd; color: #000000">+ if (data.deliveryDate != undefined) { + selectors.$DeliveryDate.val(data.deliveryDate); + selectors.$DeliveryDate.trigger("change"); + selectors.$DeliveryDate.datepicker("option", "disabled", true); + settings.blDeliveryDate = true; + } </span> if (data.customerCompanyName != undefined) { selectors.$CustEntNameLookup.val(data.customerCompanyName); selectors.$CustEntNameLookup.attr("disabled", true); <span style="color: #aaaaaa">@@ -159,21 +175,22 @@ var warrantyActivationStep1 = (function ($) { </span> selectors.$CustTypeId, selectors.$WarehouseLookup, selectors.$CustGeoId); selectors.$InvoiceDate.datepicker("option", "disabled", false); <span style="background: #ddffdd; color: #000000">+ selectors.$DeliveryDate.datepicker("option", "disabled", false); </span> } } else clearSelectorsValues(selectors.$InvoiceNumber); <span style="background: #ffdddd; color: #000000">- }; - - / * - CustomerCompanyName - * / - var _checkCustomerCompanyName = function (value) { - settings.blCompany = false; </span><span style="background: #ddffdd; color: #000000">+ }; + + / * + CustomerCompanyName + * / + var _checkCustomerCompanyName = function (value) { + settings.blCompany = false; </span> doAjaxCall("embiPartnerCheckCustomerInformations", "POST", false, {"customerCompanyName":value}, _custEntNameSuccessCallback); <span style="background: #ffdddd; color: #000000">- }; - - var _custEntNameSuccessCallback = function (data) { - if (data.responseMessage == "success") { </span><span style="background: #ddffdd; color: #000000">+ }; + + var _custEntNameSuccessCallback = function (data) { + if (data.responseMessage == "success") { </span> settings.blCompany = true; if (data.customerCompanyId != undefined) { selectors.$CustEntId.val(data.customerCompanyId); <span style="color: #aaaaaa">@@ -183,13 +200,13 @@ var warrantyActivationStep1 = (function ($) { </span> _checkCustomerTypeId(data.customerTypeId); } } <span style="background: #ffdddd; color: #000000">- }; - - / - CustomerTypeId - / - var _checkCustomerTypeId = function (value) { - if (value === "STD_MAINT_WARRANTY") { </span><span style="background: #ddffdd; color: #000000">+ }; + + / + CustomerTypeId + / + var _checkCustomerTypeId = function (value) { + if (value === "STD_MAINT_WARRANTY") { </span> selectors.$WarehouseLabel.html(i18n.lblWarehouseOptional); settings.blWarehouse = true; } else { <span style="color: #aaaaaa">@@ -197,17 +214,17 @@ var warrantyActivationStep1 = (function ($) { </span> selectors.$WarehouseLookup.val(""); settings.blWarehouse = false; } <span style="background: #ffdddd; color: #000000">- } - / * - WarehouseNumber - * / - var _checkWarehouseNumber = function (value) { - settings.blWarehouse = false; </span><span style="background: #ddffdd; color: #000000">+ } + / * + WarehouseNumber + * / + var _checkWarehouseNumber = function (value) { + settings.blWarehouse = false; </span> var customerCompanyId = selectors.$CustTypeId.val(); doAjaxCall("embiPartnerCheckWarehouseInformations", "POST", false, {"warehouseNumber":value,"customerCompanyId":customerCompanyId}, _warehouseNumberSuccessCallBack); <span style="background: #ffdddd; color: #000000">- }; - var _warehouseNumberSuccessCallBack = function (data) { - if (data.responseMessage == "success") { </span><span style="background: #ddffdd; color: #000000">+ }; + var _warehouseNumberSuccessCallBack = function (data) { + if (data.responseMessage == "success") { </span> settings.blWarehouse = true; if (data.warehouseContactMechId != undefined) { selectors.$WarehouseMechId.val(data.warehouseContactMechId); <span style="color: #aaaaaa">@@ -219,23 +236,23 @@ var warrantyActivationStep1 = (function ($) { </span> settings.blCountry = true; } } <span style="background: #ffdddd; color: #000000">- }; - </span><span style="background: #ddffdd; color: #000000">+ }; + </span> / =============================================== / / =============== EVENT CALLBACKS =============== / / =============================================== / <span style="background: #ffdddd; color: #000000">- - / * - CustomerTypeId Event Callback - * / </span><span style="background: #ddffdd; color: #000000">+ + / * + CustomerTypeId Event Callback + * / </span> var _listenerCustTypeId = function(event) { var $domObj = $(this); _checkCustomerTypeId($domObj.val()); }; / <span style="background: #ffdddd; color: #000000">- InvoiceNumber Event Callback - / </span><span style="background: #ddffdd; color: #000000">+ InvoiceNumber Event Callback + / </span> var _listenerInvoiceNumber = function (event) { var $domObj = $(this); $domObj.val($domObj.val().toUpperCase()); <span style="color: #aaaaaa">@@ -243,8 +260,8 @@ var warrantyActivationStep1 = (function ($) { </span> _checkInvoiceNumber($domObj.val()); }; / <span style="background: #ffdddd; color: #000000">- CustomerCompanyName Event Callback - / </span><span style="background: #ddffdd; color: #000000">+ CustomerCompanyName Event Callback + / </span> var _listenerCustEntName = function (event) { var $domObj = $(this); $domObj.val($domObj.val().toUpperCase()); // undefined.toUpperCase will let the value unchanged <span style="color: #aaaaaa">@@ -253,8 +270,8 @@ var warrantyActivationStep1 = (function ($) { </span> _checkCustomerCompanyName($domObj.val()); }; / <span style="background: #ffdddd; color: #000000">- WarehouseNumber Event Callback - / </span><span style="background: #ddffdd; color: #000000">+ WarehouseNumber Event Callback + / </span> var _listenerWarehouseNumber = function (event) { var $domObj = $(this); if ($domObj.val() !== undefined &amp;&amp; $domObj.val() !== "") { <span style="color: #aaaaaa">@@ -274,14 +291,15 @@ var warrantyActivationStep1 = (function ($) { </span> } }; / * <span style="background: #ffdddd; color: #000000">- SubmitButton Event Callback - * / </span><span style="background: #ddffdd; color: #000000">+ SubmitButton Event Callback + * / </span> var _listenerSubmit = function (event) { <span style="background: #ffdddd; color: #000000">- selectors.$InvoiceDate.datepicker("option", "disabled", false); </span><span style="background: #ddffdd; color: #000000">+ selectors.$InvoiceDate.datepicker("option", "disabled", false); + selectors.$DeliveryDate.datepicker("option", "disabled", false); </span> selectors.$FormWAStep1.submit(); }; <span style="background: #ffdddd; color: #000000">- - </span><span style="background: #ddffdd; color: #000000">+ + </span> / =============================================== / / ============== INTERNAL FUNCTIONS ============= / / =============================================== / <span style="color: #aaaaaa">@@ -293,11 +311,11 @@ var warrantyActivationStep1 = (function ($) { </span> } } }; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> var _extendSelectors = function () { <span style="background: #ffdddd; color: #000000">- for (key in selectors) { - selectors[key] = $("#" + settings[key.replace("$", "tgt")]); - } </span><span style="background: #ddffdd; color: #000000">+ for (key in selectors) { + selectors[key] = $("#" + settings[key.replace("$", "tgt")]); + } </span> }; var _extendLabels = function (labels) { <span style="color: #aaaaaa">@@ -307,8 +325,8 @@ var warrantyActivationStep1 = (function ($) { </span> } } }; <span style="background: #ffdddd; color: #000000">- - var _bindUIEvents = function () { </span><span style="background: #ddffdd; color: #000000">+ + var _bindUIEvents = function () { </span> // Need to select the dom object thanks to [0] to bind event selectors.$CustTypeId[0].addEventListener("change", _listenerCustTypeId, false); selectors.$InvoiceNumber[0].addEventListener("blur", _listenerInvoiceNumber, false); <span style="color: #aaaaaa">@@ -326,18 +344,18 @@ var warrantyActivationStep1 = (function ($) { </span> _bindUIEvents(); if (selectors.$InvoiceNumber.val() !== undefined &amp;&amp; selectors.$InvoiceNumber.val() !== "") <span style="background: #ffdddd; color: #000000">- _checkInvoiceNumber(selectors.$InvoiceNumber.val()); </span><span style="background: #ddffdd; color: #000000">+ _checkInvoiceNumber(selectors.$InvoiceNumber.val()); </span> }; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> / =============================================== / / ============== SPECIAL FUNCTIONS ============== / / =============================================== / <span style="background: #ffdddd; color: #000000">- $(document).ready(function() { - setInterval(_unlockSubmitButton, 333); - }); - </span><span style="background: #ddffdd; color: #000000">+ $(document).ready(function() { + setInterval(_unlockSubmitButton, 333); + }); + </span> return { init: init }; </code></pre> <br> </li> <li id="6d7cea7ffe0d1cebb1f4ddab0e3b55fe"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-32"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/common/footer.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner/common/footer.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/common/footer.ftl </span><span style="color: #aaaaaa">@@ -1,84 +1,21 @@ </span><span style="background: #ffdddd; color: #000000">- &lt;/div&gt; - &lt;footer id="footer" class="region region-footer"&gt; - &lt;div id="footer-wrapper"&gt; - &lt;div id="block-block-10" class="block block-block first odd"&gt; - - &lt;h2 class="block__title block-title"&gt;The company&lt;/h2&gt; - - &lt;p style="text-align: justify;"&gt;Our solutions are around the world. Our clients understand the importance of our products in their development strategies.&lt;/p&gt; - </span> &lt;/div&gt; <span style="background: #ffdddd; color: #000000">- &lt;div id="block-block-18" class="block block-block even"&gt; - - &lt;h2 class="block__title block-title"&gt;Contact us&lt;/h2&gt; - - &lt;p&gt; &lt;a href="http://partner.embisphere.com/en/contact#embisphere-france" id="embisphere-link-embisphere-france" rel="nofollow"&gt;Embisphere France&lt;/a&gt;&lt;/p&gt;&lt;p&gt; &lt;a href="http://partner.embisphere.com/en/contact#embisphere-china" id="embisphere-link-embisphere-china" rel="nofollow"&gt;Embisphere China&lt;/a&gt;&lt;/p&gt;&lt;p&gt; &lt;a href="http://partner.embisphere.com/en/contact#embisphere-india" id="embisphere-link-embisphere-india" rel="nofollow"&gt;Embisphere India&lt;/a&gt;&lt;/p&gt;&lt;p&gt; &lt;a href="http://partner.embisphere.com/en/contact#embisphere-vietnam" id="embisphere-link-embisphere-vietnam" rel="nofollow"&gt;Embisphere Vietnam&lt;/a&gt;&lt;/p&gt; - &lt;/div&gt; - &lt;div id="block-views-liste-reseaux-sociaux-block" class="block block-views odd"&gt; - - &lt;h2 class="block__title block-title"&gt;Follow us&lt;/h2&gt; - - &lt;div class="view view-liste-reseaux-sociaux view-id-liste_reseaux_sociaux view-display-id-block view-dom-id-042fa29104f6529550a61e798cb7f184"&gt; - - - - &lt;div class="view-content"&gt; - &lt;div class="views-row views-row-1 views-row-odd views-row-first"&gt; - - &lt;div class="views-field views-field-field-reseaux-icone"&gt; &lt;div class="field-content"&gt;&lt;a href="https://twitter.com/#!/EMBISPHERE" title="Twitter" class="social-link-Twitter" target="_blank" data-image="icons-1"&gt;&lt;canvas width="43" height="43" title="" class="" tabindex="-1" id="icons-1"&gt;&lt;/canvas&gt;&lt;/a&gt;&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; - &lt;div class="views-row views-row-2 views-row-even"&gt; - - &lt;div class="views-field views-field-field-reseaux-icone"&gt; &lt;div class="field-content"&gt;&lt;a href="https://www.facebook.com/Embisphere" title="Facebook" class="social-link-Facebook" target="_blank" data-image="icons-2"&gt;&lt;canvas width="43" height="43" title="" class="" tabindex="-1" id="icons-2"&gt;&lt;/canvas&gt;&lt;/a&gt;&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; - &lt;div class="views-row views-row-3 views-row-odd"&gt; - - &lt;div class="views-field views-field-field-reseaux-icone"&gt; &lt;div class="field-content"&gt;&lt;a href="http://www.youtube.com/channel/UCY9SCXFfqHYNrQZXoSJr4xA?feature=mhee" title="Youtube" class="social-link-Youtube" target="_blank" data-image="icons-3"&gt;&lt;canvas width="43" height="43" title="" class="" tabindex="-1" id="icons-3"&gt;&lt;/canvas&gt;&lt;/a&gt;&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; - &lt;div class="views-row views-row-4 views-row-even views-row-last"&gt; - - &lt;div class="views-field views-field-field-reseaux-icone"&gt; &lt;div class="field-content"&gt;&lt;a href="http://www.linkedin.com/company/embisphere" title="Linkedin" class="social-link-Linkedin" target="_blank" data-image="icons-4"&gt;&lt;canvas width="43" height="43" title="" class="" tabindex="-1" id="icons-4"&gt;&lt;/canvas&gt;&lt;/a&gt;&lt;/div&gt; &lt;/div&gt; &lt;/div&gt; - &lt;/div&gt; - - </span><span style="background: #ddffdd; color: #000000">+ &lt;/div&gt; </span> <span style="background: #ddffdd; color: #000000">+ &lt;div class="region region-bottom"&gt; + &lt;div id="block-menu-menu-footer" class="block block-menu first last odd" role="navigation"&gt; </span> <span style="background: #ffdddd; color: #000000">- - &lt;/div&gt; - &lt;/div&gt; - &lt;div id="block-simplenews-7" class="block block-simplenews last even"&gt; - - - &lt;p&gt;Subscribe to newsletter&lt;/p&gt; - - &lt;form class="simplenews-subscribe" action="/en" method="post" id="simplenews-block-form-7" accept-charset="UTF-8"&gt;&lt;div&gt;&lt;div class="form-item form-type-textfield form-item-mail"&gt; - &lt;label for="edit-mail"&gt;Subscribe to newsletter &lt;span class="form-required" title="This field is required."&gt;*&lt;/span&gt;&lt;/label&gt; - &lt;input placeholder="Your email" type="text" id="edit-mail" name="mail" value="" size="20" maxlength="128" class="form-text required"&gt; - &lt;/div&gt; - &lt;input class="simplenews-submit form-submit" type="submit" id="edit-submit" name="op" value="Subscribe"&gt;&lt;input type="hidden" name="form_build_id" value="form-4r96O_yLw9_r_qirtrBX33OaFe7J5oe_yrsolgoLRYU"&gt; - &lt;input type="hidden" name="form_id" value="simplenews_block_form_7"&gt; - &lt;/div&gt;&lt;/form&gt; - - - - &lt;/div&gt; - &lt;/div&gt; - &lt;/footer&gt; - &lt;/div&gt; - - &lt;div class="region region-bottom"&gt; - &lt;div id="block-menu-menu-footer" class="block block-menu first last odd" role="navigation"&gt; - - - &lt;ul class="menu"&gt;&lt;li class="menu__item is-leaf first leaf"&gt;&lt;span class="menu__link nolink"&gt;Copyright 2016 embisphere&lt;/span&gt;&lt;/li&gt; - &lt;li class="menu__item is-leaf leaf"&gt;&lt;span title="" class="menu__link separator"&gt;|&lt;/span&gt;&lt;/li&gt; - &lt;li class="menu__item is-leaf leaf"&gt;&lt;a href="http://www.embisphere.com/en/mentions-legales" rel="nofollow" class="menu__link"&gt;Legals Informations&lt;/a&gt;&lt;/li&gt; - &lt;li class="menu__item is-leaf leaf"&gt;&lt;span class="menu__link nolink"&gt;-&lt;/span&gt;&lt;/li&gt; - &lt;li class="menu__item is-leaf leaf"&gt;&lt;a href="/en/contact" rel="nofollow" class="menu__link"&gt;Contact&lt;/a&gt;&lt;/li&gt; - &lt;li class="menu__item is-leaf leaf"&gt;&lt;span class="menu__link nolink"&gt;-&lt;/span&gt;&lt;/li&gt; - &lt;li class="menu__item is-leaf leaf"&gt;&lt;a href="/en/sitemap" rel="follow" class="menu__link"&gt;Sitemap&lt;/a&gt;&lt;/li&gt; - &lt;li class="menu__item is-leaf leaf"&gt;&lt;span class="menu__link separator"&gt;|&lt;/span&gt;&lt;/li&gt; - &lt;li class="menu__item is-leaf last leaf"&gt;&lt;a href="/en/join-us" rel="follow" class="menu__link"&gt;Join us&lt;/a&gt;&lt;/li&gt; - &lt;/ul&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;ul class="menu"&gt;&lt;li class="menu__item is-leaf first leaf"&gt;&lt;span class="menu__link nolink"&gt;Copyright 2016 embisphere&lt;/span&gt;&lt;/li&gt; + &lt;li class="menu__item is-leaf leaf"&gt;&lt;span title="" class="menu__link separator"&gt;|&lt;/span&gt;&lt;/li&gt; + &lt;li class="menu__item is-leaf leaf"&gt;&lt;a href="http://www.embisphere.com/en/mentions-legales" rel="nofollow" class="menu__link"&gt;Legals Informations&lt;/a&gt;&lt;/li&gt; + &lt;li class="menu__item is-leaf leaf"&gt;&lt;span class="menu__link nolink"&gt;-&lt;/span&gt;&lt;/li&gt; + &lt;li class="menu__item is-leaf leaf"&gt;&lt;a href="/en/contact" rel="nofollow" class="menu__link"&gt;Contact&lt;/a&gt;&lt;/li&gt; + &lt;li class="menu__item is-leaf leaf"&gt;&lt;span class="menu__link nolink"&gt;-&lt;/span&gt;&lt;/li&gt; + &lt;li class="menu__item is-leaf leaf"&gt;&lt;a href="/en/sitemap" rel="follow" class="menu__link"&gt;Sitemap&lt;/a&gt;&lt;/li&gt; + &lt;li class="menu__item is-leaf leaf"&gt;&lt;span class="menu__link separator"&gt;|&lt;/span&gt;&lt;/li&gt; + &lt;li class="menu__item is-leaf last leaf"&gt;&lt;a href="/en/join-us" rel="follow" class="menu__link"&gt;Join us&lt;/a&gt;&lt;/li&gt; + &lt;/ul&gt; </span> &lt;/div&gt; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ &lt;/div&gt; </span> &lt;/body&gt; &lt;/html&gt; \ No newline at end of file </code></pre> <br> </li> <li id="16380722c95decf018f07f1ccb1e43bf"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-33"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/common/header.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner/common/header.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/common/header.ftl </span><span style="color: #aaaaaa">@@ -7,16 +7,16 @@ </span> &lt;meta http-equiv="content-type" content="text/html; charset=UTF-8"&gt; &lt;meta name="viewport" content="width=device-width, initial-scale=1"&gt; <span style="background: #ffdddd; color: #000000">- &lt;link type="text/css" rel="stylesheet" href="/assets/css/jquery-ui-1.12.0.css" /&gt; - &lt;link type="text/css" rel="stylesheet" href="/assets/css/bootstrap.css" /&gt; - &lt;link type="text/css" rel="stylesheet" href="/assets/css/carousel.css" /&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;link type="text/css" rel="stylesheet" href="../assets/css/jquery-ui-1.12.0.css" /&gt; + &lt;link type="text/css" rel="stylesheet" href="../assets/css/bootstrap.css" /&gt; + &lt;link type="text/css" rel="stylesheet" href="../assets/css/carousel.css" /&gt; </span> <span style="background: #ffdddd; color: #000000">- &lt;script type="text/javascript" src="/assets/js/jquery-2.2.4.min.js"&gt; &lt;/script&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;script type="text/javascript" src="../assets/js/jquery-2.2.4.min.js"&gt; &lt;/script&gt; </span> &lt;script type="text/javascript" src="/images/jquery/ui/js/jquery-ui-1.10.3.min.js"&gt; &lt;/script&gt; <span style="background: #ffdddd; color: #000000">- &lt;script type="text/javascript" src="/assets/js/bootstrap.min.js"&gt; &lt;/script&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;script type="text/javascript" src="../assets/js/bootstrap.min.js"&gt; &lt;/script&gt; </span> <span style="background: #ffdddd; color: #000000">- &lt;script type="text/javascript" src="/assets/js/embipartner.js"&gt; &lt;/script&gt; - &lt;script type="text/javascript" src="/assets/js/jquery-plugin-input-prefix.min.js"&gt;&lt;/script&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;script type="text/javascript" src="../assets/js/embipartner.js"&gt; &lt;/script&gt; + &lt;script type="text/javascript" src="../assets/js/jquery-plugin-input-prefix.min.js"&gt;&lt;/script&gt; </span> &lt;#if layoutSettings.javaScripts?has_content&gt; &lt;#foreach elt in layoutSettings.javaScripts&gt; &lt;script type="text/javascript" src="${elt}"&gt;&lt;/script&gt; <span style="color: #aaaaaa">@@ -29,9 +29,9 @@ </span> &lt;script type="text/javascript" src="/images/portlet.js"&gt; &lt;/script&gt; &lt;script type="text/javascript" src="/images/fieldlookup.js"&gt; &lt;/script&gt; <span style="background: #ffdddd; color: #000000">- &lt;link type="text/css" rel="stylesheet" href="/assets/css/fonts.css" /&gt; - &lt;link type="text/css" rel="stylesheet" href="/assets/css/partner.css" /&gt; - &lt;link type="text/css" rel="stylesheet" href="/assets/css/embipartner.bootstrap.css" /&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;link type="text/css" rel="stylesheet" href="../assets/css/fonts.css" /&gt; + &lt;link type="text/css" rel="stylesheet" href="../assets/css/partner.css" /&gt; + &lt;link type="text/css" rel="stylesheet" href="../assets/css/embipartner.bootstrap.css" /&gt; </span> &lt;/head&gt; &lt;body&gt; <span style="color: #aaaaaa">@@ -83,7 +83,11 @@ </span> .nav-celled &gt; li { width: initial; } <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ + ul.dropdown-menu li a{ + font-size: 15px; + } + </span> li &gt; a{ background-color: inherit !important; } <span style="color: #aaaaaa">@@ -96,7 +100,10 @@ </span> border-bottom: 2px solid #24a08d; color: #24a08d; } <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ + li h4 { + padding-left: 3px; + } </span> .menu-link { padding : 0px 0px ; line-height: 50px; <span style="color: #aaaaaa">@@ -320,7 +327,7 @@ </span> &lt;span class="icon-bar"&gt;&lt;/span&gt; &lt;/button&gt; &lt;a href="${uiLinkMap.EmbiPartner_Menu_Logo_Link}" class="navbar-brand"&gt; <span style="background: #ffdddd; color: #000000">- &lt;img src="/assets/images/common/logo.png" class="logo" alt="${uiLabelMap.EmbiPartnerMenuLogo}"/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;img src="../assets/images/common/logo.png" class="logo" alt="${uiLabelMap.EmbiPartnerMenuLogo}"/&gt; </span> &lt;/a&gt; &lt;/div&gt; <span style="color: #aaaaaa">@@ -368,6 +375,9 @@ </span> &lt;/a&gt; &lt;ul class="dropdown-menu"&gt; &lt;li&gt; <span style="background: #ddffdd; color: #000000">+ &lt;h4&gt;Warranty&lt;/h4&gt; + &lt;/li&gt; + &lt;li&gt; </span> &lt;a href="${uiLinkMap.EmbiPartner_Menu_Warranty_New_Activation_Link}" class="menu-link"&gt; ${uiLabelMap.EmbiPartnerMenuWarrantyNewActivation} &lt;/a&gt; <span style="color: #aaaaaa">@@ -378,6 +388,9 @@ </span> &lt;/a&gt; &lt;/li&gt; &lt;li&gt; <span style="background: #ddffdd; color: #000000">+ &lt;h4&gt;Product Exchange&lt;/h4&gt; + &lt;/li&gt; + &lt;li&gt; </span> &lt;a href="${uiLinkMap.EmbiPartner_Menu_Warranty_New_Exchange_Link}" class="menu-link"&gt; ${uiLabelMap.EmbiPartnerMenuWarrantyNewExchange} &lt;/a&gt; <span style="color: #aaaaaa">@@ -391,11 +404,6 @@ </span> &lt;/li&gt; &lt;/ul&gt; &lt;ul class="nav nav-justified nav-celled right"&gt; <span style="background: #ffdddd; color: #000000">- &lt;li&gt; - &lt;a href="${uiLabelMap.FrontEmbitag_Links_Menu_Search}" class="menu-link"&gt; - &lt;span class="glyphicon glyphicon-search"&gt;&lt;/span&gt; - &lt;/a&gt; - &lt;/li&gt; </span> &lt;#if userLogin?has_content&gt; &lt;li class="dropdown"&gt; &lt;#if (userLogin.userLoginId)?length &lt; 26 &gt; <span style="color: #aaaaaa">@@ -409,6 +417,13 @@ </span> &lt;span class="glyphicon glyphicon-user glyphicon-menu"&gt;&lt;/span&gt; ${printedLoginId} &lt;/a&gt; <span style="background: #ddffdd; color: #000000">+ &lt;ul class="dropdown-menu"&gt; + &lt;li&gt; + &lt;a href="&lt;@ofbizUrl&gt;logout&lt;/@ofbizUrl&gt;" title="${loginTitle}" class="glyphicon glyphicon-log-out"&gt; + &lt;span&gt;${uiLabelMap.CommonLogout}&lt;/span&gt; + &lt;/a&gt; + &lt;/li&gt; + &lt;/ul&gt; </span> &lt;/li&gt; &lt;/#if&gt; &lt;/ul&gt; </code></pre> <br> </li> <li id="86cf3f30db27b029a930c9e36c1df594"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-34"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/actions/findWarrantyActivationHistoricList.groovy </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- /dev/null </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/actions/findWarrantyActivationHistoricList.groovy </span><span style="color: #aaaaaa">@@ -0,0 +1,35 @@ </span><span style="background: #ddffdd; color: #000000">+import org.ofbiz.base.util.UtilDateTime; +import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.entity.condition.*; + + +String sortField = (String) parameters.get("sortField"); +if (UtilValidate.isEmpty(sortField)) { + sortField = "openDateTime DESC"; +} + +Set&lt;String&gt; fieldList = UtilMisc.toSet("custRequestId", "custRequestName", "custRequestTypeId", "fromPartyId", "statusId", "openDateTime"); +fieldList.add("deliveryDate"); +fieldList.add("customerCompanyName"); + +prepareFindInMap = [:]; +prepareFindInMap.entityName = "WarrantyActivationDetail"; +inputFields = requestParameters; +inputFields.remove("deliveryDate_fld0_value"); +inputFields.remove("deliveryDate_fld1_value"); + +if (!inputFields.noConditionFind) { + inputFields.noConditionFind = "N" +} +prepareFindInMap.inputFields = inputFields; +prepareFindInMap.orderBy = sortField; + +prepareFindResults = dispatcher.runSync("prepareFind", prepareFindInMap); +EntityConditionList entityConditionList = prepareFindResults.entityConditionList; + +//Ajout du filtre sur la deliveryDate + +context.warranties = delegator.findList("WarrantyActivationDetail", entityConditionList, fieldList, null, null, false); </span></code></pre> <br> </li> <li id="72adb81b8c48849f7ca34195a50d212d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-35"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/actions/retrieveWarrantyInfos.groovy </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/actions/retrieveWarrantyInfos.groovy </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/actions/retrieveWarrantyInfos.groovy </span><span style="color: #aaaaaa">@@ -1,6 +1,7 @@ </span> import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; <span style="background: #ffdddd; color: #000000">-import org.ofbiz.base.util.UtilValidate; </span><span style="background: #ddffdd; color: #000000">+import org.ofbiz.base.util.UtilValidate +import org.ofbiz.entity.GenericValue; </span> import org.ofbiz.entity.util.EntityUtil; String custRequestId = (String) parameters.get("custRequestId"); <span style="color: #aaaaaa">@@ -33,6 +34,11 @@ if (UtilValidate.isNotEmpty(custRequestId) &amp;&amp; UtilValidate.isNotEmpty(partnerPar </span> context.put("internalComment", custRequest.getString("internalComment")); context.put("reason", custRequest.getString("reason")); <span style="background: #ddffdd; color: #000000">+ GenericValue custRequestAttr = delegator.findOne("CustRequestAttribute", UtilMisc.toMap("custRequestId", custRequestId, "attrName", "deliveryDate"), true); + if (UtilValidate.isNotEmpty(custRequestAttr)) { + context.putAt("deliveryDate", custRequestAttr.getString("attrValue")); + } + </span> List&lt;GenericValue&gt; requestCustomers = custRequest.getRelated("CustRequestParty", UtilMisc.toMap("custRequestId", custRequestId, "roleTypeId", "END_USER_CUSTOMER"), null, true); if (UtilValidate.isNotEmpty(requestCustomers)) { requestCustomers = EntityUtil.filterByDate(requestCustomers); </code></pre> <br> </li> <li id="f0602bbdc119d3f5da6e11f6d0b0481d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-36"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/findWarrantyActivation.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/findWarrantyActivation.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/findWarrantyActivation.ftl </span><span style="color: #aaaaaa">@@ -79,6 +79,30 @@ </span> &lt;@customRenderDateTimeField id="openDateTime_fld1_value" name="openDateTime_fld1_value" className="form-control" alert="false" value="" title="${uiLabelMap.CommonFormatDate}" size="10" maxlength="10" step="1" timeValues="" id="openDateTime_fld1_value" event="" action="null" dateType="date" shortDateInput=true timeDropdownParamName="toDate" defaultDateTimeString="" localizedIconTitle="${uiLabelMap.CommonViewCalendar}" timeDropdown="text" timeHourName="" classString="" hour1=0 hour2=0 timeMinutesName="" minutes=0 isTwelveHour=false ampmName="" amSelected="" pmSelected="" compositeType="" formName="findWarranties" mask="" maxDate="new Date" dateFormat="dd/mm/yy" /&gt; &lt;/div&gt; &lt;/div&gt; <span style="background: #ddffdd; color: #000000">+ &lt;div class="form-group col-sm-12"&gt; + &lt;#-- Delivery Date --&gt; + &lt;label for="deliveryDate_fld0_op" class="control-label col-sm-2"&gt; + ${uiLabelMap.EmbiPartnerFormFieldDeliveryDate}: + &lt;/label&gt; + &lt;div class="col-sm-4" style="margin-left: -5px; padding: 0;"&gt; + &lt;select name="deliveryDate_fld0_op" class="form-control"&gt; + &lt;option value="equals"&gt;${opEquals}&lt;/option&gt;&lt;#rt/&gt; + &lt;option value="sameDay"&gt;${opSameDay}&lt;/option&gt;&lt;#rt/&gt; + &lt;option value="greaterThanFromDayStart"&gt;${opGreaterThanFromDayStart}&lt;/option&gt;&lt;#rt/&gt; + &lt;option value="greaterThan" selected="selected"&gt;${opGreaterThan}&lt;/option&gt;&lt;#rt/&gt; + &lt;/select&gt; + &lt;@customRenderDateTimeField id="deliveryDate_fld0_value" name="deliveryDate_fld0_value" className="form-control" alert="false" value="" title="${uiLabelMap.CommonFormatDate}" size="10" maxlength="10" step="1" timeValues="" id="deliveryDate_fld0_value" event="" action="null" dateType="date" shortDateInput=true timeDropdownParamName="fromDate" defaultDateTimeString="" localizedIconTitle="${uiLabelMap.CommonViewCalendar}" timeDropdown="text" timeHourName="" classString="" hour1=0 hour2=0 timeMinutesName="" minutes=0 isTwelveHour=false ampmName="" amSelected="" pmSelected="" compositeType="" formName="findWarranties" mask="" maxDate="new Date" dateFormat="dd/mm/yy" /&gt; + &lt;/div&gt; + &lt;div class="col-sm-4" style="margin-left: -5px; padding: 0;"&gt; + &lt;select name="deliveryDate_fld1_op" class="form-control"&gt;&lt;#rt/&gt; + &lt;option value="opLessThan"&gt;${opLessThan}&lt;/option&gt;&lt;#rt/&gt; + &lt;option value="upToDay" selected="selected"&gt;${opUpToDay}&lt;/option&gt;&lt;#rt/&gt; + &lt;option value="upThruDay"&gt;${opUpThruDay}&lt;/option&gt;&lt;#rt/&gt; + &lt;option value="empty"&gt;${opIsEmpty}&lt;/option&gt;&lt;#rt/&gt; + &lt;/select&gt; + &lt;@customRenderDateTimeField id="deliveryDate_fld1_value" name="deliveryDate_fld1_value" className="form-control" alert="false" value="" title="${uiLabelMap.CommonFormatDate}" size="10" maxlength="10" step="1" timeValues="" id="deliveryDate_fld1_value" event="" action="null" dateType="date" shortDateInput=true timeDropdownParamName="toDate" defaultDateTimeString="" localizedIconTitle="${uiLabelMap.CommonViewCalendar}" timeDropdown="text" timeHourName="" classString="" hour1=0 hour2=0 timeMinutesName="" minutes=0 isTwelveHour=false ampmName="" amSelected="" pmSelected="" compositeType="" formName="findWarranties" mask="" maxDate="new Date" dateFormat="dd/mm/yy" /&gt; + &lt;/div&gt; + &lt;/div&gt; </span> &lt;div class="form-group col-sm-12 text-center"&gt; &lt;button type="button" class="btn btn-default" onclick="reloadList();"&gt; ${uiLabelMap.EmbiPartnerActionsReset} <span style="color: #aaaaaa">@@ -106,7 +130,7 @@ </span> } function reloadList() { <span style="background: #ffdddd; color: #000000">- clearSelectorsValues($("#custRequestName"), $("#serialNumber"), $("#findWarranties_customerCompanyName"), $("#openDateTime_fld0_value"), $("#openDateTime_fld1_value")); </span><span style="background: #ddffdd; color: #000000">+ clearSelectorsValues($("#custRequestName"), $("#serialNumber"), $("#findWarranties_customerCompanyName"), $("#openDateTime_fld0_value"), $("#openDateTime_fld1_value"), $("#deliveryDate_fld0_value"), $("#deliveryDate_fld1_value")); </span> ajaxUpdateArea("warrantyLinesList", "${uiLinkMap.EmbiPartner_Internal_Link_List_Historic_Warranty}"); } &lt;/script&gt; \ No newline at end of file </code></pre> <br> </li> <li id="4025122165d71e7e9085768dae4c8606"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-37"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/viewWarrantyActivation.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/viewWarrantyActivation.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/viewWarrantyActivation.ftl </span><span style="color: #aaaaaa">@@ -68,6 +68,12 @@ ${screens.render(waBreadCrumb)} </span> &lt;/div&gt; &lt;div class="form-group col-sm-5"&gt; &lt;label class="control-label"&gt; <span style="background: #ddffdd; color: #000000">+ ${uiLabelMap.EmbiPartnerFormFieldDeliveryDate}: + &lt;/label&gt; + ${(deliveryDate)!} + &lt;/div&gt; + &lt;div class="form-group col-sm-5"&gt; + &lt;label class="control-label"&gt; </span> ${uiLabelMap.EmbiPartnerFormFieldStoreNumber}: &lt;/label&gt; ${(warehouseNumber)!} </code></pre> <br> </li> <li id="9fd60dfbdacb712bedd7b5f7a0f4208b"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-38"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/warrantyActivationHistoricList.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/warrantyActivationHistoricList.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/warrantyActivationHistoricList.ftl </span><span style="color: #aaaaaa">@@ -10,6 +10,7 @@ </span> &lt;tr&gt; &lt;th class="col-sm-1"&gt;${uiLabelMap.EmbiPartnerTableHeaderInvoiceNumber}&lt;/th&gt; &lt;th class="col-sm-1"&gt;${uiLabelMap.EmbiPartnerTableHeaderCreated}&lt;/th&gt; <span style="background: #ddffdd; color: #000000">+ &lt;th class="col-sm-1"&gt;${uiLabelMap.EmbiPartnerTableHeaderDelivered}&lt;/th&gt; </span> &lt;th class="col-sm-2"&gt;${uiLabelMap.EmbiPartnerTableHeaderEndCustomer}&lt;/th&gt; &lt;th class="col-sm-7"&gt;${uiLabelMap.EmbiPartnerTableHeaderSerialNumbersConcerned}&lt;/th&gt; &lt;th class="col-sm-1"&gt;${uiLabelMap.EmbiPartnerTableHeaderStatus}&lt;/th&gt; <span style="color: #aaaaaa">@@ -29,6 +30,11 @@ </span> &lt;td&gt; ${warrantyLine.openDateTime?string("dd/MM/yyyy")} &lt;/td&gt; <span style="background: #ddffdd; color: #000000">+ &lt;td&gt; + &lt;#if warrantyLine.deliveryDate??&gt; + ${warrantyLine.deliveryDate} + &lt;/#if&gt; + &lt;/td&gt; </span> &lt;td&gt;${warrantyLine.customerCompanyName!}&lt;/td&gt; &lt;td&gt; &lt;#if requestItems?has_content&gt; </code></pre> <br> </li> <li id="f36ce15c34c0f11bba2d039b15583548"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-39"> <strong> hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/warrantyActivationStep1.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/warrantyActivationStep1.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/webapp/embisphere-partner/warranty/warrantyActivationStep1.ftl </span><span style="color: #aaaaaa">@@ -65,11 +65,19 @@ </span> &lt;label for="1_lookupId_warehouseNumber" class="control-label" id="storeLabel"&gt;${uiLabelMap.EmbiPartnerFormFieldStoreNumber}&lt;/label&gt; &lt;@renderLookupField className="requiered form-control text-uppercase" alert="false" name="warehouseNumber" value="${(warehouseNumber)!(parameters.warehouseNumber)!}" size="25" maxlength="" id="warehouseNumber" event="" action="" readonly=false autocomplete="" descriptionFieldName="" formName="formWAStep1" fieldFormName="LookupCustomerWarehouseStoreName" targetParameterIter=['customerCompanyId'] imgSrc="/assets/images/fieldlookup.gif" ajaxUrl="warehouseNumber,LookupCustomerWarehouseStoreName,ajaxLookup=Y" ajaxEnabled=true presentation="layer" height="" width="" position="topleft" fadeBackground="true" clearText="Clear" showDescription="true" initiallyCollapsed="false" lastViewName="warrantyActivation" tabindex="5"/&gt; &lt;/div&gt; <span style="background: #ddffdd; color: #000000">+ &lt;#-- Delivery date --&gt; + &lt;div class="form-group col-sm-4"&gt; + &lt;div class="col-sm-offset-3 col-sm-6"&gt; + &lt;label for="deliveryDate" class="control-label"&gt;${uiLabelMap.EmbiPartnerFormFieldDeliveryDate}&lt;/label&gt; + &lt;#assign defaultDateTimeString= Static["org.ofbiz.base.util.UtilDateTime"].nowDateString()&gt; + &lt;@customRenderDateTimeField name="deliveryDate" className="required form-control" alert="false" value="${(deliveryDate)!(parameters.deliveryDate)!}" title="${uiLabelMap.CommonFormatDate}" size="10" maxlength="10" step="1" timeValues="" id="deliveryDate" event="" action="null" dateType="date" shortDateInput=true timeDropdownParamName="invoiceDate" defaultDateTimeString="${defaultDateTimeString?string}" localizedIconTitle="${uiLabelMap.CommonViewCalendar}" timeDropdown="text" timeHourName="" classString="" hour1=0 hour2=0 timeMinutesName="" minutes=0 isTwelveHour=false ampmName="" amSelected="" pmSelected="" compositeType="" formName="formWAStep1" mask="" maxDate="new Date" dateFormat="dd/mm/yy" tabindex="6"/&gt; + &lt;/div&gt; + &lt;/div&gt; </span> &lt;div class="clearfix"&gt;&amp;nbsp;&lt;/div&gt; &lt;#-- Customer country --&gt; &lt;div class="form-group col-sm-4"&gt; &lt;label for="countryGeoId" class="control-label"&gt;${uiLabelMap.EmbiPartnerFormFieldEndCustomerCountry}&lt;/label&gt; <span style="background: #ffdddd; color: #000000">- &lt;select tabindex="6" id="countryGeoId" name="countryGeoId" size="1" class="form-control" required&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;select tabindex="7" id="countryGeoId" name="countryGeoId" size="1" class="form-control" required&gt; </span> &lt;option value=""&gt;&amp;nbsp;&lt;/option&gt; &lt;#assign countrySelected = false /&gt; &lt;#assign countries = delegator.findByAnd("Geo", {"geoTypeId" : "COUNTRY"})&gt; <span style="color: #aaaaaa">@@ -98,6 +106,7 @@ </span> blCustomerType : ${typeSelected?c}, blInvoiceNumber : &lt;#if parameters.invoiceNumber ?? || invoiceNumber ?? &gt;true&lt;#else&gt;false&lt;/#if&gt;, blInvoiceDate : &lt;#if parameters.invoiceDate ?? || invoiceDate ??&gt;true&lt;#else&gt;false&lt;/#if&gt;, <span style="background: #ddffdd; color: #000000">+ blDeliveryDate : &lt;#if parameters.deliveryDate ?? || deliveryDate ??&gt;true&lt;#else&gt;false&lt;/#if&gt;, </span> blCompany : &lt;#if parameters.customerCompanyName ?? || customerCompanyName ??&gt;true&lt;#else&gt;false&lt;/#if&gt;, blWarehouse : &lt;#if parameters.warehouseNumber ?? || warehouseNumber ??&gt;true&lt;#else&gt;false&lt;/#if&gt;, blCountry : ${countrySelected?c} </code></pre> <br> </li> <li id="cdeee905b03e063e474f1651a1776ec0"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-40"> <strong> hot-deploy/embisphere-partner/widget/embisphere-partner-bo/EmbispherePartnerForms.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/widget/embisphere-partner-bo/EmbispherePartnerForms.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/widget/embisphere-partner-bo/EmbispherePartnerForms.xml </span><span style="color: #aaaaaa">@@ -98,6 +98,7 @@ </span> &lt;/entity-options&gt; &lt;entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName}"&gt; &lt;entity-constraint name="statusId" value="${requestStatusId}"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;entity-constraint name="statusIdTo" operator="in" value="CRQ_DRAFT,CRQ_PENDING,CRQ_SUBMITTED,CRQ_ACCEPTED,CRQ_REJECTED,CRQ_CANCELLED"/&gt; </span> &lt;entity-order-by field-name="sequenceId"/&gt; &lt;/entity-options&gt; &lt;/drop-down&gt; <span style="color: #aaaaaa">@@ -128,6 +129,7 @@ </span> &lt;/entity-options&gt; &lt;entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName}"&gt; &lt;entity-constraint name="statusId" value="${requestStatusId}"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;entity-constraint name="statusIdTo" operator="in" value="CRQ_DRAFT,CRQ_PENDING,CRQ_SUBMITTED,CRQ_ACCEPTED,CRQ_REJECTED,CRQ_CANCELLED"/&gt; </span> &lt;entity-order-by field-name="sequenceId"/&gt; &lt;/entity-options&gt; &lt;/drop-down&gt; <span style="color: #aaaaaa">@@ -143,6 +145,7 @@ </span> &lt;/field&gt; &lt;field name="invoiceNumber"&gt;&lt;text/&gt;&lt;/field&gt; &lt;field name="invoiceDate" position="2"&gt;&lt;date-time/&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="deliveryDate"&gt;&lt;date-time/&gt;&lt;/field&gt; </span> &lt;field name="warehouseNumber"&gt;&lt;lookup target-form-name="LookupCustomerWarehouseStore" target-parameter="customerCompanyId"/&gt;&lt;/field&gt; &lt;field name="countryGeoId" position="2"&gt; &lt;drop-down allow-empty="false"&gt; <span style="color: #aaaaaa">@@ -181,6 +184,7 @@ </span> &lt;/drop-down&gt; &lt;/field&gt; &lt;field name="requiredByDate" required-field="true"&gt;&lt;date-time/&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="country"&gt;&lt;text/&gt;&lt;/field&gt; </span> &lt;field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"&gt; &lt;submit button-type="button"/&gt; &lt;/field&gt; <span style="color: #aaaaaa">@@ -193,6 +197,7 @@ </span> &lt;field name="fromPartyId"&gt;&lt;hidden/&gt;&lt;/field&gt; &lt;field name="customerTypeId"&gt;&lt;hidden/&gt;&lt;/field&gt; &lt;field name="productId" required-field="true"&gt;&lt;lookup target-form-name="LookupCustRequestProduct"/&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="country"&gt;&lt;text/&gt;&lt;/field&gt; </span> &lt;field name="statusId"&gt; &lt;drop-down allow-empty="false" current="first-in-list"&gt; &lt;entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}"&gt; <span style="color: #aaaaaa">@@ -214,6 +219,7 @@ </span> &lt;/drop-down&gt; &lt;/field&gt; &lt;field name="requiredByDate" title="${uiLabelMap.EmbiPartnerTableHeaderWarrantyEndDate}" required-field="true"&gt;&lt;display type="date-time"/&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="countryExchange"&gt;&lt;text/&gt;&lt;/field&gt; </span> &lt;field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"&gt; &lt;submit button-type="button"/&gt; &lt;/field&gt; </code></pre> <br> </li> <li id="0ddfe0d90acc8129c2d03cb0e178127d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-41"> <strong> hot-deploy/embisphere-partner/widget/embisphere-partner/EmbispherePartnerScreens.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere-partner/widget/embisphere-partner/EmbispherePartnerScreens.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere-partner/widget/embisphere-partner/EmbispherePartnerScreens.xml </span><span style="color: #aaaaaa">@@ -200,26 +200,7 @@ </span> &lt;screen name="warrantyActivationHistoricList"&gt; &lt;section&gt; &lt;actions&gt; <span style="background: #ffdddd; color: #000000">- &lt;set field="parameters.sortField" from-field="parameters.sortField" - default-value="openDateTime DESC" /&gt; - &lt;set field="requestParameters.fromPartyId" from-field="userLogin.partyId" /&gt; - &lt;set field="fieldList[]" value="custRequestId" /&gt; - &lt;set field="fieldList[]" value="custRequestName" /&gt; - &lt;set field="fieldList[]" value="custRequestTypeId" /&gt; - &lt;set field="fieldList[]" value="fromPartyId" /&gt; - &lt;set field="fieldList[]" value="statusId" /&gt; - &lt;set field="fieldList[]" value="openDateTime" /&gt; - &lt;set field="fieldList[]" value="customerCompanyName" /&gt; - &lt;service service-name="performFind" result-map="result"&gt; - &lt;field-map field-name="inputFields" from-field="requestParameters" /&gt; - &lt;field-map field-name="fieldList" from-field="fieldList" /&gt; - &lt;field-map field-name="entityName" value="WarrantyActivationDetail" /&gt; - &lt;field-map field-name="orderBy" from-field="parameters.sortField" /&gt; - &lt;field-map field-name="viewIndex" from-field="viewIndex" /&gt; - &lt;field-map field-name="viewSize" from-field="viewSize" /&gt; - &lt;/service&gt; - &lt;set field="warranties" from-field="result.listIt" type="Object" /&gt; - </span><span style="background: #ddffdd; color: #000000">+ &lt;script location="component://embisphere-partner/webapp/embisphere-partner/warranty/actions/findWarrantyActivationHistoricList.groovy"/&gt; </span> &lt;/actions&gt; &lt;widgets&gt; &lt;decorator-screen name="EmbispherePartnerCommonDecoratorNoStyle" </code></pre> <br> </li> <li id="9010d24396055878d16253c3b16d655f"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-42"> <strong> hot-deploy/embisphere/data/EmbisphereSeedData.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere/data/EmbisphereSeedData.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere/data/EmbisphereSeedData.xml </span><span style="color: #aaaaaa">@@ -2183,4 +2183,142 @@ under the License. </span> &lt;VisualThemeResource visualThemeId="EMBISPHERE_AMBER" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/embisphere-theme/images/themeAmber.png" sequenceId="01"/&gt; &lt;UserPrefGroupType userPrefGroupTypeId="TAG_ORDER_FU_FILTER" description="Tag Order Follow Up filter settings"/&gt; <span style="background: #ddffdd; color: #000000">+ + &lt;!--Data load the 02/02/17--&gt; + &lt;!--HARD--&gt; + &lt;ProductStoreGroupType description="Product Store Group for Hardware" productStoreGroupTypeId="PDSTG_HARDWARE"/&gt; + &lt;ProductStoreGroup description="Hardware China product store group" primaryParentGroupId="EMBI_CN" productStoreGroupId="EMB10000" productStoreGroupName="Hardware China" productStoreGroupTypeId="PDSTG_HARDWARE"/&gt; + &lt;ProductStoreGroupRollup fromDate="2016-12-02 11:42:00.613" parentGroupId="EMBI_CN" productStoreGroupId="EMB10000"/&gt; + &lt;ProductStoreGroupMember fromDate="2016-12-02 00:00:00.0" productStoreGroupId="EMB10000" productStoreId="EMBI_CN"/&gt; + + &lt;!--GROSS REPORT EMAIL SENDING--&gt; + &lt;EmailTemplateSetting emailTemplateSettingId="EMBI_GROSS_REPORT" contentType="text/html" + description="Standard email to send Gross report" fromAddress="no-reply@embisphere.com" + subject="[OFBiz Report] ORDER-INVOICE by Quarter"/&gt; + &lt;RoleType roleTypeId="SEND_GROSS_REPORT" description="Gross Report Reader"/&gt; + &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10142"/&gt; + &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10143"/&gt; + &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10040"/&gt; + &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10002"/&gt; + &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10000"/&gt; &lt;ContentType contentTypeId="REPORT_MASTER" description="Report Master"/&gt; + &lt;ContentType contentTypeId="REPORT" description="Report"/&gt; + &lt;ContentType contentTypeId="RPTDESIGN" description="Birt report (.rptDesign) file"/&gt; + &lt;DataTemplateType dataTemplateTypeId="FORM_COMBINED" description="Form widget" extension="xml"/&gt; + + &lt;!--Birt Tag Invoicing--&gt; + &lt;DataResource dataResourceId="DR_MASTER_EmbiOrderTag" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FORM_COMBINED" /&gt; + &lt;ElectronicText dataResourceId="DR_MASTER_EmbiOrderTag"&gt; + &lt;textData&gt;&lt;![CDATA[&lt;?xml version="1.0" encoding="UTF-8"?&gt; + &lt;forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"&gt; + &lt;form name="CTNT_MASTER_EmbiOrderTag_OVERRIDE" type="single" target="editFormParameters" extends="CTNT_MASTER_EmbiOrderTag" extends-resource="component://embisphere/widget/ReportMasterForms.xml"&gt; + &lt;field name="overrideFilters" title="${uiLabelMap.overrideFilters}"&gt;&lt;textarea cols="90" rows="20" default-value="${parameters.textForm}"/&gt;&lt;/field&gt; + &lt;field name="reportContentId"&gt;&lt;hidden value="${parameters.reportContentId}"/&gt;&lt;/field&gt; + &lt;on-event-update-area event-type="submit" area-id="window" area-target="manageReports"&gt; + &lt;parameter param-name="contentId" value="${parameters.reportContentId}"/&gt; + &lt;/on-event-update-area&gt; + &lt;sort-order&gt;&lt;sort-field name="overrideFilters"/&gt;&lt;/sort-order&gt; + &lt;/form&gt; + &lt;/forms&gt;]]&gt; + &lt;/textData&gt; + &lt;/ElectronicText&gt; + &lt;Content contentId="CTNT_MASTER_EmbiOrderTag" contentTypeId="REPORT_MASTER" dataResourceId="DR_MASTER_EmbiOrderTag" customMethodId="callPerformFindFromBirt" statusId="CTNT_PUBLISHED" contentName="Order Tag Master" description="Master Content for EmbisphereOrderAndPartyAndDPPView" /&gt; + &lt;ContentAttribute contentId="CTNT_MASTER_EmbiOrderTag" attrName="Entity" attrValue="EmbisphereOrderAndPartyAndDPPView"/&gt; + &lt;ContentPurposeType contentPurposeTypeId="REPORT_EMBI_IB" description="Reporting available for IB domain" /&gt; + + &lt;DataResource createdByUserLogin="mnicolas" dataResourceId="RPT2274471" dataResourceName="Tag_Invoicing.rptdesign" dataResourceTypeId="LOCAL_FILE" dataTemplateTypeId="NONE" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-26 10:00:51.297" mimeTypeId="text/rptdesign" objectInfo="/var/lib/ofbiz/contents/uploads/birtRptDesign/Tag_Invoicing_0.rptdesign" statusId="CTNT_IN_PROGRESS"/&gt; + &lt;DataResource createdByUserLogin="mnicolas" createdDate="2017-01-26 10:00:51.071" dataResourceId="RPT2274470" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FORM_COMBINED" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-26 10:00:51.071" statusId="CTNT_IN_PROGRESS"/&gt; + &lt;Content contentId="RPT2274441" contentName="Tag Invoicing" contentTypeId="RPTDESIGN" createdByUserLogin="mnicolas" createdDate="2017-01-26 10:00:51.308" dataResourceId="RPT2274471" description="Order tag for the current fiscal company (.rptDesign file)" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-26 10:00:51.308" statusId="CTNT_PUBLISHED"/&gt; + &lt;Content contentId="RPT2274440" contentName="Tag Invoicing" contentTypeId="FLEXIBLE_REPORT" createdByUserLogin="mnicolas" createdDate="2017-01-26 10:00:51.259" dataResourceId="RPT2274470" description="Order tag for the current fiscal company" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-30 09:25:06.358" statusId="CTNT_IN_PROGRESS"/&gt; + &lt;ContentPurpose contentId="RPT2274440" contentPurposeTypeId="REPORT_EMBI_IB"/&gt; + &lt;ContentAssoc contentAssocTypeId="SUB_CONTENT" contentId="RPT2274440" contentIdTo="RPT2274441" createdByUserLogin="mnicolas" createdDate="2017-01-26 10:00:51.377" fromDate="2017-01-26 10:00:51.377" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-26 10:00:51.377" /&gt; + &lt;ElectronicText createdStamp="2017-01-26 10:00:51.0" createdTxStamp="2017-01-26 10:00:50.0" dataResourceId="RPT2274470" lastUpdatedStamp="2017-01-30 09:58:53.964" lastUpdatedTxStamp="2017-01-30 09:58:53.874"&gt; + &lt;textData&gt;&lt;![CDATA[&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"&gt; + &lt;form client-autocomplete-fields="true" default-csv-separator="," default-hide-quote="false" default-title-csv-separator="," default-title-hide-quote="false" extends="CTNT_MASTER_EmbiOrderTag" extends-resource="component://embisphere/widget/ReportMasterForms.xml" group-columns="true" hide-header="false" item-index-separator="_o_" name="CTNT_MASTER_EmbiOrderTag_2274440" paginate="${paginate}" separate-columns="false" skip-end="false" skip-start="false" target-type="intra-app" type="single" use-row-submit="false" validate-link-id="submit" validate-link-on-enter="false"&gt; + &lt;field encode-output="true" name="purchaseShipByDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="dppPartyClassificationGroupId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="email" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="statusDescription" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="channelDescription" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="purchaseStatusDescription" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="orderId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="comments" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="groupName" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="groupNameLocal" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="partyId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="purchaseOrderId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="purchaseStatusId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="estimatedDeliveryDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="productId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="externalId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="supplierGroupName" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="grandTotal" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="salesChannelEnumId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="agentPartyId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="cnuf" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="entryDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="dppDescription" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="estimatedShipDate" position="1" red-when="by-name" separate-column="false" sort-field="false" title="Actual ship date"&gt; + &lt;date-find default-option-from="greaterThan" default-option-thru="lessThan" type="timestamp"/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="shipByDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;ignored/&gt; + &lt;/field&gt; + &lt;field encode-output="true" name="orderDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; + &lt;date-find default-option-from="greaterThan" default-option-thru="lessThan" type="timestamp"/&gt; + &lt;/field&gt; + &lt;sort-order type="explicit"&gt; + &lt;sort-field name="productStoreId"/&gt; + &lt;sort-field name="estimatedShipDate"/&gt; + &lt;/sort-order&gt; + &lt;/form&gt; +&lt;/forms&gt; +]]&gt;&lt;/textData&gt; + &lt;/ElectronicText&gt; + </span> &lt;/entity-engine-xml&gt; </code></pre> <br> </li> <li id="eb43eb49763194a9a29713cd20c77b9b"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-43"> <strong> hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-103.xml </strong> deleted </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-103.xml </span><span style="background: #ddffdd; color: #000000">+++ /dev/null </span><span style="color: #aaaaaa">@@ -1,122 +0,0 @@ </span><span style="background: #ffdddd; color: #000000">-&lt;entity-engine-xml&gt; - &lt;ContentType contentTypeId="REPORT_MASTER" description="Report Master"/&gt; - &lt;ContentType contentTypeId="REPORT" description="Report"/&gt; - &lt;ContentType contentTypeId="RPTDESIGN" description="Birt report (.rptDesign) file"/&gt; - &lt;DataTemplateType dataTemplateTypeId="FORM_COMBINED" description="Form widget" extension="xml"/&gt; - - &lt;DataResource dataResourceId="DR_MASTER_EmbiOrderTag" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FORM_COMBINED" /&gt; - &lt;ElectronicText dataResourceId="DR_MASTER_EmbiOrderTag"&gt; - &lt;textData&gt;&lt;![CDATA[&lt;?xml version="1.0" encoding="UTF-8"?&gt; - &lt;forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"&gt; - &lt;form name="CTNT_MASTER_EmbiOrderTag_OVERRIDE" type="single" target="editFormParameters" extends="CTNT_MASTER_EmbiOrderTag" extends-resource="component://embisphere/widget/ReportMasterForms.xml"&gt; - &lt;field name="overrideFilters" title="${uiLabelMap.overrideFilters}"&gt;&lt;textarea cols="90" rows="20" default-value="${parameters.textForm}"/&gt;&lt;/field&gt; - &lt;field name="reportContentId"&gt;&lt;hidden value="${parameters.reportContentId}"/&gt;&lt;/field&gt; - &lt;on-event-update-area event-type="submit" area-id="window" area-target="manageReports"&gt; - &lt;parameter param-name="contentId" value="${parameters.reportContentId}"/&gt; - &lt;/on-event-update-area&gt; - &lt;sort-order&gt;&lt;sort-field name="overrideFilters"/&gt;&lt;/sort-order&gt; - &lt;/form&gt; - &lt;/forms&gt;]]&gt; - &lt;/textData&gt; - &lt;/ElectronicText&gt; - &lt;Content contentId="CTNT_MASTER_EmbiOrderTag" contentTypeId="REPORT_MASTER" dataResourceId="DR_MASTER_EmbiOrderTag" customMethodId="callPerformFindFromBirt" statusId="CTNT_PUBLISHED" contentName="Order Tag Master" description="Master Content for EmbisphereOrderAndPartyAndDPPView" /&gt; - &lt;ContentAttribute contentId="CTNT_MASTER_EmbiOrderTag" attrName="Entity" attrValue="EmbisphereOrderAndPartyAndDPPView"/&gt; - &lt;ContentPurposeType contentPurposeTypeId="REPORT_EMBI_IB" description="Reporting available for IB domain" /&gt; - - &lt;DataResource createdByUserLogin="mnicolas" dataResourceId="RPT2274471" dataResourceName="Tag_Invoicing.rptdesign" dataResourceTypeId="LOCAL_FILE" dataTemplateTypeId="NONE" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-26 10:00:51.297" mimeTypeId="text/rptdesign" objectInfo="/var/lib/ofbiz/contents/uploads/birtRptDesign/Tag_Invoicing_0.rptdesign" statusId="CTNT_IN_PROGRESS"/&gt; - &lt;DataResource createdByUserLogin="mnicolas" createdDate="2017-01-26 10:00:51.071" dataResourceId="RPT2274470" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FORM_COMBINED" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-26 10:00:51.071" statusId="CTNT_IN_PROGRESS"/&gt; - &lt;Content contentId="RPT2274441" contentName="Tag Invoicing" contentTypeId="RPTDESIGN" createdByUserLogin="mnicolas" createdDate="2017-01-26 10:00:51.308" dataResourceId="RPT2274471" description="Order tag for the current fiscal company (.rptDesign file)" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-26 10:00:51.308" statusId="CTNT_PUBLISHED"/&gt; - &lt;Content contentId="RPT2274440" contentName="Tag Invoicing" contentTypeId="FLEXIBLE_REPORT" createdByUserLogin="mnicolas" createdDate="2017-01-26 10:00:51.259" dataResourceId="RPT2274470" description="Order tag for the current fiscal company" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-30 09:25:06.358" statusId="CTNT_IN_PROGRESS"/&gt; - &lt;ContentPurpose contentId="RPT2274440" contentPurposeTypeId="REPORT_EMBI_IB"/&gt; - &lt;ContentAssoc contentAssocTypeId="SUB_CONTENT" contentId="RPT2274440" contentIdTo="RPT2274441" createdByUserLogin="mnicolas" createdDate="2017-01-26 10:00:51.377" fromDate="2017-01-26 10:00:51.377" lastModifiedByUserLogin="mnicolas" lastModifiedDate="2017-01-26 10:00:51.377" /&gt; - &lt;ElectronicText createdStamp="2017-01-26 10:00:51.0" createdTxStamp="2017-01-26 10:00:50.0" dataResourceId="RPT2274470" lastUpdatedStamp="2017-01-30 09:58:53.964" lastUpdatedTxStamp="2017-01-30 09:58:53.874"&gt; - &lt;textData&gt;&lt;![CDATA[&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"&gt; - &lt;form client-autocomplete-fields="true" default-csv-separator="," default-hide-quote="false" default-title-csv-separator="," default-title-hide-quote="false" extends="CTNT_MASTER_EmbiOrderTag" extends-resource="component://embisphere/widget/ReportMasterForms.xml" group-columns="true" hide-header="false" item-index-separator="_o_" name="CTNT_MASTER_EmbiOrderTag_2274440" paginate="${paginate}" separate-columns="false" skip-end="false" skip-start="false" target-type="intra-app" type="single" use-row-submit="false" validate-link-id="submit" validate-link-on-enter="false"&gt; - &lt;field encode-output="true" name="purchaseShipByDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="dppPartyClassificationGroupId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="email" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="statusDescription" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="channelDescription" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="purchaseStatusDescription" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="orderId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="comments" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="groupName" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="groupNameLocal" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="partyId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="purchaseOrderId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="purchaseStatusId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="estimatedDeliveryDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="productId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="externalId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="supplierGroupName" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="grandTotal" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="salesChannelEnumId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="agentPartyId" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="cnuf" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="entryDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="dppDescription" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="estimatedShipDate" position="1" red-when="by-name" separate-column="false" sort-field="false" title="Actual ship date"&gt; - &lt;date-find default-option-from="greaterThan" default-option-thru="lessThan" type="timestamp"/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="shipByDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;ignored/&gt; - &lt;/field&gt; - &lt;field encode-output="true" name="orderDate" position="1" red-when="by-name" separate-column="false" sort-field="false"&gt; - &lt;date-find default-option-from="greaterThan" default-option-thru="lessThan" type="timestamp"/&gt; - &lt;/field&gt; - &lt;sort-order type="explicit"&gt; - &lt;sort-field name="productStoreId"/&gt; - &lt;sort-field name="estimatedShipDate"/&gt; - &lt;/sort-order&gt; - &lt;/form&gt; -&lt;/forms&gt; -]]&gt;&lt;/textData&gt; - &lt;/ElectronicText&gt; - &lt;ContentAttribute contentId="RPT2274441" attrName="Entity" attrValue="EmbisphereOrderAndPartyAndDPPView"/&gt; -&lt;/entity-engine-xml&gt; </span></code></pre> <br> </li> <li id="92341f460412b5ccbc84f5acc586422d"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-44"> <strong> hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-340.xml </strong> deleted </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-340.xml </span><span style="background: #ddffdd; color: #000000">+++ /dev/null </span><span style="color: #aaaaaa">@@ -1,12 +0,0 @@ </span><span style="background: #ffdddd; color: #000000">-&lt;entity-engine-xml&gt; - &lt;EmailTemplateSetting emailTemplateSettingId="EMBI_GROSS_REPORT" contentType="text/html" - description="Standard email to send Gross report" fromAddress="no-reply@embisphere.com" - subject="[OFBiz Report] ORDER-INVOICE by Quarter"/&gt; - &lt;RoleType roleTypeId="SEND_GROSS_REPORT" description="Gross Report Reader"/&gt; - &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10142"/&gt; - &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10143"/&gt; - &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10040"/&gt; - &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10002"/&gt; - &lt;PartyRole roleTypeId="SEND_GROSS_REPORT" partyId="E10000"/&gt; - -&lt;/entity-engine-xml&gt; </span>\ No newline at end of file </code></pre> <br> </li> <li id="69b75e7d0845e4562ef1e6c3d7f0c46b"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-45"> <strong> hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-506.xml </strong> deleted </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere/data/NextSeedDataToLoad/STORE-506.xml </span><span style="background: #ddffdd; color: #000000">+++ /dev/null </span><span style="color: #aaaaaa">@@ -1,7 +0,0 @@ </span><span style="background: #ffdddd; color: #000000">-&lt;?xml version="1.0" encoding="UTF-8"?&gt; -&lt;entity-engine-xml&gt; - &lt;ProductStoreGroupType description="Product Store Group for Hardware" productStoreGroupTypeId="PDSTG_HARDWARE"/&gt; - &lt;ProductStoreGroup description="Hardware China product store group" primaryParentGroupId="EMBI_CN" productStoreGroupId="EMB10000" productStoreGroupName="Hardware China" productStoreGroupTypeId="PDSTG_HARDWARE"/&gt; - &lt;ProductStoreGroupRollup fromDate="2016-12-02 11:42:00.613" parentGroupId="EMBI_CN" productStoreGroupId="EMB10000"/&gt; - &lt;ProductStoreGroupMember fromDate="2016-12-02 00:00:00.0" productStoreGroupId="EMB10000" productStoreId="EMBI_CN"/&gt; -&lt;/entity-engine-xml&gt; </span>\ No newline at end of file </code></pre> <br> </li> <li id="f783c3bf1259cb0e48240a6b2d83f095"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-46"> <strong> hot-deploy/embisphere/entitydef/entitymodel.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere/entitydef/entitymodel.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere/entitydef/entitymodel.xml </span><span style="color: #aaaaaa">@@ -4433,6 +4433,8 @@ </span> &lt;member-entity entity-alias="PROD" entity-name="Product"/&gt; &lt;member-entity entity-alias="PWAR" entity-name="Product"/&gt; &lt;member-entity entity-alias="INVIT" entity-name="InventoryItem"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;member-entity entity-alias="IIAP" entity-name="InventoryItemAttribute"/&gt; + &lt;member-entity entity-alias="IIAPL" entity-name="InventoryItemAttribute"/&gt; </span> &lt;alias entity-alias="SUB" name="subscriptionId"/&gt; &lt;alias entity-alias="SUB" name="partyId"/&gt; &lt;alias entity-alias="SUB" name="fromDate"/&gt; <span style="color: #aaaaaa">@@ -4449,7 +4451,8 @@ </span> &lt;alias entity-alias="PWAR" name="warrantyproductName" field="productName"/&gt; &lt;alias entity-alias="INVIT" name="inventoryItemId"/&gt; &lt;alias entity-alias="INVIT" name="serialNumber"/&gt; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ &lt;alias name="country" entity-alias="IIAP" field="attrValue"/&gt; + &lt;alias name="countryLabel" entity-alias="IIAPL" field="attrValue"/&gt; </span> &lt;view-link entity-alias="SUB" rel-entity-alias="PTYGRP" rel-optional="false"&gt; &lt;key-map field-name="partyId"/&gt; &lt;/view-link&gt; <span style="color: #aaaaaa">@@ -4462,6 +4465,18 @@ </span> &lt;view-link entity-alias="INVIT" rel-entity-alias="PROD" rel-optional="false"&gt; &lt;key-map field-name="productId"/&gt; &lt;/view-link&gt; <span style="background: #ddffdd; color: #000000">+ &lt;view-link entity-alias="INVIT" rel-entity-alias="IIAP" rel-optional="true"&gt; + &lt;key-map field-name="inventoryItemId"/&gt; + &lt;entity-condition&gt; + &lt;condition-expr field-name="attrName" entity-alias="IIAP" operator="equals" value="pays"/&gt; + &lt;/entity-condition&gt; + &lt;/view-link&gt; + &lt;view-link entity-alias="INVIT" rel-entity-alias="IIAPL" rel-optional="true"&gt; + &lt;key-map field-name="inventoryItemId"/&gt; + &lt;entity-condition&gt; + &lt;condition-expr field-name="attrName" entity-alias="IIAPL" operator="equals" value="paysLibelle"/&gt; + &lt;/entity-condition&gt; + &lt;/view-link&gt; </span> &lt;entity-condition&gt; &lt;condition-list combine="or"&gt; &lt;condition-expr field-name="subscriptionTypeId" operator="equals" value="PRODUCT_WARRANTY_SUBSCR" entity-alias="SUB"/&gt; <span style="color: #aaaaaa">@@ -4686,7 +4701,7 @@ </span> &lt;/entity-condition&gt; &lt;/view-entity&gt; <span style="background: #ffdddd; color: #000000">- &lt;view-entity entity-name="UserAndPreference"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;view-entity entity-name="UserAndPreference" package-name="com.embisphere"&gt; </span> &lt;member-entity entity-alias="USL" entity-name="UserLogin"/&gt; &lt;member-entity entity-alias="USP" entity-name="UserPreference"/&gt; &lt;alias-all entity-alias="USL"/&gt; <span style="color: #aaaaaa">@@ -4742,4 +4757,34 @@ </span> &lt;/entity-condition&gt; &lt;/view-entity&gt; <span style="background: #ddffdd; color: #000000">+ &lt;view-entity entity-name="InvItLocCountryAndDate" + package-name="com.embisphere" + title="InventoryItem And FacilityLocation, with BL_DATE and PAYS attributes, View Entity"&gt; + &lt;member-entity entity-alias="II" entity-name="InventoryItemAndLocation"/&gt; + &lt;member-entity entity-alias="IIAP" entity-name="InventoryItemAttribute"/&gt; + &lt;member-entity entity-alias="IIAPL" entity-name="InventoryItemAttribute"/&gt; + &lt;member-entity entity-alias="IIAD" entity-name="InventoryItemAttribute"/&gt; + &lt;alias-all entity-alias="II"/&gt; + &lt;alias name="country" entity-alias="IIAP" field="attrValue"/&gt; + &lt;alias name="countryLabel" entity-alias="IIAPL" field="attrValue"/&gt; + &lt;alias name="blDate" entity-alias="IIAD" field="attrValue"/&gt; + &lt;view-link entity-alias="II" rel-entity-alias="IIAP" rel-optional="true"&gt; + &lt;key-map field-name="inventoryItemId"/&gt; + &lt;entity-condition&gt; + &lt;condition-expr field-name="attrName" entity-alias="IIAP" operator="equals" value="pays"/&gt; + &lt;/entity-condition&gt; + &lt;/view-link&gt; + &lt;view-link entity-alias="II" rel-entity-alias="IIAPL" rel-optional="true"&gt; + &lt;key-map field-name="inventoryItemId"/&gt; + &lt;entity-condition&gt; + &lt;condition-expr field-name="attrName" entity-alias="IIAPL" operator="equals" value="paysLibelle"/&gt; + &lt;/entity-condition&gt; + &lt;/view-link&gt; + &lt;view-link entity-alias="II" rel-entity-alias="IIAD" rel-optional="true"&gt; + &lt;key-map field-name="inventoryItemId"/&gt; + &lt;entity-condition&gt; + &lt;condition-expr field-name="attrName" entity-alias="IIAD" operator="equals" value="blDate"/&gt; + &lt;/entity-condition&gt; + &lt;/view-link&gt; + &lt;/view-entity&gt; </span> &lt;/entitymodel&gt; </code></pre> <br> </li> <li id="b00c41e1800419df4132e94fe5145fce"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-47"> <strong> hot-deploy/embisphere/widget/crm/CRMForms.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embisphere/widget/crm/CRMForms.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embisphere/widget/crm/CRMForms.xml </span><span style="color: #aaaaaa">@@ -39,6 +39,7 @@ </span> &lt;field name="warrantyId" sort-field="true" title="${uiLabelMap.ProductWarranty}"&gt;&lt;display/&gt;&lt;/field&gt; &lt;field name="warrantyInternalName" title="${uiLabelMap.ProductWarranty} ${uiLabelMap.ProductInternalName}"&gt;&lt;display/&gt;&lt;/field&gt; &lt;field name="warrantyProductName" title="${uiLabelMap.ProductWarranty} ${uiLabelMap.ProductName}"&gt;&lt;display/&gt;&lt;/field&gt; <span style="background: #ddffdd; color: #000000">+ &lt;field name="country"&gt;&lt;display description="${countryLabel} [${country}]"/&gt;&lt;/field&gt; </span> &lt;field name="fromDate" title="${uiLabelMap.FormFieldTitle_crm_fromDate}"&gt;&lt;display/&gt;&lt;/field&gt; &lt;field name="thruDate" title="${uiLabelMap.FormFieldTitle_crm_thruDate}"&gt;&lt;display/&gt;&lt;/field&gt; &lt;/form&gt; </code></pre> <br> </li> <li id="becd47e5186b47229fcf9c5334b3b1d7"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-48"> <strong> hot-deploy/embitag-com/config/FrontEmbitagUiLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/config/FrontEmbitagUiLabels.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/config/FrontEmbitagUiLabels.xml </span><span style="color: #aaaaaa">@@ -391,6 +391,10 @@ </span> &lt;value xml:lang="en"&gt;user(s)&lt;/value&gt; &lt;value xml:lang="fr"&gt;utilisateur(s)&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="FrontEmbitag_Common_Understood"&gt; + &lt;value xml:lang="en"&gt;Understood&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Compris&lt;/value&gt; + &lt;/property&gt; </span> &lt;property key="FrontEmbitag_Common_Upload"&gt; &lt;value xml:lang="en"&gt;Upload&lt;/value&gt; &lt;value xml:lang="fr"&gt;Importer&lt;/value&gt; <span style="color: #aaaaaa">@@ -460,8 +464,8 @@ </span> &lt;value xml:lang="fr"&gt;Portal factory ID&lt;/value&gt; &lt;/property&gt; &lt;property key="FrontEmbitag_Common_Quantity"&gt; <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="en"&gt;Choose a quantity&lt;/value&gt; - &lt;value xml:lang="fr"&gt;Choisissez une quantité&lt;/value&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="en"&gt;Quantity&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Quantité&lt;/value&gt; </span> &lt;/property&gt; &lt;property key="FrontEmbitag_Common_Quantity_Add"&gt; &lt;value xml:lang="en"&gt;Add Quantity&lt;/value&gt; <span style="color: #aaaaaa">@@ -575,6 +579,10 @@ </span> &lt;value xml:lang="en"&gt;Incl Tax&lt;/value&gt; &lt;value xml:lang="fr"&gt;TTC&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="FrontEmbitag_Common_Tips"&gt; + &lt;value xml:lang="en"&gt;Tips&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Astuces&lt;/value&gt; + &lt;/property&gt; </span> &lt;property key="FrontEmbitag_Common_To"&gt; &lt;value xml:lang="en"&gt;to&lt;/value&gt; &lt;value xml:lang="fr"&gt;au&lt;/value&gt; <span style="color: #aaaaaa">@@ -1743,6 +1751,54 @@ </span> &lt;value xml:lang="en"&gt;If you wish to select another customer for its catalogue, product and price then &amp;lt;span class="danger"&amp;gt;your shopping cart will be emptied first&amp;lt;/span&amp;gt;.&amp;lt;br /&amp;gt;Do you still want to continue ?&lt;/value&gt; &lt;value xml:lang="fr"&gt;Pour charger les prix, les produits et le catalogue d'un autre client, &amp;lt;span class="danger"&amp;gt;nous avons besoin de vider votre panier&amp;lt;/span&amp;gt;.&amp;lt;br /&amp;gt;Voulez-vous continuer ?&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="FrontEmbitag_Encoding_Modal_Action_Header"&gt; + &lt;value xml:lang="en"&gt;Actions&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Actions&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Feature"&gt; + &lt;value xml:lang="en"&gt;This feature allows you to manage quantity of products by 2 different ways:&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Les actions vous permettent de gérer la quantité d'un produit de 2 manières différentes : &lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Feature_1"&gt; + &lt;value xml:lang="en"&gt;- Adding / removing quantity&lt;/value&gt; + &lt;value xml:lang="fr"&gt;- En ajoutant / supprimant des quantités&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Feature_2"&gt; + &lt;value xml:lang="en"&gt;- Adding / removing percentage per quantity&lt;/value&gt; + &lt;value xml:lang="fr"&gt;- En ajoutant / supprimant des pourcentages de quantité&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Quantity"&gt; + &lt;value xml:lang="en"&gt;&amp;lt;strong&amp;gt;Example for Qty: &amp;lt;/strong&amp;gt;&lt;/value&gt; + &lt;value xml:lang="fr"&gt;&amp;lt;strong&amp;gt;Exemple pour Qté : &amp;lt;/strong&amp;gt;&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Quantity_List"&gt; + &lt;value xml:lang="en"&gt;&amp;lt;ol&amp;gt;&amp;lt;li&amp;gt;Put 10&amp;lt;/li&amp;gt;&amp;lt;li&amp;gt;Choose Qty&amp;lt;/li&amp;gt;&amp;lt;li&amp;gt;Click on Apply&amp;lt;/li&amp;gt;&amp;lt;/ol&amp;gt;&lt;/value&gt; + &lt;value xml:lang="fr"&gt;&amp;lt;ol&amp;gt;&amp;lt;li&amp;gt;Insérez 10&amp;lt;/li&amp;gt;&amp;lt;li&amp;gt;Choisissez Qté&amp;lt;/li&amp;gt;&amp;lt;li&amp;gt;Cliquez sur Appliquer&amp;lt;/li&amp;gt;&amp;lt;/ol&amp;gt;&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Quantity_Result"&gt; + &lt;value xml:lang="en"&gt;&amp;lt;strong&amp;gt;Result: &amp;lt;/strong&amp;gt;&amp;lt;br /&amp;gt;Will add 10 to the actual product quantity. If the quantity was 200, the new quantity will be 210 (200+10)&lt;/value&gt; + &lt;value xml:lang="fr"&gt;&amp;lt;strong&amp;gt;Résultat : &amp;lt;/strong&amp;gt;&amp;lt;br /&amp;gt;Cela ajoutera 10 à la quantité actuelle du produit. Si la quantité était de 200, elle sera maintenant de 210 (200+10)&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Quantity_Tips"&gt; + &lt;value xml:lang="en"&gt;If you put -10 instead of 10, it will remove 10 from the actual product quantity.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Si vous utilisez -10 au lieu de 10, cela retirera 10 à la quantité actuelle du produit.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Percent"&gt; + &lt;value xml:lang="en"&gt;&amp;lt;strong&amp;gt;Example for %: &amp;lt;/strong&amp;gt;&lt;/value&gt; + &lt;value xml:lang="fr"&gt;&amp;lt;strong&amp;gt;Exemple pour % : &amp;lt;/strong&amp;gt;&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Percent_List"&gt; + &lt;value xml:lang="en"&gt;&amp;lt;ol&amp;gt;&amp;lt;li&amp;gt;Put 10&amp;lt;/li&amp;gt;&amp;lt;li&amp;gt;Choose %&amp;lt;/li&amp;gt;&amp;lt;li&amp;gt;Click on Apply&amp;lt;/li&amp;gt;&amp;lt;/ol&amp;gt;&lt;/value&gt; + &lt;value xml:lang="fr"&gt;&amp;lt;ol&amp;gt;&amp;lt;li&amp;gt;Insérez 10&amp;lt;/li&amp;gt;&amp;lt;li&amp;gt;Choisissez %&amp;lt;/li&amp;gt;&amp;lt;li&amp;gt;Cliquez sur Appliquer&amp;lt;/li&amp;gt;&amp;lt;/ol&amp;gt;&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Percent_Result"&gt; + &lt;value xml:lang="en"&gt;&amp;lt;strong&amp;gt;Result: &amp;lt;/strong&amp;gt;&amp;lt;br /&amp;gt;Will add 10% of the quantity, to the actual product quantity. If the quantity was 200, the new quantity will be 220 (200+10%)&lt;/value&gt; + &lt;value xml:lang="fr"&gt;&amp;lt;strong&amp;gt;Résultat : &amp;lt;/strong&amp;gt;&amp;lt;br /&amp;gt;Cela ajoutera 10% de la quantité actuelle. Si la quantité était de 200, elle sera maintenant de 220 (200+10%)&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Encoding_Modal_Action_Percent_Tips"&gt; + &lt;value xml:lang="en"&gt;If you put -10 instead of 10, it will remove 10% from the actual product quantity.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Si vous utilisez -10 au lieu de 10, cela retirera 10% à la quantité actuelle du produit.&lt;/value&gt; + &lt;/property&gt; </span> &lt;!-- Shipping --&gt; &lt;property key="FrontEmbitag_Shipping_Shipping"&gt; <span style="color: #aaaaaa">@@ -1835,6 +1891,38 @@ </span> &lt;value xml:lang="en"&gt;&amp;lt;strong&amp;gt;Save time !&amp;lt;/strong&amp;gt; An order paid with the &amp;lt;strong&amp;gt;order number&amp;lt;/strong&amp;gt; or &amp;lt;strong&amp;gt;invoice number&amp;lt;/strong&amp;gt; is &amp;lt;strong&amp;gt;handled first&amp;lt;/strong&amp;gt;.&lt;/value&gt; &lt;value xml:lang="fr"&gt;&amp;lt;strong&amp;gt;Gagnez du temps !&amp;lt;/strong&amp;gt; Une commande payée avec le &amp;lt;strong&amp;gt;n° de commande&amp;lt;/strong&amp;gt; ou le &amp;lt;strong&amp;gt;n° de facture&amp;lt;/strong&amp;gt; est traitée en &amp;lt;strong&amp;gt;priorité&amp;lt;/strong&amp;gt;.&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="FrontEmbitag_Payment_Order_Type"&gt; + &lt;value xml:lang="en"&gt;Order type&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Order type&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Payment_Order_Type_Standard_Header"&gt; + &lt;value xml:lang="en"&gt;Standard order&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Commande standard&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Payment_Order_Type_Standard_Body"&gt; + &lt;value xml:lang="en"&gt;You will have ${leadTime} to edit or cancel your order. After this timeframe, it will be sent to production.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Vous aurez ${leadTime} pour modifier ou annuler votre commande. Une fois cette période passée, elle sera envoyée en production.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Payment_Order_Type_Urgent_Header"&gt; + &lt;value xml:lang="en"&gt;Urgent order&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Commande urgente&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Payment_Order_Type_Urgent_Body"&gt; + &lt;value xml:lang="en"&gt;You will win ${leadTime} of production time because your order will be sent to production right away. &amp;lt;strong&amp;gt;Urgent orders can not be edited or cancelled.&amp;lt;/strong&amp;gt;&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Vous gagnerez ${leadTime} de temps de production car nous enverrons votre commande en production immédiatement. &amp;lt;strong&amp;gt;Les commandes urgentes ne sont ni annulable ni modifiables.&amp;lt;/strong&amp;gt;&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Payment_Order_Type_Modal_Header"&gt; + &lt;value xml:lang="en"&gt;Urgent order&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Commande urgente&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Payment_Order_Type_Modal_Body"&gt; + &lt;value xml:lang="en"&gt;&amp;lt;strong&amp;gt;You will not be able to edit or cancel this order on it is placed.&amp;lt;/strong&amp;gt;&amp;lt;br /&amp;gt;Do you really want to choose urgent order option ?&lt;/value&gt; + &lt;value xml:lang="fr"&gt;&amp;lt;strong&amp;gt;Vous ne pourrez ni modifier ni annuler cette commande une fois que vous l'aurez passée.&amp;lt;/strong&amp;gt;&amp;lt;br /&amp;gt;Souhaitez-vous vraiment continuer ?&lt;/value&gt; + &lt;/property&gt; + &lt;property key="FrontEmbitag_Payment_Order_Type_Modal_Choose"&gt; + &lt;value xml:lang="en"&gt;Urgent order&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Commande urgente&lt;/value&gt; + &lt;/property&gt; </span> &lt;!-- Billing --&gt; &lt;property key="FrontEmbitag_Billing_Billing"&gt; <span style="color: #aaaaaa">@@ -1929,9 +2017,13 @@ </span> &lt;value xml:lang="fr"&gt;Confirmer l'annulation de la commande&lt;/value&gt; &lt;/property&gt; &lt;property key="FrontEmbitag_Order_Create"&gt; <span style="background: #ffdddd; color: #000000">- &lt;value xml:lang="en"&gt;Create Order&lt;/value&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;value xml:lang="en"&gt;Place Order&lt;/value&gt; </span> &lt;value xml:lang="fr"&gt;Passer commande&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="FrontEmbitag_Order_Creating"&gt; + &lt;value xml:lang="en"&gt;Placing Order&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Commande en cours&lt;/value&gt; + &lt;/property&gt; </span> &lt;property key="FrontEmbitag_Order_Confirmation"&gt; &lt;value xml:lang="en"&gt;Confirmation&lt;/value&gt; &lt;value xml:lang="fr"&gt;Confirmation&lt;/value&gt; <span style="color: #aaaaaa">@@ -2056,6 +2148,10 @@ </span> &lt;value xml:lang="en"&gt;Update order&lt;/value&gt; &lt;value xml:lang="fr"&gt;Mettre à jour la commande&lt;/value&gt; &lt;/property&gt; <span style="background: #ddffdd; color: #000000">+ &lt;property key="FrontEmbitag_Order_Updating"&gt; + &lt;value xml:lang="en"&gt;Updating order&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Mise à jour de la commande&lt;/value&gt; + &lt;/property&gt; </span> &lt;property key="FrontEmbitag_Orders_Statuses"&gt; &lt;value xml:lang="en"&gt;Orders statuses&lt;/value&gt; &lt;value xml:lang="fr"&gt;Les statuts de commandes&lt;/value&gt; </code></pre> <br> </li> <li id="d6f939b130cc97d31dd4da1c771257b8"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-49"> <strong> hot-deploy/embitag-com/config/LoadOrdersErrorUiLabels.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- /dev/null </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/config/LoadOrdersErrorUiLabels.xml </span><span style="color: #aaaaaa">@@ -0,0 +1,75 @@ </span><span style="background: #ddffdd; color: #000000">+&lt;?xml version="1.0" encoding="UTF-8"?&gt; +&lt;resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt; + &lt;property key="LoadOrdersErrorUnitPriceContent"&gt; + &lt;value xml:lang="en"&gt;See request line for detail&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Voir les lignes de la demande pour plus de détail&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorUnitPriceIsEmpty"&gt; + &lt;value xml:lang="en"&gt;No price on line ${line} for product ${productId}, we use internal price : ${unitPrice}&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Il n'y a pas de prix sur la ${line} pour l'article ${productId}, nous utilisons le prix interne : ${unitPrice}&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorUnitPriceIsNotTheSame"&gt; + &lt;value xml:lang="en"&gt;The price on line ${line} for product ${productId} is different than own price. Found on po ${poUnitPrice} instead of ${unitPrice}&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Le prix sur la ligne ${line} pour le produit ${productId} est différent de notre prix. Trouvé sur le po ${poUnitPrice} au lieu de ${unitPrice}&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadCancelOrdersErrorOrderDoesntExistContent"&gt; + &lt;value xml:lang="en"&gt;Please contact tag-support@embisphere.com.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Veuillez contacter tag-support@embisphere.com.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadCancelOrdersErrorOrderDoesntExistSubject"&gt; + &lt;value xml:lang="en"&gt;We can't find any orders ${externalId}.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Il n'existe pas de commande pour la référence ${externalId}.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorDPPNotPresentForCustomerSubject"&gt; + &lt;value xml:lang="en"&gt;The Economical area ${dpp} is missing customer ${factoryPartyId}&lt;/value&gt; + &lt;value xml:lang="fr"&gt;La zone économique ${dpp} est manquante pour le client ${factoryPartyId}&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorDPPNotPresentForCustomerContent"&gt; + &lt;value xml:lang="en"&gt;Please contact tag-support@embisphere.com.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Veuillez contacter tag-support@embisphere.com.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorUnitPriceSubject"&gt; + &lt;value xml:lang="en"&gt;Difference on unit price for PO ${externalId}&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Différence sur les prix unitaires pour l'ordre d'achat ${externalId}&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorSupplierNotFoundContent"&gt; + &lt;value xml:lang="en"&gt;Please contact tag-support@embisphere.com.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Veuillez contacter tag-support@embisphere.com.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorSupplierNotFoundSubject"&gt; + &lt;value xml:lang="en"&gt;Default Supplier ${partyId} unknow. &lt;/value&gt; + &lt;value xml:lang="fr"&gt;Fournisseur par défaut ${partyId} inconnu.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorSBNotFoundContent"&gt; + &lt;value xml:lang="en"&gt;Please contact tag-support@embisphere.com.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Veuillez contacter tag-support@embisphere.com.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorSBNotFoundSubject"&gt; + &lt;value xml:lang="en"&gt;Service bureau not found for economical area ${dppPartyId} and supplier ${supplierPartyId}&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Service bureau manquant pour la zone économique ${dppPartyId} et le fournisseur ${supplierPartyId}&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorPSRNotFoundContent"&gt; + &lt;value xml:lang="en"&gt;Please contact tag-support@embisphere.com.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Veuillez contacter tag-support@embisphere.com.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorPSRNotFoundSubject"&gt; + &lt;value xml:lang="en"&gt;ProductStore not found customer ${partyId}&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Centre de profit manquant pour le client ${partyId}&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorOrderAlreadyLoadContent"&gt; + &lt;value xml:lang="en"&gt;Please contact tag-support@embisphere.com.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Veuillez contacter tag-support@embisphere.com.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorOrderAlreadyLoadSubject"&gt; + &lt;value xml:lang="en"&gt;The purchase order ${externalId} is already load.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;La commande fournisseur ${externalId} est déjà chargée.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorAgreementSubject"&gt; + &lt;value xml:lang="en"&gt;Abord.&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Abandon de la demande.&lt;/value&gt; + &lt;/property&gt; + &lt;property key="LoadOrdersErrorAgreementContent"&gt; + &lt;value xml:lang="en"&gt;Po informations didn't permit to resolve agreements for economic area ${dppPartyId}, customer ${partyId} and supplier ${supplierId}&lt;/value&gt; + &lt;value xml:lang="fr"&gt;Les informations du po ${externalId} n'ont pas permis de résoudre d'accord pour la zone économique ${dppPartyId}, le client ${partyId} et le fournisseur ${supplierId}&lt;/value&gt; + &lt;/property&gt; +&lt;/resource&gt; </span>\ No newline at end of file </code></pre> <br> </li> <li id="805f514184cad0ad93cec748171eb52e"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-50"> <strong> hot-deploy/embitag-com/data/embitag-comTypeData.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/data/embitag-comTypeData.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/data/embitag-comTypeData.xml </span><span style="color: #aaaaaa">@@ -20,6 +20,7 @@ </span> &lt;StatusValidChange statusId="CRQ_DRAFT" statusIdTo="CRQ_PENDING" transitionName="Pending customer"/&gt; &lt;StatusValidChange statusId="CRQ_DRAFT" statusIdTo="CRQ_ERROR" transitionName="Error customer"/&gt; &lt;StatusValidChange statusId="CRQ_ERROR" statusIdTo="CRQ_PENDING" transitionName="Pending customer"/&gt; <span style="background: #ddffdd; color: #000000">+ &lt;StatusValidChange statusId="CRQ_PENDING" statusIdTo="CRQ_SUBMITTED" transitionName="Pending customer"/&gt; </span> &lt;Enumeration description="Unit price supplier correction" enumCode="SUPP_REQUEST_UNITPRICE" enumId="OICR_SUPP_REQUEST_UNITPRICE" sequenceId="01" enumTypeId="ODR_ITM_CH_REASON"/&gt; &lt;Enumeration description="Hand over date supplier correction" enumCode="SUPP_REQUEST_UNITPRICE" enumId="OICR_SUPP_REQUEST_HANDOVERDATE" sequenceId="01" enumTypeId="ODR_ITM_CH_REASON"/&gt; </code></pre> <br> </li> <li id="9c4f99cdaa893fc819427fb660c76fdc"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-51"> <strong> hot-deploy/embitag-com/src/com/embitag/EmbitagCounterWorker.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/src/com/embitag/EmbitagCounterWorker.java </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/src/com/embitag/EmbitagCounterWorker.java </span><span style="color: #aaaaaa">@@ -7,6 +7,7 @@ import java.util.Map; </span> import com.embitag.flow.instanceFlow.generic.GenericOrderParser; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; <span style="background: #ddffdd; color: #000000">+import org.ofbiz.base.util.StringUtil; </span> import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; <span style="color: #aaaaaa">@@ -210,8 +211,13 @@ public class EmbitagCounterWorker { </span> return result; } <span style="background: #ddffdd; color: #000000">+ / + * Return the bit partition calculate with 12 minus company prefix size on 3 digits + * @param companyPrefix + * @return + */ </span> public static String getPartition(String companyPrefix) { <span style="background: #ffdddd; color: #000000">- return Integer.toBinaryString(12 - companyPrefix.length()); </span><span style="background: #ddffdd; color: #000000">+ return StringUtil.padNumberString(Integer.toBinaryString(12 - companyPrefix.length()), 3); </span> } } </code></pre> <br> </li> <li id="727c9cff31b9eba0a06af43d6db6aa3b"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-52"> <strong> hot-deploy/embitag-com/src/com/embitag/EmbitagOrderWorker.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/src/com/embitag/EmbitagOrderWorker.java </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/src/com/embitag/EmbitagOrderWorker.java </span><span style="color: #aaaaaa">@@ -136,6 +136,34 @@ public class EmbitagOrderWorker { </span> */ / <span style="background: #ddffdd; color: #000000">+ * get actual validation Time Period + * @param delegator + * @param partyId + * @param portalId + * @param locale + * @return + * @throws GenericEntityException + */ + public static String getActualValidationTime(Delegator delegator, String partyId, String portalId, Locale locale) throws GenericEntityException { + GenericValue embitagPartyPortalNoticePeriod = getNoticeValue(delegator, partyId, portalId); + if (embitagPartyPortalNoticePeriod == null) { + return null; + } + String noticePeriodSO = embitagPartyPortalNoticePeriod.getString("noticePeriodSO"); + StringBuilder validationTime = new StringBuilder(noticePeriodSO); + + String noticePeriodSOUomId = embitagPartyPortalNoticePeriod.getString("noticePeriodSOUomId"); + if (UtilValidate.isNotEmpty(noticePeriodSOUomId)) { + GenericValue uom = delegator.findOne("Uom", true, UtilMisc.toMap("uomId", noticePeriodSOUomId)); + if (UtilValidate.isNotEmpty(uom)) { + validationTime = validationTime.append(" ").append(uom.get("abbreviation", locale)); + } + } + + return validationTime.toString(); + } + + / </span> * return lead time generic value * @param delegator * @param partyId <span style="color: #aaaaaa">@@ -143,7 +171,7 @@ public class EmbitagOrderWorker { </span> * @return * @throws GenericEntityException */ <span style="background: #ffdddd; color: #000000">- public static GenericValue getActualLeadTimePeriodValue(Delegator delegator, String partyId, String portalId) throws GenericEntityException { </span><span style="background: #ddffdd; color: #000000">+ public static GenericValue getNoticeValue(Delegator delegator, String partyId, String portalId) throws GenericEntityException { </span> //récupération des configuration de notice note pour cet acteur + website (ajouter une option pour visualiser l'historique) EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeConditionDate("fromDate", "thruDate"), <span style="color: #aaaaaa">@@ -174,7 +202,7 @@ public class EmbitagOrderWorker { </span> * @throws GenericEntityException */ public static Long getActualMinimumLeadTimePeriod(Delegator delegator, String partyId, String portalId) throws GenericEntityException { <span style="background: #ffdddd; color: #000000">- GenericValue embitagPartyPortalNoticePeriod = getActualLeadTimePeriodValue(delegator, partyId, portalId); </span><span style="background: #ddffdd; color: #000000">+ GenericValue embitagPartyPortalNoticePeriod = getNoticeValue(delegator, partyId, portalId); </span> if (embitagPartyPortalNoticePeriod == null) { return null; } <span style="color: #aaaaaa">@@ -199,7 +227,7 @@ public class EmbitagOrderWorker { </span> * @throws GenericEntityException */ public static Long getActualNoticePeriod(Delegator delegator, String partyId, String portalId) throws GenericEntityException { <span style="background: #ffdddd; color: #000000">- GenericValue embitagPartyPortalNoticePeriod = getActualLeadTimePeriodValue(delegator, partyId, portalId); </span><span style="background: #ddffdd; color: #000000">+ GenericValue embitagPartyPortalNoticePeriod = getNoticeValue(delegator, partyId, portalId); </span> if (embitagPartyPortalNoticePeriod == null) { return null; } <span style="color: #aaaaaa">@@ -227,7 +255,7 @@ public class EmbitagOrderWorker { </span> * @throws GenericEntityException */ public static Long getActualLimiteModificationDate(Delegator delegator, String partyId, String portalId, Timestamp orderRequestedDate, Timestamp orderCreationDate) throws GenericEntityException { <span style="background: #ffdddd; color: #000000">- GenericValue embitagPartyPortalNoticePeriod = getActualLeadTimePeriodValue(delegator, partyId, portalId); </span><span style="background: #ddffdd; color: #000000">+ GenericValue embitagPartyPortalNoticePeriod = getNoticeValue(delegator, partyId, portalId); </span> Long LMD = null; if (embitagPartyPortalNoticePeriod == null) { </code></pre> <br> </li> <li id="52cf925e6d841e51534f6c76dcc00e81"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-53"> <strong> hot-deploy/embitag-com/src/com/embitag/flow/instanceFlow/generic/GenericOagisFlow.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/src/com/embitag/flow/instanceFlow/generic/GenericOagisFlow.java </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/src/com/embitag/flow/instanceFlow/generic/GenericOagisFlow.java </span><span style="color: #aaaaaa">@@ -133,6 +133,13 @@ public class GenericOagisFlow extends Flow { </span> //set orderId cart.setExternalId(GenericHelper.getPurchaseOrderId((String) parsedOrder.get(GenericOrderParser.ORDER_HEADER), flowPrefix)); cart.setChannelType(portalId); <span style="background: #ddffdd; color: #000000">+ + //set order priority + String priority = (String) parsedOrder.get("priority"); + if (UtilValidate.isNotEmpty(priority)) { + cart.setPriority(priority); + } + </span> //set order date try { if (parsedOrder.get(GenericOrderParser.ORDER_DATE) instanceof Timestamp) { <span style="color: #aaaaaa">@@ -453,7 +460,13 @@ public class GenericOagisFlow extends Flow { </span> line.put("LineQty", item.getQuantity()); line.put("LineMasterOrderNumber", cart.getAttribute(GenericOrderParser.LINE_MASTER_ORDER_NUMBER)); line.put("productId", cart.getAttribute("DEFAULT_PRODUCT")); <span style="background: #ffdddd; color: #000000">- line.put("OrderItemSeq", itemIdex.toString()); </span><span style="background: #ddffdd; color: #000000">+ String orderItemSeqId = item.getOrderItemSeqId(); + if (UtilValidate.isEmpty(orderItemSeqId)) { + line.put("OrderItemSeq", itemIdex.toString()); + } else { + itemIdex = Integer.valueOf(orderItemSeqId) - 1; + line.put("OrderItemSeq", String.valueOf(itemIdex)); + } </span> line.put("OrderLineCharacteristicLocale", cart.getLocale().toString()); lines.add(line); itemIdex++; <span style="color: #aaaaaa">@@ -894,6 +907,7 @@ public class GenericOagisFlow extends Flow { </span> LocalDispatcher dispatcher = ctx.getDispatcher(); Delegator delegator = ctx.getDelegator(); Map&lt;String, Object&gt; data = UtilMisc.toMap("userLogin", userLogin, "locale", locale); <span style="background: #ddffdd; color: #000000">+ userLogin=delegator.findOne("UserLogin", true, "userLoginId", "system"); </span> List&lt;String&gt; requestsRaising = new ArrayList&lt;String&gt;(); //get load order map <span style="color: #aaaaaa">@@ -902,8 +916,8 @@ public class GenericOagisFlow extends Flow { </span> Map&lt;String, Object&gt; order = null; if (externalCart != null) { //TODO : voir quoi mettre dans content ... <span style="background: #ffdddd; color: #000000">- order = fulfillEntityFromExternalCart(dispatcher, delegator, locale, userLogin, externalCart, module, portal); - Map&lt;String, Object&gt; contentCtxt = UtilMisc.toMap("userLogin", delegator.findOne("UserLogin", true, "userLoginId", "system"), "locale", locale); </span><span style="background: #ddffdd; color: #000000">+ order = fulfillEntityFromExternalCart(dispatcher, delegator, locale, (GenericValue) data.get("userLogin"), externalCart, module, portal); + Map&lt;String, Object&gt; contentCtxt = UtilMisc.toMap("userLogin", userLogin, "locale", locale); </span> contentCtxt.put("contentName", order.get("OrderId")); contentCtxt.put("contentTypeId", "DOCUMENT"); contentCtxt.put("dataResourceTypeId", "ELECTRONIC_TEXT"); <span style="color: #aaaaaa">@@ -924,6 +938,7 @@ public class GenericOagisFlow extends Flow { </span> Map&lt;String, Object&gt; contextMessage = UtilMisc.toMap("portalId", portalId, "contentId", content.get("contentId"), "contentName", content.getString("contentName"), "fileName", content.getString("contentName")); <span style="background: #ddffdd; color: #000000">+ order.put("priority", externalCart.getPriority()); </span> Map&lt;String, Object&gt; initMap = checkAndInitOrderHeaderInfos(delegator, ctx, externalCart, contentId, prefix, portal, order, data, contextMessage, requestsRaising, locale, timeZone); ShoppingCart cart = (ShoppingCart) initMap.get("cart"); boolean partyCurrencyFound = (boolean) initMap.get("partyCurrencyFound"); <span style="color: #aaaaaa">@@ -1045,7 +1060,7 @@ public class GenericOagisFlow extends Flow { </span> String poOrderId = purchaseOrder.getString("toOrderId"); GenericValue purchaseOisg = delegator.findOne("OrderItemShipGroup", UtilMisc.toMap("orderId", purchaseOrder.get("toOrderId"), "shipGroupSeqId", shipGroupSeqId), false); if (purchaseOisg != null) { <span style="background: #ffdddd; color: #000000">- Map&lt;String, Object&gt; orderShipMap = UtilMisc.toMap("userLogin", delegator.findOne("UserLogin", true, "userLoginId", "system"), "locale", locale, "timeZone", timeZone, "orderId", purchaseOisg.get("orderId"), "shipGroupSeqId", shipGroupSeqId); </span><span style="background: #ddffdd; color: #000000">+ Map&lt;String, Object&gt; orderShipMap = UtilMisc.toMap("userLogin", userLogin, "locale", locale, "timeZone", timeZone, "orderId", purchaseOisg.get("orderId"), "shipGroupSeqId", shipGroupSeqId); </span> orderShipMap.put("shipAfterDate", shipAfterDate); orderShipMap.put("shipByDate", shipAfterDate); Map&lt;String, Object&gt; orderShipGroupResult = dispatcher.runSync("updateOrderItemShipGroup", orderShipMap); <span style="color: #aaaaaa">@@ -1227,7 +1242,7 @@ public class GenericOagisFlow extends Flow { </span> } if (UtilValidate.isNotEmpty(requestsRaising)) { <span style="background: #ffdddd; color: #000000">- Map&lt;String, Object&gt; orderRaiseMap = UtilMisc.toMap("userLogin", delegator.findOne("UserLogin", true, "userLoginId", "system"), "locale", locale, "orderId", (Object) orderHelper.getOrderId()); </span><span style="background: #ddffdd; color: #000000">+ Map&lt;String, Object&gt; orderRaiseMap = UtilMisc.toMap("userLogin", userLogin, "locale", locale, "orderId", (Object) orderHelper.getOrderId()); </span> for (String requestRaisingId : requestsRaising) { orderRaiseMap.put("custRequestId", requestRaisingId); Map&lt;String, Object&gt; orderResult = dispatcher.runSync("createCustRequestOrderItem", orderRaiseMap); <span style="color: #aaaaaa">@@ -1238,7 +1253,7 @@ public class GenericOagisFlow extends Flow { </span> } //send mail <span style="background: #ffdddd; color: #000000">- EmbitagEmailWorker.sendOrderEmail(delegator, dispatcher, delegator.findOne("UserLogin", true, "userLoginId", "system"), ctx, locale, portal, customerPartyId, portal.getOrderCreateEmailTemplateId(), null, orderHelper.getOrderHeader()); </span><span style="background: #ddffdd; color: #000000">+ EmbitagEmailWorker.sendOrderEmail(delegator, dispatcher, userLogin, ctx, locale, portal, customerPartyId, portal.getOrderCreateEmailTemplateId(), null, orderHelper.getOrderHeader()); </span> return orderHelper.getExternalId(); } <span style="color: #aaaaaa">@@ -1266,10 +1281,12 @@ public class GenericOagisFlow extends Flow { </span> Map&lt;String, Object&gt; fulfillResult = null; GenericValue content = null; Map&lt;String, Object&gt; order = null; <span style="background: #ddffdd; color: #000000">+ Map&lt;String, Object&gt; data = UtilMisc.toMap("userLogin", userLogin, "locale", locale); + userLogin=delegator.findOne("UserLogin", true, "userLoginId", "system"); </span> if (externalCart != null) { //TODO : voir quoi mettre dans content ... <span style="background: #ffdddd; color: #000000">- order = fulfillEntityFromExternalCart(dispatcher, delegator, locale, userLogin, externalCart, module, portal); </span><span style="background: #ddffdd; color: #000000">+ order = fulfillEntityFromExternalCart(dispatcher, delegator, locale, (GenericValue) data.get("userLogin"), externalCart, module, portal); </span> Map&lt;String, Object&gt; contentCtxt = UtilMisc.toMap("userLogin", userLogin, "locale", locale); contentCtxt.put("contentName", order.get("OrderId")); contentCtxt.put("contentTypeId", "DOCUMENT"); <span style="color: #aaaaaa">@@ -1347,8 +1364,8 @@ public class GenericOagisFlow extends Flow { </span> poCart.setOrderId(poOrderId); //chekc and init order header infos <span style="background: #ffdddd; color: #000000">- Map&lt;String, Object&gt; data = UtilMisc.toMap("userLogin", userLogin, "locale", locale); </span> List&lt;String&gt; requestsRaising = new ArrayList&lt;String&gt;(); <span style="background: #ddffdd; color: #000000">+ order.put("priority", externalCart.getPriority()); </span> Map&lt;String, Object&gt; initMap = checkAndInitOrderHeaderInfos(delegator, ctx, soCart, contentId, prefix, portal, order, data, contextMessage, requestsRaising, locale, timeZone); soCart = (ShoppingCart) initMap.get("cart"); boolean partyCurrencyFound = (boolean) initMap.get("partyCurrencyFound"); <span style="color: #aaaaaa">@@ -1404,6 +1421,43 @@ public class GenericOagisFlow extends Flow { </span> List&lt;ShoppingCartItem&gt; itemsAppends = new ArrayList&lt;ShoppingCartItem&gt;(); List&lt;Map&lt;String, Object&gt;&gt; orderitems = (List&lt;Map&lt;String, Object&gt;&gt;) order.get(GenericOrderParser.ORDER_LINES); if (orderitems != null) { <span style="background: #ddffdd; color: #000000">+ if (externalCart != null) { + //First check if there are order items not in active cart (theses are items to cancel) + for (ShoppingCartItem soCartItem : soCartitems) { + boolean containsItem = false; + String soExternalId = soCartItem.getExternalId(); + for (Map&lt;String, Object&gt; item : orderitems) { + String currentSoExternalId = (String) item.get(GenericOrderParser.LINE_SEQ); + if (soExternalId.equals(currentSoExternalId)) { + containsItem = true; + } + } + if (!containsItem) { + BigDecimal qty = BigDecimal.ZERO; + + //Add SO order item to delete list + soItemsToCancels.add(soCartItem); + Map&lt;String, Object&gt; orderMsgMap = UtilMisc.toMap("orderType", "sales", "changeTypeEnumId", "ODR_ITM_CANCEL", "orderId", soOrderId, "externalId", soExternalId, "oldQuantity", soCartItem.getQuantity(), "quantity", qty); + orderItemChanges.add(orderMsgMap); + + //find corresponding poOrderItemSeqId + String soOrderItemSeqId = soCartItem.getOrderItemSeqId(); + String poOrderItemSeqId = EmbitagOrderWorker.getPoOrderItemSeqIdFromSoOrderItemSeqId(delegator, soOrderId, soOrderItemSeqId); + + //find corresponding POShoppingCartItem + ShoppingCartItem poCartItem = null; + for (ShoppingCartItem poCartItemLocal : poCartitems) { + if (poOrderItemSeqId != null &amp;&amp; poOrderItemSeqId.equals(poCartItemLocal.getOrderItemSeqId())) { + poCartItem = poCartItemLocal; + } + } + poItemsToCancels.add(poCartItem); + orderMsgMap = UtilMisc.toMap("orderType", "purchase", "changeTypeEnumId", "ODR_ITM_CANCEL", "soOrderId", soOrderId, "orderId", poOrderId, "externalId", soExternalId, "oldQuantity", poCartItem.getQuantity(), "quantity", qty); + orderItemChanges.add(orderMsgMap); + } + } + } + </span> for (Map&lt;String, Object&gt; item : orderitems) { String soExternalId = (String) item.get(GenericOrderParser.LINE_SEQ); GenericValue soOrderItem = EntityUtil.getFirst(delegator.findByAnd("OrderItem", UtilMisc.toMap("orderId", soOrderId, "externalId", soExternalId))); <span style="color: #aaaaaa">@@ -1476,6 +1530,7 @@ public class GenericOagisFlow extends Flow { </span> else if (soCartItem == null) { //SO soCartItem = appendOrUpdateOrderItem(delegator, dispatcher, soCart, null, item, partyCurrencyFound, keyAccountPartyId, roundingError, contextMessage, linesAlert, timeZone, locale); <span style="background: #ddffdd; color: #000000">+ soCartItem.setIsModifiedPrice(true); </span> itemsAppends.add(soCartItem); Map&lt;String, Object&gt; orderMsgMap = UtilMisc.toMap("orderType", "sales", "changeTypeEnumId", "ODR_ITM_APPEND", "orderId", soOrderId, "externalId", soExternalId, "quantity", qty, "unitPrice", soCartItem.getBasePrice(), "shipBeforeDate", shipAfterDate, "shipAfterDate", shipAfterDate); orderItemChanges.add(orderMsgMap); <span style="color: #aaaaaa">@@ -1485,6 +1540,7 @@ public class GenericOagisFlow extends Flow { </span> Integer poIndex = poCart.addItemToEnd(productId, null, qty, null, null, null, null, null, dispatcher, false, true); //association poCartItem = poCart.findCartItem(poIndex); <span style="background: #ddffdd; color: #000000">+ poCartItem.setIsModifiedPrice(true); </span> poCartItem.setExternalId(soExternalId); orderMsgMap = UtilMisc.toMap("orderType", "purchase", "changeTypeEnumId", "ODR_ITM_APPEND", "soOrderId", soOrderId, "orderId", poOrderId, "externalId", soExternalId, "quantity", qty, "shipBeforeDate", shipAfterDate, "shipAfterDate", shipAfterDate); orderItemChanges.add(orderMsgMap); <span style="color: #aaaaaa">@@ -1550,7 +1606,7 @@ public class GenericOagisFlow extends Flow { </span> "itemCommentMap", UtilMisc.&lt;String, Object&gt;toMap("changeComments", "test")); loadCartResp = dispatcher.runSync("saveUpdatedCartToOrder", UtilMisc.&lt;String, Object&gt;toMap( <span style="background: #ffdddd; color: #000000">- "userLogin", userLogin, </span><span style="background: #ddffdd; color: #000000">+ "userLogin", data.get("userLogin"), </span> "locale", locale, "orderId", soOrderId, "changeMap", changeMap, <span style="color: #aaaaaa">@@ -1563,7 +1619,7 @@ public class GenericOagisFlow extends Flow { </span> //cancel SO order for (ShoppingCartItem itemsToCancel : soItemsToCancels) { loadCartResp = dispatcher.runSync("cancelOrderItem", UtilMisc.&lt;String, Object&gt;toMap( <span style="background: #ffdddd; color: #000000">- "userLogin", userLogin, </span><span style="background: #ddffdd; color: #000000">+ "userLogin", data.get("userLogin"), </span> "locale", locale, "orderId", soOrderId, "orderItemSeqId", itemsToCancel.getOrderItemSeqId(), <span style="color: #aaaaaa">@@ -1578,7 +1634,7 @@ public class GenericOagisFlow extends Flow { </span> if (!UtilValidate.isEmpty(poCart.items())) { poCart.setDoPromotions(false); loadCartResp = dispatcher.runSync("saveUpdatedCartToOrder", UtilMisc.&lt;String, Object&gt;toMap( <span style="background: #ffdddd; color: #000000">- "userLogin", userLogin, </span><span style="background: #ddffdd; color: #000000">+ "userLogin", data.get("userLogin"), </span> "locale", locale, "orderId", poOrderId, "changeMap", changeMap, <span style="color: #aaaaaa">@@ -1611,7 +1667,7 @@ public class GenericOagisFlow extends Flow { </span> //cancel dropShip PO for (ShoppingCartItem itemsToCancel : poItemsToCancels) { loadCartResp = dispatcher.runSync("cancelOrderItem", UtilMisc.&lt;String, Object&gt;toMap( <span style="background: #ffdddd; color: #000000">- "userLogin", userLogin, </span><span style="background: #ddffdd; color: #000000">+ "userLogin", data.get("userLogin"), </span> "locale", locale, "orderId", poOrderId, "orderItemSeqId", itemsToCancel.getOrderItemSeqId(), <span style="color: #aaaaaa">@@ -1649,7 +1705,7 @@ public class GenericOagisFlow extends Flow { </span> serviceCtx.put("reasonEnumId", "OICR_CUST_REQUEST_UPDATE_FLOW"); serviceCtx.put("changeComments", "Portal " + portal.getPortalId() + " update flow"); <span style="background: #ffdddd; color: #000000">- serviceCtx.put("userLogin", userLogin); </span><span style="background: #ddffdd; color: #000000">+ serviceCtx.put("userLogin", data.get("userLogin")); </span> Map&lt;String, Object&gt; resp = dispatcher.runSync("createOrderItemChange", serviceCtx); if (ServiceUtil.isError(resp)) { <span style="color: #aaaaaa">@@ -1666,7 +1722,7 @@ public class GenericOagisFlow extends Flow { </span> //update requested date on PO <span style="background: #ffdddd; color: #000000">- Map&lt;String, Object&gt; orderShipMap = UtilMisc.toMap("userLogin", delegator.findOne("UserLogin", true, "userLoginId", "system"), "locale", locale, "timeZone", timeZone, "orderId", (Object) poOrderId, "shipGroupSeqId", (Object) shipGroupSeqId); </span><span style="background: #ddffdd; color: #000000">+ Map&lt;String, Object&gt; orderShipMap = UtilMisc.toMap("userLogin", userLogin, "locale", locale, "timeZone", timeZone, "orderId", (Object) poOrderId, "shipGroupSeqId", (Object) shipGroupSeqId); </span> orderShipMap.put("shipAfterDate", shipAfterDate); orderShipMap.put("shipByDate", shipAfterDate); Map&lt;String, Object&gt; orderShipGroupResult = dispatcher.runSync("updateOrderItemShipGroup", orderShipMap); <span style="color: #aaaaaa">@@ -1680,7 +1736,7 @@ public class GenericOagisFlow extends Flow { </span> //si la LMD est dépassée on bloque a l'édition et inversement si elle n'est plus dépassée //Ceci sera fait automatiquement par le batch "embitagSetDisableOrder" il faut juste réactiver les commandes qui seraient déja désactivée <span style="background: #ffdddd; color: #000000">- EmbitagOrderWorker.enableLMDOrder(delegator, soOrderId, userLogin); </span><span style="background: #ddffdd; color: #000000">+ EmbitagOrderWorker.enableLMDOrder(delegator, soOrderId, (GenericValue) data.get("userLogin")); </span> //si la commande SO etait approved (confirmée par le fournisseur) il faut qu'elle soit passée en requested afin d'etre de nouveau envoyée au fournisseur en édition if ("ORDER_APPROVED".equals(soORH.getOrderHeader().getString("statusId"))) { <span style="color: #aaaaaa">@@ -1701,7 +1757,7 @@ public class GenericOagisFlow extends Flow { </span> if ("ORDER_REQUESTED".equals(soORH.getOrderHeader().getString("statusId"))) { //create supplier request and send customer email //this will be done by SECA on changeOrderStatus <span style="background: #ffdddd; color: #000000">- Map&lt;String, Object&gt; localContext = UtilMisc.toMap("userLogin", delegator.findOne("UserLogin", true, "userLoginId", "system"), "locale", locale); </span><span style="background: #ddffdd; color: #000000">+ Map&lt;String, Object&gt; localContext = UtilMisc.toMap("userLogin", userLogin, "locale", locale); </span> localContext.put("orderId", poOrderId); //ajout des informations de modification de commande localContext.put("orderItemChangeIds", orderItemChangeIds); <span style="color: #aaaaaa">@@ -1713,19 +1769,19 @@ public class GenericOagisFlow extends Flow { </span> //sned cancel flow to supplier if ("ORDER_CANCELLED".equals(soORH.getOrderHeader().getString("statusId"))) { Map&lt;String, Object&gt; localContext = new HashMap&lt;String, Object&gt;(); <span style="background: #ffdddd; color: #000000">- localContext.put("userLogin", delegator.findOne("UserLogin", true, "userLoginId", "system")); </span><span style="background: #ddffdd; color: #000000">+ localContext.put("userLogin", userLogin); </span> localContext.put("orderId", poOrderId); Map&lt;String, Object&gt; localResults = dispatcher.runSync("embitagCreateSupplierRequestForCancelOrder", localContext); if (ServiceUtil.isError(localResults)) { throw new GenericServiceException(ServiceUtil.getErrorMessage(localResults)); } //send email <span style="background: #ffdddd; color: #000000">- EmbitagEmailWorker.sendOrderEmail(delegator, dispatcher, delegator.findOne("UserLogin", true, "userLoginId", "system"), ctx, locale, portal, soORH.getEndUserParty().getString("partyId"), portal.getOrderCancelledEmailTemplateId(), null, soORH.getOrderHeader()); </span><span style="background: #ddffdd; color: #000000">+ EmbitagEmailWorker.sendOrderEmail(delegator, dispatcher, userLogin, ctx, locale, portal, soORH.getEndUserParty().getString("partyId"), portal.getOrderCancelledEmailTemplateId(), null, soORH.getOrderHeader()); </span> } else { //traitement des mails de commandes (annulation / mise a jour //send email with SO parameters Portal orderPortal = PortalConstructor.getPortal(soORH.getOrderHeader()); <span style="background: #ffdddd; color: #000000">- EmbitagEmailWorker.sendOrderEmail(delegator, dispatcher, delegator.findOne("UserLogin", true, "userLoginId", "system"), ctx, locale, orderPortal, soORH.getEndUserParty().getString("partyId"), orderPortal.getOrderUpdatedEmailTemplateId(), null, soORH.getOrderHeader()); </span><span style="background: #ddffdd; color: #000000">+ EmbitagEmailWorker.sendOrderEmail(delegator, dispatcher, userLogin, ctx, locale, orderPortal, soORH.getEndUserParty().getString("partyId"), orderPortal.getOrderUpdatedEmailTemplateId(), null, soORH.getOrderHeader()); </span> } return soORH.getExternalId(); <span style="color: #aaaaaa">@@ -1746,6 +1802,7 @@ public class GenericOagisFlow extends Flow { </span> //if (timeZone == null) timeZone = TimeZone.getDefault(); LocalDispatcher dispatcher = ctx.getDispatcher(); Delegator delegator = ctx.getDelegator(); <span style="background: #ddffdd; color: #000000">+ GenericValue systemLogin = delegator.findOne("UserLogin", true, "userLoginId", "system"); </span> String prefix = portal.getPrefix(); <span style="color: #aaaaaa">@@ -1762,8 +1819,8 @@ public class GenericOagisFlow extends Flow { </span> orderHeaders = delegator.findByAnd("OrderHeader", UtilMisc.toMap("externalId", externalId)); if (UtilValidate.isEmpty(orderHeaders)) { //raise <span style="background: #ffdddd; color: #000000">- String alertSubject = UtilProperties.getMessage(Portal.resource_embisphere_error, "LoadCancelOrdersOxylaneErrorOrderDoesntExistSubject", contextMessage, locale); - String alertContent = UtilProperties.getMessage(Portal.resource_embisphere_error, "LoadCancelOrdersOxylaneErrorOrderDoesntExistContent", contextMessage, locale); </span><span style="background: #ddffdd; color: #000000">+ String alertSubject = UtilProperties.getMessage(Portal.resource_embisphere_error, "LoadCancelOrdersErrorOrderDoesntExistSubject", contextMessage, locale); + String alertContent = UtilProperties.getMessage(Portal.resource_embisphere_error, "LoadCancelOrdersErrorOrderDoesntExistContent", contextMessage, locale); </span> throw new GenericEntityException(alertSubject + "; " + alertContent); } if (orderHeaders.size() &gt; 1) { <span style="color: #aaaaaa">@@ -1816,7 +1873,7 @@ public class GenericOagisFlow extends Flow { </span> if ("ORDER_REQUESTED".equals(statusId) || "ORDER_APPROVED".equals(statusId)) { String poOrderId = EmbitagOrderWorker.getPoIdFromSoId(delegator, (String) orderHeader.get("orderId")); Map&lt;String, Object&gt; localContext = new HashMap&lt;String, Object&gt;(); <span style="background: #ffdddd; color: #000000">- localContext.put("userLogin", delegator.findOne("UserLogin", true, "userLoginId", "system")); </span><span style="background: #ddffdd; color: #000000">+ localContext.put("userLogin", systemLogin); </span> localContext.put("orderId", poOrderId); Map&lt;String, Object&gt; localResults = dispatcher.runSync("embitagCreateSupplierRequestForCancelOrder", localContext); if (ServiceUtil.isError(localResults)) { <span style="color: #aaaaaa">@@ -1826,7 +1883,7 @@ public class GenericOagisFlow extends Flow { </span> //send email OrderReadHelper orh = new OrderReadHelper(orderHeader); <span style="background: #ffdddd; color: #000000">- EmbitagEmailWorker.sendOrderEmail(delegator, dispatcher, delegator.findOne("UserLogin", true, "userLoginId", "system"), ctx, locale, portal, orh.getEndUserParty().getString("partyId"), portal.getOrderCancelledEmailTemplateId(), null, orderHeader); </span><span style="background: #ddffdd; color: #000000">+ EmbitagEmailWorker.sendOrderEmail(delegator, dispatcher, systemLogin, ctx, locale, portal, orh.getEndUserParty().getString("partyId"), portal.getOrderCancelledEmailTemplateId(), null, orderHeader); </span> return orh.getExternalId(); } </code></pre> <br> </li> <li id="bf9b0e377773f2e875b8f268a59f2676"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-54"> <strong> hot-deploy/embitag-com/src/com/embitag/front/FrontCartEvent.java </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/src/com/embitag/front/FrontCartEvent.java </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/src/com/embitag/front/FrontCartEvent.java </span><span style="color: #aaaaaa">@@ -1125,6 +1125,32 @@ public class FrontCartEvent { </span> return "success"; } <span style="background: #ddffdd; color: #000000">+ / + * ajoute les informations de priorité + * + * @param request + * @param response + * @return + */ + public static String setOrderPriority(HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(true); + ShoppingCart cart = getActiveCart(request, session); + Locale locale = getLocale(request, session, cart); + if (cart == null) { + return informEmptyCart(request, locale); + } + + String priority = request.getParameter("priority"); + if (UtilValidate.isEmpty(priority)) { + priority = "2"; + } + + //mise a jour de la priorité + cart.setPriority(priority); + + return "success"; + } + </span> public static String createOrUpdateOrder(HttpServletRequest request, HttpServletResponse response) { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Delegator delegator = dispatcher.getDelegator(); <span style="color: #aaaaaa">@@ -1152,11 +1178,13 @@ public class FrontCartEvent { </span> //appel du service de création de commande MPTAG GenericOagisFlow oxylaneFlow = new GenericOagisFlow(); String externalOrderId = null; <span style="background: #ddffdd; color: #000000">+ String priority = cart.getPriority(); </span> boolean beganTransaction = false; try { beganTransaction = TransactionUtil.begin(); <span style="background: #ddffdd; color: #000000">+ GenericValue systemUserLogin = delegator.findOne("UserLogin", true, "userLoginId", "system"); </span> if (createAction) { <span style="background: #ffdddd; color: #000000">- externalOrderId = oxylaneFlow.createOneOrderFromOneContent(dispatcher.getDispatchContext(), cart.getLocale(), delegator.findOne("UserLogin", true, "userLoginId", "system"), null, PortalConstructor.getPortal(cart.getWebSiteId()), cart); </span><span style="background: #ddffdd; color: #000000">+ externalOrderId = oxylaneFlow.createOneOrderFromOneContent(dispatcher.getDispatchContext(), cart.getLocale(), systemUserLogin, null, PortalConstructor.getPortal(cart.getWebSiteId()), cart); </span> //set externalId as orderId GenericValue orderHader = EntityUtil.getFirst(delegator.findByAnd("OrderHeader", UtilMisc.toMap("externalId", externalOrderId), null, false)); if (orderHader != null) { <span style="color: #aaaaaa">@@ -1164,8 +1192,25 @@ public class FrontCartEvent { </span> delegator.storeByCondition("OrderHeader", UtilMisc.toMap("externalId", orderId), EntityCondition.makeCondition(UtilMisc.toMap("externalId", orderId))); externalOrderId = orderId; } <span style="background: #ddffdd; color: #000000">+ + if (UtilValidate.isNotEmpty(priority) &amp;&amp; "1".equals(priority)) { + try { + Map&lt;String, Object&gt; serviceContext = new HashMap&lt;String, Object&gt;(); + serviceContext.put("locale", cart.getLocale()); + serviceContext.put("userLogin", systemUserLogin); + serviceContext.put("orderId", orderId); + Map&lt;String, Object&gt; result = dispatcher.runSync("EmbiSendToSupplierNow", serviceContext); + if (ServiceUtil.isError(result)) { + Debug.logError("Service lookupProduct error : " + ServiceUtil.getErrorMessage(result), module); + return informError(request, "FrontEmbitagItemNotAvailable", locale); + } + request.setAttribute("list", result.get("list")); + } catch (Exception e) { + return informInternalError(request, locale); + } + } </span> } else { <span style="background: #ffdddd; color: #000000">- externalOrderId = oxylaneFlow.modifyOrder(dispatcher.getDispatchContext(), cart.getLocale(), UtilHttp.getTimeZone(request), delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "system"), true), null, cart, PortalConstructor.getPortal(cart.getWebSiteId())); </span><span style="background: #ddffdd; color: #000000">+ externalOrderId = oxylaneFlow.modifyOrder(dispatcher.getDispatchContext(), cart.getLocale(), UtilHttp.getTimeZone(request), systemUserLogin, null, cart, PortalConstructor.getPortal(cart.getWebSiteId())); </span> //set externalId as orderId GenericValue orderHader = EntityUtil.getFirst(delegator.findByAnd("OrderHeader", UtilMisc.toMap("externalId", externalOrderId), null, false)); if (orderHader != null) { <span style="color: #aaaaaa">@@ -1173,6 +1218,23 @@ public class FrontCartEvent { </span> delegator.storeByCondition("OrderHeader", UtilMisc.toMap("externalId", orderId), EntityCondition.makeCondition(UtilMisc.toMap("externalId", orderId))); externalOrderId = orderId; } <span style="background: #ddffdd; color: #000000">+ + if (UtilValidate.isNotEmpty(priority) &amp;&amp; "1".equals(priority)) { + try { + Map&lt;String, Object&gt; serviceContext = new HashMap&lt;String, Object&gt;(); + serviceContext.put("locale", cart.getLocale()); + serviceContext.put("userLogin", systemUserLogin); + serviceContext.put("orderId", orderId); + Map&lt;String, Object&gt; result = dispatcher.runSync("EmbiSendToSupplierNow", serviceContext); + if (ServiceUtil.isError(result)) { + Debug.logError("Service lookupProduct error : " + ServiceUtil.getErrorMessage(result), module); + return informError(request, "FrontEmbitagItemNotAvailable", locale); + } + request.setAttribute("list", result.get("list")); + } catch (Exception e) { + return informInternalError(request, locale); + } + } </span> } } catch (Exception e) { try { </code></pre> <br> </li> <li id="8488011c5b0c39c96e2b0905e6490262"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-55"> <strong> hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/actions/front/displayOrder.groovy </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/actions/front/displayOrder.groovy </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/actions/front/displayOrder.groovy </span><span style="color: #aaaaaa">@@ -49,25 +49,25 @@ String orderRolePlacedById = null; </span> String orderRolePlacedForId = null; EntityCondition placedByCond = EntityCondition.makeCondition(UtilMisc.toList( <span style="background: #ffdddd; color: #000000">- EntityCondition.makeCondition("orderId", orderId), - EntityCondition.makeCondition("roleTypeId", "PLACING_CUSTOMER"))); </span><span style="background: #ddffdd; color: #000000">+ EntityCondition.makeCondition("orderId", orderId), + EntityCondition.makeCondition("roleTypeId", "PLACING_CUSTOMER"))); </span> EntityCondition placedforCond = EntityCondition.makeCondition(UtilMisc.toList( <span style="background: #ffdddd; color: #000000">- EntityCondition.makeCondition("orderId", orderId), - EntityCondition.makeCondition("roleTypeId", "KEY_ACCOUNT"))); -GenericValue orderRolePlacedBy = EntityUtil.getFirst(delegator.findList("OrderRole", placedByCond, null, null, null,true)); -GenericValue orderRolePlacedFor = EntityUtil.getFirst(delegator.findList("OrderRole", placedforCond, null, null, null,true)); </span><span style="background: #ddffdd; color: #000000">+ EntityCondition.makeCondition("orderId", orderId), + EntityCondition.makeCondition("roleTypeId", "KEY_ACCOUNT"))); +GenericValue orderRolePlacedBy = EntityUtil.getFirst(delegator.findList("OrderRole", placedByCond, null, null, null, true)); +GenericValue orderRolePlacedFor = EntityUtil.getFirst(delegator.findList("OrderRole", placedforCond, null, null, null, true)); </span> <span style="background: #ffdddd; color: #000000">-if(UtilValidate.isNotEmpty(orderRolePlacedBy)){ </span><span style="background: #ddffdd; color: #000000">+if (UtilValidate.isNotEmpty(orderRolePlacedBy)) { </span> GenericValue partyGroupPlacedBy = delegator.findOne("PartyGroup", true, UtilMisc.toMap("partyId", (String) orderRolePlacedBy.get("partyId"))); <span style="background: #ffdddd; color: #000000">- if(UtilValidate.isNotEmpty(partyGroupPlacedBy)){ </span><span style="background: #ddffdd; color: #000000">+ if (UtilValidate.isNotEmpty(partyGroupPlacedBy)) { </span> orderPlacedByName = (String) partyGroupPlacedBy.get("groupName"); orderRolePlacedById = (String) partyGroupPlacedBy.get("partyId"); } } <span style="background: #ffdddd; color: #000000">-if(UtilValidate.isNotEmpty(orderRolePlacedFor)){ </span><span style="background: #ddffdd; color: #000000">+if (UtilValidate.isNotEmpty(orderRolePlacedFor)) { </span> GenericValue partyGroupPlacedFor = delegator.findOne("PartyGroup", true, UtilMisc.toMap("partyId", (String) orderRolePlacedFor.get("partyId"))); <span style="background: #ffdddd; color: #000000">- if(UtilValidate.isNotEmpty(partyGroupPlacedFor)){ - orderPlacedForName = (String) partyGroupPlacedFor.get("groupName"); </span><span style="background: #ddffdd; color: #000000">+ if (UtilValidate.isNotEmpty(partyGroupPlacedFor)) { + orderPlacedForName = (String) partyGroupPlacedFor.get("groupName"); </span> orderRolePlacedForId = (String) partyGroupPlacedFor.get("partyId"); } } <span style="color: #aaaaaa">@@ -183,6 +183,15 @@ for (GenericValue orderItem : orderItems) { </span> item.put(GenericOrderParser.LINE_CHARACT_2, orh.getOrderItemAttribute(poItem, GenericOrderParser.LINE_CHARACT_2)); item.put(GenericOrderParser.RFID_ID, orh.getOrderItemAttribute(poItem, GenericOrderParser.RFID_ID)); <span style="background: #ddffdd; color: #000000">+ //Gestion des lignes annulées + String itemStatusId = orderItem.statusId; + if ("ITEM_CANCELLED".equals(itemStatusId)) { + GenericValue statusItem = orderItem.getRelatedOne("StatusItem", true); + if (UtilValidate.isNotEmpty(statusItem)) { + item.quantity = statusItem.get("description", locale); + } + } + </span> itemDetails.add(item); } context.itemDetails = itemDetails; <span style="color: #aaaaaa">@@ -202,6 +211,13 @@ if (oisg &amp;&amp; oisg.shipByDate) { </span> context.requestedDate = df.format((Timestamp) oisg.shipByDate); } <span style="background: #ddffdd; color: #000000">+//Add order priority +String priority = orderHeader.priority +if (UtilValidate.isEmpty(priority)) { + priority = "2" +} +context.orderPriority = priority + </span> //ajoute le temps restant de modification orderTerm = delegator.findOne("OrderTerm", [orderId: orh.getOrderId(), "termTypeId": "DELAY_SO_DISABLE", "orderItemSeqId": "_NA_"], true); context.orderCanBeUpdated = EmbitagOrderWorker.isOrderCanBeUpdate(orderHeader); <span style="color: #aaaaaa">@@ -239,14 +255,14 @@ if (UtilValidate.isNotEmpty(ibanMap)) { </span> } //Recuperation de la date selon le statut de la commande <span style="background: #ffdddd; color: #000000">-DateFormat formatter = DateFormat.getDateTimeInstance( DateFormat.MEDIUM, DateFormat.MEDIUM, locale); </span><span style="background: #ddffdd; color: #000000">+DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, locale); </span> List&lt;GenericValue&gt; orderStatus = delegator.findByAnd("OrderStatus", UtilMisc.toMap("orderId", orderId), UtilMisc.toList("statusDatetime DESC"), true); if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHeader.statusId) || "ORDER_REQUESTED".equals(orderHeader.statusId)) { //Retrieve created status date from the SO if (UtilValidate.isNotEmpty(orderStatus)) { //Filter by type <span style="background: #ffdddd; color: #000000">- createdOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId","ORDER_CREATED")); </span><span style="background: #ddffdd; color: #000000">+ createdOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId", "ORDER_CREATED")); </span> if (UtilValidate.isNotEmpty(createdOrderStatus)) { GenericValue status = EntityUtil.getFirst(createdOrderStatus); statusCreationDate = formatter.format(status.get("statusDatetime")); <span style="color: #aaaaaa">@@ -258,7 +274,7 @@ if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHea </span> //Retrieve created status date from the SO if (UtilValidate.isNotEmpty(orderStatus)) { //Filter by type <span style="background: #ffdddd; color: #000000">- createdOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId","ORDER_CREATED")); </span><span style="background: #ddffdd; color: #000000">+ createdOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId", "ORDER_CREATED")); </span> if (UtilValidate.isNotEmpty(createdOrderStatus)) { GenericValue status = EntityUtil.getFirst(createdOrderStatus); statusCreationDate = formatter.format(status.get("statusDatetime")); <span style="color: #aaaaaa">@@ -268,7 +284,7 @@ if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHea </span> //Retrieve Status date of the SO if (UtilValidate.isNotEmpty(orderStatus)) { <span style="background: #ffdddd; color: #000000">- approvedOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId","ORDER_APPROVED")); </span><span style="background: #ddffdd; color: #000000">+ approvedOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId", "ORDER_APPROVED")); </span> if (UtilValidate.isNotEmpty(approvedOrderStatus)) { GenericValue status = EntityUtil.getFirst(approvedOrderStatus); statusApprovedDate = formatter.format(status.get("statusDatetime")); <span style="color: #aaaaaa">@@ -278,10 +294,10 @@ if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHea </span> //Retrieve Estimated ship date on the PO GenericValue itemAssoc = EntityUtil.getFirst(delegator.findList("OrderItemAssoc", EntityCondition.makeCondition([orderId: orderId]), null, null, null, false)); <span style="background: #ffdddd; color: #000000">- List&lt;GenericValue&gt; poOisgs = delegator.findByAnd("OrderItemShipGroup", UtilMisc.toMap("orderId", itemAssoc.toOrderId), null , true); </span><span style="background: #ddffdd; color: #000000">+ List&lt;GenericValue&gt; poOisgs = delegator.findByAnd("OrderItemShipGroup", UtilMisc.toMap("orderId", itemAssoc.toOrderId), null, true); </span> if (UtilValidate.isNotEmpty(poOisgs)) { poOisg = EntityUtil.getFirst(poOisgs); <span style="background: #ffdddd; color: #000000">- formatterDate = DateFormat.getDateInstance( DateFormat.MEDIUM, locale); </span><span style="background: #ddffdd; color: #000000">+ formatterDate = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); </span> statusExpectedShipDate = formatterDate.format(poOisg.get("shipByDate")); context.statusExpectedShipDate = statusExpectedShipDate; } <span style="color: #aaaaaa">@@ -291,7 +307,7 @@ if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHea </span> //Retrieve created status date from the SO if (UtilValidate.isNotEmpty(orderStatus)) { //Filter by type <span style="background: #ffdddd; color: #000000">- createdOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId","ORDER_CREATED")); </span><span style="background: #ddffdd; color: #000000">+ createdOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId", "ORDER_CREATED")); </span> if (UtilValidate.isNotEmpty(createdOrderStatus)) { GenericValue status = EntityUtil.getFirst(createdOrderStatus); statusCreationDate = formatter.format(status.get("statusDatetime")); <span style="color: #aaaaaa">@@ -301,7 +317,7 @@ if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHea </span> //Retrieve Status date of the SO if (UtilValidate.isNotEmpty(orderStatus)) { <span style="background: #ffdddd; color: #000000">- approvedOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId","ORDER_APPROVED")); </span><span style="background: #ddffdd; color: #000000">+ approvedOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId", "ORDER_APPROVED")); </span> if (UtilValidate.isNotEmpty(approvedOrderStatus)) { GenericValue status = EntityUtil.getFirst(approvedOrderStatus); statusApprovedDate = formatter.format(status.get("statusDatetime")); <span style="color: #aaaaaa">@@ -311,10 +327,10 @@ if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHea </span> //Retrieve Estimated ship date on the PO GenericValue itemAssoc = EntityUtil.getFirst(delegator.findList("OrderItemAssoc", EntityCondition.makeCondition([orderId: orderId]), null, null, null, false)); <span style="background: #ffdddd; color: #000000">- List&lt;GenericValue&gt; poOisgs = delegator.findByAnd("OrderItemShipGroup", UtilMisc.toMap("orderId", itemAssoc.toOrderId), null , true); </span><span style="background: #ddffdd; color: #000000">+ List&lt;GenericValue&gt; poOisgs = delegator.findByAnd("OrderItemShipGroup", UtilMisc.toMap("orderId", itemAssoc.toOrderId), null, true); </span> if (UtilValidate.isNotEmpty(poOisgs)) { poOisg = EntityUtil.getFirst(poOisgs); <span style="background: #ffdddd; color: #000000">- formatterDate = DateFormat.getDateInstance( DateFormat.MEDIUM, locale); </span><span style="background: #ddffdd; color: #000000">+ formatterDate = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); </span> statusExpectedShipDate = formatterDate.format(poOisg.get("shipByDate")); context.statusExpectedShipDate = statusExpectedShipDate; } <span style="color: #aaaaaa">@@ -338,7 +354,7 @@ if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHea </span> //Retrieve created status date from the SO if (UtilValidate.isNotEmpty(orderStatus)) { //Filter by type <span style="background: #ffdddd; color: #000000">- createdOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId","ORDER_CREATED")); </span><span style="background: #ddffdd; color: #000000">+ createdOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId", "ORDER_CREATED")); </span> if (UtilValidate.isNotEmpty(createdOrderStatus)) { GenericValue status = EntityUtil.getFirst(createdOrderStatus); statusCreationDate = formatter.format(status.get("statusDatetime")); <span style="color: #aaaaaa">@@ -348,24 +364,23 @@ if ("ORDER_CREATED".equals(orderHeader.statusId) || "ORDER_HOLD".equals(orderHea </span> //Retrieve Status date of the SO if (UtilValidate.isNotEmpty(orderStatus)) { <span style="background: #ffdddd; color: #000000">- approvedOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId","ORDER_APPROVED")); </span><span style="background: #ddffdd; color: #000000">+ approvedOrderStatus = EntityUtil.filterByAnd(orderStatus, UtilMisc.toMap("statusId", "ORDER_APPROVED")); </span> if (UtilValidate.isNotEmpty(approvedOrderStatus)) { GenericValue status = EntityUtil.getFirst(approvedOrderStatus); statusApprovedDate = formatter.format(status.get("statusDatetime")); context.statusApprovedDate = statusApprovedDate; //Retrieve Estimated ship date on the PO GenericValue itemAssoc = EntityUtil.getFirst(delegator.findList("OrderItemAssoc", EntityCondition.makeCondition([orderId: orderId]), null, null, null, false)); <span style="background: #ffdddd; color: #000000">- List&lt;GenericValue&gt; poOisgs = delegator.findByAnd("OrderItemShipGroup", UtilMisc.toMap("orderId", itemAssoc.toOrderId), null , true); </span><span style="background: #ddffdd; color: #000000">+ List&lt;GenericValue&gt; poOisgs = delegator.findByAnd("OrderItemShipGroup", UtilMisc.toMap("orderId", itemAssoc.toOrderId), null, true); </span> if (UtilValidate.isNotEmpty(poOisgs)) { poOisg = EntityUtil.getFirst(poOisgs); <span style="background: #ffdddd; color: #000000">- formatterDate = DateFormat.getDateInstance( DateFormat.MEDIUM, locale); </span><span style="background: #ddffdd; color: #000000">+ formatterDate = DateFormat.getDateInstance(DateFormat.MEDIUM, locale); </span> statusExpectedShipDate = formatterDate.format(poOisg.get("shipByDate")); context.statusExpectedShipDate = statusExpectedShipDate; } } } <span style="background: #ffdddd; color: #000000">- </span> //Retrieve Status date of the SO if (UtilValidate.isNotEmpty(orderStatus)) { GenericValue status = EntityUtil.getFirst(orderStatus); </code></pre> <br> </li> <li id="3f7e91e350823c32db1118ec53df8435"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-56"> <strong> hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/actions/front/displayPaymentInfo.groovy </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/actions/front/displayPaymentInfo.groovy </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/actions/front/displayPaymentInfo.groovy </span><span style="color: #aaaaaa">@@ -93,6 +93,15 @@ if (UtilValidate.isNotEmpty(selectedShipmentMethodId)) { </span> context.selectedCarrierDescription = delegator.makeValue("ShipmentMethodType", [shipmentMethodTypeId : selectedShipmentMethodId]).get("description", locale); } <span style="background: #ddffdd; color: #000000">+//Add Priority +String priority = cart.getPriority(); +if (UtilValidate.isEmpty(priority)) { + //Default value + priority = "2"; + cart.setPriority(priority); +} +context.priority = priority; + </span> //Add Carrier String selectedCarrierPartyId = cart.getCarrierPartyId(0); if (UtilValidate.isNotEmpty(selectedCarrierPartyId)) { <span style="color: #aaaaaa">@@ -115,6 +124,9 @@ context.shipEstimate = cart.getShipInfo(0).shipEstimate.setScale(shippingDisplay </span> //Add Requested Date context.requestedDate = cart.getShipAfterDate(); <span style="background: #ddffdd; color: #000000">+//Add LeadTime +context.leadTime = EmbitagOrderWorker.getActualValidationTime(delegator, parameters.keyAccountPartyId, parameters.portalId, locale); + </span> //Add Cart Addresses String selectedContactMechId = cart.getContactMech("SHIPPING_LOCATION"); if (selectedContactMechId != null) { </code></pre> <br> </li> <li id="f3e2f822d56d5a39d81e3a1aca8246c8"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-57"> <strong> hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/controllerFront.xml </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/controllerFront.xml </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/WEB-INF/controllerFront.xml </span><span style="color: #aaaaaa">@@ -617,6 +617,14 @@ </span> &lt;response name="error" type="request" value="json" /&gt; &lt;response name="initCart" type="request-redirect-noparam" value="RFIDtagCatalogAlt" /&gt; &lt;/request-map&gt; <span style="background: #ddffdd; color: #000000">+ &lt;request-map uri="setOrderPriority"&gt; + &lt;security https="true" auth="true" /&gt; + &lt;event type="java" path="com.embitag.front.FrontCartEvent" invoke="setOrderPriority" /&gt; + &lt;response name="success" type="request" value="json" /&gt; + &lt;response name="error" type="request" value="json" /&gt; + &lt;response name="initCart" type="request-redirect-noparam" value="RFIDtagCatalogAlt" /&gt; + &lt;/request-map&gt; + </span> &lt;!-- Create the order --&gt; &lt;request-map uri="createOrder"&gt; &lt;security https="true" auth="true" /&gt; </code></pre> <br> </li> <li id="d03f4acd220dcc624d78728b074fb7aa"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-58"> <strong> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagEditPassword.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagEditPassword.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagEditPassword.ftl </span><span style="color: #aaaaaa">@@ -1,19 +1,20 @@ </span><span style="background: #ffdddd; color: #000000">-&lt;#-- Provisory --&gt; </span><span style="background: #ddffdd; color: #000000">+&lt;#include "component://embitag-com/webapp/embitag-com/templates/htmlMacroLibrary.ftl" /&gt; + </span> &lt;script type="text/javascript"&gt; <span style="background: #ffdddd; color: #000000">- jQuery(document).ready(function() { - - jQuery('#newPassword').on('input', function(){ </span><span style="background: #ddffdd; color: #000000">+ $(document).ready(function() { + + $("#newPassword").on("input", function(){ </span> $("#newPasswordVerify").val("").trigger("input"); <span style="background: #ffdddd; color: #000000">- passwordStrength($(this).val(), $('#passwordStrength')); </span><span style="background: #ddffdd; color: #000000">+ passwordStrength($(this).val(), $("#passwordStrength")); </span> }); <span style="background: #ffdddd; color: #000000">- jQuery('#newPasswordVerify').on('input', function(){ - var match = passwordMatch($('#newPassword').val(), $(this).val(), $('#passwordMatch')); </span><span style="background: #ddffdd; color: #000000">+ $("#newPasswordVerify").on("input", function(){ + var match = passwordMatch($("#newPassword").val(), $(this).val(), $("passwordMatch")); </span> $("#submitPasswordChangeForm").attr("disabled", !match); }); <span style="background: #ffdddd; color: #000000">-}) </span><span style="background: #ddffdd; color: #000000">+ + }); </span> &lt;/script&gt; <span style="background: #ffdddd; color: #000000">-&lt;#-- // Provisory --&gt; </span> &lt;div class="row"&gt; &lt;div class="col-sm-12"&gt; <span style="color: #aaaaaa">@@ -24,12 +25,9 @@ </span> &lt;fieldset class="custom-fieldset"&gt; &lt;#-- New Password --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="newPassword" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Password_New} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="newPassword" content="${uiLabelMap.FrontEmbitag_Account_Password_New}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="newPassword" id="newPassword" type="password" value="" class="form-control" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="newPassword" id="newPassword" type="password" value="" class="form-control" tabindex="1" autofocus required&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7 col-sm-offset-5"&gt; &lt;div class="help-block"&gt; <span style="color: #aaaaaa">@@ -39,12 +37,9 @@ </span> &lt;/div&gt; &lt;#-- Confirm Password --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="newPasswordVerify" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Password_Confirm} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="newPasswordVerify" content="${uiLabelMap.FrontEmbitag_Account_Password_Confirm}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="newPasswordVerify" id="newPasswordVerify" type="password" value="" class="form-control" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="newPasswordVerify" id="newPasswordVerify" type="password" value="" class="form-control" tabindex="2" required/&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7 col-sm-offset-5"&gt; &lt;div class="help-block"&gt; <span style="color: #aaaaaa">@@ -55,10 +50,12 @@ </span> &lt;#-- Back / Validate buttons --&gt; &lt;div class="form-group"&gt; &lt;div class="col-sm-1 col-sm-offset-4"&gt; <span style="background: #ffdddd; color: #000000">- &lt;a class="btn btn-link" type="button" href="&lt;@ofbizUrl&gt;companyAccount&lt;/@ofbizUrl&gt;"&gt;${uiLabelMap.FrontEmbitag_Common_Back}&lt;/a&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;a class="btn btn-link" type="button" href="&lt;@ofbizUrl&gt;companyAccount&lt;/@ofbizUrl&gt;" tabindex="4"&gt; + ${uiLabelMap.FrontEmbitag_Common_Back} + &lt;/a&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7"&gt; <span style="background: #ffdddd; color: #000000">- &lt;button type="submit" id="submitPasswordChangeForm" class="btn btn-warning" disabled&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;button type="submit" id="submitPasswordChangeForm" class="btn btn-warning" tabindex="3" disabled&gt; </span> ${uiLabelMap.FrontEmbitag_Common_Update} &lt;/button&gt; &lt;/div&gt; </code></pre> <br> </li> <li id="5f083dacacb540b336621436df499c80"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-59"> <strong> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagEditUser.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagEditUser.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagEditUser.ftl </span><span style="color: #aaaaaa">@@ -1,51 +1,44 @@ </span><span style="background: #ffdddd; color: #000000">-&lt;#-- Provisory --&gt; </span><span style="background: #ddffdd; color: #000000">+&lt;#include "component://embitag-com/webapp/embitag-com/templates/htmlMacroLibrary.ftl" /&gt; + </span> &lt;script type="text/javascript"&gt; <span style="background: #ffdddd; color: #000000">- jQuery(document).ready(function() { - </span><span style="background: #ddffdd; color: #000000">+ $(document).ready(function() { + </span> $("#newPassword").on("input", function(){ $("#newPasswordVerify").val("").trigger("input"); <span style="background: #ffdddd; color: #000000">- passwordStrength($(this).val(), $("#passwordStrength")); </span><span style="background: #ddffdd; color: #000000">+ passwordStrength(this.val, $("#passwordStrength")); </span> }); <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> $("#newPasswordVerify").on("input", function(){ var match = passwordMatch($("#newPassword").val(), $(this).val(), $("#passwordMatch")); $("#submitPasswordUpdateForm").attr("disabled", !match); }); <span style="background: #ffdddd; color: #000000">-}) </span><span style="background: #ddffdd; color: #000000">+ + }); </span> &lt;/script&gt; <span style="background: #ffdddd; color: #000000">-&lt;#-- // Provisory --&gt; </span> &lt;div class="row"&gt; &lt;div class="col-sm-12"&gt; &lt;form method="POST" name="passwordUpdateForm" action="&lt;@ofbizUrl&gt;passwordUpdate&lt;/@ofbizUrl&gt;" class="form-horizontal" data-toggle="validator"&gt; &lt;fieldset class="custom-fieldset"&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;#-- Username --&gt; - &lt;label for="userLoginId" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Email} - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;#-- Username --&gt; + &lt;@renderInputLabel for="userLoginId" content="${uiLabelMap.FrontEmbitag_Account_Email}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; &lt;input name="userLoginId" id="userLoginId" type="text" pattern="^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\.[a-zA-Z]{2,4}$" readonly="readonly" value="${userLoginId}" class="form-control" required/&gt; &lt;/div&gt; &lt;/div&gt; &lt;#-- Current Password --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="currentPassword" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Password_Current} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="currentPassword" content="${uiLabelMap.FrontEmbitag_Account_Password_Current}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="currentPassword" id="currentPassword" type="password" value="" class="form-control" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="currentPassword" id="currentPassword" type="password" value="" class="form-control" tabindex="1" autofocus required/&gt; </span> &lt;/div&gt; &lt;/div&gt; &lt;#-- New Password --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="newPassword" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Password_New} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="newPassword" content="${uiLabelMap.FrontEmbitag_Account_Password_New}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="newPassword" id="newPassword" type="password" value="" class="form-control" pattern=".{5,}" title="${uiLabelMap.FrontEmbitag_Account_Password_Min_Length}" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="newPassword" id="newPassword" type="password" value="" class="form-control" pattern=".{5,}" title="${uiLabelMap.FrontEmbitag_Account_Password_Min_Length}" tabindex="2" required/&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7 col-sm-offset-5"&gt; &lt;div class="help-block"&gt; <span style="color: #aaaaaa">@@ -55,12 +48,9 @@ </span> &lt;/div&gt; &lt;#-- Confirm Password --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="newPasswordVerify" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Password_Confirm} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="newPasswordVerify" content="${uiLabelMap.FrontEmbitag_Account_Password_Confirm}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="newPasswordVerify" id="newPasswordVerify" type="password" value="" class="form-control" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="newPasswordVerify" id="newPasswordVerify" type="password" value="" class="form-control" tabindex="3" required/&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7 col-sm-offset-5"&gt; &lt;div class="help-block"&gt; <span style="color: #aaaaaa">@@ -81,12 +71,12 @@ </span> &lt;#-- Back / Validate buttons --&gt; &lt;div class="form-group"&gt; &lt;div class="col-sm-1 col-sm-offset-4"&gt; <span style="background: #ffdddd; color: #000000">- &lt;a class="btn btn-link" type="button" href="&lt;@ofbizUrl&gt;companyAccount&lt;/@ofbizUrl&gt;"&gt; - ${uiLabelMap.FrontEmbitag_Common_Back} - &lt;/a&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;a class="btn btn-link" type="button" href="&lt;@ofbizUrl&gt;companyAccount&lt;/@ofbizUrl&gt;" tabindex="5"&gt; + ${uiLabelMap.FrontEmbitag_Common_Back} + &lt;/a&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7"&gt; <span style="background: #ffdddd; color: #000000">- &lt;button type="submit" id="submitPasswordUpdateForm" class="btn btn-warning" disabled&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;button type="submit" id="submitPasswordUpdateForm" class="btn btn-warning" tabindex="4" disabled&gt; </span> ${uiLabelMap.FrontEmbitag_Common_Update} &lt;/button&gt; &lt;/div&gt; </code></pre> <br> </li> <li id="70551b52d8c74f18b538c169505d01c3"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-60"> <strong> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagForgotPassword.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagForgotPassword.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagForgotPassword.ftl </span><span style="color: #aaaaaa">@@ -1,22 +1,26 @@ </span><span style="background: #ddffdd; color: #000000">+&lt;#include "component://embitag-com/webapp/embitag-com/templates/htmlMacroLibrary.ftl" /&gt; + </span> &lt;div class="row"&gt; &lt;div class="col-sm-12"&gt; &lt;form method="POST" name="askNewPassword" id="askNewPassword" action="&lt;@ofbizUrl&gt;proceedForgotPassword&lt;/@ofbizUrl&gt;" class="form-horizontal" data-toggle="validator"&gt; &lt;fieldset class="custom-fieldset"&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="inputUsername" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Email} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="inputUsername" content="${uiLabelMap.FrontEmbitag_Account_Email}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-6"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="USERNAME" id="inputUsername" type="text" pattern="^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\.[a-zA-Z]{2,4}$" value="" class="form-control" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="USERNAME" id="inputUsername" type="text" pattern="^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\.[a-zA-Z]{2,4}$" value="" class="form-control" tabindex="1" autofocus required/&gt; </span> &lt;/div&gt; &lt;/div&gt; &lt;div class="form-group"&gt; &lt;div class="col-sm-1 col-sm-offset-4"&gt; <span style="background: #ffdddd; color: #000000">- &lt;a class="btn btn-link" type="button" href="&lt;@ofbizUrl&gt;login&lt;/@ofbizUrl&gt;"&gt;${uiLabelMap.FrontEmbitag_Common_Back}&lt;/a&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;a class="btn btn-link" type="button" href="&lt;@ofbizUrl&gt;login&lt;/@ofbizUrl&gt;" tabindex="3"&gt; + ${uiLabelMap.FrontEmbitag_Common_Back} + &lt;/a&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7"&gt; <span style="background: #ffdddd; color: #000000">- &lt;button type="submit" class="btn btn-warning"&gt;${uiLabelMap.FrontEmbitag_Common_Send}&lt;/button&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;button type="submit" class="btn btn-warning" tabindex="2"&gt; + ${uiLabelMap.FrontEmbitag_Common_Send} + &lt;/button&gt; + &lt;/div&gt; </span> &lt;/div&gt; &lt;/fieldset&gt; &lt;/form&gt; </code></pre> <br> </li> <li id="7ea3346b9ca18920568a910f181257d0"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-61"> <strong> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagLogin.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagLogin.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagLogin.ftl </span><span style="color: #aaaaaa">@@ -1,21 +1,11 @@ </span><span style="background: #ffdddd; color: #000000">-&lt;div class="row"&gt; - &lt;div class="col-sm-12"&gt; - &lt;div class="alert alert-warning" role="alert"&gt; - &lt;span class="glyphicon glyphicon-warning-sign"&gt;&lt;/span&gt; - ${StringUtil.wrapString(uiLabelMap.FrontEmbitagAlertNewSiteLogin)}. - &lt;/div&gt; - &lt;/div&gt; -&lt;/div&gt; </span><span style="background: #ddffdd; color: #000000">+&lt;#include "component://embitag-com/webapp/embitag-com/templates/htmlMacroLibrary.ftl" /&gt; </span> &lt;div class="row"&gt; &lt;div class="col-sm-12"&gt; &lt;form method="POST" name="formLogin" id="formLogin" action="&lt;@ofbizUrl&gt;TagRFIDCatalogue&lt;/@ofbizUrl&gt;" class="form-horizontal" data-toggle="validator"&gt; &lt;fieldset class="custom-fieldset"&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="inputUsername" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Email} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="inputUsername" content="${uiLabelMap.FrontEmbitag_Account_Email}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; &lt;input name="USERNAME" id="inputUsername" type="text" pattern="^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\.[a-zA-Z]{2,4}$" value="" aria-describedby="inputUsernameHelpBlock" class="form-control" tabindex="1" autofocus required="required"/&gt; <span style="color: #aaaaaa">@@ -25,10 +15,7 @@ </span> &lt;/div&gt; &lt;/div&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="inputPassword" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Password} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="inputPassword" content="${uiLabelMap.FrontEmbitag_Account_Password}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; &lt;input type="password" name="PASSWORD" id="inputPassword" value="" aria-describedby="inputPasswordHelpBlock" class="form-control" tabindex="2" required="required"/&gt; &lt;/div&gt; <span style="color: #aaaaaa">@@ -38,9 +25,10 @@ </span> &lt;/div&gt; &lt;div class="form-group"&gt; &lt;div class="col-sm-offset-5 col-sm-7"&gt; <span style="background: #ffdddd; color: #000000">- &lt;button type="submit" class="btn btn-warning disabled" tabindex="3"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;button type="submit" class="btn btn-warning disabled" onClick="$('#login-loader').removeClass('hidden');" tabindex="3"&gt; </span> ${uiLabelMap.FrontEmbitag_Account_Log_In} &lt;/button&gt; <span style="background: #ddffdd; color: #000000">+ &lt;@renderSimpleLoader id="login-loader" class="warning margin-left-10 hidden" /&gt; </span> &lt;a role="button" type="button" class="btn btn-link" href="&lt;@ofbizUrl&gt;forgotPassword&lt;/@ofbizUrl&gt;" tabindex="4"&gt; ${uiLabelMap.FrontEmbitag_Account_Password_Request_New} &lt;/a&gt; </code></pre> <br> </li> <li id="715604ae913d6ea24c688406674b6d01"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-62"> <strong> hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagRegisterUser.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagRegisterUser.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/front/account/frontEmbitagRegisterUser.ftl </span><span style="color: #aaaaaa">@@ -1,43 +1,38 @@ </span><span style="background: #ffdddd; color: #000000">-&lt;#-- Provisory --&gt; </span><span style="background: #ddffdd; color: #000000">+&lt;#include "component://embitag-com/webapp/embitag-com/templates/htmlMacroLibrary.ftl" /&gt; + </span> &lt;script type="text/javascript"&gt; <span style="background: #ffdddd; color: #000000">- jQuery(document).ready(function() { </span><span style="background: #ddffdd; color: #000000">+ $(document).ready(function() { </span> <span style="background: #ffdddd; color: #000000">- $('#currentPassword').on('input', function(){ </span><span style="background: #ddffdd; color: #000000">+ $("#currentPassword").on("input", function(){ </span> $("#currentPasswordVerify").val("").trigger("input"); <span style="background: #ffdddd; color: #000000">- passwordStrength($(this).val(), $('#passwordStrength')); </span><span style="background: #ddffdd; color: #000000">+ passwordStrength($(this).val(), $("#passwordStrength")); </span> }); <span style="background: #ffdddd; color: #000000">- $('#currentPasswordVerify').on('input', function(){ - var match = passwordMatch($('#currentPassword').val(), $(this).val(), $('#passwordMatch')); </span><span style="background: #ddffdd; color: #000000">+ $("#currentPasswordVerify").on("input", function(){ + var match = passwordMatch($("#currentPassword").val(), $(this).val(), $("#passwordMatch")); </span> $("#submitRegisterUserForm").attr("disabled", !match); }); <span style="background: #ffdddd; color: #000000">- }) </span><span style="background: #ddffdd; color: #000000">+ }); </span> &lt;/script&gt; <span style="background: #ffdddd; color: #000000">-&lt;#-- // Provisory --&gt; </span> &lt;div class="row"&gt; &lt;div class="col-sm-12"&gt; &lt;form method="POST" name="registerUserForm" action="&lt;@ofbizUrl&gt;proceedRegisterUser&lt;/@ofbizUrl&gt;" class="form-horizontal" data-toggle="validator"&gt; <span style="background: #ddffdd; color: #000000">+ &lt;input name="partyId" id="partyId" type="hidden" value="${userLogin.partyId}" class="hidden" /&gt; + </span> &lt;fieldset class="custom-fieldset"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="partyId" id="partyId" type="hidden"value="${userLogin.partyId}" class="hidden" /&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;#-- Username --&gt; </span> &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;#-- Username --&gt; - &lt;label for="userLoginId" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Email} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="userLoginId" content="${uiLabelMap.FrontEmbitag_Account_Email}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="userLoginId" id="userLoginId" type="text" pattern="^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\.[a-zA-Z]{2,4}$" value="" class="form-control" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="userLoginId" id="userLoginId" type="text" pattern="^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\.[a-zA-Z]{2,4}$" value="" class="form-control" tabindex="1" autofocus required/&gt; </span> &lt;/div&gt; &lt;/div&gt; &lt;#-- New Password --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="currentPassword" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Password_New} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="currentPassword" content="${uiLabelMap.FrontEmbitag_Account_Password_New}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="currentPassword" id="currentPassword" type="password" value="" class="form-control" pattern=".{5,}" title="${uiLabelMap.FrontEmbitag_Account_Password_Min_Length}" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="currentPassword" id="currentPassword" type="password" value="" class="form-control" pattern=".{5,}" title="${uiLabelMap.FrontEmbitag_Account_Password_Min_Length}" tabindex="2" required/&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7 col-sm-offset-5"&gt; &lt;div class="help-block"&gt; <span style="color: #aaaaaa">@@ -47,12 +42,9 @@ </span> &lt;/div&gt; &lt;#-- Confirm Password --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="currentPasswordVerify" class="col-sm-4 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Account_Password_Confirm} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="currentPasswordVerify" content="${uiLabelMap.FrontEmbitag_Account_Password_Confirm}" class="col-sm-4 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-5"&gt; <span style="background: #ffdddd; color: #000000">- &lt;input name="currentPasswordVerify" id="currentPasswordVerify" type="password" value="" class="form-control" required/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;input name="currentPasswordVerify" id="currentPasswordVerify" type="password" value="" class="form-control" tabindex="3" required/&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7 col-sm-offset-5"&gt; &lt;div class="help-block"&gt; <span style="color: #aaaaaa">@@ -73,13 +65,18 @@ </span> &lt;#-- Back / Validate buttons --&gt; &lt;div class="form-group"&gt; &lt;div class="col-sm-1 col-sm-offset-4"&gt; <span style="background: #ffdddd; color: #000000">- &lt;a class="btn btn-link" type="button" href="&lt;@ofbizUrl&gt;companyAccount&lt;/@ofbizUrl&gt;"&gt;${uiLabelMap.FrontEmbitag_Common_Back}&lt;/a&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;a class="btn btn-link" type="button" href="&lt;@ofbizUrl&gt;companyAccount&lt;/@ofbizUrl&gt;" tabindex="5"&gt; + ${uiLabelMap.FrontEmbitag_Common_Back} + &lt;/a&gt; </span> &lt;/div&gt; &lt;div class="col-sm-7"&gt; <span style="background: #ffdddd; color: #000000">- &lt;button type="submit" id="submitRegisterUserForm" class="btn btn-warning" disabled&gt;${uiLabelMap.FrontEmbitag_Common_Create}&lt;/button&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;button type="submit" id="submitRegisterUserForm" class="btn btn-warning" tabindex="4" disabled&gt; + ${uiLabelMap.FrontEmbitag_Common_Create} + &lt;/button&gt; </span> &lt;/div&gt; &lt;/div&gt; &lt;/fieldset&gt; <span style="background: #ddffdd; color: #000000">+ </span> &lt;/form&gt; &lt;/div&gt; &lt;/div&gt; </code></pre> <br> </li> <li id="e557e26240b137493ec46a2aa35c4945"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-63"> <strong> hot-deploy/embitag-com/webapp/embitag-com/front/catalog/item/finalparent/modalItemToShare.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/front/catalog/item/finalparent/modalItemToShare.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/front/catalog/item/finalparent/modalItemToShare.ftl </span><span style="color: #aaaaaa">@@ -1,7 +1,13 @@ </span> &lt;#include "component://widget/templates/htmlFormMacroLibrary.ftl" /&gt; <span style="background: #ddffdd; color: #000000">+&lt;#include "component://embitag-com/webapp/embitag-com/templates/htmlMacroLibrary.ftl" /&gt; </span> &lt;script type="text/javascript"&gt; <span style="background: #ffdddd; color: #000000">- function itemToShareLookup(item) { </span><span style="background: #ddffdd; color: #000000">+ + function lookupCallback() { + $("#modalItemToShareLookupLoader").addClass("hidden"); + } + + function callbackItemToShare(item) { </span> $.ajax({ type: "POST", async: true, <span style="color: #aaaaaa">@@ -85,6 +91,13 @@ </span> $("#modalItemToShare").modal("hide"); }); <span style="background: #ddffdd; color: #000000">+ $("#modalItemToShareLookup").on("input", function() { + $("#modalItemToShareLookupLoader").removeClass("hidden"); + }); + + $("#modalItemToShareLookup").on("blur", function() { + $("#modalItemToShareLookupLoader").addClass("hidden"); + }); </span> }); &lt;/script&gt; <span style="color: #aaaaaa">@@ -112,8 +125,11 @@ </span> ${uiLabelMap.FrontEmbitag_Catalog_Item_Modal_Item_Search_Item} &lt;/label&gt; &lt;/div&gt; <span style="background: #ffdddd; color: #000000">- &lt;div class="col-sm-8"&gt; - &lt;@renderLookupField className="form-control text-uppercase" alert="false" name="modalItemToShareProduct" value="" size="25" maxlength="" id="modalItemToShareProduct" event="" action="" readonly=false autocomplete="" descriptionFieldName="" formName="modalItemToShareForm" fieldFormName="LookupFinishGoodProductMgmt" targetParameterIter="" imgSrc="/assets/images/fieldlookup.gif" ajaxUrl="inputEAN13,LookupFinishGoodProductMgmt,ajaxLookup=Y&amp;&amp;" ajaxEnabled=true presentation="layer" height="" width="" position="topleft" showDescription="true" lastViewName="viewAddItem" lookupCallback="itemToShareLookup"/&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;div class="col-sm-7"&gt; + &lt;@renderLookupField className="form-control text-uppercase" alert="false" name="modalItemToShareLookup" value="" size="25" maxlength="" id="modalItemToShareLookup" event="" action="" readonly=false autocomplete="" descriptionFieldName="" formName="modalItemToShareForm" fieldFormName="LookupFinishGoodProductMgmt" targetParameterIter="" imgSrc="/assets/images/fieldlookup.gif" ajaxUrl="inputEAN13,LookupFinishGoodProductMgmt,ajaxLookup=Y&amp;&amp;" ajaxEnabled=true presentation="layer" height="" width="" position="topleft" showDescription="true" lastViewName="viewAddItem" lookupCallback="lookupCallback" lookupOnSelectCallback="callbackItemToShare"/&gt; + &lt;/div&gt; + &lt;div class="col-sm-1"&gt; + &lt;@renderSimpleLoader id="modalItemToShareLookupLoader" class="embi-blue hidden" /&gt; </span> &lt;/div&gt; &lt;/div&gt; &lt;div class="col-sm-12 margin-top-20"&gt; </code></pre> <br> </li> <li id="763b511643bfa504f439c475f70394bd"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-64"> <strong> hot-deploy/embitag-com/webapp/embitag-com/front/catalog/rfid/rfidTagCatalogWrapper.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/front/catalog/rfid/rfidTagCatalogWrapper.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/front/catalog/rfid/rfidTagCatalogWrapper.ftl </span><span style="color: #aaaaaa">@@ -31,16 +31,7 @@ </span> }); &lt;/script&gt; <span style="background: #ffdddd; color: #000000">-&lt;#if !(userLogin??)&gt; - &lt;#-- Not logged ? Show welcome message--&gt; - &lt;div class="row"&gt; - &lt;div class="col-sm-12"&gt; - &lt;div class="alert alert-success" role="alert"&gt; - ${StringUtil.wrapString(uiLabelMap.FrontEmbitagAlertNewSiteWelcome)} - &lt;/div&gt; - &lt;/div&gt; - &lt;/div&gt; -&lt;#else&gt; </span><span style="background: #ddffdd; color: #000000">+&lt;#if userLogin??&gt; </span> &lt;#if linkedCatalogList.size() gt 0 &amp;&amp; isCustomer&gt; &lt;#-- FC/PC : if linked, show the dropdown --&gt; &lt;#if !(linkedCatalogList.size() == 1 &amp;&amp; linkedCatalogList.get(0).partyId == userLogin.partyId)&gt; </code></pre> <br> </li> <li id="d39fdd3f5ea3e29a0ba217115db3803b"> <a href="https://labs.nereide.fr/10923/PRO20200/compare/a5cb4989f0cb3104cf8bfffe66314a60ae5f99c8...65aa31bb1df33d15157fe83e30b6741b5a55d24d#diff-65"> <strong> hot-deploy/embitag-com/webapp/embitag-com/front/command/encodeItemsForCommand.ftl </strong> </a> <hr> <pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/hot-deploy/embitag-com/webapp/embitag-com/front/command/encodeItemsForCommand.ftl </span><span style="background: #ddffdd; color: #000000">+++ b/hot-deploy/embitag-com/webapp/embitag-com/front/command/encodeItemsForCommand.ftl </span><span style="color: #aaaaaa">@@ -1,133 +1,214 @@ </span> &lt;#-- JS --&gt; &lt;#include "component://widget/templates/htmlFormMacroLibrary.ftl" /&gt; <span style="background: #ffdddd; color: #000000">-&lt;script&gt; -var currentTotalQuantity = parseInt(${totalQuantity!0}), - maxTotalQuantity = parseInt(${productMaxQuantity}); -function checkMaxQuantity(newQty) { - newQty = parseInt(newQty); - if (maxTotalQuantity &lt; (currentTotalQuantity + newQty)) { - $("#modalOverQuantity").modal("toggle"); - return false; </span><span style="background: #ddffdd; color: #000000">+&lt;#include "component://embitag-com/webapp/embitag-com/templates/htmlMacroLibrary.ftl" /&gt; + +&lt;script type="application/javascript"&gt; + var selectedItemArray = []; + + function itemArrayHandler(itemId) { + var idx; + + if ( (idx = selectedItemArray.indexOf(itemId)) &gt; -1 ) { + selectedItemArray.splice(idx, 1); + } else { + selectedItemArray.push(itemId); + } + + changeRemovalButtonHtml(); </span> } <span style="background: #ffdddd; color: #000000">- return true; -} </span> <span style="background: #ffdddd; color: #000000">-function submitNewQuantity(itemId, newQty) { - var total = 0; - $("input[id^='inputLiveQuantity-']").each(function() { - total += parseInt(this.value); - }); - if (maxTotalQuantity &lt; total) { - $("#modalOverQuantity").modal("toggle"); - } else { - document.location.href = '&lt;@ofbizUrl&gt;updateItems&lt;/@ofbizUrl&gt;' + '?itemId='+itemId+'&amp;quantity='+newQty; </span><span style="background: #ddffdd; color: #000000">+ function changeRemovalButtonHtml() { + if (selectedItemArray.length &gt; 0) { + $("#linkRemoveAll").addClass("hidden"); + $("#linkRemoveSelected").removeClass("hidden"); + } else { + $("#linkRemoveAll").removeClass("hidden"); + $("#linkRemoveSelected").addClass("hidden"); + } </span> } <span style="background: #ffdddd; color: #000000">-} </span> <span style="background: #ffdddd; color: #000000">-$(document).ready(function() { - // FGO LookUp - $("#inputFGO").on("blur", function(){ - if ($(this).val().length &gt; 0) { - $.ajax({ - type: "GET", - async: false, - url: "&lt;@ofbizUrl&gt;setFinishGoodOrderId&lt;/@ofbizUrl&gt;", - data: 'fgoId='+$(this).val() - }); </span><span style="background: #ddffdd; color: #000000">+ function checkMaxQuantity(newQty) { + newQty = parseInt(newQty); + if (maxTotalQuantity &lt; (currentTotalQuantity + newQty)) { + $("#modalOverQuantity").modal("toggle"); + return false; </span> } <span style="background: #ffdddd; color: #000000">- }); </span><span style="background: #ddffdd; color: #000000">+ return true; + } </span> <span style="background: #ffdddd; color: #000000">- // Add Quantity - var isQtyPercent = false; - $("input[id^='addPercentQty-']").on("click", function(){ - isQtyPercent = true; - var unitarySelector = $(this).siblings("input[id^='addUnitaryQty-']"); - unitarySelector.removeClass("btn-primary"); - unitarySelector.addClass("btn-default"); - - $(this).addClass("btn-primary"); - $(this).removeClass("btn-default"); - }); - $("input[id^='addUnitaryQty-']").on("click", function(){ - isQtyPercent = false; - var percentSelector = $(this).siblings("input[id^='addPercentQty-']"); - percentSelector.removeClass("btn-primary"); - percentSelector.addClass("btn-default"); - - $(this).addClass("btn-primary"); - $(this).removeClass("btn-default"); - }); </span><span style="background: #ddffdd; color: #000000">+ function submitNewQuantity(itemId, oldQty, newQty) { + oldQty = parseInt(oldQty); + newQty = parseInt(newQty); + var total = parseInt($("#encodingTotalQuantity").val()) + oldQty; + if (maxTotalQuantity &lt; total) { + $("#modalOverQuantity").modal("toggle"); + } else { + documentLocation("&lt;@ofbizUrl&gt;updateItems&lt;/@ofbizUrl&gt;?itemId="+itemId+"&amp;quantity="+newQty); + } + } </span> <span style="background: #ffdddd; color: #000000">- $("button[id^='submitAddQty']").on("click", function(){ - var itemId = parseInt($(this).closest('tr').find('td').eq(0).html()), - quantity = parseInt($("#inputLiveQuantity-"+itemId).val()), - addQty = parseInt($("#addQty-"+itemId).val()), - newQty = 0; - if (isQtyPercent) { - newQty = quantity + (quantity*(addQty/100)); </span><span style="background: #ddffdd; color: #000000">+ function checkboxLabelVisibility(id, isChecked) { + if (isChecked) { + $("#labelCheckboxRow-"+id).addClass("hidden"); </span> } else { <span style="background: #ffdddd; color: #000000">- newQty = quantity + addQty; </span><span style="background: #ddffdd; color: #000000">+ $("#labelCheckboxRow-"+id).removeClass("hidden"); </span> } <span style="background: #ddffdd; color: #000000">+ } </span> <span style="background: #ffdddd; color: #000000">- submitNewQuantity(itemId, newQty); - }); - $("input[id^='inputLiveQuantity-']").on("blur", function(){ - var itemId = $(this).attr("id").replace("inputLiveQuantity-",""), - qty = $(this).val(); </span><span style="background: #ddffdd; color: #000000">+ function encodingLookupCallback() { + hideEncodingLoader(); + } </span> <span style="background: #ffdddd; color: #000000">- submitNewQuantity(itemId, qty); - }); - - // Remove items - $("input[id^='checkboxRemove']").on("click", function(){ - var removeAtLeastOne = false; - $("input[id^='checkboxRemove'").each(function(){ - if ($(this).is(':checked')){ - removeAtLeastOne = true; </span><span style="background: #ddffdd; color: #000000">+ function showEncodingLoader() { + $("#encoding-lookupLoader").removeClass("hidden"); + } + + function hideEncodingLoader() { + $("#encoding-lookupLoader").addClass("hidden"); + } + + function documentLocation(location) { + document.location.href = location; + } + + function scrollToEncoding() { + $("html, body").animate({ + scrollTop: $("#encodingHeaderAnchor").offset().top + }); + } + + var currentTotalQuantity = parseInt(${totalQuantity!0}), + maxTotalQuantity = parseInt(${productMaxQuantity!0}); + $(document).ready(function() { + // Change FGO + $("#inputFGO").on("blur", function(){ + if ($(this).val().length &gt; 0) { + $.ajax({ + type: "GET", + async: false, + url: "&lt;@ofbizUrl&gt;setFinishGoodOrderId&lt;/@ofbizUrl&gt;", + data: 'fgoId='+$(this).val() + }); </span> } }); <span style="background: #ffdddd; color: #000000">- - if (removeAtLeastOne){ - $("#linkRemoveAll").hide(); - $("#linkRemoveSelected").show(); - } else { - $("#linkRemoveAll").show(); - $("#linkRemoveSelected").hide(); - } - }); - - $("#linkRemoveSelected").hide(); - $("#linkRemoveSelected").on("click", function(){ - var itemIds = new Array(); - $("input[id^='checkboxRemove'").each(function(){ - if ($(this).is(':checked')){ - itemIds.push($(this).attr("id").replace("checkboxRemove-","")); </span><span style="background: #ddffdd; color: #000000">+ + // EAN13 events binding + $("#inputEAN13").on({ + "input": function() { + showEncodingLoader(); + }, + "blur": function() { + hideEncodingLoader(); </span> } }); <span style="background: #ffdddd; color: #000000">- document.location.href = "&lt;@ofbizUrl&gt;removeItems?itemId=&lt;/@ofbizUrl&gt;" + itemIds.join(","); - }); - - // Anchor scrolling - $("html, body").animate({ - scrollTop: $("#validateEncodingAnchor").offset().top - $(window).height() + 2*$("#validateEncodingButton").height() - }, 500); - - - $("#selectCustomer").on("change", function(){ - $.ajax({ - type: "POST", - async: false, - url: "&lt;@ofbizUrl&gt;updateUserDefaultCatalog&lt;/@ofbizUrl&gt;", - data: 'partyId='+$(this).val(), - success: function() { - document.location.href = "&lt;@ofbizUrl&gt;RFIDtagCatalogAlt&lt;/@ofbizUrl&gt;"; </span><span style="background: #ddffdd; color: #000000">+ + $("#encodeItem").on("click", function() { + var qty = $('#inputQuantity').val(); + if(checkMaxQuantity(qty)) { + $('#addItemForm').submit(); </span> } }); <span style="background: #ffdddd; color: #000000">- }); </span> <span style="background: #ffdddd; color: #000000">-}); </span><span style="background: #ddffdd; color: #000000">+ $("#updateItem").on("click", function() { + var qty = $('#inputQuantity').val(), + oldQty = $(this).data("oldQuantity"), + itemId = $(this).data("itemId"); + if(checkMaxQuantity(qty)) { + submitNewQuantity(itemId, oldQty, qty); + } + }); + + // Add Quantity Percent + var isQtyPercent = false; + $("input[id^='addPercentQty-']").on("click", function(){ + isQtyPercent = true; + var unitarySelector = $(this).siblings("input[id^='addUnitaryQty-']"); + unitarySelector.removeClass("btn-primary"); + unitarySelector.addClass("btn-default"); + + $(this).addClass("btn-primary"); + $(this).removeClass("btn-default"); + }); + + // Add Quantity Unitary + $("input[id^='addUnitaryQty-']").on("click", function(){ + isQtyPercent = false; + var percentSelector = $(this).siblings("input[id^='addPercentQty-']"); + percentSelector.removeClass("btn-primary"); + percentSelector.addClass("btn-default"); + + $(this).addClass("btn-primary"); + $(this).removeClass("btn-default"); + }); + + // Change item Quantity + $("button[id^='submitAddQty']").on("click", function(){ + var itemId = parseInt($(this).data("itemId")), + quantity = parseInt($(this).data("currentQuantity")), + addQty = parseInt($("#addQty-"+itemId).val()), + newQty = 0; + if (isQtyPercent) { + newQty = quantity + (quantity*(addQty/100)); + } else { + newQty = quantity + addQty; + } + newQty = Math.floor(newQty); // Prevent decimal for percents + submitNewQuantity(itemId, quantity, newQty); + }); + + // Remove items + $("input[id^='checkboxRemove']").on("click", function(event){ + event.stopPropagation(); + var id = $(this).data("itemId"), + status = $(this).is(":checked"); + checkboxLabelVisibility(id, status); + itemArrayHandler(id); + }); + + // Edit item + $(".edit-item").on("click", function() { + var qty = $(this).data("itemQuantity"), + rfidId = $(this).data("itemRfid"), + itemId = $(this).data("itemId"); + $("#0_lookupId_inputEAN13").val(rfidId) + .prop("disabled", true); + $("#inputQuantity").val(qty); + $("#encodeItem").addClass("hidden"); + $("#updateItem").removeClass("hidden").data("oldQuantity", qty).data("itemId", itemId); + scrollToEncoding(); + }); + + // Delete item + $(".delete-item").on("click", function() { + var itemId = $(this).data("itemId"); + $("#modalDeleteItemLink").attr("href", "&lt;@ofbizUrl&gt;removeItems?itemId=&lt;/@ofbizUrl&gt;" + itemId); + $("#modalDeleteEncoding").modal("show"); + }); + + // Remove selected items + $("#linkRemoveSelected").on("click", function(){ + documentLocation("&lt;@ofbizUrl&gt;removeItems?itemId=&lt;/@ofbizUrl&gt;" + selectedItemArray.join(",")); + }); + + // Change customer Event Binding + $("#selectCustomer").on("change", function(){ + $.ajax({ + type: "POST", + async: false, + url: "&lt;@ofbizUrl&gt;updateUserDefaultCatalog&lt;/@ofbizUrl&gt;", + data: 'partyId='+$(this).val(), + success: function() { + documentLocation("&lt;@ofbizUrl&gt;RFIDtagCatalogAlt&lt;/@ofbizUrl&gt;"); + } + }); + }); + + // Anchor scrolling + $("html, body").animate({ + scrollTop: $("#validateEncodingAnchor").offset().top - $(window).height() + 3*$("#validateEncodingButton").height() + }, 500); + }); </span> &lt;/script&gt; <span style="background: #ffdddd; color: #000000">-&lt;#-- // JS --&gt; </span> &lt;div class="row steps"&gt; &lt;div class="col-sm-offset-1 col-sm-12"&gt; <span style="color: #aaaaaa">@@ -154,13 +235,13 @@ $(document).ready(function() { </span> &lt;div class="progress-bar progress-bar-striped" role="progressbar" style="width: 0%"&gt; &lt;/div&gt; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> &lt;div class="progress-bar progress-bar-striped" role="progressbar" style="width: 0%"&gt; &lt;/div&gt; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> &lt;div class="progress-bar progress-bar-striped" role="progressbar" style="width: 0%"&gt; &lt;/div&gt; <span style="background: #ffdddd; color: #000000">- </span><span style="background: #ddffdd; color: #000000">+ </span> &lt;div class="progress-bar progress-bar-striped" role="progressbar" style="width: 0%"&gt; &lt;/div&gt; &lt;/div&gt; <span style="color: #aaaaaa">@@ -227,7 +308,7 @@ $(document).ready(function() { </span> &lt;div class="row"&gt; &lt;div class="col-sm-12"&gt; &lt;form name="addItemForm" id="addItemForm" method="POST" action="&lt;@ofbizUrl&gt;addItem&lt;/@ofbizUrl&gt;" data-toggle="validator" class="form-horizontal"&gt; <span style="background: #ffdddd; color: #000000">- &lt;fieldset class="custom-fieldset"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;fieldset class="custom-fieldset" id="encodingHeaderAnchor"&gt; </span> &lt;div class="form-group"&gt; &lt;div class="col-sm-12"&gt; &lt;legend&gt;${uiLabelMap.FrontEmbitag_Encoding}&lt;/legend&gt; <span style="color: #aaaaaa">@@ -247,14 +328,12 @@ $(document).ready(function() { </span> &lt;/#if&gt; &lt;#-- EAN 13 --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="inputEAN13" class="col-sm-3 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Product_Yours} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="inputEAN13" content="${uiLabelMap.FrontEmbitag_Product_Yours}" class="col-sm-3 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-4"&gt; <span style="background: #ffdddd; color: #000000">- &lt;@renderLookupField className="required form-control text-uppercase" alert="false" name="externalProductId" value="${parameters.externalProductId!}" size="25" maxlength="" id="inputEAN13" event="" action="" readonly=false autocomplete="" descriptionFieldName="" formName="addItemForm" fieldFormName="LookupFinishGoodProduct" targetParameterIter="" imgSrc="/assets/images/fieldlookup.gif" ajaxUrl="inputEAN13,LookupFinishGoodProduct,ajaxLookup=Y&amp;&amp;" ajaxEnabled=true presentation="layer" height="" width="" position="topleft" fadeBackground="true" clearText="Clear" showDescription="true" initiallyCollapsed="false" lastViewName="viewAddItem" placeholder="${uiLabelMap.FrontEmbitag_Encoding_Input_EAN_Placeholder}" /&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderLookupField className="required form-control text-uppercase" alert="false" name="externalProductId" value="${parameters.externalProductId!}" size="25" maxlength="" id="inputEAN13" event="" action="" readonly=false autocomplete="" descriptionFieldName="" formName="addItemForm" fieldFormName="LookupFinishGoodProduct" targetParameterIter="" imgSrc="/assets/images/fieldlookup.gif" ajaxUrl="inputEAN13,LookupFinishGoodProduct,ajaxLookup=Y&amp;&amp;" ajaxEnabled=true presentation="layer" height="" width="" position="topleft" fadeBackground="true" clearText="Clear" showDescription="true" initiallyCollapsed="false" lastViewName="viewAddItem" placeholder="${uiLabelMap.FrontEmbitag_Encoding_Input_EAN_Placeholder}" lookupCallback="encodingLookupCallback" /&gt; </span> &lt;/div&gt; &lt;div class="col-sm-4"&gt; <span style="background: #ddffdd; color: #000000">+ &lt;@renderSimpleLoader id="encoding-lookupLoader" class="embi-blue margin-right-5 hidden" /&gt; </span> &lt;a href="javascript:void(0);" onClick="$('#redirectToCatalogForm').submit();"&gt; ${uiLabelMap.FrontEmbitag_Encoding_See_Catalog} &lt;/a&gt; <span style="color: #aaaaaa">@@ -262,10 +341,7 @@ $(document).ready(function() { </span> &lt;/div&gt; &lt;#-- Quantity --&gt; &lt;div class="form-group"&gt; <span style="background: #ffdddd; color: #000000">- &lt;label for="inputQuantity" class="col-sm-3 col-sm-offset-1 control-label"&gt; - ${uiLabelMap.FrontEmbitag_Common_Quantity} - &lt;span class="form-required" title="${uiLabelMap.FrontEmbitag_Common_Field_Is_Required}"&gt;*&lt;/span&gt; - &lt;/label&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;@renderInputLabel for="inputQuantity" content="${uiLabelMap.FrontEmbitag_Common_Quantity}" class="col-sm-3 col-sm-offset-1 control-label" required=true /&gt; </span> &lt;div class="col-sm-4"&gt; &lt;input name="quantity" id="inputQuantity" type="number" min="${tagMinQuantity}" max="${tagMaxQuantity}" value="${tagDefaultQuantity}" class="form-control" required="required" /&gt; &lt;/div&gt; <span style="color: #aaaaaa">@@ -273,10 +349,15 @@ $(document).ready(function() { </span> &lt;#-- Add --&gt; &lt;div class="form-group"&gt; &lt;div class="col-sm-4 col-sm-offset-4"&gt; <span style="background: #ffdddd; color: #000000">- &lt;button type="submit" value="" class="btn btn-block btn-primary" onclick="event.preventDefault();if(checkMaxQuantity($('#inputQuantity').val()))$('#addItemForm').submit();"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;button id="encodeItem" type="button" class="btn btn-block btn-primary"&gt; </span> &lt;span class="glyphicon glyphicon-save"&gt;&lt;/span&gt; ${uiLabelMap.FrontEmbitag_Encode} &lt;/button&gt; <span style="background: #ddffdd; color: #000000">+ &lt;input type="hidden" /&gt;&lt;#-- Trick to prevent btnblock+btnblock from bootstrap--&gt; + &lt;button id="updateItem" type="button" class="btn btn-block btn-success hidden" data-item-id="" data-old-quantity=""&gt; + &lt;span class="glyphicon glyphicon-pencil"&gt;&lt;/span&gt; + ${uiLabelMap.FrontEmbitag_Common_Update} + &lt;/button&gt; </span> &lt;/div&gt; &lt;/div&gt; &lt;/fieldset&gt; <span style="color: #aaaaaa">@@ -289,35 +370,34 @@ $(document).ready(function() { </span> &lt;table id="products" class="table table-bordered table-lightgrey"&gt; &lt;thead&gt; &lt;tr&gt; <span style="background: #ffdddd; color: #000000">- &lt;th class="col-sm-1"&gt;#&lt;/th&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;th class="col-sm-1 text-center"&gt;#&lt;/th&gt; </span> &lt;th class="col-sm-1"&gt;${uiLabelMap.FrontEmbitag_Common_Reference}&lt;/th&gt; <span style="background: #ffdddd; color: #000000">- &lt;th class="col-sm-4"&gt;${uiLabelMap.FrontEmbitag_Common_Description}&lt;/th&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;th class="col-sm-3"&gt;${uiLabelMap.FrontEmbitag_Common_Description}&lt;/th&gt; </span> &lt;th class="col-sm-2"&gt;${uiLabelMap.FrontEmbitag_Common_Quantity}&lt;/th&gt; &lt;th class="col-sm-2"&gt;${uiLabelMap.FrontEmbitag_Common_Price}&lt;/th&gt; <span style="background: #ffdddd; color: #000000">- &lt;th class="col-sm-2"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;th class="col-sm-2 cur-pointer" onClick="actionModalOpen();"&gt; </span> ${uiLabelMap.FrontEmbitag_Common_Actions} <span style="background: #ffdddd; color: #000000">- &lt;span class="glyphicon glyphicon-question-sign" title="${uiLabelMap.FrontEmbitag_Common_Actions_Helper}"&gt;&lt;/span&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;span class="glyphicon glyphicon-question-sign"&gt;&lt;/span&gt; </span> &lt;/th&gt; <span style="background: #ffdddd; color: #000000">- &lt;th&gt;&lt;/th&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;th class="col-sm-1"&gt;&lt;/th&gt; </span> &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;#list itemList as item&gt; <span style="background: #ffdddd; color: #000000">- &lt;tr&gt; - &lt;td&gt; - ${item.itemId!} - &lt;input type="checkbox" id="checkboxRemove-${item.itemId}" class="checkbox form-control" /&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;tr class="hidden-action-holder"&gt; + &lt;td class="text-center" onClick="$('#checkboxRemove-${item.itemId}').click();"&gt; + &lt;label class="shown-action" id="labelCheckboxRow-${item.itemId}"&gt; + ${item.itemId!} + &lt;/label&gt; + &lt;input type="checkbox" data-item-id="${item.itemId}" id="checkboxRemove-${item.itemId}" class="hidden-action form-control checkbox" /&gt; </span> &lt;/td&gt; &lt;td&gt;${item.RfidId!}&lt;/td&gt; &lt;td&gt; &lt;p&gt;${item.OrderLineCharacteristic1!?replace('&amp;#92;r', '&lt;br/&gt;')}&lt;/p&gt; &lt;p&gt;${item.OrderLineCharacteristic2!?replace('&amp;#92;r', '&lt;br/&gt;')}&lt;/p&gt; &lt;/td&gt; <span style="background: #ffdddd; color: #000000">- &lt;td&gt; - &lt;input id="inputLiveQuantity-${item.itemId}" class="form-control" type="number" min="10" max="200000" step="10" value="${item.quantity!}" /&gt; - &lt;/td&gt; - &lt;td&gt;&lt;@ofbizCurrency amount=item.subTotal isoCode=currencyUomId/&gt; - &lt;/td&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;td&gt;${item.quantity!}&lt;/td&gt; + &lt;td&gt;&lt;@ofbizCurrency amount=item.subTotal isoCode=currencyUomId/&gt;&lt;/td&gt; </span> &lt;td&gt; &lt;div class="col-sm-12"&gt; &lt;input type="number" min="1" max="200000" step="10" id="addQty-${item.itemId}" value="1" class="form-control" /&gt; <span style="color: #aaaaaa">@@ -326,14 +406,13 @@ $(document).ready(function() { </span> &lt;input type="button" role="button" class="btn btn-default col-sm-6" id="addPercentQty-${item.itemId}" value="${uiLabelMap.FrontEmbitag_Common_Percent_Short}" /&gt; &lt;input type="button" role="button" class="btn btn-primary col-sm-6" id="addUnitaryQty-${item.itemId}" value="${uiLabelMap.FrontEmbitag_Common_Quantity_Short}" /&gt; &lt;/div&gt; <span style="background: #ffdddd; color: #000000">- &lt;button id="submitAddQty-${item.itemId}" type="button" class="btn btn-link"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;button id="submitAddQty-${item.itemId}" type="button" class="btn btn-link" data-item-id="${item.itemId}" data-current-quantity="${item.quantity}"&gt; </span> ${uiLabelMap.FrontEmbitag_Common_Apply} &lt;/button&gt; &lt;/td&gt; <span style="background: #ffdddd; color: #000000">- &lt;td&gt; - &lt;a role="button" class="btn" data-toggle="modal" data-target="#modalDeleteEncoding" onclick="$('#modalDeleteItemLink').attr('href', '&lt;@ofbizUrl&gt;removeItems?itemId=${item.itemId!}&lt;/@ofbizUrl&gt;')"&gt; - &lt;span class="glyphicon glyphicon-remove glyphicon-red" title="${uiLabelMap.FrontEmbitag_Common_Delete}"&gt;&lt;/span&gt; - &lt;/a&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;td class="text-center"&gt; + &lt;span class="glyphicon glyphicon-pencil success cur-pointer edit-item" data-item-id="${item.itemId}" data-item-rfid="${item.RfidId}" data-item-quantity="${item.quantity}"&gt;&lt;/span&gt; + &lt;span class="glyphicon glyphicon-remove danger cur-pointer delete-item" data-item-id="${item.itemId}" title="${uiLabelMap.FrontEmbitag_Common_Delete}"&gt;&lt;/span&gt; </span> &lt;/td&gt; &lt;/tr&gt; &lt;/#list&gt; <span style="color: #aaaaaa">@@ -343,11 +422,12 @@ $(document).ready(function() { </span> &lt;a id="linkRemoveAll" href="&lt;@ofbizUrl&gt;removeAllItems&lt;/@ofbizUrl&gt;" class="btn btn-link"&gt; ${uiLabelMap.FrontEmbitag_Product_Remove_All} &lt;/a&gt; <span style="background: #ffdddd; color: #000000">- &lt;button id="linkRemoveSelected" type="button" class="btn btn-link"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;button id="linkRemoveSelected" type="button" class="btn btn-link hidden"&gt; </span> ${uiLabelMap.FrontEmbitag_Product_Remove_Selected} &lt;/button&gt; &lt;/td&gt; &lt;td&gt; <span style="background: #ddffdd; color: #000000">+ &lt;input type="hidden" id="encodingTotalQuantity" value="${totalQuantity}" /&gt; </span> &lt;strong&gt; ${uiLabelMap.FrontEmbitag_Common_Quantity_Total}: &lt;br /&gt; <span style="color: #aaaaaa">@@ -398,19 +478,18 @@ $(document).ready(function() { </span> &lt;/div&gt; &lt;/div&gt; <span style="background: #ddffdd; color: #000000">+ </span> &lt;#-- Confirm Item Deletion Modal --&gt; &lt;div class="modal fade" id="modalDeleteItem" role="dialog"&gt; &lt;div class="modal-dialog"&gt; &lt;!-- Modal content--&gt; <span style="background: #ffdddd; color: #000000">- &lt;div class="modal-content"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;div class="modal-content modal-danger"&gt; </span> &lt;div class="modal-header"&gt; &lt;button type="button" class="close" data-dismiss="modal"&gt;*&lt;/button&gt; &lt;h4 class="modal-title"&gt;${uiLabelMap.FrontEmbitag_Product_Modal_Delete}&lt;/h4&gt; &lt;/div&gt; &lt;div class="modal-body"&gt; <span style="background: #ffdddd; color: #000000">- &lt;div class="alert alert-danger" role="alert"&gt; - &lt;strong&gt;${uiLabelMap.FrontEmbitag_Common_Attention} !&lt;/strong&gt; ${uiLabelMap.FrontEmbitag_Product_Modal_Delete_No_Reverse} - &lt;/div&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;strong&gt;${uiLabelMap.FrontEmbitag_Common_Attention} !&lt;/strong&gt; ${uiLabelMap.FrontEmbitag_Product_Modal_Delete_No_Reverse} </span> &lt;/div&gt; &lt;div class="modal-footer"&gt; &lt;button type="button" class="btn btn-primary col-sm-6" data-dismiss="modal"&gt; <span style="color: #aaaaaa">@@ -429,15 +508,13 @@ $(document).ready(function() { </span> &lt;div class="modal fade" id="modalDeleteEncoding" role="dialog"&gt; &lt;div class="modal-dialog"&gt; &lt;!-- Modal content--&gt; <span style="background: #ffdddd; color: #000000">- &lt;div class="modal-content"&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;div class="modal-content modal-danger"&gt; </span> &lt;div class="modal-header"&gt; &lt;button type="button" class="close" data-dismiss="modal"&gt;*&lt;/button&gt; &lt;h4 class="modal-title"&gt;${uiLabelMap.FrontEmbitag_Encoding_Modal_Delete}&lt;/h4&gt; &lt;/div&gt; &lt;div class="modal-body"&gt; <span style="background: #ffdddd; color: #000000">- &lt;div class="alert alert-danger" role="alert"&gt; - &lt;strong&gt;${uiLabelMap.FrontEmbitag_Common_Attention} !&lt;/strong&gt; ${uiLabelMap.FrontEmbitag_Encoding_Modal_Delete_Confirm} - &lt;/div&gt; </span><span style="background: #ddffdd; color: #000000">+ &lt;strong&gt;${uiLabelMap.FrontEmbitag_Common_Attention} !&lt;/strong&gt; ${uiLabelMap.FrontEmbitag_Encoding_Modal_Delete_Confirm} </span> &lt;/div&gt; &lt;div class="modal-footer"&gt; &lt;button type="button" class="btn btn-primary col-sm-6" data-dismiss="modal"&gt; <span style="color: #aaaaaa">@@ -452,20 +529,17 @@ $(document).ready(function() { </span> &lt;/div&gt; &lt;/div&gt; <span style="background: #ffdddd; color: #000000">- </span> &lt;#-- Over-quantity Modal