Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

562348eb

Commit 562348eb authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	htdocs/fourn/commande/dispatch.php

parents e55d3489 74f15680

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/class/ctypent.class.php 3 additions, 2 deletions

htdocs/core/class/ctypent.class.php
htdocs/core/modules/import/import_csv.modules.php 16 additions, 7 deletions

htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/modSociete.class.php 5 additions, 5 deletions

htdocs/core/modules/modSociete.class.php
htdocs/imports/import.php 1 addition, 0 deletions

htdocs/imports/import.php
htdocs/langs/en_US/errors.lang 1 addition, 1 deletion

htdocs/langs/en_US/errors.lang
htdocs/product/list.php 6 additions, 3 deletions

htdocs/product/list.php

with 32 additions and 18 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