Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

293c8e14

Commit 293c8e14 authored Jun 5, 2016 by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.9' into develop

Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang

parents bbe5e398 c0793372

No related branches found

No related tags found

No related merge requests found

Changes 22

Show whitespace changes

Inline Side-by-side

Showing

htdocs/comm/propal/class/propal.class.php 1 addition, 1 deletion

htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php 1 addition, 1 deletion

htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php 1 addition, 1 deletion

htdocs/compta/facture/class/facture.class.php
htdocs/compta/index.php 2 additions, 2 deletions

htdocs/compta/index.php
htdocs/core/ajax/ajaxdirpreview.php 4 additions, 1 deletion

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

htdocs/core/class/html.form.class.php
htdocs/core/class/ldap.class.php 67 additions, 64 deletions

htdocs/core/class/ldap.class.php
htdocs/core/lib/admin.lib.php 7 additions, 0 deletions

htdocs/core/lib/admin.lib.php
htdocs/core/lib/functions.lib.php 1 addition, 1 deletion

htdocs/core/lib/functions.lib.php
htdocs/core/menus/standard/eldy.lib.php 2 additions, 2 deletions

htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php 1 addition, 0 deletions

.../modules/propale/doc/doc_generic_proposal_odt.modules.php
htdocs/ecm/index.php 1 addition, 2 deletions

htdocs/ecm/index.php
htdocs/expensereport/card.php 10 additions, 7 deletions

htdocs/expensereport/card.php
htdocs/fourn/class/fournisseur.commande.class.php 1 addition, 1 deletion

htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php 1 addition, 1 deletion

htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/class/fournisseur.product.class.php 1 addition, 1 deletion

htdocs/fourn/class/fournisseur.product.class.php
htdocs/fourn/commande/card.php 1 addition, 1 deletion

htdocs/fourn/commande/card.php
htdocs/imports/import.php 5 additions, 1 deletion

htdocs/imports/import.php
htdocs/langs/en_US/admin.lang 1 addition, 0 deletions

htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/main.lang 1 addition, 0 deletions

htdocs/langs/en_US/main.lang

with 110 additions and 88 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