[Dolibarr-git] [Dolibarr/dolibarr] 7a8f24: Fix: Translation

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7a8f244ae986f190b178448712d7acd91ef32fac
      
https://github.com/Dolibarr/dolibarr/commit/7a8f244ae986f190b178448712d7acd91ef32fac
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-19 (Sat, 19 Jul 2014)

  Changed paths:
    M htdocs/langs/fa_IR/main.lang
    M test/phpunit/LangTest.php

  Log Message:
  -----------
  Fix: Translation


  Commit: 109ccf9b74d8e334afdcb9a98a7f658fbe5bc301
      
https://github.com/Dolibarr/dolibarr/commit/109ccf9b74d8e334afdcb9a98a7f658fbe5bc301
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-19 (Sat, 19 Jul 2014)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php

  Log Message:
  -----------
  Fix: SQL syntax error with pgsql

Conflicts:
        htdocs/contrat/class/contrat.class.php


  Commit: a9779ca1ffc7243e330d5872d925cb1ad493e6ed
      
https://github.com/Dolibarr/dolibarr/commit/a9779ca1ffc7243e330d5872d925cb1ad493e6ed
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  Fix: bad colspan for line with date selector


  Commit: 8137fd7fe427bf42ab461842e826efc678432996
      
https://github.com/Dolibarr/dolibarr/commit/8137fd7fe427bf42ab461842e826efc678432996
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Fix: Type of line (product/service) could not be edited on supplier
order/invoice.


  Commit: 5cbb39594f617aeb1d6712132f514c411c7f002c
      
https://github.com/Dolibarr/dolibarr/commit/5cbb39594f617aeb1d6712132f514c411c7f002c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M README-FR.md
    M README.md

  Log Message:
  -----------
  Fix: I hate duplicated documentation.


  Commit: dec7fe42aff186860099550f46f473eab29133d7
      
https://github.com/Dolibarr/dolibarr/commit/dec7fe42aff186860099550f46f473eab29133d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-20 (Sun, 20 Jul 2014)

  Changed paths:
    M README-FR.md
    M README.md
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/langs/fa_IR/main.lang
    M test/phpunit/LangTest.php

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

Conflicts:
        htdocs/core/class/html.form.class.php
        htdocs/fourn/commande/fiche.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d7163fe5434d...dec7fe42aff1