Merge branch 'upstream/develop'

Dolibarr · May 28, 2014 · b384f91 · b384f91
2 parents dce9c2b + baa5734
commit b384f91
Show file tree

Hide file tree

Showing 169 changed files with 638 additions and 238 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -100,8 +100,9 @@ tools:
                 comparison_of_bit_result:  true
             basic_semantic_checks:
                 enabled:              true
+            # Disabled unused code. In most cases, we want to keep it.
             unused_code:
-                enabled:              true
+                enabled:              false		
             deprecation_checks:
                 enabled:              true
             useless_function_calls:

diff --git a/build/debian/README.howto b/build/debian/README.howto
@@ -229,7 +229,9 @@ from origin/upstream and origin/pristine.
 * If new upstream is available onto sourceforge, launch:
 > debian/get-orig-source.sh
 
-* Edit tgz file to remove ckeditor and phpexcel and renama file into dolibarr-x.y.z+dsfgw.tgz
+* Edit tgz file to remove ckeditor and phpexcel and rename file into 
+dolibarr-x.y.z+dsfgw.tgz
+(x.y.z = version, w start from 1 and is increased for each new import)
 
 * Staying into git root directory, run
 > git-import-orig -vv ../dolibarr-x.y.z+dsfgw.tgz

diff --git a/build/dmg/dolimamp/install.forced.php b/build/dmg/dolimamp/install.forced.php
@@ -14,4 +14,3 @@
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
-?>
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
@@ -452,6 +452,7 @@
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
         #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
 
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;

diff --git a/dev/examples/create_invoice.php b/dev/examples/create_invoice.php
@@ -115,4 +115,3 @@
 $db->close();
 
 return $error;
-?>
diff --git a/dev/rmphpclosingtag.sh b/dev/rmphpclosingtag.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# vim:ft=sh:ts=3:sts=3:sw=3:et:
+
+###
+# Strips the closing php tag `?>` and any following blank lines from the 
+# end of any PHP file in the current working directory and sub-directories. Files
+# with non-whitespace characters following the closing tag will not be affected.
+#
+# Author: Bryan C. Geraghty <bryan@ravensight.org>
+# Date: 2009-10-28
+# Source: http://bryan.ravensight.org/2010/07/remove-php-closing-tag/
+##
+
+FILES=$(pcregrep -rnM --include='^.*\.php$' '^\?\>(?=([\s\n]+)?$(?!\n))' .);
+
+for MATCH in $FILES;
+do
+   FILE=`echo $MATCH | awk -F ':' '{print $1}'`;
+   TARGET=`echo $MATCH | awk -F ':' '{print $2}'`;
+   LINE_COUNT=`wc -l $FILE | awk -F " " '{print $1}'`;
+   echo "Removing lines ${TARGET} through ${LINE_COUNT} from file $FILE...";
+   sed -i "${TARGET},${LINE_COUNT}d" $FILE;
+done;
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
@@ -371,4 +371,3 @@ function initAsSpecimen()
 	}
 
 }
-?>
diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php
@@ -271,4 +271,3 @@ function createSkeleton($authentication,$skeleton)
 // Return the results.
 $server->service($HTTP_RAW_POST_DATA);
 
-?>
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
@@ -338,4 +338,3 @@ private function translateTexts($src_texts, $src_lang, $dest_lang)
 	}
 
 }
-?>
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
@@ -264,4 +264,3 @@
 
 
 return 0;
-?>
diff --git a/htdocs/accountancy/class/accountancyaccount.class.php b/htdocs/accountancy/class/accountancyaccount.class.php
@@ -93,4 +93,3 @@ function create($user)
     }
 
 }
-?>
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -62,7 +62,7 @@ function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	 */
 	private function getTitle($action)
 	{
-		global $langs;
+		global $langs,$conf;
 
 		$out='';
 

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
@@ -138,7 +138,7 @@
         if ($_POST["userid"] != $object->user_id)  // If link differs from currently in database
         {
             $result=$object->setUserId($_POST["userid"]);
-            if ($result < 0) dol_print_error($object->db,$object->error);
+            if ($result < 0) dol_print_error('',$object->error);
             $_POST['action']='';
             $action='';
         }
@@ -172,7 +172,7 @@
             if (! $error)
             {
                 $result=$object->setThirdPartyId(GETPOST('socid','int'));
-                if ($result < 0) dol_print_error($object->db,$object->error);
+                if ($result < 0) dol_print_error('',$object->error);
                 $_POST['action']='';
                 $action='';
             }
@@ -1101,4 +1101,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
@@ -280,4 +280,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
@@ -95,6 +95,8 @@ class Adherent extends CommonObject
     var $first_subscription_date;
     var $first_subscription_amount;
     var $last_subscription_date;
+    var $last_subscription_date_start;
+    var $last_subscription_date_end;
     var $last_subscription_amount;
     var $subscriptions=array();
 

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
@@ -99,8 +99,10 @@ function create($user)
      */
     function update($user)
     {
-    	global $hookmanager;
-
+    	global $hookmanager,$conf;
+
+    	$error=0;
+
         $this->libelle=trim($this->libelle);
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
@@ -116,6 +118,8 @@ function update($user)
         $result = $this->db->query($sql);
         if ($result)
         {
+        	$action='update';
+
         	// Actions on extra fields (by external module or standard code)
         	$hookmanager->initHooks(array('membertypedao'));
         	$parameters=array('membertype'=>$this->id);
@@ -132,8 +136,8 @@ function update($user)
         		}
         	}
         	else if ($reshook < 0) $error++;
-        	
-        	
+
+
             return 1;
         }
         else

diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
@@ -64,7 +64,7 @@
 {
 	if (GETPOST('submit_GENBARCODE_LOCATION'))
 	{
-		$location = GETPOST('genbarcodelocation','alpha');
+		$location = GETPOST('GENBARCODE_LOCATION','alpha');
 		$res = dolibarr_set_const($db, "GENBARCODE_LOCATION",$location,'chaine',0,'',$conf->entity);
 	}
 	if (GETPOST('submit_PRODUIT_DEFAULT_BARCODE_TYPE'))

diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
@@ -468,4 +468,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
@@ -170,4 +170,3 @@
 $db->close();
 
 llxFooter();
-?>
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
@@ -511,4 +511,3 @@
 $db->close();
 
 llxFooter();
-?>
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
@@ -116,4 +116,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
@@ -143,4 +143,3 @@ function(token) {
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
@@ -703,4 +703,3 @@ function initfields()
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
@@ -540,4 +540,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
@@ -157,4 +157,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php
@@ -88,4 +88,3 @@
 $db->close();
 
 llxFooter();
-?>
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
@@ -156,4 +156,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
@@ -253,4 +253,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
@@ -113,28 +113,23 @@
 print '</ul>';
 
 
-print $langs->trans("OfficialWebHostingService").':';
-$url='http://wiki.dolibarr.org/index.php/Cloud_Solutions'; $title=$langs->trans('List');
+print $langs->trans("OtherResources").':';
+print '<ul>';
+
+$url='http://saas.dolibarr.org'; $title=$langs->trans("OfficialWebHostingService");
 if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Solutions_de_Cloud';
 if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Soluciones_en_la_Nube';
-print '<ul>';
 print '<li>';
 print '<a target="_blank" href="'.$url.'">'.$title.'</a>';
 print '</li>';
+$url='http://partners.dolibarr.org'; $title=$langs->trans("ReferencedPreferredPartners");
+print '<li>';
+print '<a target="_blank" href="'.$url.'">'.$title.'</a>';
+print '</li>';
+
 print '</ul>';
 
 
 llxFooter();
 
 $db->close();
-?>
-
-
-
-
-
-
-
-
-
-
diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php
@@ -51,4 +51,3 @@
 
 
 llxFooter();
-?>
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
@@ -120,4 +120,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php
@@ -64,4 +64,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
@@ -214,4 +214,3 @@
 
 llxFooter();
 $db->close();
-?>
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
@@ -141,4 +141,3 @@ function verif($aLogin, $aPasswd)
 
 }
 
-?>
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
@@ -653,4 +653,3 @@ public function prixTotalTtc( $aTotalTtc=null )
 
 }
 
-?>
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
@@ -166,4 +166,3 @@
 header('Location: '.$redirection);
 exit;
 
-?>
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
@@ -142,4 +142,3 @@
 	exit;
 }
 
-?>
diff --git a/htdocs/cashdesk/validation.php b/htdocs/cashdesk/validation.php
@@ -26,4 +26,3 @@
 // Affichage des templates
 require ('tpl/validation1.tpl.php');
 
-?>
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
@@ -179,4 +179,3 @@
 llxFooter();
 
 $db->close();
-?>
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
@@ -142,4 +142,3 @@
 
 llxFooter();
 $db->close();
-?>
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
@@ -466,4 +466,3 @@
 
 llxFooter();
 $db->close();
-?>
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
@@ -224,4 +224,3 @@
 
 $db->close();
 llxFooter();
-?>
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
@@ -855,4 +855,3 @@
 llxFooter();
 
 $db->close();
-?>