-
- Downloads
Merge remote-tracking branch 'origin/4.0' into develop
Conflicts: htdocs/core/class/html.form.class.php htdocs/langs/en_US/admin.lang
Showing
- htdocs/admin/fckeditor.php 1 addition, 1 deletionhtdocs/admin/fckeditor.php
- htdocs/admin/supplier_payment.php 1 addition, 1 deletionhtdocs/admin/supplier_payment.php
- htdocs/core/class/html.formprojet.class.php 3 additions, 3 deletionshtdocs/core/class/html.formprojet.class.php
- htdocs/expensereport/card.php 16 additions, 10 deletionshtdocs/expensereport/card.php
- htdocs/expensereport/info.php 1 addition, 1 deletionhtdocs/expensereport/info.php
- htdocs/fourn/class/fournisseur.commande.class.php 2 additions, 0 deletionshtdocs/fourn/class/fournisseur.commande.class.php
- htdocs/fourn/commande/card.php 2 additions, 1 deletionhtdocs/fourn/commande/card.php
- htdocs/fourn/facture/list.php 1 addition, 13 deletionshtdocs/fourn/facture/list.php
- htdocs/langs/en_US/admin.lang 1 addition, 1 deletionhtdocs/langs/en_US/admin.lang
- htdocs/langs/en_US/main.lang 1 addition, 0 deletionshtdocs/langs/en_US/main.lang
- htdocs/langs/en_US/projects.lang 1 addition, 1 deletionhtdocs/langs/en_US/projects.lang
- htdocs/margin/tabs/thirdpartyMargins.php 4 additions, 1 deletionhtdocs/margin/tabs/thirdpartyMargins.php
- htdocs/projet/activity/perweek.php 1 addition, 1 deletionhtdocs/projet/activity/perweek.php
- htdocs/projet/admin/project.php 6 additions, 6 deletionshtdocs/projet/admin/project.php
- htdocs/projet/card.php 3 additions, 3 deletionshtdocs/projet/card.php
- htdocs/projet/element.php 1 addition, 1 deletionhtdocs/projet/element.php
- htdocs/societe/note.php 3 additions, 1 deletionhtdocs/societe/note.php
- htdocs/theme/eldy/img/puce.png 0 additions, 0 deletionshtdocs/theme/eldy/img/puce.png
- htdocs/theme/eldy/style.css.php 3 additions, 0 deletionshtdocs/theme/eldy/style.css.php
- htdocs/theme/md/img/puce.png 0 additions, 0 deletionshtdocs/theme/md/img/puce.png
Loading
Please register or sign in to comment