[Dolibarr-git] [Dolibarr/dolibarr] 23f7de: Fix: [ bug #1094 ] Invoice Text Reminder

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 23f7de0873c10d4b8a7eae6e455179d84089135d
      
https://github.com/Dolibarr/dolibarr/commit/23f7de0873c10d4b8a7eae6e455179d84089135d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: [ bug #1094 ] Invoice Text Reminder

Conflicts:
        htdocs/compta/facture.php


  Commit: e63dcc53431539cc9d4addcb511d12d8ca5c0869
      
https://github.com/Dolibarr/dolibarr/commit/e63dcc53431539cc9d4addcb511d12d8ca5c0869
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M htdocs/product/stock/fiche.php

  Log Message:
  -----------
  Fix: [ bug #1119 ] If no country is selected for a warehouse or thids
card,
broken IMG is shown


  Commit: 9e9a386852141100b640eca03d5f5b7ad41ba424
      
https://github.com/Dolibarr/dolibarr/commit/9e9a386852141100b640eca03d5f5b7ad41ba424
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/product/stock/fiche.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
        htdocs/compta/facture.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/358175b35751...9e9a38685214