Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

e70aebf2

Commit e70aebf2 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge pull request #1937 from fappels/develop

Expedition lines from same orderline merged.

parents d9f898ab 269df778

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/modules/livraison/doc/pdf_typhon.modules.php 2 additions, 2 deletions

htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/expedition/card.php 23 additions, 2 deletions

htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php 37 additions, 9 deletions

htdocs/expedition/class/expedition.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql 1 addition, 1 deletion

htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_US/sendings.lang 4 additions, 0 deletions

htdocs/langs/en_US/sendings.lang

with 67 additions and 14 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