Conflicts: htdocs/admin/stock.php htdocs/admin/system/index.php htdocs/comm/fiche.php htdocs/core/lib/admin.lib.php htdocs/core/lib/holiday.lib.php htdocs/core/lib/pdf.lib.php htdocs/core/login/functions_forceuser.php htdocs/core/login/functions_http.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/filefunc.inc.php htdocs/holiday/define_holiday.php htdocs/opensurvey/fonctions.php htdocs/societe/canvas/actions_card_common.class.php test/phpunit/CompanyBankAccountTest.php test/phpunit/ExportTest.php test/phpunit/FactureTest.php test/phpunit/FunctionsLibTest.php test/phpunit/PropalTest.php test/phpunit/SocieteTest.php test/phpunit/WebservicesInvoicesTest.php test/phpunit/WebservicesThirdpartyTest.php |
||
|---|---|---|
| .. | ||
| admin | ||
| class | ||
| tpl | ||
| apercu.php | ||
| card.php | ||
| contact.php | ||
| document.php | ||
| index.html | ||
| info.php | ||
| list.php | ||
| note.php | ||