Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

782ab6a0

Commit 782ab6a0 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php

parents 40723b26 112b945e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/commande/class/commande.class.php 24 additions, 12 deletions

htdocs/commande/class/commande.class.php
htdocs/compta/prelevement/fiche-stat.php 1 addition, 1 deletion

htdocs/compta/prelevement/fiche-stat.php
htdocs/core/modules/barcode/mod_barcode_product_standard.php 4 additions, 4 deletions

htdocs/core/modules/barcode/mod_barcode_product_standard.php
htdocs/core/modules/barcode/modules_barcode.class.php 4 additions, 4 deletions

htdocs/core/modules/barcode/modules_barcode.class.php
htdocs/product/admin/product.php 4 additions, 3 deletions

htdocs/product/admin/product.php

with 37 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment