From 7f91713c4a93fe41421b8752223de2eb073d53ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Apr 2021 14:06:30 +0200
Subject: [PATCH] Fix merge not complete

---
 htdocs/comm/index.php | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 54d9453971d..17f1f20718f 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -809,7 +809,6 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 }
 
 
-<<<<<<< HEAD
 /*
  * Opened (validated) order
  */
@@ -822,14 +821,6 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-=======
-	$sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.fk_statut, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
-    $sql .= ", s.code_client";
-	$sql .= ", s.entity";
-    $sql .= ", s.email";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE c.entity IN (".getEntity($orderstatic->element).")";
 	$sql .= " AND c.fk_soc = s.rowid";
@@ -862,18 +853,11 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 
 				$orderstatic->id = $obj->commandeid;
 				$orderstatic->ref = $obj->ref;
-<<<<<<< HEAD
 				$orderstatic->ref_client = $obj->ref_client;
+				$orderstatic->statut = $obj->fk_statut;
 				$orderstatic->total_ht = $obj->total_ht;
 				$orderstatic->total_tva = $obj->total_tva;
 				$orderstatic->total_ttc = $obj->total_ttc;
-=======
-				$orderstatic->statut = $obj->fk_statut;
-                $orderstatic->ref_client = $obj->ref_client;
-                $orderstatic->total_ht = $obj->total_ht;
-                $orderstatic->total_tva = $obj->total_tva;
-                $orderstatic->total_ttc = $obj->total_ttc;
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;