Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

987c09b8

Commit 987c09b8 authored 11 years ago by Florian Henry

Downloads
- Plain Diff

Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

parents 399093f5 4d105406

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

ChangeLog 2 additions, 0 deletions

ChangeLog
htdocs/core/class/commonobject.class.php 24 additions, 22 deletions

htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php 4 additions, 3 deletions

htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/agentMargins.php 9 additions, 14 deletions

htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php 24 additions, 24 deletions

htdocs/margin/customerMargins.php
htdocs/margin/lib/margins.lib.php 2 additions, 2 deletions

htdocs/margin/lib/margins.lib.php
htdocs/margin/productMargins.php 23 additions, 24 deletions

htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php 25 additions, 25 deletions

htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php 21 additions, 21 deletions

htdocs/margin/tabs/thirdpartyMargins.php

with 134 additions and 135 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