Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

55775605

Commit 55775605 authored 11 years ago by Florian Henry

Downloads
- Plain Diff

Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41

parents c61f7b63 15402b92

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/adherents/class/adherent.class.php 3 additions, 2 deletions

htdocs/adherents/class/adherent.class.php
htdocs/contrat/fiche.php 1 addition, 1 deletion

htdocs/contrat/fiche.php
htdocs/fourn/class/fournisseur.facture.class.php 40 additions, 1 deletion

htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/fiche.php 11 additions, 1 deletion

htdocs/fourn/facture/fiche.php
htdocs/install/mysql/migration/3.3.0-3.4.0.sql 4 additions, 0 deletions

htdocs/install/mysql/migration/3.3.0-3.4.0.sql
htdocs/install/mysql/tables/llx_adherent.sql 1 addition, 1 deletion

htdocs/install/mysql/tables/llx_adherent.sql
htdocs/install/mysql/tables/llx_societe_address.sql 2 additions, 2 deletions

htdocs/install/mysql/tables/llx_societe_address.sql
htdocs/societe/class/societe.class.php 4 additions, 3 deletions

htdocs/societe/class/societe.class.php

with 66 additions and 11 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