From 76efc31b00d03ecf24d75fb4ce81051a588aa3ac Mon Sep 17 00:00:00 2001
From: tarrsalah <tarrsalah@gmail.com>
Date: Thu, 5 Oct 2017 09:51:17 +0100
Subject: [PATCH 1/3] WIP fix supplier payement modelpath.

---
 htdocs/fourn/class/paiementfourn.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 25639bfd3f9..7a709bbce94 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -702,7 +702,7 @@ class PaiementFourn extends Paiement
 		}
 		else
 		{
-            $modelpath = "core/modules/supplier_payment/pdf/";
+            $modelpath = "core/modules/supplier_payment/doc/";
 
             return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}

From 711bbe0afbb3051b670805c25ee773ad0d8d617f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Oct 2017 11:09:09 +0200
Subject: [PATCH 2/3] FIX #7546

---
 htdocs/projet/activity/perday.php  | 4 ++--
 htdocs/projet/activity/perweek.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 3dbf7e32650..9f5a69941b1 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -107,7 +107,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 {
     $action = '';
     $search_categ='';
-    $search_usertoprocessid = '';
+    $search_usertoprocessid = $user->id;
     $search_task_ref = '';
     $search_task_label = '';
     $search_project_ref = '';
@@ -506,7 +506,7 @@ print '</form>';
 
 print '<script type="text/javascript">';
 print "jQuery(document).ready(function () {\n";
-print '		jQuery(".timesheetalreadyrecorded").tipTip({ maxWidth: "600px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50, content: \''.dol_escape_js($langs->trans("TimeAlreadyRecorded", $user->getFullName($langs))).'\'});';
+print '		jQuery(".timesheetalreadyrecorded").tipTip({ maxWidth: "600px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50, content: \''.dol_escape_js($langs->trans("TimeAlreadyRecorded", $usertoprocess->getFullName($langs))).'\'});';
 print "});";
 print '</script>';
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 3b6ce8efd91..e91d5572c99 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -120,7 +120,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 {
     $action = '';
     $search_categ='';
-    $search_usertoprocessid = '';
+    $search_usertoprocessid = $user->id;
     $search_task_ref = '';
     $search_task_label = '';
     $search_project_ref = '';
@@ -528,7 +528,7 @@ $modeinput='hours';
 
 print '<script type="text/javascript">';
 print "jQuery(document).ready(function () {\n";
-print '		jQuery(".timesheetalreadyrecorded").tipTip({ maxWidth: "600px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50, content: \''.dol_escape_js($langs->trans("TimeAlreadyRecorded", $user->getFullName($langs))).'\'});';
+print '		jQuery(".timesheetalreadyrecorded").tipTip({ maxWidth: "600px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50, content: \''.dol_escape_js($langs->trans("TimeAlreadyRecorded", $usertoprocess->getFullName($langs))).'\'});';
 $i=0;
 while ($i < 7)
 {

From 7767f03e9c1c9759647385a9affa326d977c8dd3 Mon Sep 17 00:00:00 2001
From: tarrsalah <tarrsalah@gmail.com>
Date: Thu, 5 Oct 2017 10:44:08 +0100
Subject: [PATCH 3/3] WIP: reuse actions_builddoc to build/remove supplier
 payment doc.

---
 htdocs/fourn/paiement/card.php | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index ee32ddcfb05..91586c86449 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -140,30 +140,10 @@ if ($action == 'setdatep' && ! empty($_POST['datepday']))
 }
 
 // Build document
-if ($action == 'builddoc')
-{
-	// Save modele used
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-
-	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-    $outputlangs = $langs;
-    $newlang=GETPOST('lang_id','aZ09');
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
-    if (! empty($newlang))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
-	$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-    if ($result	< 0)
-    {
-		setEventMessages($object->error, $object->errors, 'errors');
-	    $action='';
-    }
-}
+$upload_dir = $conf->fournisseur->payment->dir_output;
+// TODO: get the appropriate permisson
+$permissioncreate = true;
+include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
 /*