Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

de3d66ea

Commit de3d66ea authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into

aspangaro-develop-accounting3

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

parents 64513c10 9af336b5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/dict.php 5 additions, 5 deletions

htdocs/admin/dict.php
htdocs/compta/deplacement/class/deplacement.class.php 1 addition, 1 deletion

htdocs/compta/deplacement/class/deplacement.class.php
htdocs/core/class/html.form.class.php 1 addition, 1 deletion

htdocs/core/class/html.form.class.php
htdocs/install/mysql/data/llx_c_type_fees.sql 3 additions, 3 deletions

htdocs/install/mysql/data/llx_c_type_fees.sql
htdocs/install/mysql/migration/3.6.0-3.7.0.sql 3 additions, 0 deletions

htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/install/mysql/tables/llx_c_type_fees.sql 7 additions, 5 deletions

htdocs/install/mysql/tables/llx_c_type_fees.sql

with 20 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