-
- Downloads
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/cron/card.php htdocs/cron/list.php htdocs/filefunc.inc.php
No related branches found
No related tags found
Showing
- htdocs/admin/tools/export.php 5 additions, 2 deletionshtdocs/admin/tools/export.php
- htdocs/cashdesk/tpl/facturation1.tpl.php 3 additions, 3 deletionshtdocs/cashdesk/tpl/facturation1.tpl.php
- htdocs/compta/facture.php 1 addition, 1 deletionhtdocs/compta/facture.php
- htdocs/contrat/card.php 10 additions, 2 deletionshtdocs/contrat/card.php
- htdocs/contrat/services.php 6 additions, 1 deletionhtdocs/contrat/services.php
- htdocs/core/lib/functions.lib.php 18 additions, 2 deletionshtdocs/core/lib/functions.lib.php
- htdocs/core/modules/propale/doc/pdf_azur.modules.php 2 additions, 1 deletionhtdocs/core/modules/propale/doc/pdf_azur.modules.php
- htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php 2 additions, 1 deletion...core/modules/supplier_proposal/doc/pdf_aurore.modules.php
- htdocs/cron/card.php 39 additions, 29 deletionshtdocs/cron/card.php
- htdocs/cron/class/cronjob.class.php 14 additions, 11 deletionshtdocs/cron/class/cronjob.class.php
- htdocs/cron/list.php 48 additions, 30 deletionshtdocs/cron/list.php
- htdocs/fourn/commande/index.php 197 additions, 198 deletionshtdocs/fourn/commande/index.php
- htdocs/holiday/list.php 5 additions, 5 deletionshtdocs/holiday/list.php
- htdocs/install/fileconf.php 0 additions, 10 deletionshtdocs/install/fileconf.php
- htdocs/install/mysql/migration/3.9.0-4.0.0.sql 1 addition, 0 deletionshtdocs/install/mysql/migration/3.9.0-4.0.0.sql
- htdocs/install/mysql/tables/llx_multicurrency_rate.sql 2 additions, 1 deletionhtdocs/install/mysql/tables/llx_multicurrency_rate.sql
- htdocs/langs/en_US/companies.lang 1 addition, 0 deletionshtdocs/langs/en_US/companies.lang
- htdocs/theme/eldy/style.css.php 3 additions, 1 deletionhtdocs/theme/eldy/style.css.php
- htdocs/theme/md/style.css.php 25 additions, 1 deletionhtdocs/theme/md/style.css.php
Loading
Please register or sign in to comment