[Dolibarr-git] [Dolibarr/dolibarr] 840a98: Expedition lines from same orderline merged.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 840a98d8acc5015d4537aabd6c3782abc2d293a3
      
https://github.com/Dolibarr/dolibarr/commit/840a98d8acc5015d4537aabd6c3782abc2d293a3
  Author: Francis Appels <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/sendings.lang

  Log Message:
  -----------
  Expedition lines from same orderline merged.

When there are more expedition lines from same orderline key, merge them
and get source warehouses. Usefull future possibility for creating
shippinglines with same products from multiple warehouses.
@KreizIT also changed some batch related items.


  Commit: bcc5bebd77a48762899c028384b24ed100cb5290
      
https://github.com/Dolibarr/dolibarr/commit/bcc5bebd77a48762899c028384b24ed100cb5290
  Author: Francis Appels <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php

  Log Message:
  -----------
  Fix deliveryorder qty and remainingqty positions


  Commit: 269df77873c183eb6062a603621a77707c67ab37
      
https://github.com/Dolibarr/dolibarr/commit/269df77873c183eb6062a603621a77707c67ab37
  Author: Francis Appels <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql

  Log Message:
  -----------
  Fix migration sql for inserting accounting records

Migration SQL could not insert accounting records because datec was set
to NOT NULL


  Commit: e70aebf2c75dc58ee4fab867b65ec5d92745d170
      
https://github.com/Dolibarr/dolibarr/commit/e70aebf2c75dc58ee4fab867b65ec5d92745d170
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/langs/en_US/sendings.lang

  Log Message:
  -----------
  Merge pull request #1937 from fappels/develop

Expedition lines from same orderline merged.


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d9f898ab8c2c...e70aebf2c75d