-
- Downloads
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts: htdocs/comm/remise.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/filefunc.inc.php htdocs/societe/price.php
No related branches found
No related tags found
Showing
- htdocs/comm/mailing/card.php 9 additions, 6 deletionshtdocs/comm/mailing/card.php
- htdocs/comm/propal.php 3 additions, 2 deletionshtdocs/comm/propal.php
- htdocs/comm/propal/class/propal.class.php 1 addition, 0 deletionshtdocs/comm/propal/class/propal.class.php
- htdocs/comm/remise.php 4 additions, 2 deletionshtdocs/comm/remise.php
- htdocs/core/class/commonobject.class.php 4 additions, 2 deletionshtdocs/core/class/commonobject.class.php
- htdocs/core/lib/functions.lib.php 4 additions, 3 deletionshtdocs/core/lib/functions.lib.php
- htdocs/core/modules/modSociete.class.php 5 additions, 1 deletionhtdocs/core/modules/modSociete.class.php
- htdocs/expedition/card.php 2 additions, 1 deletionhtdocs/expedition/card.php
- htdocs/expedition/class/expedition.class.php 16 additions, 4 deletionshtdocs/expedition/class/expedition.class.php
- htdocs/product/class/productcustomerprice.class.php 2 additions, 0 deletionshtdocs/product/class/productcustomerprice.class.php
- htdocs/societe/price.php 5 additions, 5 deletionshtdocs/societe/price.php
- scripts/emailings/mailing-send.php 14 additions, 13 deletionsscripts/emailings/mailing-send.php
Loading
Please register or sign in to comment