Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

085fa690

Commit 085fa690 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php

parents 609cc1dd b47db3e9

Branches main

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

htdocs/commande/class/commandestats.class.php 1 addition, 1 deletion

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

htdocs/compta/facture.php
htdocs/contrat/list.php 1 addition, 1 deletion

htdocs/contrat/list.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php 1 addition, 1 deletion

htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/fourn/ajax/getSupplierPrices.php 5 additions, 3 deletions

htdocs/fourn/ajax/getSupplierPrices.php
htdocs/projet/tasks/time.php 1 addition, 1 deletion

htdocs/projet/tasks/time.php
htdocs/societe/soc.php 1 addition, 1 deletion

htdocs/societe/soc.php

with 11 additions and 9 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