Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

d4e324d1

Commit d4e324d1 authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/compta/facture.php

parents 39c4feae 9c12444a

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/compta/facture.php 11 additions, 5 deletions

htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php 1 addition, 1 deletion

htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.form.class.php 1 addition, 1 deletion

htdocs/core/class/html.form.class.php
htdocs/core/tpl/objectline_edit.tpl.php 9 additions, 3 deletions

htdocs/core/tpl/objectline_edit.tpl.php
htdocs/fourn/card.php 0 additions, 1 deletion

htdocs/fourn/card.php
htdocs/product/class/html.formproduct.class.php 1 addition, 1 deletion

htdocs/product/class/html.formproduct.class.php
htdocs/projet/activity/perday.php 1 addition, 1 deletion

htdocs/projet/activity/perday.php

with 24 additions and 13 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