Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

1e3bc9f8

Commit 1e3bc9f8 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents c06abac4 888d9887

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/delais.php 6 additions, 0 deletions

htdocs/admin/delais.php
htdocs/compta/facture.php 1 addition, 0 deletions

htdocs/compta/facture.php
htdocs/core/class/conf.class.php 2 additions, 0 deletions

htdocs/core/class/conf.class.php
htdocs/core/lib/pdf.lib.php 2 additions, 2 deletions

htdocs/core/lib/pdf.lib.php
htdocs/expensereport/class/expensereport.class.php 83 additions, 0 deletions

htdocs/expensereport/class/expensereport.class.php
htdocs/index.php 25 additions, 8 deletions

htdocs/index.php
htdocs/install/mysql/data/llx_const.sql 1 addition, 0 deletions

htdocs/install/mysql/data/llx_const.sql
htdocs/install/mysql/migration/3.8.0-3.9.0.sql 4 additions, 1 deletion

htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/langs/en_US/trips.lang 2 additions, 0 deletions

htdocs/langs/en_US/trips.lang

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