Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0
Conflicts: htdocs/resource/class/dolresource.class.php
No related branches found
No related tags found
Showing
- htdocs/categories/card.php 3 additions, 2 deletionshtdocs/categories/card.php
- htdocs/categories/viewcat.php 2 additions, 1 deletionhtdocs/categories/viewcat.php
- htdocs/compta/bank/card.php 5 additions, 1 deletionhtdocs/compta/bank/card.php
- htdocs/compta/sociales/charges.php 6 additions, 4 deletionshtdocs/compta/sociales/charges.php
- htdocs/contact/card.php 16 additions, 16 deletionshtdocs/contact/card.php
- htdocs/contact/perso.php 4 additions, 4 deletionshtdocs/contact/perso.php
- htdocs/core/class/commonobject.class.php 3 additions, 2 deletionshtdocs/core/class/commonobject.class.php
- htdocs/core/class/extrafields.class.php 8 additions, 7 deletionshtdocs/core/class/extrafields.class.php
- htdocs/core/db/pgsql.class.php 1 addition, 1 deletionhtdocs/core/db/pgsql.class.php
- htdocs/core/modules/modCategorie.class.php 2 additions, 2 deletionshtdocs/core/modules/modCategorie.class.php
- htdocs/core/modules/modFacture.class.php 1 addition, 1 deletionhtdocs/core/modules/modFacture.class.php
- htdocs/core/modules/modSalaries.class.php 1 addition, 1 deletionhtdocs/core/modules/modSalaries.class.php
- htdocs/core/modules/modUser.class.php 1 addition, 1 deletionhtdocs/core/modules/modUser.class.php
- htdocs/fourn/card.php 2 additions, 2 deletionshtdocs/fourn/card.php
- htdocs/fourn/class/fournisseur.commande.class.php 1 addition, 1 deletionhtdocs/fourn/class/fournisseur.commande.class.php
- htdocs/langs/en_US/bills.lang 1 addition, 0 deletionshtdocs/langs/en_US/bills.lang
- htdocs/langs/en_US/companies.lang 1 addition, 0 deletionshtdocs/langs/en_US/companies.lang
- htdocs/margin/tabs/productMargins.php 14 additions, 4 deletionshtdocs/margin/tabs/productMargins.php
- htdocs/opensurvey/card.php 4 additions, 3 deletionshtdocs/opensurvey/card.php
- htdocs/opensurvey/results.php 5 additions, 3 deletionshtdocs/opensurvey/results.php
Loading
Please register or sign in to comment