Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

b4e5acba

Commit b4e5acba authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/product/class/product.class.php

parents 568a4321 911e862a

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

htdocs/adherents/list.php 148 additions, 40 deletions

htdocs/adherents/list.php
htdocs/commande/list.php 1 addition, 1 deletion

htdocs/commande/list.php
htdocs/langs/en_US/products.lang 2 additions, 0 deletions

htdocs/langs/en_US/products.lang
htdocs/langs/en_US/suppliers.lang 5 additions, 2 deletions

htdocs/langs/en_US/suppliers.lang
htdocs/product/class/product.class.php 13 additions, 5 deletions

htdocs/product/class/product.class.php
htdocs/product/composition/card.php 41 additions, 38 deletions

htdocs/product/composition/card.php
htdocs/societe/list.php 9 additions, 8 deletions

htdocs/societe/list.php

with 219 additions and 94 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