[Dolibarr-git] [Dolibarr/dolibarr] e46975: Divers

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e469755d294bcae9829b2bdcd5a4e6b5dff795b6
      
https://github.com/Dolibarr/dolibarr/commit/e469755d294bcae9829b2bdcd5a4e6b5dff795b6
  Author: aspangaro <address@hidden>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M htdocs/boutique/index.php
    M htdocs/boutique/osc_master.inc.php
    M htdocs/categories/admin/categorie.php
    M htdocs/core/modules/modLabel.class.php

  Log Message:
  -----------
  Divers


  Commit: a974fa4a08937990c9f6a9af3448292b7e7b0c33
      
https://github.com/Dolibarr/dolibarr/commit/a974fa4a08937990c9f6a9af3448292b7e7b0c33
  Author: aspangaro <address@hidden>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Merge branch 'Upstream/develop'


  Commit: 736561e8f0a658520ef5220c731d21d5dba252a7
      
https://github.com/Dolibarr/dolibarr/commit/736561e8f0a658520ef5220c731d21d5dba252a7
  Author: aspangaro <address@hidden>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M htdocs/boutique/index.php
    M htdocs/boutique/osc_master.inc.php
    M htdocs/langs/en_US/shop.lang
    M htdocs/langs/fr_FR/shop.lang

  Log Message:
  -----------
  Shop - Bad language file ("boutique" instead of "shop") & add language key


  Commit: 516363f491715a088999b512172ab69fa28cd01c
      
https://github.com/Dolibarr/dolibarr/commit/516363f491715a088999b512172ab69fa28cd01c
  Author: aspangaro <address@hidden>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

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

  Log Message:
  -----------
  Bank - Enhance readability


  Commit: 51eb761b02d07ccf3c97a91e6aa023f783c4456f
      
https://github.com/Dolibarr/dolibarr/commit/51eb761b02d07ccf3c97a91e6aa023f783c4456f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M htdocs/boutique/index.php
    M htdocs/boutique/osc_master.inc.php
    M htdocs/categories/admin/categorie.php
    M htdocs/compta/bank/index.php
    M htdocs/core/modules/modLabel.class.php
    M htdocs/langs/en_US/shop.lang
    M htdocs/langs/fr_FR/shop.lang

  Log Message:
  -----------
  Merge pull request #1669 from aspangaro/develop-patch1

Correction on 3.6beta


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8819f3e6e239...51eb761b02d0