Conflicts: dev/initdata/initdemo.sh htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/commande/card.php htdocs/compta/facture.php |
||
|---|---|---|
| .. | ||
| doc_generic_invoice_odt.modules.php | ||
| index.html | ||
| pdf_crabe.modules.php | ||