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

Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/filefunc.inc.php

build/makepack-howto.txt

@@ -33,11 +33,11 @@ complete release of Dolibarr, step by step.
 
 - Check all files are commited.
 - Update version/info in /ChangeLog and /filefunc.inc.php
-- Update version number with x.x.x-y in htdocs/filefunc.inc.php
+- Update version number with x.x.x in htdocs/filefunc.inc.php
-- Update version number with x.x.x-y in build/makepack-dolibarr.pl
+- Update version number with x.x.x in build/makepack-dolibarr.pl
-- Update version number with x.x.x-y in build/debian/changelog
+- Update version number with x.x.x in build/debian/changelog
-- Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
+- Update version number with x.x.x in build/exe/doliwamp/doliwamp.iss
-- Update version number with x.x.x-y in build/rpm/*.spec
+- Update version number with x.x.x in build/rpm/*.spec
 - Update PAD files.
 - Commit all changes.
 - Add a Tag (DOLIBARR_x_y)

build/pad/pad_dolibarr.xml

@@ -35,9 +35,9 @@
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
 		<Program_Version>3.3.0</Program_Version>
-		<Program_Release_Month>08</Program_Release_Month>
+		<Program_Release_Month>02</Program_Release_Month>
-		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Day>17</Program_Release_Day>
-		<Program_Release_Year>2012</Program_Release_Year>
+		<Program_Release_Year>2013</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />

build/pad/pad_doliwamp.xml

@@ -35,9 +35,9 @@
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
 		<Program_Version>3.3.0</Program_Version>
-		<Program_Release_Month>08</Program_Release_Month>
+		<Program_Release_Month>02</Program_Release_Month>
-		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Day>17</Program_Release_Day>
-		<Program_Release_Year>2012</Program_Release_Year>
+		<Program_Release_Year>2013</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />

build/rpm/dolibarr_fedora.spec

@@ -333,5 +333,5 @@ fi
 
 
 %changelog
-* Mon Jan 14 2013 Laurent Destailleur 3.4.0-0.1.a
+* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.a
 - Initial version (#723326)

build/rpm/dolibarr_generic.spec

@@ -522,5 +522,5 @@ fi
 
 
 %changelog
-* Mon Jan 14 2013 Laurent Destailleur 3.4.0-0.1.a
+* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.a
 - Initial version (#723326)

build/rpm/dolibarr_mandriva.spec

@@ -322,5 +322,5 @@ fi
 
 
 %changelog
-* Mon Jan 14 2013 Laurent Destailleur 3.4.0-0.1.a
+* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.a
 - Initial version (#723326)

build/rpm/dolibarr_opensuse.spec

@@ -333,5 +333,5 @@ fi
 
 
 %changelog
-* Mon Jan 14 2013 Laurent Destailleur 3.4.0-0.1.a
+* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.a
 - Initial version (#723326)

htdocs/comm/action/listactions.php

@@ -143,6 +143,7 @@ if ($socid) $param.="&socid=".$socid;
 if ($showbirthday) $param.="&showbirthday=1";
 if ($pid) $param.="&projectid=".$pid;
 if ($type) $param.="&type=".$type;
+if ($actioncode) $param.="&actioncode=".$actioncode;
 
 $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,";
 $sql.= " a.id, a.datep as dp, a.datep2 as dp2,";

htdocs/compta/facture.php

@@ -1964,9 +1964,9 @@ if ($action == 'create')
 	    print '</td></tr>'."\n";
 	}
 
-	if (empty($origin) && $socid > 0)
+    if (empty($origin) && $socid > 0)
-	{
+    {
-	    // Credit note
+    	// Credit note
 	    print '<tr height="18"><td valign="middle">';
 	    print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
 	    if (! $optionsav) print ' disabled="disabled"';
@@ -1990,7 +1990,8 @@ if ($action == 'create')
 	    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
 	    print $desc;
 	    print '</td></tr>'."\n";
-	}
+    }
+
 	print '</table>';
 	print '</td></tr>';
 

htdocs/install/mysql/data/llx_c_tva.sql

@@ -67,6 +67,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14,   '7','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14,   '0','0','VAT Rate 0',1);
 
+-- CAMEROUN (id country=24)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (241, 24, '19.25','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (242, 24,     '0','0','VAT Rate 0',1);
+
 -- CHILE (id country=67)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (671, 67,  '19','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (672, 67,   '0','0','VAT Rate 0',1);
@@ -151,6 +155,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (17
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1662, 166,  '15','0','VAT standard rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1663, 166,   '0','0','VAT Rate 0', 1);
 
+-- NIGERIA (id country=169)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1692, 169,   '5','0','VAT standard rate', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1693, 169,   '0','0','VAT Rate 0', 1);
+
 -- NORWAY (id country=173)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1731, 173,  '25','0','VAT standard rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1732, 173,   '14','0','VAT reduced rate', 1);