Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

ed0e6753

Commit ed0e6753 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents d2843cea 0de3f8ac

No related branches found

No related tags found

No related merge requests found

Changes 83

Expand all Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 1 addition, 0 deletions

ChangeLog
dev/skeletons/skeleton_page.php 3 additions, 2 deletions

dev/skeletons/skeleton_page.php
htdocs/admin/company.php 2 additions, 2 deletions

htdocs/admin/company.php
htdocs/api/class/api_access.class.php 2 additions, 1 deletion

htdocs/api/class/api_access.class.php
htdocs/cashdesk/admin/cashdesk.php 4 additions, 4 deletions

htdocs/cashdesk/admin/cashdesk.php
htdocs/categories/class/categorie.class.php 5 additions, 11 deletions

htdocs/categories/class/categorie.class.php
htdocs/comm/action/card.php 1 addition, 1 deletion

htdocs/comm/action/card.php
htdocs/comm/askpricesupplier/card.php 6 additions, 4 deletions

htdocs/comm/askpricesupplier/card.php
htdocs/comm/propal.php 9 additions, 6 deletions

htdocs/comm/propal.php
htdocs/comm/propal/list.php 25 additions, 8 deletions

htdocs/comm/propal/list.php
htdocs/commande/card.php 9 additions, 7 deletions

htdocs/commande/card.php
htdocs/compta/facture.php 7 additions, 74 deletions

htdocs/compta/facture.php
htdocs/contrat/card.php 7 additions, 4 deletions

htdocs/contrat/card.php
htdocs/core/actions_extrafields.inc.php 30 additions, 3 deletions

htdocs/core/actions_extrafields.inc.php
htdocs/core/class/CMailFile.class.php 2 additions, 2 deletions

htdocs/core/class/CMailFile.class.php
htdocs/core/class/commonobject.class.php 13 additions, 286 deletions

htdocs/core/class/commonobject.class.php
htdocs/core/class/conf.class.php 1 addition, 1 deletion

htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php 372 additions, 123 deletions

htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmargin.class.php 273 additions, 0 deletions

htdocs/core/class/html.formmargin.class.php
htdocs/core/db/DoliDB.class.php 1 addition, 1 deletion

htdocs/core/db/DoliDB.class.php

with 773 additions and 540 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