Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

774e3278

"README.md" did not exist on "5ebd766b0ffc4b642b03689e12c25b2318d92a30"

Commit 774e3278 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang

parents 6e1d7aeb 972d998f

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/comm/remx.php 36 additions, 27 deletions

htdocs/comm/remx.php
htdocs/compta/facture.php 21 additions, 18 deletions

htdocs/compta/facture.php
htdocs/don/class/don.class.php 2 additions, 1 deletion

htdocs/don/class/don.class.php
htdocs/expensereport/class/expensereport.class.php 1 addition, 0 deletions

htdocs/expensereport/class/expensereport.class.php
htdocs/langs/en_US/companies.lang 2 additions, 0 deletions

htdocs/langs/en_US/companies.lang
htdocs/product/index.php 2 additions, 3 deletions

htdocs/product/index.php
htdocs/societe/soc.php 17 additions, 4 deletions

htdocs/societe/soc.php

with 81 additions and 53 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