Conflicts: htdocs/admin/mails_templates.php htdocs/core/actions_linkedfiles.inc.php htdocs/core/lib/functions.lib.php htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php htdocs/societe/consumption.php |
||
|---|---|---|
| .. | ||
| account.class.php | ||
| api_bankaccounts.class.php | ||
| bankcateg.class.php | ||
| paymentvarious.class.php | ||