From 90eeb8ff94a63db48b2bf6bbbdb3ee76a58089d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Tue, 6 Mar 2012 17:53:55 +0100 Subject: [PATCH 1/2] Agenda export: Tweaked HTTP headers for Google Agenda import --- htdocs/public/agenda/agendaexport.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index d4eea8f36a9..53fc43c00e0 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -155,6 +155,9 @@ if ($format == 'ical' || $format == 'vcal') // Ajout directives pour resoudre bug IE //header('Cache-Control: Public, must-revalidate'); //header('Pragma: public'); + + // Google Agenda import tweak + header('Cache-Control: max-age=7200, private, must-revalidate'); // Clean parameters $outputfile=$conf->agenda->dir_temp.'/'.$filename; From 9237d7b8ee443529cade98265e14eaff08394557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 26 Apr 2012 15:32:34 +0200 Subject: [PATCH 2/2] Fix: typo in unset --- htdocs/compta/facture.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index b2f625d972e..814ca85636f 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1112,7 +1112,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights- unset($_POST['qty']); unset($_POST['type']); unset($_POST['idprod']); - unset($_POST['remmise_percent']); + unset($_POST['remise_percent']); unset($_POST['dp_desc']); unset($_POST['np_desc']); unset($_POST['np_price']);