Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts: htdocs/adherents/class/adherent.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/facture.class.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/contrat/class/contrat.class.php
No related branches found
No related tags found
Showing
- htdocs/adherents/class/adherent.class.php 5 additions, 5 deletionshtdocs/adherents/class/adherent.class.php
- htdocs/comm/propal/class/propal.class.php 4 additions, 4 deletionshtdocs/comm/propal/class/propal.class.php
- htdocs/commande/class/commande.class.php 3 additions, 3 deletionshtdocs/commande/class/commande.class.php
- htdocs/compta/bank/class/account.class.php 13 additions, 13 deletionshtdocs/compta/bank/class/account.class.php
- htdocs/compta/facture/class/facture.class.php 7 additions, 7 deletionshtdocs/compta/facture/class/facture.class.php
- htdocs/compta/localtax/class/localtax.class.php 4 additions, 4 deletionshtdocs/compta/localtax/class/localtax.class.php
- htdocs/compta/paiement/cheque/class/remisecheque.class.php 1 addition, 1 deletionhtdocs/compta/paiement/cheque/class/remisecheque.class.php
- htdocs/compta/salaries/class/paymentsalary.class.php 5 additions, 5 deletionshtdocs/compta/salaries/class/paymentsalary.class.php
- htdocs/compta/sociales/class/chargesociales.class.php 2 additions, 2 deletionshtdocs/compta/sociales/class/chargesociales.class.php
- htdocs/compta/tva/class/tva.class.php 4 additions, 4 deletionshtdocs/compta/tva/class/tva.class.php
- htdocs/contrat/class/contrat.class.php 13 additions, 13 deletionshtdocs/contrat/class/contrat.class.php
- htdocs/theme/eldy/style.css.php 2 additions, 2 deletionshtdocs/theme/eldy/style.css.php
Loading
Please register or sign in to comment