Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

cd6c6f64

Commit cd6c6f64 authored 9 years ago by Juanjo Menent

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into dolibarr-3510

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql

parents 305bbf14 8cd1b958

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/accountancy/admin/account.php 6 additions, 6 deletions

htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/card.php 13 additions, 3 deletions

htdocs/accountancy/admin/card.php
htdocs/core/lib/functions.lib.php 5 additions, 5 deletions

htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql 2 additions, 0 deletions

htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_accounting_account.sql 1 addition, 1 deletion

htdocs/install/mysql/tables/llx_accounting_account.sql

with 27 additions and 15 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