Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

fe789960

Commit fe789960 authored Nov 5, 2015 by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/product/stock/fiche.php
	htdocs/product/stock/valo.php

parents cbff03ca 375e61de

Branches

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

htdocs/commande/class/commande.class.php 3 additions, 2 deletions

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/core/tpl/objectline_create.tpl.php 1 addition, 1 deletion

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

htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php 2 additions, 1 deletion

htdocs/product/stock/product.php

with 8 additions and 6 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