From 7d45e42039ef2b25381d581d6efa6aa658fbb4a0 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 27 Jun 2014 20:58:30 +0200
Subject: [PATCH] =?UTF-8?q?Bug=20#1006=20ANCGL=20:=20export=20des=20pi?=
 =?UTF-8?q?=C3=A8ces=20dans=20un=20grand=20PDF=20avec=20un=20tampon=20Task?=
 =?UTF-8?q?=20#1006=20-=20ANCGL=20:=20export=20des=20pi=C3=A8ces=20dans=20?=
 =?UTF-8?q?un=20grand=20PDF=20avec=20un=20tampon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README                            |   2 +-
 html/export.php                   |  11 +-
 html/js/infobulle.js              |   2 +
 include/anc_great_ledger.inc.php  |  38 +++++--
 include/class_anc_grandlivre.php  | 176 ++++++++++++++++++------------
 include/class_document_export.php | 160 +++++++++++++++++++++++++++
 include/template/template.gif     | Bin 0 -> 6626 bytes
 release-note                      |  94 ----------------
 sql/upgrade.sql                   |  48 +-------
 9 files changed, 309 insertions(+), 222 deletions(-)
 create mode 100644 include/class_document_export.php
 create mode 100644 include/template/template.gif
 delete mode 100644 release-note

diff --git a/README b/README
index 5547d8570..b20ca8fa7 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
 Si vous avez besoin d'aide pour l'installation 
 utilisez la mailing list 
 Pour souscrire ou faire des recherches 
-    aller à http://mail.nongnu.org/mailman/listinfo/phpcompta-support
+    aller à https://lists.nongnu.org/mailman/listinfo/noalyss-generale
diff --git a/html/export.php b/html/export.php
index 8f8bbfb4f..90b027955 100644
--- a/html/export.php
+++ b/html/export.php
@@ -43,7 +43,14 @@ if ( $action=='X' || ! isset($_GET['act']) || $g_user->check_print($_GET['act'])
     exit();
   }
 // get file and execute it
-
- $prfile=$cn->get_value("select me_file from menu_ref where me_code=$1",array($_GET['act']));
+$action=HtmlInput::default_value_get('act', null);
+if ($action == null )
+{
+    die(_('Appel invalide'));
+}
+ $prfile=$cn->get_value("select me_file from menu_ref where me_code=$1",array($action));
+ if ( $prfile == "") {
+     die (_('Export impossible'));
+ }
  require_once $prfile;
  ?>
\ No newline at end of file
diff --git a/html/js/infobulle.js b/html/js/infobulle.js
index 36015afd7..3aa510847 100644
--- a/html/js/infobulle.js
+++ b/html/js/infobulle.js
@@ -64,6 +64,8 @@ content[33]='le type vaut :<ul>	<li> ME pour Menu</li>	<li> PR pour les impressi
 content[34]='Cliquez sur le code AD pour ouvrir le menu dans un nouvel onglet';
 content[35]='Cliquez sur le chemin pour ouvrir le menu';
 content[36]='En utilisant les dates d\'échéance ou de paiement, seuls les journaux de type ACH et VEN seront utilisés ,vous excluez d\'office les autres journaux';
+content[37]='Les dates sont en format DD.MM.YYYY';
+
 function showBulle(p_ctl){
     d=document.getElementById('bulle');
     d.innerHTML=content[p_ctl];
diff --git a/include/anc_great_ledger.inc.php b/include/anc_great_ledger.inc.php
index a21335589..a304d7e9b 100644
--- a/include/anc_great_ledger.inc.php
+++ b/include/anc_great_ledger.inc.php
@@ -3,17 +3,37 @@
 //see licence.txt
 
 if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once('class_anc_grandlivre.php');
-$gl = new Anc_GrandLivre($cn);
-$gl->get_request();
-echo '<form method="get">';
-echo $gl->display_form();
+
+require_once 'class_anc_grandlivre.php';
+
+$grandLivre=new Anc_Grandlivre($cn);
+
+$grandLivre->get_request();
+
+/*
+ * Form
+ */
+echo '<form method="get" >';
+echo $grandLivre->display_form();
 echo '<p>' . HtmlInput::submit('Recherche', _('Recherche')) . '</p>';
+echo HtmlInput::request_to_hidden(array('sa','ac','gDossier'));
 echo '</form>';
-if (isset($_GET['result']))
+
+$result=HtmlInput::default_value_request('result',null);
+
+if ($result != null)
 {
-    echo $gl->show_button();
-    echo $gl->display_html();
-    echo $gl->show_button();
+    echo '<span style="display:block">';
+      echo _('Tout sélectionner')." ".ICheckBox::toggle_checkbox('export_pdf_bt1','export_anc_receipt_pdf');
+    echo '</span>';
+    echo $grandLivre->show_button();
+    echo '<form method="GET" id="export_anc_receipt_pdf" action="export.php" style="display:inline">';
+  
+    echo $grandLivre->button_export_pdf();
+    echo $grandLivre->display_html();
+    echo $grandLivre->button_export_pdf();
+    echo HtmlInput::get_to_hidden(array('ac','gDossier','sa'));
+    echo '</form>';
+    echo $grandLivre->show_button();
 }
 ?>
diff --git a/include/class_anc_grandlivre.php b/include/class_anc_grandlivre.php
index 28ff9bcf5..2a3d920b4 100644
--- a/include/class_anc_grandlivre.php
+++ b/include/class_anc_grandlivre.php
@@ -27,7 +27,8 @@ require_once 'class_impress.php';
 
 class Anc_GrandLivre extends Anc_Print
 {
-	    function set_sql_filter()
+    
+    function set_sql_filter()
     {
         $sql="";
         $and=" and ";
@@ -114,7 +115,28 @@ class Anc_GrandLivre extends Anc_Print
 
         return $array;
     }
+    /* !
+     * \brief Show the button to export in PDF all the receipt
+     * 
+     * \param $p_string extra hidden value
+     * \return string with the button
+     */
 
+    function button_export_pdf($p_string = "")
+    {
+        $r = "";
+        $r.= HtmlInput::hidden("to", $this->to);
+        $r.= HtmlInput::hidden("from", $this->from);
+        $r.= HtmlInput::hidden("pa_id", $this->pa_id);
+        $r.= HtmlInput::hidden("from_poste", $this->from_poste);
+        $r.= HtmlInput::hidden("to_poste", $this->to_poste);
+        $r.= HtmlInput::hidden("act","PDF:AncReceipt");
+
+        $r.= $p_string;
+        $r.= dossier::hidden();
+        $r.=HtmlInput::submit('bt_receipt_anal_pdf', _("Export des pièces en PDF"));
+        return $r;
+    }
    /*!
      * \brief compute the html display
      *
@@ -123,79 +145,102 @@ class Anc_GrandLivre extends Anc_Print
      */
 
     function display_html()
-    {
-        $r="";
+   {
+        $r = "";
         //---Html
-        $array=$this->load();
-        if ( is_array($array) == false )
+        $array = $this->load();
+        if (is_array($array) == false)
         {
             return $array;
-
         }
 
-        if ( empty($array) )
+        if (empty($array))
         {
             $r.= _("aucune donnée");
             return $r;
         }
         $r.= '<table class="result" style="width=100%">';
-	$ix=0;$prev='xx';$idx=0;
-	$tot_deb=$tot_cred=0;
-        
-        foreach ( $array as $row )
-        {
-	  if ($prev != $row['po_name'])
-	    {
-	      if ( $ix>0)
-		{
-		  $r.='<tr>';
-		  $tot_solde=bcsub($tot_cred,$tot_deb);
-		  $sign=($tot_solde>0)?'C':'D';
-		  $r.=td('').td('').td('').td('').td('').td(nbm($tot_deb),' class="num"').td(nbm($tot_cred),' class="num"').td(nbm($tot_solde).$sign,' class="num"');
-		}
-	      $r.='<tr>'.'<td colspan="7" style="width:auto">'.'<h2>'.h($row['po_name'].' '.$row['po_description']).'</td></tr>';
-	      $r.= '<tr>'.
-		'<th>'._('Date').'</th>'.
-		'<th>'._('Poste').'</th>'.
-		'<th>'._('Quick_code').'</th>'.
-		'<th>'._('libelle').'</th>'.
-                '<th>'._('Pièce').'</th>'.
-		'<th>'._('Num.interne').'</th>'.
-		'<th style="text-align:right">'._('Debit').'</th>'.
-		'<th style="text-align:right">'._('Credit').'</th>'.
-		'</tr>';
+        $ix = 0;
+        $prev = 'xx';
+        $idx = 0;
+        $tot_deb = $tot_cred = 0;
 
-	      $tot_deb=$tot_cred=0;
-	      $prev=$row['po_name'];
-	      $ix++;
-	    }
-            $class=($idx%2==0)?'even':'odd'; $idx++;
-            $r.='<tr class="'.$class.'">';
-	    $detail=($row['jr_id'] != null)?HtmlInput::detail_op($row['jr_id'],$row['jr_internal']):'';
-	    $post_detail=($row['j_poste'] != null)?HtmlInput::history_account($row['j_poste'],$row['j_poste']):'';
-	    $card_detail=($row['f_id'] != null)?HtmlInput::history_card($row['f_id'],$row['qcode']):'';
-	    $amount_deb=($row['oa_debit']=='t')?$row['oa_amount']:0;
-	    $amount_cred=($row['oa_debit']=='f')?$row['oa_amount']:0;
-	    $tot_deb=bcadd($tot_deb,$amount_deb);
-	    $tot_cred=bcadd($tot_cred,$amount_cred);
+        foreach ($array as $row)
+        {
+            if ($prev != $row['po_name'])
+            {
+                if ($ix > 0)
+                {
+                    $r.='<tr>';
+                    $tot_solde = bcsub($tot_cred, $tot_deb);
+                    $sign = ($tot_solde > 0) ? 'C' : 'D';
+                    $r.=td('') . td('') . td('') . td('') . td('') . td(nbm($tot_deb), ' class="num"') . td(nbm($tot_cred), ' class="num"') . td(nbm($tot_solde) . $sign, ' class="num"');
+                }
+                $r.='<tr>' . '<td colspan="7" style="width:auto">' . '<h2>' . h($row['po_name'] . ' ' . $row['po_description']) . '</td></tr>';
+                $r.= '<tr>' .
+                        '<th>' . '</th>' .
+                        '<th>' . _('Date') . '</th>' .
+                        '<th>' . _('Poste') . '</th>' .
+                        '<th>' . _('Quick_code') . '</th>' .
+                        '<th>' . _('Libellé') . '</th>' .
+                        '<th>' . _('Document') . '</th>' .
+                        '<th>' . _('Pièce') . '</th>' .
+                        '<th>' . _('Num.interne') . '</th>' .
+                        '<th style="text-align:right">' . _('Debit') . '</th>' .
+                        '<th style="text-align:right">' . _('Credit') . '</th>' .
+                        '</tr>';
+
+                $tot_deb = $tot_cred = 0;
+                $prev = $row['po_name'];
+                $ix++;
+            }
+            $class = ($idx % 2 == 0) ? 'even' : 'odd';
+            $idx++;
+            $r.='<tr class="' . $class . '">';
+            $detail = ($row['jr_id'] != null) ? HtmlInput::detail_op($row['jr_id'], $row['jr_internal']) : '';
+            $post_detail = ($row['j_poste'] != null) ? HtmlInput::history_account($row['j_poste'], $row['j_poste']) : '';
+            $card_detail = ($row['f_id'] != null) ? HtmlInput::history_card($row['f_id'], $row['qcode']) : '';
+            $amount_deb = ($row['oa_debit'] == 't') ? $row['oa_amount'] : 0;
+            $amount_cred = ($row['oa_debit'] == 'f') ? $row['oa_amount'] : 0;
+            $tot_deb = bcadd($tot_deb, $amount_deb);
+            $tot_cred = bcadd($tot_cred, $amount_cred);
+
+            /*
+             * Checked button
+             */
+            $str_ck = "";
+            $str_document = "";
+            if ($row['jr_id'] != null)
+            {
+                /*
+                 * Get receipt info  
+                 */
+                $str_document = HtmlInput::show_receipt_document($row['jr_id']);
+                if ($str_document != "")
+                {
+                    $ck = new ICheckBox('ck[]', $row['jr_id']);
+                    $str_ck = $ck->input();
+                }
+            }
 
             $r.=
-                '<td>'.$row['oa_date'].'</td>'.
-	      td($post_detail).
-	      td($card_detail).
-	      //	      '<td>'.h($row['oa_description']).'</td>'.
-	      td($row['jr_comment']).
-              td($row['jr_pj_number']).
-	      '<td>'.$detail.'</td>'.
-	      '<td class="num">'.nbm($amount_deb).'</td>'.
-	      '<td class="num">'.nbm($amount_cred)
-	      .'</td>';
+                    '<td>' . $str_ck . '</td>' .
+                    '<td>' . $row['oa_date'] . '</td>' .
+                    td($post_detail) .
+                    td($card_detail) .
+                    td($row['jr_comment']) .
+                    '<td>' . $str_document . '</td>' .
+                    td($row['jr_pj_number']) .
+                    '<td>' . $detail . '</td>' .
+                    '<td class="num">' . nbm($amount_deb) . '</td>' .
+                    '<td class="num">' . nbm($amount_cred)
+                    . '</td>';
             $r.= '</tr>';
         }
-	$r.='<tr>';
-	$tot_solde=bcsub($tot_cred,$tot_deb);
-	$sign=($tot_solde>0)?'C':'D';
-	$r.=td('').td('').td('').td('').td('').td(nbm($tot_deb),' class="num"').td(nbm($tot_cred),' class="num"').td(nbm($tot_solde).$sign,' class="num"');
+        $r.='<tr>';
+        $tot_solde = bcsub($tot_cred, $tot_deb);
+        $sign = ($tot_solde > 0) ? 'C' : 'D';
+        $r.=td('') . td('') . td('') . td('') . td('') . td(nbm($tot_deb), ' class="num"') . td(nbm($tot_cred), ' class="num"') . td(nbm($tot_solde) . $sign, ' class="num"');
 
         $r.= '</table>';
         return $r;
@@ -212,19 +257,6 @@ class Anc_GrandLivre extends Anc_Print
     function show_button($p_string="")
     {
         $r="";
-   /*     $r.= '<form method="GET" action="export.php" style="display:inline">';
-        $r.= $p_string;
-        $r.= dossier::hidden();
-        $r.= HtmlInput::hidden("to",$this->to);
-        $r.= HtmlInput::hidden("act","PDF:AncGrandLivre");
-
-        $r.= HtmlInput::hidden("from",$this->from);
-        $r.= HtmlInput::hidden("pa_id",$this->pa_id);
-        $r.= HtmlInput::hidden("from_poste",$this->from_poste);
-        $r.= HtmlInput::hidden("to_poste",$this->to_poste);
-        $r.=HtmlInput::submit('bt_pdf',"Export en PDF");
-        $r.= '</form>';
-*/
         $r.= '<form method="GET" action="export.php"  style="display:inline">';
         $r.= HtmlInput::hidden("act","CSV:AncGrandLivre");
         $r.= HtmlInput::hidden("to",$this->to);
diff --git a/include/class_document_export.php b/include/class_document_export.php
new file mode 100644
index 000000000..b3bc1ee85
--- /dev/null
+++ b/include/class_document_export.php
@@ -0,0 +1,160 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of class_export_receipt
+ *
+ * @author dany
+ */
+class Document_Export
+{
+
+    function __construct()
+    {
+        // Create 2 temporary folders   1. convert to PDF + stamp
+        //                              2. store result
+        $this->feedback = array();
+        $this->store_convert = tempnam($_ENV['TMP'], 'convert_');
+        $this->store_pdf = tempnam($_ENV['TMP'], 'pdf_');
+        unlink($this->store_convert);
+        unlink($this->store_pdf);
+        umask(0);
+        mkdir($this->store_convert);
+        mkdir($this->store_pdf);
+    }
+
+    function concatenate_pdf()
+    {
+        $stmt = PDFTK . " " . $this->store_pdf . '/stamp_*pdf  output ' . $this->store_pdf . '/result.pdf';
+        $status = 0;
+        echo $stmt;
+        passthru($stmt, $status);
+
+        if ($status <> 0)
+        {
+            $cnt_feedback = count($this->feedback);
+            $this->feedback[$cnt_feedback]['file'] = 'result.pdf';
+            $this->feedback[$cnt_feedback]['message'] = ' cannot concatenate PDF';
+            $this->feedback[$cnt_feedback]['error'] = $status;
+        }
+    }
+
+    function move_file($p_source, $target)
+    {
+        copy($p_source, $this->store_pdf . '/' . $target);
+    }
+
+    function send_pdf()
+    {
+        header('Content-Type: application/x-download');
+        header('Content-Disposition: attachment; filename="result.pdf"');
+        header('Cache-Control: private, max-age=0, must-revalidate');
+        header('Pragma: public');
+        echo file_get_contents($this->store_pdf . '/result.pdf');
+    }
+
+    function clean_folder()
+    {
+        //unlink($this->store_convert . '/*.pdf');
+    }
+
+    /**
+     * @brief export all the pieces in PDF
+     * @param $p_array contents all the jr_id
+     */
+    function export_all($p_array)
+    {
+        ob_start();
+        var_dump($p_array);
+        global $cn;
+
+        $cn->start();
+        foreach ($p_array as $value)
+        {
+            // For each file save it into the temp folder,
+            $file = $cn->get_array('select jr_pj,jr_pj_name,jr_pj_number,jr_pj_type from jrn '
+                    . ' where jr_id=$1', array($value));
+            if ($file[0]['jr_pj'] == '')
+                continue;
+
+            $cn->lo_export($file[0]['jr_pj'], $this->store_convert . '/' . $file[0]['jr_pj_name']);
+
+            // Convert this file into PDF 
+            if ($file[0]['jr_pj_type'] != 'application/pdf')
+            {
+                $status = 0;
+                passthru(OFFICE . " " . $this->store_convert . '/' . $file[0]['jr_pj_name'], $status);
+                if ($status <> 0)
+                {
+                    $this->feedback[$cnt_feedback]['file'] = $file[0]['jr_pj_name'];
+                    $this->feedback[$cnt_feedback]['message'] = ' cannot convert to PDF';
+                    $this->feedback[$cnt_feedback]['error'] = $status;
+                    $cnt_feedback++;
+                    continue;
+                }
+            }
+
+            // Create a image with the stamp + formula
+            $img = imagecreatefromgif(__DIR__ . '/template/template.gif');
+            $font = imagecolorallocatealpha($img, 100, 100, 100, 110);
+            imagettftext($img, 40, 25, 500, 1000, $font, __DIR__ . '/tfpdf/font/unifont/DejaVuSans.ttf', _("Copie certifiée conforme à l'original"));
+            imagettftext($img, 40, 25, 550, 1100, $font, __DIR__ . '/tfpdf/font/unifont/DejaVuSans.ttf', $file[0]['jr_pj_number']);
+            imagettftext($img, 40, 25, 600, 1200, $font, __DIR__ . '/tfpdf/font/unifont/DejaVuSans.ttf', $file[0]['jr_pj_name']);
+            imagegif($img, $this->store_convert . '/' . 'stamp.gif');
+
+            // transform gif file to pdf with convert tool
+            $stmt = CONVERT_GIF_PDF . " " . escapeshellarg($this->store_convert . '/' . 'stamp.gif') . " " . escapeshellarg($this->store_convert . '/stamp.pdf');
+            passthru($stmt, $status);
+
+            if ($status <> 0)
+            {
+                $this->feedback[$cnt_feedback]['file'] = 'stamp.pdf';
+                $this->feedback[$cnt_feedback]['message'] = ' cannot convert to PDF';
+                $this->feedback[$cnt_feedback]['error'] = $status;
+                $cnt_feedback++;
+                continue;
+            }
+
+            // 
+            // remove extension
+            $ext = strrpos($file[0]['jr_pj_name'], ".");
+            $file_pdf = substr($file[0]['jr_pj_name'], 0, $ext);
+            $file_pdf .=".pdf";
+
+            // output
+            $output = $this->store_convert . '/stamp_' . $file_pdf;
+
+            // Concatenate stamp + file
+            $stmt = PDFTK . " " . escapeshellarg($this->store_convert . '/' . $file_pdf) . ' stamp ' . $this->store_convert .
+                    '/stamp.pdf output ' . $output;
+
+            passthru($stmt, $status);
+            echo $stmt;
+            if ($status <> 0)
+            {
+
+                $this->feedback[$cnt_feedback]['file'] = $file_pdf;
+                $this->feedback[$cnt_feedback]['message'] = ' cannot convert to stamped PDF';
+                $this->feedback[$cnt_feedback]['error'] = $status;
+                $cnt_feedback++;
+                continue;
+            }
+            // Move the PDF into another temp directory 
+            $this->move_file($output, 'stamp_' . $file_pdf);
+        }
+        $this->concatenate_pdf();
+        ob_clean();
+        $this->send_pdf();
+
+        // remove files from "conversion folder"
+        $this->clean_folder();
+        var_dump($this->feedback);
+        // concatenate all pdf into one
+    }
+
+}
diff --git a/include/template/template.gif b/include/template/template.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ab44205fed5f41869d060fd6cc3f672fc723573b
GIT binary patch
literal 6626
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

literal 0
HcmV?d00001

diff --git a/release-note b/release-note
deleted file mode 100644
index 27a213418..000000000
--- a/release-note
+++ /dev/null
@@ -1,94 +0,0 @@
-===================================================================
-|| Done
-===================================================================
-
-Favori
-======
-Permet d'avoir une liste qui apparaît dans une fenêtre interne avec
-les menus que vous utilisez le plus
-
-Navigateur
-==========
-Permet d'accèder rapidement au menu nécessaire, il y a plus
-d'explication sur les menu
-
-Impression journaux
-===================
-Anciennement appelé impression - historique -> changer dans menu_ref
-Permet impression des journaux vente et achat avec détail pour la TVA, la partie
-non déductible et la partie privée
-
-Modéle d'opération
-==================
-Amélioration : Fenêtre interne avec filtrage et une description des
-modèles, la limite est plus élevée aussi
-
-Impression journaux 
-===================
-Anciennement appelé impression - historique -> changer dans menu_ref
-Permet impression des journaux vente et achat avec détail pour la TVA, la partie
-non déductible et la partie privée
-
-
-Protection fichier include
-==========================
-Ajout d'une sécurité supplémentaire
-
-Préférence 
-==========
-Dans fenêtre interne
-
-Action - Suivi
-===============
-1. Ajout de tags (table tag et action_tag) (v)
-2. changement présentation liste (x)
-3. Ajout menu : CFGTAG pour gèrer les tags : description, nom ...
-4. Ajout d'un ou plusieurs tags par action, un tag n'est pas un type de document
- Sécurité : vérifier que l'utilisateur peut ajouter ou enlever des tags à une action 
-Changement présentation Détail action : les détails (qui/quand) sont à mettre dans la colonne de gauche
-
-Journaux
-========
-Suivi type de journal montrer ou cacher les bons détails
-Pour ACH indiquer Fournisseur (D) et Services ou Marchandises achetés
-Pour VEN indiquer Client (C) et Services ou Marchandises vendus
-Pour FIN indiquer Compte tiers (D/C) et surtout permettre de créer un fiche de type trésorerie (frd_id=4)
-
-Fiche
-=====
-Si aucun quickcode n'est donné, il en sera calculé un en se basant sur le nom de la fiche (5ière lettre) + n° si duplicate
-code php 
-fiche_def.inc.php
-
-Action - Suivi
-===============
-Recherche par tag
-L'avoir dans les changements de page
-Tag repris dans le bouton retour
-Visible dans la recherche après une recherche
-Possibilité d'ajouter / enlever des tags à plusieurs documents
-Possibilité d'avoir une impression web de plusieurs documents
-Possibilité de changer l'état de plusieurs documents
-
-Date de paiement
-================
-Lors de rapprochement
-Dans le détail journaux ACH et VEN
-Dans l'impression PRINTJRN + export CSV
-Dans l'historique
-
-===================================================================
-|| A faire
-===================================================================
-
-
-Document à générer
-=================
-Par journal
-ou par profil
-
-
-
-
-
-
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 27bd799be..26c24e0ba 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,48 +1,8 @@
 insert into fiche_def_ref(frd_id,frd_text) values (26,'Projet');
 insert into attr_min (frd_id,ad_id) values (26,1),(26,9);
 
-DROP VIEW v_detail_purchase;
+INSERT INTO menu_ref(
+            me_code, me_menu, me_file,   me_type)
+    VALUES ('PDF:AncReceipt', 'Export pièce PDF',  'export_anc_receipt_pdf.php','PR');
 
-CREATE OR REPLACE VIEW v_detail_purchase AS 
- WITH m AS (
-         SELECT sum(quant_purchase.qp_price) AS htva, sum(quant_purchase.qp_vat) AS tot_vat, jrn.jr_id
-           FROM quant_purchase
-      JOIN jrnx USING (j_id)
-   JOIN jrn ON jrnx.j_grpt = jrn.jr_grpt_id
-  GROUP BY jrn.jr_id
-        )
- SELECT jrn.jr_id, jrn.jr_date, jrn.jr_date_paid,jr_ech,
- jrn.jr_tech_per, jrn.jr_comment, 
- jrn.jr_pj_number, jrn.jr_internal, 
- jrn.jr_def_id, jrnx.j_poste, 
- jrnx.j_text, jrnx.j_qcode, 
- quant_purchase.qp_fiche AS item_card, a.name AS item_name, 
- quant_purchase.qp_supplier, b.vw_name AS tiers_name, 
- b.quick_code, tva_rate.tva_label, 
- tva_rate.tva_comment, tva_rate.tva_both_side, quant_purchase.qp_vat_sided AS vat_sided, quant_purchase.qp_vat_code AS vat_code, quant_purchase.qp_vat AS vat, quant_purchase.qp_price AS price, quant_purchase.qp_quantite AS quantity, quant_purchase.qp_price / quant_purchase.qp_quantite AS price_per_unit, quant_purchase.qp_nd_amount AS non_ded_amount, quant_purchase.qp_nd_tva AS non_ded_tva, quant_purchase.qp_nd_tva_recup AS non_ded_tva_recup, m.htva, m.tot_vat
-   FROM jrn
-   JOIN jrnx ON jrn.jr_grpt_id = jrnx.j_grpt
-   JOIN quant_purchase USING (j_id)
-   JOIN vw_fiche_name a ON quant_purchase.qp_fiche = a.f_id
-   JOIN vw_fiche_attr b ON quant_purchase.qp_supplier = b.f_id
-   JOIN tva_rate ON quant_purchase.qp_vat_code = tva_rate.tva_id
-   JOIN m ON m.jr_id = jrn.jr_id;
-
-DROP VIEW v_detail_sale;
-
-CREATE OR REPLACE VIEW v_detail_sale AS 
- WITH m AS (
-         SELECT sum(quant_sold.qs_price) AS htva, sum(quant_sold.qs_vat) AS tot_vat, jrn.jr_id
-           FROM quant_sold
-      JOIN jrnx USING (j_id)
-   JOIN jrn ON jrnx.j_grpt = jrn.jr_grpt_id
-  GROUP BY jrn.jr_id
-        )
- SELECT jrn.jr_id, jrn.jr_date, jrn.jr_date_paid,jr_ech,jrn.jr_tech_per, jrn.jr_comment, jrn.jr_pj_number, jrn.jr_internal, jrn.jr_def_id, jrnx.j_poste, jrnx.j_text, jrnx.j_qcode, quant_sold.qs_fiche AS item_card, a.name AS item_name, quant_sold.qs_client, b.vw_name AS tiers_name, b.quick_code, tva_rate.tva_label, tva_rate.tva_comment, tva_rate.tva_both_side, quant_sold.qs_vat_sided AS vat_sided, quant_sold.qs_vat_code AS vat_code, quant_sold.qs_vat AS vat, quant_sold.qs_price AS price, quant_sold.qs_quantite AS quantity, quant_sold.qs_price / quant_sold.qs_quantite AS price_per_unit, m.htva, m.tot_vat
-    FROM jrn
-   JOIN jrnx ON jrn.jr_grpt_id = jrnx.j_grpt
-   JOIN quant_sold USING (j_id)
-   JOIN vw_fiche_name a ON quant_sold.qs_fiche = a.f_id
-   JOIN vw_fiche_attr b ON quant_sold.qs_client = b.f_id
-   JOIN tva_rate ON quant_sold.qs_vat_code = tva_rate.tva_id
-   join  m on m.jr_id=jrn.jr_id;
\ No newline at end of file
+insert into profile_menu(me_code,p_id,p_type_display,pm_default) values ('PDF:AncReceipt',1,'P',0);
\ No newline at end of file