diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 17947e6e3ed..3a28ddb22a5 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1673,6 +1673,14 @@ else if ($action == 'remove_file')
}
}
+// Print file
+else if ($action == 'print_file' AND $user->rights->printipp->use)
+{
+ require_once DOL_DOCUMENT_ROOT.'/core/class/dolprintipp.class.php';
+ $printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
+ $printer->print_file(GETPOST('file',alpha),GETPOST('printer',alpha));
+}
+
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer)
{
if ($action == 'addcontact')
@@ -3421,9 +3429,11 @@ else if ($id > 0 || ! empty($ref))
$urlsource=$_SERVER['PHP_SELF'].'?facid='.$object->id;
$genallowed=$user->rights->facture->creer;
$delallowed=$user->rights->facture->supprimer;
+ $printer = false;
+ if ($user->rights->printipp->use AND $conf->printipp->enabled) $printer = true;
print '
';
- print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+ print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang,$printer);
$somethingshown=$formfile->numoffiles;
/*
diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
index 30ddbfe254a..e4507de19b8 100644
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@@ -138,10 +138,33 @@ class dolprintIPP
$ipp->setPrinterURI("ipp://localhost:631/printers/");
}
}
- echo 'Jobs for : '.$this->userid.' module : '.$module.' Printer : '.$obj->printer_name.'
';
- echo "Getting Jobs: ".$ipp->getJobs(true,3,"completed",true)."
";
-
- echo "
";print_r($ipp->jobs_attributes); echo ""; + // Getting Jobs + $ipp->getJobs(false,0,'completed',false); + print '
| Id | "; + print "Owner | "; + print "Printer | "; + print "File | "; + print "Status | "; + print "Cancel | "; + print "
| '.$value->job_id->_value0.' | '; + print ''.$value->job_originating_user_name->_value0.' | '; + print ''.$value->printer_uri->_value0.' | '; + print ''.$value->job_name->_value0.' | '; + print ''.$value->job_state->_value0.' | '; + print ''.$value->job_uri->_value0.' | '; + print '