Index: www-lp/www/admin/orders.php
===================================================================
diff -u -r29 -r33
--- www-lp/www/admin/orders.php	(.../orders.php)	(revision 29)
+++ www-lp/www/admin/orders.php	(.../orders.php)	(revision 33)
@@ -719,7 +719,7 @@
 // <- OSC-99 - Gestion des agents commerciaux
 // <- ORED5066+MANORM155
 // -> VDUPS: génération du fichier XML/UPS
-      $contents[] = array('align' => 'center', 'text' => '<a style="border-radius:3px;" href="' . tep_href_link('edit_form_chronopost.php', tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $_GET['oID'] . '&action=edit') . '">' . tep_image_button('button_chronopost.gif', IMAGE_CHRONOPOST) . '</a>'); 
+      $contents[] = array('align' => 'center', 'text' => '<a style="border-radius:3px;" href="' . tep_href_link('edit_form_chronopost.php', tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $oInfo->orders_id . '&action=edit') . '">' . tep_image_button('button_chronopost.gif', IMAGE_CHRONOPOST) . '</a>'); 
       $contents[] = array('align' => 'center', 'text' => '<a href="' . tep_href_link(FILENAME_EXPORT_UPS, "page=" . $HTTP_GET_VARS['page'] . '&oID=' . $oInfo->orders_id) . '">' . accrosys_tep_image('logo_ups', IMAGE_ORDERS_UPS) . '</a>');
 // <- VDUPS: génération du fichier XML/UPS
 // -> 0000003: affichage bouton exapaq
Index: www-lp/www/admin/edit_form_chronopost.php
===================================================================
diff -u -r31 -r33
--- www-lp/www/admin/edit_form_chronopost.php	(.../edit_form_chronopost.php)	(revision 31)
+++ www-lp/www/admin/edit_form_chronopost.php	(.../edit_form_chronopost.php)	(revision 33)
@@ -14,7 +14,6 @@
   include('includes/classes/order.php');
 
 $oID = tep_db_prepare_input($_GET['oID']);
-//$order = new manualOrder($oID);
 $order = new Order($oID);
 
 
@@ -302,7 +301,6 @@
 
  
   <style>
-
     /* Conteneur principal du formulaire */
     form {
       width: 100%;
@@ -434,6 +432,7 @@
     justify-content: start;
 }
 
+
   </style>
 
 </head>
@@ -521,37 +520,26 @@
         window.location.href = '?action=exporte';
     }
 
-
 $(function () {
-    var initialCollapse = localStorage.collapse ;
-    if (initialCollapse) initialCollapse = initialCollapse.split(",")
+
     $(".collapse-headings>a").click(function () {
         var div = $(this).parent();
-
         div.toggleClass("close open");
-
-
         $(".collapse-content", div).toggle("slow");
+    });
 
-        localStorage.collapse = $(".collapse-headings").map(function () {
-            return $(this).hasClass("open") ? "open" : "close"
-        }).get()
-        console.log(localStorage.collapse)
-        return false;
-    })
-    if (initialCollapse) {
-        $(".collapse-headings>a").each(function (i) {
+    $(".collapse-headings>a").each(function () {
             var div = $(this).parent();
-            div.removeClass("close open").addClass(initialCollapse[i])
+            if ( div.hasClass("close") ) {
+                $(".collapse-content", div).hide();
+            }
+            else {
+                $(".collapse-content", div).show();
+            }
+        });
 
-            $(".collapse-content", div).toggle(initialCollapse[i] !== "close");
-
-        })
-    }
-
 });
 
-
   </script>
 <?php require(DIR_WS_INCLUDES . 'header.php'); ?>
 <table border="0" width="100%" cellspacing="2" cellpadding="3">
@@ -564,11 +552,11 @@
         </td>
         <td width="1000" valign="top">
             <table width="100%" border="0" cellspacing="0" cellpadding="2">
-                <!--<div>NB : Il faut éviter les caractères accentués.</div>-->
+            <div colspan="3" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, 'page=' . $HTTP_GET_VARS['page'] . "&oID=$oID") . '">' . tep_image_button('button_back.gif', "Retour") . '</a>'; ?></div>
                 <?php echo tep_draw_form('edit_form_chronopost', "edit_form_chronopost.php", tep_get_all_get_params(array('action')) . 'action=edit_form', 'post', 'id=myForm onsubmit="return validateForm()"');?>
-                <div class="collapse-headings" id="collapse-headings"><strong>Section destinataire</strong>
+                <div class="collapse-headings" id="collapse-headings"><strong>Section destinataire</strong> 
+                <br>
                     <br>
-                    <br>
                     <div class="">
                         <div class="form-section">
                             <div class="form-group fr">
@@ -579,7 +567,7 @@
                                         <option value="business">Professionnel</option>
                                         <option value="customer">Particulier</option>
                                     <?php }
-                                        else if($customer_type['customers_group_id'] === '0'){?>
+                                        else { ?>
                                             <option value="customer">Particulier</option>
                                             <option value="business">Professionnel</option>
                                     <?php } ?>
@@ -592,17 +580,31 @@
                                 <span class="">&nbsp;2&nbsp;</span>
                                 <label for="company" class="size">Société destinataire <br> ou Nom et prénom</label>
                                 <?php 
-                                $societe_destinataire_value = $order->delivery['name'];
-                                if($order->delivery['company'] != ""){
-                                    $societe_destinataire_value = $order->delivery['company'] . " - " . $societe_destinataire_value; 
-                                } ?>
+                                // détermination des champs societe_destinataire et nom_destinataire
+                                if($order->delivery['company'] != "") {  // société
+                                    $societe_destinataire_value = $order->delivery['company'];
+                                    // on fournit en plus le nom associé à la livraison, peut être utile pour le livreur
+                                    $nom_destinataire_value = $order->delivery['name'];
+                                }
+                                else {                                  // particulier
+                                    // pas de société, on fournit uniquement le nom associé à la livraison
+                                    $societe_destinataire_value = $order->delivery['name'];
+                                    $nom_destinataire_value = "";
+                                }
+                                ?>
                                     <input class="size" id='company' name="societe_destinataire" size="30" value="<?php echo $societe_destinataire_value; ?>" maxlength="38" required>
 
                                     <span class="fieldRequired">*</span>
                                     <span>&nbsp;&nbsp;</span>
                             </div>
-
                             <div class="form-group fr">
+                                <span class="">&nbsp;3&nbsp;</span>
+                                <label for="nom_destinataire" class="size">Nom destinataire</label>
+                                <input type="text" name="nom_destinataire" size="30" value="<?php echo $nom_destinataire_value; ?>" maxlength="38">
+                                <span>&nbsp;&nbsp;</span> <!-- Colonne vide pour alignement -->
+                                <span>&nbsp;&nbsp;</span>
+                            </div>
+                            <div class="form-group fr">
                                 <span class="">&nbsp;5&nbsp;</span>
                                 <label for="adresse_destinataire" class="size">Adresse destinataire</label>
                                 <input type="text" name="adresse_destinataire" size="30" value="<?php echo $order->delivery['street_address']?>" class="size" maxlength="38" required>
@@ -677,18 +679,11 @@
                         </div>
                     </div>
                 </div>
-                <div class="collapse-headings open"><a href="#"><strong>. . .</strong></a>
+                <div class="collapse-headings close"><a href="#"><strong>. . .</strong></a>
                     <br>
                     <div class="collapse-content">
                         <div class="form-section">
                             <div class="form-group fr">
-                                <span class="">&nbsp;3&nbsp;</span>
-                                <label for="nom_destinataire" class="size">Nom destinataire</label>
-                                <input type="text" name="nom_destinataire" size="30" value="" class="size">
-                                <span>&nbsp;&nbsp;</span> <!-- Colonne vide pour alignement -->
-                                <span>&nbsp;&nbsp;</span>
-                            </div>
-                            <div class="form-group fr">
                                 <span class="">&nbsp;4&nbsp;</span>
                                 <label for="prenom_destinataire" class="size">Prénom destinataire</label>
                                 <input type="text" name="prenom_destinataire" size="30" value="" class="size">
@@ -785,7 +780,7 @@
                                 <span class="fieldRequired"><?php echo REQUIRE_DESCRIPTION; ?></span>
                             </div>
                         </div>
-                        <div class="collapse-headings open package-one" id="collapse-headings-1"><strong>. . .</strong><a href="#"> </a>
+                        <div class="collapse-headings close package-one" id="collapse-headings-1"><strong>. . .</strong><a href="#"> </a>
                             <div class="collapse-content">
 
                                 <div class="form-group fr">
@@ -877,7 +872,7 @@
                     </div>
                 </div>
                             
-                <div class="collapse-headings open package-two"><strong>Colis 2</strong><a href="#"> </a>
+                <div class="collapse-headings close package-two"><strong>Colis 2</strong><a href="#"> </a>
                     <div class="collapse-content">
                         <div class="form-section">
                             <div class="form-group fr">
@@ -991,7 +986,7 @@
                     </div>
                 </div>
 
-                <div class="collapse-headings open package-three"><strong>Colis 3</strong><a href="#"> </a>
+                <div class="collapse-headings close package-three"><strong>Colis 3</strong><a href="#"> </a>
                     <div class="collapse-content">
                         <div class="form-section">
                             <div class="form-group fr">
@@ -1342,8 +1337,7 @@
     refresh_screen();
 });
 
-
-   </script>
+</script>
 </body>
 </html>
 <?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file