Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

d7dcf28c

Commit d7dcf28c authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into

atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql

parents 2d2930b4 105e024c

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/fourn/class/fournisseur.commande.class.php 13 additions, 12 deletions

htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php 10 additions, 7 deletions

htdocs/fourn/commande/dispatch.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql 2 additions, 0 deletions

htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql 1 addition, 0 deletions

...nstall/mysql/tables/llx_commande_fournisseur_dispatch.sql

with 26 additions and 19 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