Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop

.tx/config

@@ -272,12 +272,6 @@ source_file = htdocs/langs/en_US/sendings.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.shop]
-file_filter = htdocs/langs/<lang>/shop.lang
-source_file = htdocs/langs/en_US/shop.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.sms]
 file_filter = htdocs/langs/<lang>/sms.lang
 source_file = htdocs/langs/en_US/sms.lang

ChangeLog

@@ -5,6 +5,14 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.7 compared to 3.6.* *****
 For users:
+- New: Module notification has been enhanced:
+       EMail use now language of target contact.
+       Can also define a fixed email for notifications.
+- New: Feature to link manually an order to an invoice does not disappear once
+       link has been done.
+- New: Can set a color on user card (visible into agenda view).
+- New: extrafields for projects and tasks are exported to ODT documents.
+- New: Add number of active notification into tab title (like we do for notes and documents)
 - New: Can add product into category from category card.
 - New: PDF event report show project and status of event.
 - New: Can filter on status on interventions.
@@ -60,9 +68,14 @@ For users:
 - New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture 
        onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
 - New: Add more search field in list of cheque deposits.
-- New: Add feature to order to invoice on supplier part
+- New: Add feature to order to invoice on supplier part.
+- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export.
+- New: Direct invoice creation from predefined invoice.
+- New: Add dunning into accountancy report.
+- New: Add favorite button into country dictionary to put value on top select list
 - Upgrade phpexcel lib to 1.7.8
 - New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export
+- New : Option on extrafields to have them always editable regardless of the document status
 - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
 - Fix: [ bug #1470, #1472, #1473] User trigger problem
 - Fix: [ bug #1489, #1491 ] Intervention trigger problem
@@ -80,9 +93,8 @@ For users:
 - Fix: [ bug #1506, #1507 ] ECM trigger error problem
 - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message
 - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe.
-- New: Direct invoice creation from predefined invoice
-- New: Add dunning into accountancy report
-For users, new experimental module:
+
+For users, new experimental module (need to set feature level of instance to experimental to see them):
 - New: Module Accounting Expert to manage accountancy
 		Special Thanks to developpers :
 			Olivier Geffroy
@@ -96,6 +108,7 @@ For users, new experimental module:
 			Hydroflex		 		 120 euros
 			Asysteo			 		 120 euros
 			Fournisseur médical		 120 euros
+- Removed: unmaintained OScommerce module
 
 For translators:
 - Update language files.
@@ -117,6 +130,8 @@ For developers:
 - New: renamed table llx_c_pays to llx_c_country & libelle field to label.
 - New: Added hook "formConfirm" and "doActions" for fichinter card
 - New: Can search list of thirdparties from web service on part of name.
+- New: Function getCurrencyAmount is marked as deprecated. Use function price to output a price
+       including currency symbol.
 - Qual: Renamed table llx_c_civilite into llx_c_civility,
 		field civilite into label in the same table,
 		and field civilite into civility in other table.
@@ -128,14 +143,25 @@ For developers:
 WARNING: Following changes may create regression for some external modules, but was necessary to make
 Dolibarr better:
 
+- Deprecated module "oscommerce" were removed.
 - Changed the way parameters are provided to scripts sync_xxx_ldap2dolibarr.php
 - Some field into database were renamed from "libelle" to "label".
 - Table llx_c_pays were renamed into llx_c_country.  
 - Triggers *_BUILDDOC are removed. Building a doc is not a business event. For action after 
   creation of a pdf or odt, hook "afterPDFCreation" or "afterODTCreation" must be used instead.
 - A lot of pages called fiche.php were renamed into card.php
 - A lot of pages called liste.php were renamed into list.php
-
+
+
+
+***** ChangeLog for 3.6.2 compared to 3.6.1 *****
+- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice
+- Fix: bug 1588 : relative discount
+- Fix: label of input method not tranlated.
+- Fix: box of customer and propsects were not correctly disabled.
+- Fix: right and error management #1961
+- Fix: Fix Error when trying to clone an Order #1943
+
 ***** ChangeLog for 3.6.1 compared to 3.6.* *****
 For users:
 - Fix: Can upload files on services.
@@ -154,7 +180,13 @@ For users:
 - Fix: Extrafield feature select from table should try to translate multiple column when not needed 
 - Fix: cents for indian ruppes are calle paisa and paise.
 - Fix: Invoices payments may be older than invoices.
+- Fix: Withdrawal total amount is double
 - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line
+- Fix: Web service categorie WDSL declaration is correct
+- Fix: ErrorBadValueForParamNotAString was displayed in virtual product if no base price defined
+- Fix: Category creation failed and no message output
+- Fix: Lanf for Payment Type
+- Fix: PHPCheckstyle 1.5.5
 
 ***** ChangeLog for 3.6 compared to 3.5.* *****
 For users:

build/makepack-dolibarr.pl

@@ -442,6 +442,7 @@
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;

build/rpm/dolibarr_fedora.spec

@@ -162,7 +162,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm

build/rpm/dolibarr_generic.spec

@@ -242,7 +242,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm

build/rpm/dolibarr_mandriva.spec

@@ -159,7 +159,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm

build/rpm/dolibarr_opensuse.spec

@@ -170,7 +170,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm

dev/fixperms.sh

@@ -25,4 +25,6 @@ then
 	find ./htdocs -type f -iname "*.php" -exec chmod a-x {} \; 
 	chmod a+x ./scripts/*/*.php
 	chmod a+x ./scripts/*/*.sh
+	chmod g-w ./scripts/*/*.php
+	chmod g-w ./scripts/*/*.sh
 fi

htdocs/accountancy/admin/account.php

@@ -65,8 +65,7 @@
 $accounting = new AccountingAccount($db);
 
 if ($action == 'disable') {
-	$accounting = $accounting->fetch($id);
-	if (! empty($accounting->id)) {
+	if ($accounting->fetch($id)) {
 		$result = $accounting->account_desactivate($id);
 	}
 
@@ -75,10 +74,7 @@
 		setEventMessage($accounting->error, 'errors');
 	}
 } else if ($action == 'enable') {
-
-	$accounting = $accounting->fetch($id);
-
-	if (! empty($accounting->id)) {
+	if ($accounting->fetch($id)) {
 		$result = $accounting->account_activate($id);
 	}
 	$action = 'update';
@@ -160,7 +156,7 @@
 	print '</td>';
 	print '</tr>';
 
-	$var = True;
+	$var = true;
 
 	while ( $i < min($num, $limit) ) {
 		$obj = $db->fetch_object($resql);

htdocs/accountancy/admin/export.php

@@ -99,7 +99,7 @@
 print '<input type="hidden" name="action" value="update">';
 
 print '<table class="noborder" width="100%">';
-$var = True;
+$var = true;
 
 print '<tr class="liste_titre">';
 print '<td colspan="2">' . $langs->trans("Modelcsv") . '</td>';

htdocs/accountancy/admin/importaccounts.php

@@ -135,7 +135,7 @@
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 	print '<input type="hidden" name="action" value="import">';
 
-	$var = True;
+	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		$var = ! $var;

htdocs/accountancy/admin/index.php

@@ -191,7 +191,7 @@
  *  Define Chart of accounts
  */
 print '<table class="noborder" width="100%">';
-$var = True;
+$var = true;
 
 print '<tr class="liste_titre">';
 print '<td colspan="3">';
@@ -211,7 +211,7 @@
 dol_syslog('accountancy/admin/index.php:: $sql=' . $sql);
 $resql = $db->query($sql);
 
-$var = True;
+$var = true;
 
 if ($resql) {
 	$num = $db->num_rows($resql);

htdocs/accountancy/admin/productaccount.php

@@ -89,7 +89,7 @@ function launch_export() {
 	print '<td align="left">' . $langs->trans("Accountancy_code_sell") . '</td>';
 	print '<td align="left">' . $langs->trans("Accountancy_code_sell_suggest") . '</td>';
 
-	$var = True;
+	$var = true;
 
 	while ( $i < min($num, 250) ) {
 		$obj = $db->fetch_object($resql);

htdocs/accountancy/customer/list.php

@@ -227,9 +227,8 @@
 		$i ++;
 	}
 
-	print '<tr><td colspan="8">&nbsp;</td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></td></tr>';
-
 	print '</table>';
+	print '<br><div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></div>';
 	print '</form>';
 } else {
 	print $db->error();

htdocs/accountancy/supplier/list.php

@@ -208,10 +208,8 @@
 		$i ++;
 	}
 
-	print '<tr><td colspan="8">&nbsp;</td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventiler") . '"></td></tr>';
-
-	print "</table>";
-
+	print '</table>';
+	print '<br><div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></div>';
 	print '</form>';
 } else {
 	print $db->error();

htdocs/adherents/index.php

@@ -159,7 +159,7 @@
     print '<br>';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>';
-    print '<tr><td align="center">';
+    print '<tr '.$bc[0].'><td align="center" colspan="2">';
 
     $SommeA=0;
     $SommeB=0;

htdocs/admin/agenda.php

@@ -154,7 +154,7 @@
 print '<td colspan="2">'.$langs->trans("ActionsEvents").'</td>';
 print '<td><a href="'.$_SERVER["PHP_SELF"].'?action=selectall">'.$langs->trans("All").'</a>/<a href="'.$_SERVER["PHP_SELF"].'?action=selectnone">'.$langs->trans("None").'</a>';
 print '</tr>'."\n";
-// Show each trigger
+// Show each trigger (list is in c_action_trigger)
 if (! empty($triggers))
 {
 	foreach ($triggers as $trigger)

htdocs/admin/company.php

@@ -117,7 +117,7 @@
                         }
                         else dol_syslog($imgThumbMini);
                     }
-                    else dol_syslog($langs->trans("ErrorImageFormatNotSupported"),LOG_WARNING);
+                    else dol_syslog("ErrorImageFormatNotSupported",LOG_WARNING);
                 }
                 else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
                 {
@@ -133,9 +133,10 @@
                 }
             }
             else
-            {
+			{
             	$error++;
-                setEventMessage($langs->trans("ErrorOnlyPngJpgSupported"),'errors');
+				$langs->load("errors");
+            	setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
             }
         }
     }
@@ -158,7 +159,7 @@
     // Local taxes
     dolibarr_set_const($db, "FACTURE_LOCAL_TAX1_OPTION",$_POST["optionlocaltax1"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "FACTURE_LOCAL_TAX2_OPTION",$_POST["optionlocaltax2"],'chaine',0,'',$conf->entity);
-    
+
     if($_POST["optionlocaltax1"]=="localtax1on")
     {
     	if(!isset($_REQUEST['lt1']))
@@ -226,13 +227,15 @@
         else
         {
         	$error++;
-            setEventMessage($langs->trans("ErrorImageFormatNotSupported"),'errors');
-            dol_syslog($langs->transnoentities("ErrorImageFormatNotSupported"),LOG_WARNING);
+        	$langs->load("errors");
+            setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
+            dol_syslog($langs->transnoentities("ErrorBadImageFormat"),LOG_WARNING);
         }
     }
     else
     {
     	$error++;
+    	$langs->load("errors");
         setEventMessage($langs->trans("ErrorFileDoesNotExists",$_GET["file"]),'errors');
         dol_syslog($langs->transnoentities("ErrorFileDoesNotExists",$_GET["file"]),LOG_WARNING);
     }
@@ -601,7 +604,7 @@
     	    $formcompany->select_localtax(1,$conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
         }
         print '</td></tr>';
-        
+
         print '<tr><td align="left"></label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
         $opcions=array($langs->transcountry("CalcLocaltax1",$mysoc->country_code),$langs->transcountry("CalcLocaltax2",$mysoc->country_code),$langs->transcountry("CalcLocaltax3",$mysoc->country_code));
         print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
@@ -1003,7 +1006,7 @@
         if($conf->global->MAIN_INFO_VALUE_LOCALTAX1!=0)
         {
 	        print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .'</td></tr>';
-	    }    
+	    }
         print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
         if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0)
         {
@@ -1016,7 +1019,7 @@
         else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==2){
         	print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
         }
-        
+
         print '</td></tr>';
         print "</table>";
         print "</td></tr>\n";
@@ -1054,7 +1057,7 @@
         if($conf->global->MAIN_INFO_VALUE_LOCALTAX2!=0)
         {
 	        print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .'</td></tr>';
-	    }    
+	    }
         print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
         if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0)
         {
@@ -1068,7 +1071,7 @@
         {
         	print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
         }
-        
+
         print '</td></tr>';
         print "</table>";
         print "</td></tr>\n";