[Dolibarr-git] [Dolibarr/dolibarr] 5254f1: Fix: Solve duplicate js and solve jmobile problem ...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5254f102ba5575c211ea2d1f3850058b8a687971
      
https://github.com/Dolibarr/dolibarr/commit/5254f102ba5575c211ea2d1f3850058b8a687971
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M htdocs/core/get_menudiv.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: Solve duplicate js and solve jmobile problem of cache.


  Commit: a5962a410e3ec1fafa73a5f2e95cb9f1c4d17ac5
      
https://github.com/Dolibarr/dolibarr/commit/a5962a410e3ec1fafa73a5f2e95cb9f1c4d17ac5
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M htdocs/core/modules/DolibarrModules.class.php

  Log Message:
  -----------
  Fix: Bad param used


  Commit: da73a8d84c4cd47cff1d67d603ce69773d2c64a6
      
https://github.com/Dolibarr/dolibarr/commit/da73a8d84c4cd47cff1d67d603ce69773d2c64a6
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modExternalRss.class.php

  Log Message:
  -----------
  Fix: syntax error
Fix: Bad field param


  Commit: 743da5a2140f26454725e72125c62aa2bf65e9fe
      
https://github.com/Dolibarr/dolibarr/commit/743da5a2140f26454725e72125c62aa2bf65e9fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/price.lib.php
    A htdocs/langs/fr_CA/admin.lang
    A htdocs/langs/fr_CA/companies.lang
    M htdocs/langs/fr_CA/main.lang

  Log Message:
  -----------
  Fix: function to get localtax1 or 2 value from vat rate return bad value
when countries differs.

Conflicts:
        htdocs/langs/fr_CA/main.lang


  Commit: 3395fd6d8d451e1e138f41c08899640b82c82879
      
https://github.com/Dolibarr/dolibarr/commit/3395fd6d8d451e1e138f41c08899640b82c82879
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M htdocs/langs/fr_CA/main.lang

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

Conflicts:
        htdocs/langs/fr_CA/main.lang
        htdocs/main.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/500c29f014ec...3395fd6d8d45