This commit is contained in:
30
.idea/workspace.xml
generated
30
.idea/workspace.xml
generated
@@ -4,12 +4,10 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : order navbar + modification création fournisseur et client">
|
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : order récéption/expédition + correction style bouton récéption">
|
||||||
<change beforePath="$PROJECT_DIR$/.claude/settings.local.json" beforeDir="false" afterPath="$PROJECT_DIR$/.claude/settings.local.json" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Entity/Reception.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Reception.php" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/templates/reception_voucher.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/templates/reception_voucher.html.twig" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Entity/Shipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Shipment.php" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -326,15 +324,7 @@
|
|||||||
<workItem from="1773766075191" duration="6202000" />
|
<workItem from="1773766075191" duration="6202000" />
|
||||||
<workItem from="1773824491213" duration="24805000" />
|
<workItem from="1773824491213" duration="24805000" />
|
||||||
<workItem from="1774275549972" duration="51000" />
|
<workItem from="1774275549972" duration="51000" />
|
||||||
<workItem from="1774276665015" duration="2660000" />
|
<workItem from="1774276665015" duration="4910000" />
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00028" summary="fix : doc et script de déploiement">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1769097091268</created>
|
|
||||||
<option name="number" value="00028" />
|
|
||||||
<option name="presentableId" value="LOCAL-00028" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1769097091268</updated>
|
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00029" summary="fix : gitea workflow">
|
<task id="LOCAL-00029" summary="fix : gitea workflow">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
@@ -720,7 +710,15 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1773852806121</updated>
|
<updated>1773852806121</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="77" />
|
<task id="LOCAL-00077" summary="fix : order récéption/expédition + correction style bouton récéption">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1774283204849</created>
|
||||||
|
<option name="number" value="00077" />
|
||||||
|
<option name="presentableId" value="LOCAL-00077" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1774283204849</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="78" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
@@ -770,7 +768,6 @@
|
|||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
|
|
||||||
<MESSAGE value="feat : creer une nouvelle expedtion (WIP)" />
|
<MESSAGE value="feat : creer une nouvelle expedtion (WIP)" />
|
||||||
<MESSAGE value="feat : ajout d'une page de creation d'une expedition" />
|
<MESSAGE value="feat : ajout d'une page de creation d'une expedition" />
|
||||||
<MESSAGE value="feat : changelog" />
|
<MESSAGE value="feat : changelog" />
|
||||||
@@ -795,7 +792,8 @@
|
|||||||
<MESSAGE value="feat : ajout de l'api de l'état pour chercher les villes via le CP" />
|
<MESSAGE value="feat : ajout de l'api de l'état pour chercher les villes via le CP" />
|
||||||
<MESSAGE value="fix : script de déploiement + CI/CD build de l'app" />
|
<MESSAGE value="fix : script de déploiement + CI/CD build de l'app" />
|
||||||
<MESSAGE value="fix : order navbar + modification création fournisseur et client" />
|
<MESSAGE value="fix : order navbar + modification création fournisseur et client" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="fix : order navbar + modification création fournisseur et client" />
|
<MESSAGE value="fix : order récéption/expédition + correction style bouton récéption" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="fix : order récéption/expédition + correction style bouton récéption" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
|
|||||||
@@ -140,7 +140,7 @@
|
|||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td style="width:30%; text-align:right; vertical-align:top; font-size: 14px;">
|
<td style="width:30%; text-align:right; vertical-align:top; font-size: 14px;">
|
||||||
<div style="display:inline-block; width:75mm; line-height:1.3;">
|
<div style="display:inline-block; line-height:1.3; border: 1px solid black; padding: 8px; border-radius: 8px; width: 60mm">
|
||||||
<strong>{{ reception.supplier ? reception.supplier.name : '-' }}</strong><br>
|
<strong>{{ reception.supplier ? reception.supplier.name : '-' }}</strong><br>
|
||||||
<span>{{ reception.address ? reception.address.street : '' }}</span><br>
|
<span>{{ reception.address ? reception.address.street : '' }}</span><br>
|
||||||
{% if reception.address and reception.address.street2 %}
|
{% if reception.address and reception.address.street2 %}
|
||||||
|
|||||||
Reference in New Issue
Block a user