Marcos García 486425d258 Merge branch '3.3' into bug-817 ... Conflicts: ChangeLog		2013-04-13 23:58:05 +02:00
..
purchasesjournal.php	[ bug #817 ] Purchases journal does not reflect localtaxes	2013-04-13 15:22:59 +02:00
sellsjournal.php	[ bug #816 ] Sales journal does not reflect localtaxes	2013-04-13 14:44:56 +02:00