diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index c2985ac8e7f..a594d2977ae 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -1,6 +1,7 @@ * Copyright (C) 2007-2010 Jean Heimburger + * Copyright (C) 2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -142,7 +143,7 @@ print ""; print "".$langs->trans("Date").""; print "".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")"; print "".$langs->trans("Account").""; -print "".$langs->trans("Type")."".$langs->trans("Debit")."".$langs->trans("Credit").""; +print "".$langs->trans("Type")."".$langs->trans("Debit")."".$langs->trans("Credit").""; print "\n"; $var=true; @@ -164,7 +165,7 @@ foreach ($tabfac as $key => $val) foreach ($tabttc[$key] as $k => $mt) { - print "".$k."".$langs->trans("ThirdParty")."".($mt>=0?$mt:'')."".($mt<0?-$mt:'').""; + print "".$k."".$langs->trans("ThirdParty")."".($mt>=0?price($mt):'')."".($mt<0?-price(-$mt):'').""; } print ""; // product @@ -176,7 +177,7 @@ foreach ($tabfac as $key => $val) //print "".$conf->global->COMPTA_JOURNAL_BUY.""; print "".$val["date"].""; print "".$invoicestatic->getNomUrl(1).""; - print "".$k."".$langs->trans("Products")."".($mt<0?-$mt:'')."".($mt>=0?$mt:'').""; + print "".$k."".$langs->trans("Products")."".($mt<0?price(-$mt):'')."".($mt>=0?price($mt):'').""; } } // vat @@ -189,7 +190,7 @@ foreach ($tabfac as $key => $val) //print "".$conf->global->COMPTA_JOURNAL_BUY.""; print "".$val["date"].""; print "".$invoicestatic->getNomUrl(1).""; - print "".$k."".$langs->trans("VAT")." ".$key."".($mt<0?-$mt:'')."".($mt>=0?$mt:'').""; + print "".$k."".$langs->trans("VAT")." ".$key."".($mt<0?price(-$mt):'')."".($mt>=0?price($mt):'').""; } } diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index a55d824cb74..e5ecde1a6be 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -1,6 +1,7 @@ * Copyright (C) 2007-2010 Jean Heimburger + * Copyright (C) 2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -145,7 +146,7 @@ print ""; //print "".$langs->trans("JournalNum").""; print "".$langs->trans("Date")."".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")"; print "".$langs->trans("Account").""; -print "".$langs->trans("Type")."".$langs->trans("Debit")."".$langs->trans("Credit").""; +print "".$langs->trans("Type")."".$langs->trans("Debit")."".$langs->trans("Credit").""; print "\n"; $var=true; @@ -166,7 +167,7 @@ foreach ($tabfac as $key => $val) print "".$invoicestatic->getNomUrl(1).""; foreach ($tabttc[$key] as $k => $mt) { - print "".$k."".$langs->trans("ThirdParty")."".($mt>=0?$mt:'')."".($mt<0?-$mt:'').""; + print "".$k."".$langs->trans("ThirdParty")."".($mt>=0?price($mt):'')."".($mt<0?price(-$mt):'').""; } print ""; // product @@ -178,7 +179,7 @@ foreach ($tabfac as $key => $val) //print "".$conf->global->COMPTA_JOURNAL_SELL.""; print "".$val["date"].""; print "".$invoicestatic->getNomUrl(1).""; - print "".$k."".$langs->trans("Products")."".($mt<0?-$mt:'')."".($mt>=0?$mt:'').""; + print "".$k."".$langs->trans("Products")."".($mt<0?price(-$mt):'')."".($mt>=0?price($mt):'').""; } } // vat @@ -191,7 +192,7 @@ foreach ($tabfac as $key => $val) //print "".$conf->global->COMPTA_JOURNAL_SELL.""; print "".$val["date"].""; print "".$invoicestatic->getNomUrl(1).""; - print "".$k."".$langs->trans("VAT")." ".$key."".($mt<0?-$mt:'')."".($mt>=0?$mt:'').""; + print "".$k."".$langs->trans("VAT")." ".$key."".($mt<0?price(-$mt):'')."".($mt>=0?price($mt):'').""; } }