[Dolibarr-git] [Dolibarr/dolibarr] 5358d1: Merge branch 'develop' of https://github.com/Dolib...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5358d11cd72d87817e2f7e1da67b3b6a4dc51739
      
https://github.com/Dolibarr/dolibarr/commit/5358d11cd72d87817e2f7e1da67b3b6a4dc51739
  Author: abb <address@hidden>
  Date:   2015-05-24 (Sun, 24 May 2015)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/list.php
    M htdocs/categories/card.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/index.php
    M htdocs/categories/photos.php
    M htdocs/categories/traduction.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/prospect/list.php
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/casoc.php
    M htdocs/contact/list.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contact.lib.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/fourn/list.php
    M htdocs/product/card.php
    M htdocs/product/composition/card.php
    M htdocs/product/list.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/societe.php
    M htdocs/user/card.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop


  Commit: f9aec93d737b3dc49a63523c37af7feface5cc34
      
https://github.com/Dolibarr/dolibarr/commit/f9aec93d737b3dc49a63523c37af7feface5cc34
  Author: abb <address@hidden>
  Date:   2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/list.php
    M htdocs/comm/prospect/list.php
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/casoc.php
    M htdocs/contact/list.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contact.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/fourn/list.php
    M htdocs/install/fileconf.php
    M htdocs/langs/en_US/install.lang
    M htdocs/product/composition/card.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop


  Commit: 3c8d37cb0557dac78dcb4751a569b74ba477f3ae
      
https://github.com/Dolibarr/dolibarr/commit/3c8d37cb0557dac78dcb4751a569b74ba477f3ae
  Author: abb <address@hidden>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M htdocs/langs/ar_SA/admin.lang

  Log Message:
  -----------
  fix 600 first lines of arabic language admin file


  Commit: 1048bd1ba4420110dc731160ce1a4d690c872d72
      
https://github.com/Dolibarr/dolibarr/commit/1048bd1ba4420110dc731160ce1a4d690c872d72
  Author: abb <address@hidden>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/admin/mails.php
    M htdocs/admin/tools/purge.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/compta/facture.php
    M htdocs/contrat/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/install/upgrade2.php
    M htdocs/projet/card.php
    M test/phpunit/FilesLibTest.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop


  Commit: 487879ffd703aacc74a102d2f2c3b8fbb5599d16
      
https://github.com/Dolibarr/dolibarr/commit/487879ffd703aacc74a102d2f2c3b8fbb5599d16
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M htdocs/langs/ar_SA/admin.lang

  Log Message:
  -----------
  Merge pull request #2933 from bafbes/develop

 fix 600 first lines of arabic language admin file


Compare: 
https://github.com/Dolibarr/dolibarr/compare/49f2157f2da8...487879ffd703