-
- Downloads
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts: htdocs/product/stock/card.php
No related branches found
No related tags found
Showing
- ChangeLog 2 additions, 1 deletionChangeLog
- htdocs/admin/modules.php 1 addition, 1 deletionhtdocs/admin/modules.php
- htdocs/admin/perms.php 1 addition, 1 deletionhtdocs/admin/perms.php
- htdocs/admin/stock.php 5 additions, 0 deletionshtdocs/admin/stock.php
- htdocs/cashdesk/admin/cashdesk.php 25 additions, 10 deletionshtdocs/cashdesk/admin/cashdesk.php
- htdocs/cashdesk/affContenu.php 11 additions, 4 deletionshtdocs/cashdesk/affContenu.php
- htdocs/cashdesk/css/style.css 5 additions, 4 deletionshtdocs/cashdesk/css/style.css
- htdocs/cashdesk/facturation_verif.php 6 additions, 5 deletionshtdocs/cashdesk/facturation_verif.php
- htdocs/cashdesk/include/environnement.php 1 addition, 0 deletionshtdocs/cashdesk/include/environnement.php
- htdocs/cashdesk/index.php 3 additions, 4 deletionshtdocs/cashdesk/index.php
- htdocs/cashdesk/index_verif.php 11 additions, 11 deletionshtdocs/cashdesk/index_verif.php
- htdocs/cashdesk/tpl/facturation1.tpl.php 2 additions, 1 deletionhtdocs/cashdesk/tpl/facturation1.tpl.php
- htdocs/cashdesk/tpl/liste_articles.tpl.php 0 additions, 2 deletionshtdocs/cashdesk/tpl/liste_articles.tpl.php
- htdocs/cashdesk/tpl/menu.tpl.php 1 addition, 1 deletionhtdocs/cashdesk/tpl/menu.tpl.php
- htdocs/cashdesk/tpl/validation1.tpl.php 4 additions, 2 deletionshtdocs/cashdesk/tpl/validation1.tpl.php
- htdocs/cashdesk/tpl/validation2.tpl.php 2 additions, 1 deletionhtdocs/cashdesk/tpl/validation2.tpl.php
- htdocs/cashdesk/validation_verif.php 54 additions, 2 deletionshtdocs/cashdesk/validation_verif.php
- htdocs/comm/mailing/card.php 22 additions, 4 deletionshtdocs/comm/mailing/card.php
- htdocs/comm/mailing/cibles.php 2 additions, 1 deletionhtdocs/comm/mailing/cibles.php
- htdocs/compta/facture/class/facture.class.php 2 additions, 2 deletionshtdocs/compta/facture/class/facture.class.php
Loading
Please register or sign in to comment