Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

6a58b025

Commit 6a58b025 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

parents bc1b2d04 6aba69c6

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/dict.php 30 additions, 7 deletions

htdocs/admin/dict.php
htdocs/compta/bank/card.php 18 additions, 37 deletions

htdocs/compta/bank/card.php
htdocs/core/class/html.formbank.class.php 15 additions, 0 deletions

htdocs/core/class/html.formbank.class.php
htdocs/core/class/html.formprojet.class.php 1 addition, 1 deletion

htdocs/core/class/html.formprojet.class.php
htdocs/core/lib/pdf.lib.php 4 additions, 2 deletions

htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modHRM.class.php 2 additions, 40 deletions

htdocs/core/modules/modHRM.class.php
htdocs/install/pgsql/functions/functions.sql 0 additions, 5 deletions

htdocs/install/pgsql/functions/functions.sql
htdocs/langs/fr_CA/admin.lang 2 additions, 2 deletions

htdocs/langs/fr_CA/admin.lang
htdocs/langs/fr_FR/admin.lang 1 addition, 1 deletion

htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/holiday.lang 4 additions, 4 deletions

htdocs/langs/fr_FR/holiday.lang
htdocs/projet/card.php 1 addition, 1 deletion

htdocs/projet/card.php
htdocs/projet/list.php 1 addition, 1 deletion

htdocs/projet/list.php
htdocs/projet/tasks/list.php 1 addition, 1 deletion

htdocs/projet/tasks/list.php
htdocs/resource/class/resource.class.php 2 additions, 2 deletions

htdocs/resource/class/resource.class.php

with 82 additions and 104 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