Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	ChangeLog
	htdocs/admin/dict.php
	htdocs/comm/prospect/fiche.php

ChangeLog

@@ -99,7 +99,10 @@ WARNING: If you used external modules, some of them may need to be upgraded due
 - Fix: Orderstoinvoice didn't act as expected when no order was checked
 - Fix: Bad link to all proposals into Third party card if customer is prospect
 - Fix: [ bug #789 ] VAT not being calculated in POS
-
+- Fix: [ bug #794 ] Lost filter on zipcode in prospect list
+- Fix: [ bug #774 ] Bug on creating event with box "all day" crossed
+- Fix: [ bug #810 ] Cannot update ODT template path
+- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
 
 
 ***** ChangeLog for 3.3.1 compared to 3.3 *****
@@ -109,6 +112,7 @@ WARNING: If you used external modules, some of them may need to be upgraded due
 - Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
 - Fix: Localtax2 for Spain must be based into buyer
 - Fix: [ bug #762 ] Bad profit calculation in Reporting
+- Fix: bug dictionnary with wrong prefix table
 
 
 

test/phpunit/NumberingModulesTest.php

@@ -443,4 +443,4 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
+?>