-
- Downloads
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/exports/class/export.class.php
No related branches found
No related tags found
Showing
- htdocs/admin/expedition.php 13 additions, 8 deletionshtdocs/admin/expedition.php
- htdocs/commande/liste.php 3 additions, 2 deletionshtdocs/commande/liste.php
- htdocs/core/menus/standard/eldy.lib.php 16 additions, 16 deletionshtdocs/core/menus/standard/eldy.lib.php
- htdocs/core/modules/facture/doc/pdf_crabe.modules.php 1 addition, 1 deletionhtdocs/core/modules/facture/doc/pdf_crabe.modules.php
- htdocs/core/modules/propale/doc/pdf_azur.modules.php 1 addition, 1 deletionhtdocs/core/modules/propale/doc/pdf_azur.modules.php
- htdocs/exports/class/export.class.php 1 addition, 1 deletionhtdocs/exports/class/export.class.php
- htdocs/index.php 1 addition, 1 deletionhtdocs/index.php
- htdocs/langs/ar_SA/bills.lang 1 addition, 1 deletionhtdocs/langs/ar_SA/bills.lang
- htdocs/langs/bg_BG/bills.lang 1 addition, 1 deletionhtdocs/langs/bg_BG/bills.lang
- htdocs/langs/ca_ES/orders.lang 5 additions, 3 deletionshtdocs/langs/ca_ES/orders.lang
- htdocs/langs/da_DK/bills.lang 1 addition, 1 deletionhtdocs/langs/da_DK/bills.lang
- htdocs/langs/el_GR/bills.lang 1 addition, 1 deletionhtdocs/langs/el_GR/bills.lang
- htdocs/langs/en_US/admin.lang 1 addition, 1 deletionhtdocs/langs/en_US/admin.lang
- htdocs/langs/en_US/bills.lang 2 additions, 2 deletionshtdocs/langs/en_US/bills.lang
- htdocs/langs/en_US/orders.lang 1 addition, 1 deletionhtdocs/langs/en_US/orders.lang
- htdocs/langs/es_ES/orders.lang 5 additions, 3 deletionshtdocs/langs/es_ES/orders.lang
- htdocs/langs/et_EE/bills.lang 1 addition, 1 deletionhtdocs/langs/et_EE/bills.lang
- htdocs/langs/fi_FI/bills.lang 1 addition, 1 deletionhtdocs/langs/fi_FI/bills.lang
- htdocs/langs/fr_FR/orders.lang 1 addition, 1 deletionhtdocs/langs/fr_FR/orders.lang
- htdocs/langs/he_IL/bills.lang 1 addition, 1 deletionhtdocs/langs/he_IL/bills.lang
Loading
Please register or sign in to comment