[Dolibarr-git] [Dolibarr/dolibarr] 4d1120: FIX: change object statut on close shipping and re...

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4d11205a01f056dd1a0dd2baf1223e35ef953d60
      
https://github.com/Dolibarr/dolibarr/commit/4d11205a01f056dd1a0dd2baf1223e35ef953d60
  Author: Christophe Battarel <address@hidden>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  FIX: change object statut on close shipping and remove erratic db commit


  Commit: f33157033c26f4d85b23ee0f718b069f74b74bd2
      
https://github.com/Dolibarr/dolibarr/commit/f33157033c26f4d85b23ee0f718b069f74b74bd2
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Merge pull request #3909 from altatof/fixcloseshipping

FIX: change object statut on close shipping and remove erratic db commit


  Commit: b4c3804c911d458d575ab0ce559e2acbf521ae6b
      
https://github.com/Dolibarr/dolibarr/commit/b4c3804c911d458d575ab0ce559e2acbf521ae6b
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-07 (Sat, 07 Nov 2015)

  Changed paths:
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  FIX #3928 Creating a Customer order and a Customer invoice from a project, 
does not inherit payment conditions and method of payment of customer card


  Commit: 728f469c1e37e9cec1f22686461f8eedf48e8d12
      
https://github.com/Dolibarr/dolibarr/commit/728f469c1e37e9cec1f22686461f8eedf48e8d12
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-11-07 (Sat, 07 Nov 2015)

  Changed paths:
    M htdocs/compta/bank/treso.php

  Log Message:
  -----------
  FIX #3890 Expected transactions bank account page, shows negative numbers


  Commit: d69e76168f2e464e831126e5448b3020d1acad04
      
https://github.com/Dolibarr/dolibarr/commit/d69e76168f2e464e831126e5448b3020d1acad04
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #3929 from marcosgdf/bug-3928

FIX #3928 Creating a Customer order and a Customer invoice from a project, does 
not inherit payment conditions and method of payment of customer card


  Commit: a6f0baefc108a5a5ec9532750f9abe46897999ba
      
https://github.com/Dolibarr/dolibarr/commit/a6f0baefc108a5a5ec9532750f9abe46897999ba
  Author: Juanjo Menent <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M htdocs/compta/bank/treso.php

  Log Message:
  -----------
  Merge pull request #3933 from marcosgdf/bug-3980

FIX #3890 Expected transactions bank account page, shows negative numbers


  Commit: d4aeb8b3bcea0e212de82f2ade1070f56a262088
      
https://github.com/Dolibarr/dolibarr/commit/d4aeb8b3bcea0e212de82f2ade1070f56a262088
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Abandon package APS. Was never used.


  Commit: 722a133b314807bd08b9a0d59c0614f6b0599d7f
      
https://github.com/Dolibarr/dolibarr/commit/722a133b314807bd08b9a0d59c0614f6b0599d7f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5

Conflicts:
        ChangeLog

Conflicts:
        ChangeLog


  Commit: 350345eccaa70ac932f7ddaa94e6f217f01bef6e
      
https://github.com/Dolibarr/dolibarr/commit/350345eccaa70ac932f7ddaa94e6f217f01bef6e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M build/debian/changelog

  Log Message:
  -----------
  Prepare 3.6.5


  Commit: eac80d7db4c5ba141b8e08176b77b3d384005230
      
https://github.com/Dolibarr/dolibarr/commit/eac80d7db4c5ba141b8e08176b77b3d384005230
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M ChangeLog
    M htdocs/commande/card.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture.php
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
        ChangeLog
        build/debian/changelog
        htdocs/commande/fiche.php
        htdocs/compta/facture.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c7546dbad290...eac80d7db4c5