Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

5bfc6567

Commit 5bfc6567 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/theme/eldy/style.css.php

parents 3278c824 f96f8eac

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 80 additions, 0 deletions

ChangeLog
htdocs/barcode/printsheet.php 1 addition, 1 deletion

htdocs/barcode/printsheet.php
htdocs/commande/class/commande.class.php 6 additions, 2 deletions

htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php 1 addition, 1 deletion

htdocs/compta/facture/class/facture.class.php
htdocs/compta/localtax/quadri_detail.php 8 additions, 33 deletions

htdocs/compta/localtax/quadri_detail.php
htdocs/compta/prelevement/card.php 2 additions, 2 deletions

htdocs/compta/prelevement/card.php
htdocs/core/lib/tax.lib.php 1 addition, 2 deletions

htdocs/core/lib/tax.lib.php
htdocs/core/modules/printing/printgcp.modules.php 41 additions, 41 deletions

htdocs/core/modules/printing/printgcp.modules.php
htdocs/theme/eldy/style.css.php 1 addition, 1 deletion

htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php 4 additions, 1 deletion

htdocs/user/class/user.class.php

with 145 additions and 84 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