[Dolibarr-git] [Dolibarr/dolibarr] 37fd90: Task [ task #752 ] Allow model from external model...

[Laurent Destailleur]

  Branch: refs/heads/3.2_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 37fd901a4f6a61dcfdbfc2aa726836586de01ce9
      
https://github.com/Dolibarr/dolibarr/commit/37fd901a4f6a61dcfdbfc2aa726836586de01ce9
  Author: fhenry <address@hidden>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/expedition/fiche.php

  Log Message:
  -----------
  Task [ task #752 ] Allow model from external models


  Commit: 541620c229757ab356c05259e610d1c6df0afa4a
      
https://github.com/Dolibarr/dolibarr/commit/541620c229757ab356c05259e610d1c6df0afa4a
  Author: fhenry <address@hidden>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php

  Log Message:
  -----------
  same task models shipments


  Commit: 8499668f4dc53c3063ee9a62d4bc0d235be7e070
      
https://github.com/Dolibarr/dolibarr/commit/8499668f4dc53c3063ee9a62d4bc0d235be7e070
  Author: fhenry <address@hidden>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M htdocs/expedition/fiche.php

  Log Message:
  -----------
  better correction


  Commit: 1695af56d0021bffbce28acf097719c403005822
      
https://github.com/Dolibarr/dolibarr/commit/1695af56d0021bffbce28acf097719c403005822
  Author: fhenry <address@hidden>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M htdocs/core/modules/livraison/modules_livraison.php

  Log Message:
  -----------
  [ task #752 ] Allow model from external models for shipment


  Commit: 9f8c3545d38d79a1ae9ca7a86a637cd3df58c6e2
      
https://github.com/Dolibarr/dolibarr/commit/9f8c3545d38d79a1ae9ca7a86a637cd3df58c6e2
  Author: fhenry <address@hidden>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M htdocs/admin/livraison.php

  Log Message:
  -----------
  task [ task #752 ] Allow model from external models for shipment


  Commit: c1c3a450e907aa0ebd528b1d137a3407b6fb9e8c
      
https://github.com/Dolibarr/dolibarr/commit/c1c3a450e907aa0ebd528b1d137a3407b6fb9e8c
  Author: fhenry <address@hidden>
  Date:   2013-03-09 (Sat, 09 Mar 2013)

  Changed paths:
    M htdocs/imports/class/import.class.php

  Log Message:
  -----------
  Allow import from external module


  Commit: 3b8bf77012970f5515302251d3293d2933a0564e
      
https://github.com/Dolibarr/dolibarr/commit/3b8bf77012970f5515302251d3293d2933a0564e
  Author: fhenry <address@hidden>
  Date:   2013-03-09 (Sat, 09 Mar 2013)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/imports/class/import.class.php

  Log Message:
  -----------
  Merge branch '3.2' into 3.2_backported

Conflicts:
        htdocs/core/modules/expedition/modules_expedition.php
        htdocs/core/modules/livraison/modules_livraison.php


  Commit: 6a5fb53eef8077f8201b6d7a29c7ebf49a105650
      
https://github.com/Dolibarr/dolibarr/commit/6a5fb53eef8077f8201b6d7a29c7ebf49a105650
  Author: fhenry <address@hidden>
  Date:   2013-03-09 (Sat, 09 Mar 2013)

  Changed paths:
    M htdocs/imports/class/import.class.php

  Log Message:
  -----------
  change log dol_syslog


  Commit: f828aa01fe323a1aba53869a4f17ac615e38a42a
      
https://github.com/Dolibarr/dolibarr/commit/f828aa01fe323a1aba53869a4f17ac615e38a42a
  Author: fhenry <address@hidden>
  Date:   2013-03-09 (Sat, 09 Mar 2013)

  Changed paths:
    M htdocs/imports/class/import.class.php

  Log Message:
  -----------
  Merge branch '3.2' into 3.2_backported


  Commit: 165cc950ea586bfaa2cf072c29faef0a6578656d
      
https://github.com/Dolibarr/dolibarr/commit/165cc950ea586bfaa2cf072c29faef0a6578656d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-09 (Sat, 09 Mar 2013)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/imports/class/import.class.php

  Log Message:
  -----------
  Merge pull request #723 from FHenry/3.2_backported

3.2 backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b1517665cbb5...165cc950ea58