-
- Downloads
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/core/lib/files.lib.php
Showing
- README.md 3 additions, 2 deletionsREADME.md
- htdocs/accountancy/admin/index.php 9 additions, 4 deletionshtdocs/accountancy/admin/index.php
- htdocs/admin/index.php 1 addition, 1 deletionhtdocs/admin/index.php
- htdocs/core/class/commondocgenerator.class.php 14 additions, 7 deletionshtdocs/core/class/commondocgenerator.class.php
- htdocs/core/class/commonobject.class.php 2 additions, 2 deletionshtdocs/core/class/commonobject.class.php
- htdocs/core/lib/accounting.lib.php 4 additions, 2 deletionshtdocs/core/lib/accounting.lib.php
- htdocs/core/lib/files.lib.php 108 additions, 90 deletionshtdocs/core/lib/files.lib.php
- htdocs/core/login/functions_dolibarr.php 4 additions, 1 deletionhtdocs/core/login/functions_dolibarr.php
- htdocs/fourn/class/fournisseur.commande.class.php 12 additions, 5 deletionshtdocs/fourn/class/fournisseur.commande.class.php
- htdocs/fourn/class/fournisseur.facture.class.php 8 additions, 1 deletionhtdocs/fourn/class/fournisseur.facture.class.php
- htdocs/fourn/commande/card.php 1 addition, 1 deletionhtdocs/fourn/commande/card.php
- htdocs/fourn/facture/card.php 2 additions, 1 deletionhtdocs/fourn/facture/card.php
- htdocs/langs/en_US/accountancy.lang 3 additions, 3 deletionshtdocs/langs/en_US/accountancy.lang
- htdocs/product/stock/class/mouvementstock.class.php 3 additions, 1 deletionhtdocs/product/stock/class/mouvementstock.class.php
Loading
Please register or sign in to comment