[Dolibarr-git] [Dolibarr/dolibarr] 74e16d: [ bug #1589 ] Menu type in "Edit menu" page is not...

[Laurent Destailleur]

  Branch: refs/heads/marcosgdf-bug-1577
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 74e16db6321a27b4d064af12bb8ef8d2860c8cf3
      
https://github.com/Dolibarr/dolibarr/commit/74e16db6321a27b4d064af12bb8ef8d2860c8cf3
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/menus/edit.php

  Log Message:
  -----------
  [ bug #1589 ] Menu type in "Edit menu" page is not translated


  Commit: afd631e6e3aa2d36b5af62fc30b0ac6e9d5a9321
      
https://github.com/Dolibarr/dolibarr/commit/afd631e6e3aa2d36b5af62fc30b0ac6e9d5a9321
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/societe/soc.php

  Log Message:
  -----------
  [ bug #1577 ] When creating new Private individual third, selected third type 
is ignored


  Commit: fcbb388a72e7ce9fe12a900669435b236e09ede8
      
https://github.com/Dolibarr/dolibarr/commit/fcbb388a72e7ce9fe12a900669435b236e09ede8
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/menus/edit.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-bug-1589' into 3.5


  Commit: f0d4ebe41704e8e1c3f7a35aa6f8fb774a4828bf
      
https://github.com/Dolibarr/dolibarr/commit/f0d4ebe41704e8e1c3f7a35aa6f8fb774a4828bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php

  Log Message:
  -----------
  Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5

Conflicts:
        ChangeLog


  Commit: 2704f50bd4e5bc26de52ac45aefd529a4343a34a
      
https://github.com/Dolibarr/dolibarr/commit/2704f50bd4e5bc26de52ac45aefd529a4343a34a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge branch 'bug-1577' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1577

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/74e16db6321a^...2704f50bd4e5