-
- Downloads
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php
No related branches found
No related tags found
Showing
- dev/skeletons/README.md 1 addition, 1 deletiondev/skeletons/README.md
- htdocs/admin/perms.php 4 additions, 2 deletionshtdocs/admin/perms.php
- htdocs/barcode/printsheet.php 20 additions, 14 deletionshtdocs/barcode/printsheet.php
- htdocs/contrat/class/contrat.class.php 1 addition, 1 deletionhtdocs/contrat/class/contrat.class.php
- htdocs/core/boxes/box_produits.php 8 additions, 1 deletionhtdocs/core/boxes/box_produits.php
- htdocs/core/boxes/box_produits_alerte_stock.php 9 additions, 2 deletionshtdocs/core/boxes/box_produits_alerte_stock.php
- htdocs/core/class/commonobject.class.php 12 additions, 4 deletionshtdocs/core/class/commonobject.class.php
- htdocs/core/class/hookmanager.class.php 3 additions, 3 deletionshtdocs/core/class/hookmanager.class.php
- htdocs/core/class/html.form.class.php 10 additions, 2 deletionshtdocs/core/class/html.form.class.php
- htdocs/core/lib/functions.lib.php 2 additions, 1 deletionhtdocs/core/lib/functions.lib.php
- htdocs/product/class/product.class.php 119 additions, 112 deletionshtdocs/product/class/product.class.php
- htdocs/product/index.php 11 additions, 1 deletionhtdocs/product/index.php
- htdocs/product/list.php 4 additions, 4 deletionshtdocs/product/list.php
- htdocs/public/members/new.php 21 additions, 10 deletionshtdocs/public/members/new.php
- htdocs/theme/eldy/style.css.php 6 additions, 0 deletionshtdocs/theme/eldy/style.css.php
- htdocs/theme/md/style.css.php 7 additions, 1 deletionhtdocs/theme/md/style.css.php
- htdocs/user/perms.php 2 additions, 2 deletionshtdocs/user/perms.php
Loading
Please register or sign in to comment