'.$langs->trans("ClosePaidInvoicesAutomatically");
+ print '
';
}
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 6c70b73030f..c8b2ad9a057 100644
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -520,3 +520,14 @@ create table llx_c_price_global_variable_updater
ALTER TABLE llx_adherent CHANGE COLUMN note note_private text DEFAULT NULL;
ALTER TABLE llx_adherent ADD COLUMN note_public text DEFAULT NULL after note_private;
+CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product (
+ rowid integer NOT NULL auto_increment PRIMARY KEY,
+ fk_product integer NOT NULL,
+ file_name varchar(200) NOT NULL,
+ lang varchar(5) DEFAULT NULL,
+ fk_user_author integer DEFAULT NULL,
+ fk_user_mod integer NOT NULL,
+ datec datetime NOT NULL,
+ tms timestamp NOT NULL,
+ import_key varchar(14) DEFAULT NULL
+) ENGINE=InnoDB;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
new file mode 100644
index 00000000000..93af93c9190
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
@@ -0,0 +1,28 @@
+--
+-- Copyright (C) 2013 Florian HENRY
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see ';
$quantite_livree = $commande->livraisons[$line->id];
- print $quantite_livree;;
+ print $quantite_livree;
print ' ';
$quantite_commandee = $line->qty;
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index cf4034308ef..a217f34d939 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -367,7 +367,7 @@ if ($comments) {
}
else
{
- print $langs->trans("NoCommentYet").'
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
- print ''.$productstatic->getNomUrl(1,'composition').' ';;
+ print ''.$productstatic->getNomUrl(1,'composition').' ';
print ' ';
}
print '';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 810a131be60..615f4accf70 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -33,6 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
+ require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
$langs->load("other");
$langs->load("products");
@@ -84,8 +86,70 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
if (empty($reshook))
{
+ //Delete line if product propal merge is linked to a file
+ if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
+ if ($action == 'confirm_deletefile' && $confirm == 'yes')
+ {
+ print 'toto';
+ //extract file name
+ $urlfile = GETPOST('urlfile', 'alpha');
+ $filename = basename($urlfile);
+ $filetomerge = new Propalmergepdfproduct($db);
+ $filetomerge->fk_product=$object->id;
+ $filetomerge->file_name=$filename;
+ $result=$filetomerge->delete_by_file($user);
+ if ($result<0) {
+ setEventMessage($filetomerge->error,'errors');
+ }
+ }
+ }
+
// Action sending file
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_pre_headers.tpl.php';
+
+}
+
+if ($action=='filemerge') {
+ $is_refresh = GETPOST('refresh');
+ if (empty($is_refresh)) {
+
+ $filetomerge_file_array = GETPOST('filetoadd');
+
+ $filetomerge_file_array = GETPOST('filetoadd');
+
+ if ($conf->global->MAIN_MULTILANGS) {
+ $lang_id = GETPOST('lang_id');
+ }
+
+ // Delete all file already associated
+ $filetomerge = new Propalmergepdfproduct($db);
+
+ if ($conf->global->MAIN_MULTILANGS) {
+ $result=$filetomerge->delete_by_product($user, $object->id, $lang_id);
+ } else {
+ $result=$filetomerge->delete_by_product($user, $object->id);
+ }
+ if ($result<0) {
+ setEventMessage($filetomerge->error,'errors');
+ }
+
+ // for each file checked add it to the product
+ if (is_array($filetomerge_file_array)) {
+ foreach ( $filetomerge_file_array as $filetomerge_file ) {
+ $filetomerge->fk_product = $object->id;
+ $filetomerge->file_name = $filetomerge_file;
+
+ if ($conf->global->MAIN_MULTILANGS) {
+ $filetomerge->lang = $lang_id;
+ }
+
+ $result=$filetomerge->create($user);
+ if ($result<0) {
+ setEventMessage($filetomerge->error,'errors');
+ }
+ }
+ }
+ }
}
@@ -142,13 +206,139 @@ if ($object->id)
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").'