Merge remote-tracking branch 'origin/3.7' into develop
Conflicts: htdocs/core/modules/DolibarrModules.class.php
No related branches found
No related tags found
Showing
- htdocs/admin/barcode.php 2 additions, 3 deletionshtdocs/admin/barcode.php
- htdocs/barcode/codeinit.php 4 additions, 3 deletionshtdocs/barcode/codeinit.php
- htdocs/commande/contact.php 1 addition, 1 deletionhtdocs/commande/contact.php
- htdocs/core/menus/standard/eldy.lib.php 2 additions, 2 deletionshtdocs/core/menus/standard/eldy.lib.php
- htdocs/core/modules/DolibarrModules.class.php 6 additions, 3 deletionshtdocs/core/modules/DolibarrModules.class.php
- htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php 4 additions, 2 deletions.../core/modules/supplier_order/pdf/pdf_muscadet.modules.php
- htdocs/cron/card.php 1 addition, 1 deletionhtdocs/cron/card.php
- htdocs/cron/info.php 1 addition, 1 deletionhtdocs/cron/info.php
- htdocs/fourn/class/fournisseur.commande.class.php 3 additions, 3 deletionshtdocs/fourn/class/fournisseur.commande.class.php
- htdocs/fourn/commande/card.php 7 additions, 3 deletionshtdocs/fourn/commande/card.php
- htdocs/install/mysql/migration/3.6.0-3.7.0.sql 2 additions, 0 deletionshtdocs/install/mysql/migration/3.6.0-3.7.0.sql
- htdocs/install/mysql/tables/llx_commande_fournisseur.sql 2 additions, 2 deletionshtdocs/install/mysql/tables/llx_commande_fournisseur.sql
- htdocs/install/upgrade2.php 42 additions, 20 deletionshtdocs/install/upgrade2.php
- htdocs/langs/en_US/admin.lang 2 additions, 2 deletionshtdocs/langs/en_US/admin.lang
- htdocs/langs/en_US/cron.lang 1 addition, 0 deletionshtdocs/langs/en_US/cron.lang
- htdocs/langs/en_US/errors.lang 1 addition, 1 deletionhtdocs/langs/en_US/errors.lang
- htdocs/langs/fr_FR/admin.lang 1 addition, 1 deletionhtdocs/langs/fr_FR/admin.lang
Loading
Please register or sign in to comment