Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

fcfe94d4

Commit fcfe94d4 authored 11 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	htdocs/product/liste.php

parents 8c9d1457 ec1aef01

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

COPYRIGHT 1 addition, 0 deletions

COPYRIGHT
ChangeLog 2 additions, 0 deletions

ChangeLog
htdocs/cashdesk/facturation.php 16 additions, 1 deletion

htdocs/cashdesk/facturation.php
htdocs/compta/facture.php 1 addition, 1 deletion

htdocs/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php 1 addition, 1 deletion

htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/modFournisseur.class.php 6 additions, 6 deletions

htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/modSociete.class.php 2 additions, 2 deletions

htdocs/core/modules/modSociete.class.php
htdocs/product/liste.php 8 additions, 8 deletions

htdocs/product/liste.php

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