Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts: htdocs/core/tpl/objectline_edit.tpl.php htdocs/fourn/class/fournisseur.product.class.php htdocs/fourn/facture/card.php htdocs/product/composition/card.php
No related branches found
No related tags found
Showing
- htdocs/core/menus/standard/eldy.lib.php 1 addition, 0 deletionshtdocs/core/menus/standard/eldy.lib.php
- htdocs/core/tpl/objectline_create.tpl.php 0 additions, 6 deletionshtdocs/core/tpl/objectline_create.tpl.php
- htdocs/core/tpl/objectline_edit.tpl.php 1 addition, 6 deletionshtdocs/core/tpl/objectline_edit.tpl.php
- htdocs/fourn/class/fournisseur.product.class.php 1 addition, 1 deletionhtdocs/fourn/class/fournisseur.product.class.php
- htdocs/fourn/facture/card.php 5 additions, 1 deletionhtdocs/fourn/facture/card.php
- htdocs/fourn/facture/paiement.php 1 addition, 1 deletionhtdocs/fourn/facture/paiement.php
- htdocs/includes/nusoap/lib/nusoap.php 1 addition, 1 deletionhtdocs/includes/nusoap/lib/nusoap.php
- htdocs/margin/lib/margins.lib.php 1 addition, 1 deletionhtdocs/margin/lib/margins.lib.php
- htdocs/product/composition/card.php 1 addition, 1 deletionhtdocs/product/composition/card.php
Loading
Please register or sign in to comment