Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

c4c7ccc2

Commit c4c7ccc2 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php

parents 4f842fd2 079ed881

No related branches found

No related tags found

No related merge requests found

Changes 24

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/comm/card.php 3 additions, 2 deletions

htdocs/comm/card.php
htdocs/contrat/card.php 1 addition, 1 deletion

htdocs/contrat/card.php
htdocs/core/class/commonobject.class.php 3 additions, 1 deletion

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

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

htdocs/core/class/utils.class.php
htdocs/core/tpl/objectline_create.tpl.php 1 addition, 1 deletion

htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/card.php 3 additions, 1 deletion

htdocs/fourn/card.php
htdocs/fourn/commande/list.php 2 additions, 2 deletions

htdocs/fourn/commande/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql 4 additions, 0 deletions

htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_multicurrency_rate.sql 2 additions, 2 deletions

htdocs/install/mysql/tables/llx_multicurrency_rate.sql
htdocs/margin/tabs/thirdpartyMargins.php 3 additions, 1 deletion

htdocs/margin/tabs/thirdpartyMargins.php
htdocs/opensurvey/card.php 3 additions, 6 deletions

htdocs/opensurvey/card.php
htdocs/opensurvey/class/opensurveysondage.class.php 1 addition, 2 deletions

htdocs/opensurvey/class/opensurveysondage.class.php
htdocs/public/opensurvey/studs.php 10 additions, 1 deletion

htdocs/public/opensurvey/studs.php
htdocs/societe/agenda.php 3 additions, 1 deletion

htdocs/societe/agenda.php
htdocs/societe/commerciaux.php 3 additions, 1 deletion

htdocs/societe/commerciaux.php
htdocs/societe/consumption.php 3 additions, 1 deletion

htdocs/societe/consumption.php
htdocs/societe/document.php 3 additions, 1 deletion

htdocs/societe/document.php
htdocs/societe/note.php 3 additions, 1 deletion

htdocs/societe/note.php
htdocs/societe/notify/card.php 3 additions, 1 deletion

htdocs/societe/notify/card.php

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