Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

Admin message

On Saturday, April 12 from 8:00 AM to 9:00 AM, we will be performing an upgrade of the GitLab system. During that time, GitLab and git services on git.unl.edu may be unavailable.

51b67704

Commit 51b67704 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

parents 94acbeaa 194260fc

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/comm/index.php 15 additions, 0 deletions

htdocs/comm/index.php
htdocs/compta/charges/index.php 8 additions, 7 deletions

htdocs/compta/charges/index.php
htdocs/compta/salaries/card.php 7 additions, 2 deletions

htdocs/compta/salaries/card.php
htdocs/compta/salaries/class/paymentsalary.class.php 3 additions, 1 deletion

htdocs/compta/salaries/class/paymentsalary.class.php
htdocs/compta/salaries/index.php 21 additions, 6 deletions

htdocs/compta/salaries/index.php
htdocs/core/lib/functions.lib.php 9 additions, 9 deletions

htdocs/core/lib/functions.lib.php
htdocs/fourn/commande/list.php 1 addition, 1 deletion

htdocs/fourn/commande/list.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql 2 additions, 0 deletions

htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/install/mysql/tables/llx_payment_salary.sql 1 addition, 0 deletions

htdocs/install/mysql/tables/llx_payment_salary.sql
htdocs/langs/en_US/orders.lang 1 addition, 0 deletions

htdocs/langs/en_US/orders.lang
htdocs/langs/en_US/salaries.lang 1 addition, 0 deletions

htdocs/langs/en_US/salaries.lang

with 69 additions and 26 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