(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 8d90b23f21ab774cbed413a1b07ce330515d48d6..fef184b0ab0f23b5e6405de47ac2fe18be5a4e5a 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -427,9 +427,9 @@ class extranetAjax {
        public static function valideFacture($args, &$x) {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
-               $dao->valide($args[1]);\r
+               $id=$dao->valide($args[1]);\r
 \r
-               $x->addTruePopup('/voirfacture/' . $args[1]);\r
+               $x->addTruePopup('/voirfacture/' . $id);\r
                $x->addRedirection(SITE_PATH . 'factures');\r
        }\r
 \r

diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php
index 77c4d8cf749f16c78f9782a8a23ee7524426b615..181d5da487d0b65b32d6d5f00462cd8a4ad0daf4 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.facture.php
+++ b/inc/extranet/DAO/class.extranet.dao.facture.php
@@ -317,7 +317,7 @@ class extranetDAOFacture extends commonDAO {
                        $new_id = $facture_id;\r
                }\r
 \r
-               return $this->changeStatus($new_id, 1);\r
+               return $new_id;\r
        }\r
 \r
        public function idBrouillonToIdNormal($facture_id) {\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 12213be8633cc2541a6ee739a77a52a7dee08aa5..5fcb0b1282c72dc75c7fc26cbc2142641c4d4503 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -332,7 +332,7 @@ class wsAjax extends cubeAjax {
                        $data = array();\r
                        $data['nom'] = $_POST['new_book_project_nom'];\r
                        $data['chef'] = $core->user->utilisateur_id;\r
-                       $data['client'] = $book->proprietaire_id;\r
+                       $data['client'] = $book->facturable_id;\r
                        $data['devis'] = 0;\r
                        $data['projet_id'] = 'new';\r
                        $project = $daoProjet->sauve($data);\r