cvsimport

COPYRIGHT

@@ -10,28 +10,29 @@ However it uses some external libraries under different licences. This is compat
 
 Composant         Version  License                     Compatible GPL   Usage
 ----------------------------------------------------------------------------
-In alphabetical order of includes directory:
+PHP libraries:
 AdoDb-Date        0.21     Modified BSD License        Yes              Date convertion
 ArtiChow          1.07     Public Domain               Yes              Graphics
 CKEditor		  3.6.1	   GPL or LGPL 2.1 or MPL 1.1  Yes				Editor WYSIWYG
-FPDI              1.4.1    Apache Software License 2.0 No GPL3 only     PDF templates management
+FPDI              1.4.1    Apache Software License 2.0 ?                PDF templates management
+NuSoap            0.9.5    LGPL 2.1                    Yes              Library to develop SOAP Web services
+OdtPHP            1.0.1    GPL 2.0                     Yes              Library to build/edit ODT files
+Php-barcode       0.3pl1   GPL 2.0                     Yes              Bar code generation
+PHPExcel		  1.7.6    LGPL 2.1                    Yes              Read/Write XLS files, read ODS files
+TCPDF             5.9.098  LGPL 3.0                    Yes				PDF generation
+
+JS libraries:
 jQuery            1.6.1    GPL and MIT Licence         Yes              JS library
 jQuery UI         1.8.14   GPL and MIT Licence         Yes              JS library plugin UI
 jQuery Flot       0.7      MIT Licence                 Yes              JS library to build graph
 jQuery JCrop      0.9.8    MIT Licence                 Yes              JS library plugin Crop (to crop images)
 jQuery Layout     1.3.0	   GPL and MIT Licence         Yes              JS library plugin Layout (RC-29.15)
 jQuery TableDnD   0.5      GPL and MIT Licence         Yes              JS library plugin TableDnD (to reorder table rows)
-jQuery jNotify	  1.1.00   Apache Software License 2.0 No GPL3 only		JS library plugin jNotify (to use ajax popups)
+jQuery jNotify	  1.1.00   Apache Software License 2.0 ?          		JS library plugin jNotify (to use ajax popups)
 jQuery Mobile	  1.0b1	   GPL and MIT Licence		   Yes			    JS library for smartphone (not used)
 jQuery Tiptip     1.3      GPL and MIT Licence         Yes              JS library for tooltips
 JSGantt           1.2      BSD Licence                 Yes              JS library (to build Gantt reports)
-NuSoap            0.9.5    LGPL 2.1                    Yes              Interfaces with third tools
-OdtPHP            1.0.1    GPL 2.0                     Yes              Library to build/edit ODT files
-Php-barcode       0.3pl1   GPL 2.0                     Yes              Bar code generation
-PHPExcel		  1.7.6    LGPL 2.1                    Yes              Read/Write XLS files, read ODS files
-SMTPs             1.15     GPL                         Yes              SMTPS library
-TCPDF             5.9.098  LGPL 3.0                    Yes				PDF generation
-VCard             2.0      GPL 2.0                     Yes              VCard library
+
 
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html
@@ -45,6 +46,8 @@ Copyright (C) 2011
 - Regis Houssin <regis@dolibarr.fr>
 - Juanjo Menent
 - Philippe Grand
+- Jean Heimburger <jean@tiaris.info>
+- Philippe Grand
 
 Copyright (C) 2010
 - Laurent Destailleur <eldy@users.sourceforge.net>

build/deb/control.debian

@@ -18,7 +18,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 Recommends: apache2 | lighttpd | httpd, mysql-client
 Suggests: www-browser
 Architecture: all
-Description: Easy to use web based ERP & CRM software
+Description: Web based software to manage a small company or foundation
  Dolibarr ERP & CRM is an easy to use open source/free software for small 
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship

build/deb/control.debianbin

@@ -13,7 +13,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 Section: web
 Priority: optional
 Homepage: http://www.dolibarr.org
-Description: Easy to use web based ERP & CRM software
+Description: Web based software to manage a small company or foundation
  Dolibarr ERP & CRM is an easy to use open source/free software for small 
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship

htdocs/admin/external_rss.php

@@ -24,7 +24,7 @@
  *      \file       htdocs/admin/external_rss.php
  *      \ingroup    external_rss
  *      \brief      Page to setupe module ExternalRss
- *      \version    $Id: external_rss.php,v 1.49 2011/08/17 13:44:16 eldy Exp $
+ *      \version    $Id: external_rss.php,v 1.50 2011/08/26 19:09:03 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -286,7 +286,10 @@
 		}
 		else
 		{
-			print '<font class="error">'.$langs->trans("Offline").'</div>';
+			print '<font class="error">'.$langs->trans("Offline");
+			$langs->load("errors");
+			if ($rssparser->error) print ' - '.$langs->trans($rssparser->error);
+			print '</div>';
 		}
 		print "</td>";
 		print "</tr>";
@@ -320,5 +323,5 @@
 
 $db->close();
 
-llxFooter('$Date: 2011/08/17 13:44:16 $ - $Revision: 1.49 $');
+llxFooter('$Date: 2011/08/26 19:09:03 $ - $Revision: 1.50 $');
 ?>

htdocs/admin/societe.php

@@ -23,7 +23,7 @@
  *	\file       htdocs/admin/societe.php
  *	\ingroup    company
  *	\brief      Third party module setup page
- *	\version    $Id: societe.php,v 1.63 2011/08/17 07:50:29 simnandez Exp $
+ *	\version    $Id: societe.php,v 1.64 2011/08/26 11:48:36 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -357,7 +357,7 @@
 print '<td width="140">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="60" colspan="2">'.$langs->trans("Infos").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Infos").'</td>';
 print "</tr>\n";
 
 clearstatcache();
@@ -440,20 +440,16 @@
 						$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn($module->option_draft_watermark,1,1);
 
 
-						print '<td align="center">';
-						print $form->textwithpicto('',$htmltooltip,1,0);
-						print '</td>';
-
-						// Preview
-						print '<td align="center">';
+						print '<td align="center" nowrap="nowrap">';
 						if ($modele->type == 'pdf')
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+							$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
 						}
 						else
 						{
-							print img_object($langs->trans("PreviewNotAvailable"),'generic');
+							$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
 						}
+						print $form->textwithpicto(' &nbsp; '.$linkspec,$htmltooltip,1,0);
 						print '</td>';
 
 						print "</tr>\n";
@@ -475,7 +471,7 @@
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center">'.$langs->trans("Value").'</td>';
+print '<td align="center">'.$langs->trans("MustBeUnique").'</td>';
 print "</tr>\n";
 
 $profid[0][0]=$langs->trans("ProfId1");
@@ -531,7 +527,7 @@
 	$i++;
 }
 
-print "</table>\n";
+print "</table><br>\n";
 
 
 print_titre($langs->trans("Other"));
@@ -581,5 +577,5 @@
 
 $db->close();
 
-llxFooter('$Date: 2011/08/17 07:50:29 $ - $Revision: 1.63 $');
+llxFooter('$Date: 2011/08/26 11:48:36 $ - $Revision: 1.64 $');
 ?>

htdocs/cache.manifest

@@ -0,0 +1,30 @@
+# version 1
+
+# Files listed under CACHE will be cached after they are loaded;
+# while the ones under NETWORK are said to be white-listed.
+# What this means is that they require a live connection to the server.
+# If the user isn't connected to the server, the browser should not use the cached version instead.
+
+CACHE MANIFEST
+
+CACHE:
+index.php
+main.inc.php
+master.inc.php
+filefunc.inc.php
+lib/functions.lib.php
+
+# The NETWORK section contains the path to a folder to ensure that requests
+# to load resources contained under /api will bypass the cache and always fetch the resource from the server.
+
+NETWORK: 
+# search.php 
+# login.php 
+# /api
+
+# The FALLBACK section contains entries that provide a backup strategy.
+# If the browser is unable to retrieve the original content, the fallback resource will be used.
+# In the example above, we display a static image in case the dynamic one is unavailable.
+
+FALLBACK: 
+# images/dynamic.php static_image.png

htdocs/cashdesk/admin/cashdesk.php

@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
  *
  * 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
@@ -19,7 +20,7 @@
  *	\file       htdocs/cashdesk/admin/cashdesk.php
  *	\ingroup    cashdesk
  *	\brief      Setup page for cashdesk module
- *	\version    $Id: cashdesk.php,v 1.7 2011/08/03 00:46:38 eldy Exp $
+ *	\version    $Id: cashdesk.php,v 1.10 2011/08/26 23:56:14 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -45,31 +46,45 @@
 /*
  * Actions
  */
-if ($_POST["action"] == 'set')
+if (GETPOST("action") == 'set')
 {
-	if ($_POST["socid"] < 0) $_POST["socid"]='';
-	if ($_POST["CASHDESK_ID_BANKACCOUNT"] < 0)  $_POST["CASHDESK_ID_BANKACCOUNT"]='';
-	if ($_POST["CASHDESK_ID_WAREHOUSE"] < 0)  $_POST["CASHDESK_ID_WAREHOUSE"]='';
-
-	dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",$_POST["socid"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CASH",$_POST["CASHDESK_ID_BANKACCOUNT_CASH"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CHEQUE",$_POST["CASHDESK_ID_BANKACCOUNT_CHEQUE"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CB",$_POST["CASHDESK_ID_BANKACCOUNT_CB"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",$_POST["CASHDESK_ID_WAREHOUSE"],'chaine',0,'',$conf->entity);
-
-	dol_syslog("admin/cashdesk: level ".$_POST["level"]);
+	$db->begin();
+
+	if (GETPOST("socid") < 0) $_POST["socid"]='';
+	/*if (GETPOST("CASHDESK_ID_BANKACCOUNT") < 0)  $_POST["CASHDESK_ID_BANKACCOUNT"]='';
+	if (GETPOST("CASHDESK_ID_WAREHOUSE") < 0)  $_POST["CASHDESK_ID_WAREHOUSE"]='';*/
+
+	$res = dolibarr_set_const($db,"CASHDESK_ID_THIRDPARTY",GETPOST("socid"),'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CASH",GETPOST("CASHDESK_ID_BANKACCOUNT_CASH"),'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CHEQUE",GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE"),'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db,"CASHDESK_ID_BANKACCOUNT_CB",GETPOST("CASHDESK_ID_BANKACCOUNT_CB"),'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",GETPOST("CASHDESK_ID_WAREHOUSE"),'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db,"CASHDESK_SERVICES", GETPOST("CASHDESK_SERVICES"),'chaine',0,'',$conf->entity);
+
+	dol_syslog("admin/cashdesk: level ".GETPOST("level"));
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        $db->commit();
+        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+    }
+    else
+    {
+        $db->rollback();
+        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+    }
 }
 
-
-
 /*
  * View
  */
 
 $form=new Form($db);
 $formproduct=new FormProduct($db);
 
-llxHeader();
+llxHeader('',$langs->trans("CashDeskSetup"));
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("CashDeskSetup"),$linkback,'setup');
@@ -121,12 +136,26 @@
 	print '</td></tr>';
 }
 
+if ($conf->service->enabled)
+{
+    $var=! $var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("CashdeskShowServices");
+    print '<td colspan="2">';;
+    print $form->selectyesno("CASHDESK_SERVICES",$conf->global->CASHDESK_SERVICES,1);
+    print "</td></tr>\n";
+}
+
 print '</table>';
 print '<br>';
 
 print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"></center>';
 
 print "</form>\n";
 
-llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.7 $');
+dol_htmloutput_mesg($mesg);
+
+$db->close();
+
+llxFooter('$Date: 2011/08/26 23:56:14 $ - $Revision: 1.10 $');
 ?>

htdocs/cashdesk/facturation.php

@@ -21,7 +21,7 @@
  *	\file       htdocs/cashdesk/facturation.php
  *	\ingroup    cashdesk
  *	\brief      Include to show main page for cashdesk module
- *	\version    $Id: facturation.php,v 1.19 2011/07/31 22:23:27 eldy Exp $
+ *	\version    $Id: facturation.php,v 1.20 2011/08/26 14:52:00 simnandez Exp $
  */
 
 // Get list of articles (in warehouse '$conf_fkentrepot' if defined and stock module enabled)
@@ -30,12 +30,12 @@
 	// Avec filtre
 	$ret=array(); $i=0;
 
-	$sql = "SELECT p.rowid, p.ref, p.label, p.tva_tx";
+	$sql = "SELECT p.rowid, p.ref, p.label, p.tva_tx, p.fk_product_type";
 	if ($conf->stock->enabled && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 	if ($conf->stock->enabled && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
 	$sql.= " WHERE p.tosell = 1";
-	$sql.= " AND p.fk_product_type = 0";
+	if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0";
 	$sql.= " AND (p.ref LIKE '%".$_GET['filtre']."%' OR p.label LIKE '%".$_GET['filtre']."%' ";
 	if ($conf->barcode->enabled) $sql.= " OR p.barcode='".$_GET['filtre']."')";
 	else $sql.= ")";
@@ -66,12 +66,12 @@
 	$ret=array();
 	$i=0;
 
-	$sql = "SELECT p.rowid, ref, label, tva_tx";
+	$sql = "SELECT p.rowid, ref, label, tva_tx, p.fk_product_type";
 	if ($conf->stock->enabled && !empty($conf_fkentrepot)) $sql.= ", ps.reel";
 	$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 	if ($conf->stock->enabled && !empty($conf_fkentrepot)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
 	$sql.= " WHERE p.tosell = 1";
-	$sql.= " AND p.fk_product_type = 0";
+	if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0";
 	$sql.= " ORDER BY p.label";
 
 	dol_syslog($sql);

htdocs/cashdesk/tpl/facturation1.tpl.php

@@ -21,7 +21,7 @@
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-$Id: facturation1.tpl.php,v 1.15 2011/08/03 01:13:30 eldy Exp $
+$Id: facturation1.tpl.php,v 1.16 2011/08/26 14:52:00 simnandez Exp $
 -->
 <script type="text/javascript" src="javascript/facturation1.js"></script>
 <script type="text/javascript" src="javascript/dhtml.js"></script>
@@ -73,7 +73,7 @@
 								$label = $tab_designations[$i]['label'];
 
 								print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],7).' - '.dol_trunc($label,35,'middle');
-								if ($conf->stock->enabled && !empty($conf_fkentrepot)) print ' ('.$langs->trans("CashDeskStock").': '.$tab_designations[$i]['reel'].')';
+								if ($conf->stock->enabled && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.$tab_designations[$i]['reel'].')';
 								print '</option>'."\n				";
 
 							}
@@ -91,7 +91,7 @@
 								$label = $tab_designations[$i]['label'];
 
 								print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],7).' - '.dol_trunc($label,35,'middle');
-								if ($conf->stock->enabled && !empty($conf_fkentrepot)) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')';
+								if ($conf->stock->enabled && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')';
 								print '</option>'."\n				";
 
 							}

htdocs/contact/vcard.php

@@ -20,13 +20,13 @@
  *	    \file       htdocs/contact/vcard.php
  *      \ingroup    societe
  *		\brief      Onglet vcard d'un contact
- *		\version    $Id: vcard.php,v 1.27 2011/07/31 23:54:12 eldy Exp $
+ *		\version    $Id: vcard.php,v 1.28 2011/08/26 23:40:49 eldy Exp $
  */
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
-require_once(DOL_DOCUMENT_ROOT."/includes/vcard/vcard.class.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/vcard.class.php");
 
 
 $contact = new Contact($db);