Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

3d9456b2

Commit 3d9456b2 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.8' into 3.9

Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php

parents 755b9947 53386e22

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/commande/class/commande.class.php 22 additions, 1 deletion

htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php 14 additions, 0 deletions

htdocs/compta/facture/class/facture.class.php
htdocs/compta/stats/cabyprodserv.php 4 additions, 0 deletions

htdocs/compta/stats/cabyprodserv.php
htdocs/core/class/html.form.class.php 3 additions, 3 deletions

htdocs/core/class/html.form.class.php
htdocs/expedition/class/expedition.class.php 6 additions, 8 deletions

htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.facture.class.php 11 additions, 2 deletions

htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php 5 additions, 2 deletions

htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php 2 additions, 2 deletions

htdocs/fourn/facture/list.php

with 67 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