Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

b5747615

Commit b5747615 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php

parents b51c4ab5 085fa690

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/menus/edit.php 10 additions, 6 deletions

htdocs/admin/menus/edit.php
htdocs/admin/menus/index.php 48 additions, 9 deletions

htdocs/admin/menus/index.php
htdocs/comm/action/listactions.php 3 additions, 3 deletions

htdocs/comm/action/listactions.php
htdocs/commande/class/commandestats.class.php 1 addition, 1 deletion

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

htdocs/compta/facture.php
htdocs/contrat/list.php 1 addition, 1 deletion

htdocs/contrat/list.php
htdocs/core/class/menubase.class.php 4 additions, 0 deletions

htdocs/core/class/menubase.class.php
htdocs/core/lib/treeview.lib.php 15 additions, 8 deletions

htdocs/core/lib/treeview.lib.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php 1 addition, 1 deletion

htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/fourn/ajax/getSupplierPrices.php 7 additions, 4 deletions

htdocs/fourn/ajax/getSupplierPrices.php
htdocs/install/mysql/migration/3.8.0-3.9.0.sql 1 addition, 0 deletions

htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/install/mysql/tables/llx_import_model.sql 1 addition, 1 deletion

htdocs/install/mysql/tables/llx_import_model.sql
htdocs/langs/en_US/admin.lang 1 addition, 0 deletions

htdocs/langs/en_US/admin.lang
htdocs/projet/tasks/time.php 1 addition, 1 deletion

htdocs/projet/tasks/time.php
htdocs/societe/consumption.php 12 additions, 12 deletions

htdocs/societe/consumption.php
htdocs/societe/soc.php 1 addition, 1 deletion

htdocs/societe/soc.php

with 108 additions and 49 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