-
- Downloads
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts: htdocs/core/lib/functions2.lib.php htdocs/install/mysql/migration/repair.sql htdocs/langs/en_US/errors.lang htdocs/product/fiche.php htdocs/projet/tasks/task.php
No related branches found
No related tags found
Showing
- ChangeLog 4 additions, 0 deletionsChangeLog
- htdocs/core/class/commonobject.class.php 5 additions, 4 deletionshtdocs/core/class/commonobject.class.php
- htdocs/core/class/html.formother.class.php 2 additions, 2 deletionshtdocs/core/class/html.formother.class.php
- htdocs/core/lib/functions2.lib.php 1 addition, 0 deletionshtdocs/core/lib/functions2.lib.php
- htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php 4 additions, 2 deletionshtdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
- htdocs/expedition/class/expedition.class.php 45 additions, 28 deletionshtdocs/expedition/class/expedition.class.php
- htdocs/expedition/fiche.php 4 additions, 3 deletionshtdocs/expedition/fiche.php
- htdocs/imports/import.php 1 addition, 1 deletionhtdocs/imports/import.php
- htdocs/install/mysql/migration/repair.sql 1 addition, 1 deletionhtdocs/install/mysql/migration/repair.sql
- htdocs/langs/ca_ES/companies.lang 0 additions, 1 deletionhtdocs/langs/ca_ES/companies.lang
- htdocs/langs/en_US/errors.lang 2 additions, 0 deletionshtdocs/langs/en_US/errors.lang
- htdocs/langs/es_ES/companies.lang 0 additions, 1 deletionhtdocs/langs/es_ES/companies.lang
- htdocs/langs/fr_FR/errors.lang 17 additions, 17 deletionshtdocs/langs/fr_FR/errors.lang
- htdocs/langs/pt_PT/companies.lang 0 additions, 1 deletionhtdocs/langs/pt_PT/companies.lang
- htdocs/main.inc.php 7 additions, 10 deletionshtdocs/main.inc.php
- htdocs/product/fiche.php 14 additions, 14 deletionshtdocs/product/fiche.php
- htdocs/projet/tasks/task.php 1 addition, 2 deletionshtdocs/projet/tasks/task.php
- htdocs/theme/eldy/style.css.php 1 addition, 1 deletionhtdocs/theme/eldy/style.css.php
Loading
Please register or sign in to comment