Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

dolibarr
- Activity
- Members

Snippets Groups Projects

Software_Artifact_Infrastructure_Repository
dolibarr
Commits
7f18dfee

Commit 7f18dfee authored Jun 2, 2017 by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php

parents b789246e 3555bd2b

Branches

Tags

No related merge requests found

Changes 14

Show whitespace changes

Inline Side-by-side

Showing

ChangeLog 20 additions, 0 deletions

ChangeLog
build/debian/source/lintian-overrides 9 additions, 4 deletions

build/debian/source/lintian-overrides
htdocs/comm/action/card.php 1 addition, 1 deletion

htdocs/comm/action/card.php
htdocs/compta/facture/class/facture.class.php 29 additions, 28 deletions

htdocs/compta/facture/class/facture.class.php
htdocs/compta/prelevement/class/bonprelevement.class.php 13 additions, 52 deletions

htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/contrat/class/contrat.class.php 2 additions, 0 deletions

htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php 3 additions, 2 deletions

htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php 27 additions, 3 deletions

htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php 1 addition, 1 deletion

htdocs/filefunc.inc.php
htdocs/install/upgrade2.php 11 additions, 8 deletions

htdocs/install/upgrade2.php
htdocs/projet/card.php 9 additions, 4 deletions

htdocs/projet/card.php
htdocs/projet/class/api_projects.class.php 31 additions, 28 deletions

htdocs/projet/class/api_projects.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php 9 additions, 3 deletions

htdocs/supplier_proposal/class/supplier_proposal.class.php
test/phpunit/DateLibTest.php 22 additions, 17 deletions

test/phpunit/DateLibTest.php

with 187 additions and 151 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