Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

fdcc8580

Commit fdcc8580 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'dev_resource_extrafields' of

https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

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

parents b1cab83a 5f3eb909

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/resource.php 144 additions, 0 deletions

htdocs/admin/resource.php
htdocs/admin/resource_extrafields.php 122 additions, 0 deletions

htdocs/admin/resource_extrafields.php
htdocs/core/lib/resource.lib.php 30 additions, 1 deletion

htdocs/core/lib/resource.lib.php
htdocs/core/modules/modResource.class.php 5 additions, 5 deletions

htdocs/core/modules/modResource.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql 11 additions, 0 deletions

htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/install/mysql/tables/llx_resource_extrafields.key.sql 20 additions, 0 deletions

htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
htdocs/install/mysql/tables/llx_resource_extrafields.sql 26 additions, 0 deletions

htdocs/install/mysql/tables/llx_resource_extrafields.sql
htdocs/langs/en_US/admin.lang 6 additions, 1 deletion

htdocs/langs/en_US/admin.lang
htdocs/resource/add.php 21 additions, 0 deletions

htdocs/resource/add.php
htdocs/resource/card.php 32 additions, 3 deletions

htdocs/resource/card.php
htdocs/resource/class/dolresource.class.php 124 additions, 27 deletions

htdocs/resource/class/dolresource.class.php
htdocs/resource/list.php 185 additions, 19 deletions

htdocs/resource/list.php

with 726 additions and 56 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