dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 2aa399: Fix :: Sql problem for fresh


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 2aa399: Fix :: Sql problem for fresh install on resource t...
Date: Thu, 18 Sep 2014 01:13:32 -0700

  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2aa3995b73d808fd4a325000d312e2f95c4ec26b
      
https://github.com/Dolibarr/dolibarr/commit/2aa3995b73d808fd4a325000d312e2f95c4ec26b
  Author: aspangaro <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.sql

  Log Message:
  -----------
  Fix :: Sql problem for fresh install on resource table // Ok in migration 
script


  Commit: 03f642e8619d4690cef422b965de10ccd971438b
      
https://github.com/Dolibarr/dolibarr/commit/03f642e8619d4690cef422b965de10ccd971438b
  Author: aspangaro <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

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

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


  Commit: 2f4e1f09e678d7c11a65b7d429b0b2071e5d6c79
      
https://github.com/Dolibarr/dolibarr/commit/2f4e1f09e678d7c11a65b7d429b0b2071e5d6c79
  Author: aspangaro <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Fix :: Entries salaries into menu doesn't appears when this module is 
activated alone - Needed module tax at the moment


  Commit: d485e270b99c0a391308fb925b46934380061083
      
https://github.com/Dolibarr/dolibarr/commit/d485e270b99c0a391308fb925b46934380061083
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M htdocs/cashdesk/affContenu.php

  Log Message:
  -----------
  Fix: menu param is not inside allowed list


  Commit: 8f18db8e3fce59553e92b5ebe0a588007ea16423
      
https://github.com/Dolibarr/dolibarr/commit/8f18db8e3fce59553e92b5ebe0a588007ea16423
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M htdocs/includes/ckeditor/contents.css
    M htdocs/theme/eldy/style.css.php

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


  Commit: a32791f79dd071876392de670c3e8a7ae7b749d1
      
https://github.com/Dolibarr/dolibarr/commit/a32791f79dd071876392de670c3e8a7ae7b749d1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Merge pull request #1839 from aspangaro/3.6

Fix :: Sql problem for fresh install on resource table


  Commit: a2f0866c0c036b015cc39de9f74b9f590e55a299
      
https://github.com/Dolibarr/dolibarr/commit/a2f0866c0c036b015cc39de9f74b9f590e55a299
  Author: aspangaro <address@hidden>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M htdocs/cashdesk/affContenu.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/includes/ckeditor/contents.css
    M htdocs/theme/eldy/style.css.php

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


  Commit: a353f816e311b340b2b84e85785006fb82449190
      
https://github.com/Dolibarr/dolibarr/commit/a353f816e311b340b2b84e85785006fb82449190
  Author: Alexis Algoud <address@hidden>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

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

  Log Message:
  -----------
  FIX error sql on update ficheinter


  Commit: a97241f71682f59ff629c881b0566696becd42b1
      
https://github.com/Dolibarr/dolibarr/commit/a97241f71682f59ff629c881b0566696becd42b1
  Author: Cubexed <address@hidden>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

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

  Log Message:
  -----------
  Fix unable to delete order line

Calling trigger without having globalized $conf causes error and cancels delete 
operation, this commit adds the missing

2014-08-23 16:52:05 ERR     127.0.0.1        Interfaces::run_triggers was 
called with wrong parameters action=LINEORDER_SUPPLIER_DELETE object=1 user= 
langs= conf=


  Commit: b561d48b5f4f4828ec1e83c6e8df18f4bc710551
      
https://github.com/Dolibarr/dolibarr/commit/b561d48b5f4f4828ec1e83c6e8df18f4bc710551
  Author: aspangaro <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

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

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


  Commit: b7daef10c6f7c4c1ae3fbf2a86bd6797f932a423
      
https://github.com/Dolibarr/dolibarr/commit/b7daef10c6f7c4c1ae3fbf2a86bd6797f932a423
  Author: aspangaro <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql

  Log Message:
  -----------
  Fix llx_c_type_resource when you update from a 3.6-beta


  Commit: ca7ff0ecfab48f79c1eaf4b1f106f0f5479fddfb
      
https://github.com/Dolibarr/dolibarr/commit/ca7ff0ecfab48f79c1eaf4b1f106f0f5479fddfb
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Fix: error in strict mode


  Commit: 1e28fd354146ab4a7e65dcbbcba92e5b84daa8b1
      
https://github.com/Dolibarr/dolibarr/commit/1e28fd354146ab4a7e65dcbbcba92e5b84daa8b1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M build/debian/dolibarr.postinst

  Log Message:
  -----------
  Fix: syntax error


  Commit: 21ff810952e6fe4411b8396e8c29a9cbefaddd60
      
https://github.com/Dolibarr/dolibarr/commit/21ff810952e6fe4411b8396e8c29a9cbefaddd60
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/fichinter/class/fichinter.class.php

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


  Commit: f5883741bf2a94995a5df419bf887e482fca5b2e
      
https://github.com/Dolibarr/dolibarr/commit/f5883741bf2a94995a5df419bf887e482fca5b2e
  Author: braito4 <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Update fiche.php

Proyect selection was missing


  Commit: 12c67529712d924f16989b92f421ec4d0fe89485
      
https://github.com/Dolibarr/dolibarr/commit/12c67529712d924f16989b92f421ec4d0fe89485
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/product/document.php

  Log Message:
  -----------
  Fix: Can upload files on services.


  Commit: 4405f17f2280395c83260911b439b808a2b2a437
      
https://github.com/Dolibarr/dolibarr/commit/4405f17f2280395c83260911b439b808a2b2a437
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update changelog


  Commit: 0674667932a71965b8ffa25d71a6edffac916109
      
https://github.com/Dolibarr/dolibarr/commit/0674667932a71965b8ffa25d71a6edffac916109
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Fix: error with php strict mode


  Commit: 61ae2f3f37fab514d8c355f6d08c565a13f71010
      
https://github.com/Dolibarr/dolibarr/commit/61ae2f3f37fab514d8c355f6d08c565a13f71010
  Author: Philippe GRAND <address@hidden>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  fix : missing translation


  Commit: 08c621037c76f0a1656f41ecec8dd5f878a5459a
      
https://github.com/Dolibarr/dolibarr/commit/08c621037c76f0a1656f41ecec8dd5f878a5459a
  Author: Philippe GRAND <address@hidden>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

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

  Log Message:
  -----------
  fix : missing code for extrafields


  Commit: 34561906fcb34aa3cd88a47ef48855e6bdaa333d
      
https://github.com/Dolibarr/dolibarr/commit/34561906fcb34aa3cd88a47ef48855e6bdaa333d
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

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

  Log Message:
  -----------
  Fix: strict mode anarchy ;-)
check your variable please


  Commit: 338fc5f2f862f5f094d64bf0259ed15e8a7f8e0a
      
https://github.com/Dolibarr/dolibarr/commit/338fc5f2f862f5f094d64bf0259ed15e8a7f8e0a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql

  Log Message:
  -----------
  Fix: Bad unique key


  Commit: 14ec2cd1d95862cd533870059876950ba0081a1f
      
https://github.com/Dolibarr/dolibarr/commit/14ec2cd1d95862cd533870059876950ba0081a1f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge pull request #1851 from grandoc/3.6

fix : missing translation


  Commit: f1993e719fd0bd2aa08e760b939c8225d13d59cb
      
https://github.com/Dolibarr/dolibarr/commit/f1993e719fd0bd2aa08e760b939c8225d13d59cb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.sql

  Log Message:
  -----------
  Merge pull request #1846 from aspangaro/3.6

Fix :: llx_c_type_resource when you update from a 3.6-beta


  Commit: 3064aa21776a262da0cdbe051825b1eed0bc1f09
      
https://github.com/Dolibarr/dolibarr/commit/3064aa21776a262da0cdbe051825b1eed0bc1f09
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.sql
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/document.php

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

Conflicts:
        htdocs/install/mysql/tables/llx_c_type_resource.key.sql


  Commit: 79b081a7b74572913b70c47925ecc88af3482db7
      
https://github.com/Dolibarr/dolibarr/commit/79b081a7b74572913b70c47925ecc88af3482db7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

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

  Log Message:
  -----------
  Merge pull request #1845 from Cubexed/patch-1

Fix unable to delete order line


  Commit: d3a3e8786ec5b7c2665bb828f74902874c5d290d
      
https://github.com/Dolibarr/dolibarr/commit/d3a3e8786ec5b7c2665bb828f74902874c5d290d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

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

  Log Message:
  -----------
  Fix: sql request with pgsql


  Commit: 1505ade3db5d8309813a5e9800b7680c076cd944
      
https://github.com/Dolibarr/dolibarr/commit/1505ade3db5d8309813a5e9800b7680c076cd944
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M htdocs/core/lib/files.lib.php

  Log Message:
  -----------
  Fix error management: When an error is returned by hooks into
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
        htdocs/core/lib/files.lib.php


  Commit: 0e1f22fe26173cefb9f376f5d9ac3228adae754e
      
https://github.com/Dolibarr/dolibarr/commit/0e1f22fe26173cefb9f376f5d9ac3228adae754e
  Author: Juanjo Menent <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php

  Log Message:
  -----------
  Fix: Salary payments are not reflected on the reporting sheets


  Commit: 714da050346bdd0415e5c6b8c9e282d3d27882e9
      
https://github.com/Dolibarr/dolibarr/commit/714da050346bdd0415e5c6b8c9e282d3d27882e9
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Fix: another strict mode alert


  Commit: 2c46c20dfb6dac5b65071cf10e71380c0f36630b
      
https://github.com/Dolibarr/dolibarr/commit/2c46c20dfb6dac5b65071cf10e71380c0f36630b
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Fix: php strict mode saga


  Commit: a518a7256ce8729748dc74c40e46722caa846bdb
      
https://github.com/Dolibarr/dolibarr/commit/a518a7256ce8729748dc74c40e46722caa846bdb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss

  Log Message:
  -----------
  maj copyright


  Commit: 47fc72a0012f63e53082bebda097d6d7dfe7d20c
      
https://github.com/Dolibarr/dolibarr/commit/47fc72a0012f63e53082bebda097d6d7dfe7d20c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/core/class/html.formfile.class.php

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


  Commit: 47339d0e6202762b987f82c9d6f788eaef5405bd
      
https://github.com/Dolibarr/dolibarr/commit/47339d0e6202762b987f82c9d6f788eaef5405bd
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/exports/export.php
    M htdocs/langs/en_US/exports.lang

  Log Message:
  -----------
  Fix: Missing field tobuy into service export.
Fix: Filter on date into export.
Fix: Tooltip help.


  Commit: 2c68317864a424d0ef88b6aa2dce1ce7ad544b37
      
https://github.com/Dolibarr/dolibarr/commit/2c68317864a424d0ef88b6aa2dce1ce7ad544b37
  Author: jfefe <address@hidden>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

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

  Log Message:
  -----------
  Fix : bad sql request when linking resource to an element


  Commit: 71afc4adb0a84f8acc430ca9eaf6cf7b13576381
      
https://github.com/Dolibarr/dolibarr/commit/71afc4adb0a84f8acc430ca9eaf6cf7b13576381
  Author: jfefe <address@hidden>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M htdocs/resource/class/actions_resource.class.php
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Fix : missing actions for resource element


  Commit: b7a2e3783ebe050271692bc671cc4882e55ccadd
      
https://github.com/Dolibarr/dolibarr/commit/b7a2e3783ebe050271692bc671cc4882e55ccadd
  Author: jfefe <address@hidden>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/fr_FR/resource.lang

  Log Message:
  -----------
  Fix : missing translations


  Commit: 2d14e53b4529bdb6fc497744d058c3e83f69079d
      
https://github.com/Dolibarr/dolibarr/commit/2d14e53b4529bdb6fc497744d058c3e83f69079d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M htdocs/core/db/pgsql.class.php

  Log Message:
  -----------
  Fix: Pb with pgsql


  Commit: 20475ba3e88ea084850c281890c6f1fdc631da4e
      
https://github.com/Dolibarr/dolibarr/commit/20475ba3e88ea084850c281890c6f1fdc631da4e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M htdocs/core/ajax/ziptown.php

  Log Message:
  -----------
  Fix: sql request not compatible with pgsql

Conflicts:
        htdocs/core/ajax/ziptown.php


  Commit: fd03f582c97c728ee5cc1d5e382fe0214be22535
      
https://github.com/Dolibarr/dolibarr/commit/fd03f582c97c728ee5cc1d5e382fe0214be22535
  Author: Florian HENRY <address@hidden>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M htdocs/admin/limits.php

  Log Message:
  -----------
  Fix SQL syntax


  Commit: 0473bc5138e31459279fb478e8f56c524bf26c58
      
https://github.com/Dolibarr/dolibarr/commit/0473bc5138e31459279fb478e8f56c524bf26c58
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php

  Log Message:
  -----------
  Fix missing $user into create call categorie


  Commit: db1c97bdad116c5d9c393d9918949826a76605fa
      
https://github.com/Dolibarr/dolibarr/commit/db1c97bdad116c5d9c393d9918949826a76605fa
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  changelog


  Commit: 4372c587142902b3e0f562cfeb6f69e16121196c
      
https://github.com/Dolibarr/dolibarr/commit/4372c587142902b3e0f562cfeb6f69e16121196c
  Author: Juanjo Menent <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/public/emailing/mailing-unsubscribe.php

  Log Message:
  -----------
  Fix: Unsubscribe emailing not working


  Commit: 772acd6bf91af654fab49c750fc16f39410dcebc
      
https://github.com/Dolibarr/dolibarr/commit/772acd6bf91af654fab49c750fc16f39410dcebc
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M htdocs/categories/fiche.php

  Log Message:
  -----------
  Fix missing $user in create method


  Commit: e2fac5dd9187478f91eeeb330ccc6950fbe86025
      
https://github.com/Dolibarr/dolibarr/commit/e2fac5dd9187478f91eeeb330ccc6950fbe86025
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/public/emailing/mailing-unsubscribe.php

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

Conflicts:
        ChangeLog


  Commit: 2d0f353529bc575173e551b6993fbd37b5acb0c8
      
https://github.com/Dolibarr/dolibarr/commit/2d0f353529bc575173e551b6993fbd37b5acb0c8
  Author: Juanjo Menent <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/limits.php
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Merge pull request #1859 from FHenry/3.6

Fix SQL syntax


  Commit: c8a9f4600c57d237c4f484b0922830fc7bc79de2
      
https://github.com/Dolibarr/dolibarr/commit/c8a9f4600c57d237c4f484b0922830fc7bc79de2
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Fix: list event view lost type event filter


  Commit: 0dd955875c6fc7b9db05c782ff654c4bb137666d
      
https://github.com/Dolibarr/dolibarr/commit/0dd955875c6fc7b9db05c782ff654c4bb137666d
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

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


  Commit: 832d1b37c12709757a8c9ddca988ea862614820f
      
https://github.com/Dolibarr/dolibarr/commit/832d1b37c12709757a8c9ddca988ea862614820f
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Save also code of event


  Commit: 9b40cc9e891fc817ddd5ce65abffe7b8d3ef5e85
      
https://github.com/Dolibarr/dolibarr/commit/9b40cc9e891fc817ddd5ce65abffe7b8d3ef5e85
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  fix


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

  Changed paths:
    M ChangeLog
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture.php
    M htdocs/product/fiche.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php

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

Conflicts:
        ChangeLog
        htdocs/compta/facture.php
        htdocs/core/js/lib_head.js


  Commit: 17dec4b924c2fca89a3a6d1d6ddae2f9e6429ef6
      
https://github.com/Dolibarr/dolibarr/commit/17dec4b924c2fca89a3a6d1d6ddae2f9e6429ef6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: Bad merge


  Commit: 0bc511a6260d788cfb3bfddcd644663ce61b7624
      
https://github.com/Dolibarr/dolibarr/commit/0bc511a6260d788cfb3bfddcd644663ce61b7624
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge pull request #1850 from braito4/patch-1

Update fiche.php


  Commit: 257d7c41d64b9e575f31f9a300642422dff32bbb
      
https://github.com/Dolibarr/dolibarr/commit/257d7c41d64b9e575f31f9a300642422dff32bbb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Merge pull request #1863 from FHenry/3.6

 Fix: list event view lost type event filter


  Commit: 80968bc087b4333d15b489777e5ee4e37a366c72
      
https://github.com/Dolibarr/dolibarr/commit/80968bc087b4333d15b489777e5ee4e37a366c72
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/fr_FR/resource.lang
    M htdocs/resource/class/actions_resource.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Merge pull request #1857 from aternatik/resource-fix

Fixes for resource module


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

  Changed paths:
    M htdocs/product/price.php

  Log Message:
  -----------
  Fix: balance with td


  Commit: 165856656a366ee48f8c755c0742286fc14f160a
      
https://github.com/Dolibarr/dolibarr/commit/165856656a366ee48f8c755c0742286fc14f160a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/societe/price.php

  Log Message:
  -----------
  Fix: balance with td


  Commit: b04eae95e5e72f3768e010af9bc4890ee623cc2a
      
https://github.com/Dolibarr/dolibarr/commit/b04eae95e5e72f3768e010af9bc4890ee623cc2a
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/fr_FR/resource.lang
    M htdocs/product/fiche.php
    M htdocs/product/price.php
    M htdocs/resource/class/actions_resource.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/price.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php

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


  Commit: bd99f3943df513830407cc98577fcaff635ae91e
      
https://github.com/Dolibarr/dolibarr/commit/bd99f3943df513830407cc98577fcaff635ae91e
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M htdocs/compta/tva/fiche.php

  Log Message:
  -----------
  Payment VAT :: Add control on field required


  Commit: 4e05afdd6682d7fcebc4958fb8d6c0c87588ca61
      
https://github.com/Dolibarr/dolibarr/commit/4e05afdd6682d7fcebc4958fb8d6c0c87588ca61
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M htdocs/compta/salaries/fiche.php

  Log Message:
  -----------
  Payment Salaries :: Add field required & control on it


  Commit: 395209a5dbaee724a516e2958d505deaa56212dd
      
https://github.com/Dolibarr/dolibarr/commit/395209a5dbaee724a516e2958d505deaa56212dd
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M htdocs/compta/facture/prelevement.php

  Log Message:
  -----------
  Fix: Reason to have button greyed is wrong

Conflicts:
        htdocs/compta/facture/prelevement.php


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

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Fix: bad balance of td


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Fix: Iban was used instead of Bic into SEPA file.
Fix: Must unaccent strings into SEPA file.


  Commit: 85cabbf921b88150cd57f2ff0e23db9d9d67fb04
      
https://github.com/Dolibarr/dolibarr/commit/85cabbf921b88150cd57f2ff0e23db9d9d67fb04
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/class/html.formfile.class.php

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

Conflicts:
        ChangeLog


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

  Changed paths:
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  Fix: Dictionnary with one n

Conflicts:
        htdocs/expedition/fiche.php


  Commit: 643fc6c61f8ae7ea4d726be32a2a68ec54f185c3
      
https://github.com/Dolibarr/dolibarr/commit/643fc6c61f8ae7ea4d726be32a2a68ec54f185c3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/contrat/fiche.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/opensurvey/results.php

  Log Message:
  -----------
  Fix: Bad use of fetch_lines

Conflicts:
        htdocs/comm/propal.php
        htdocs/contrat/fiche.php
        htdocs/opensurvey/class/opensurveysondage.class.php


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

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Fix: pgsql compatibility. No upper cas into field names.


  Commit: 0e944b0403f1cc846db32806257bb48a29d188d7
      
https://github.com/Dolibarr/dolibarr/commit/0e944b0403f1cc846db32806257bb48a29d188d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M htdocs/core/lib/date.lib.php

  Log Message:
  -----------
  Fix: Pb with week position when week start on sunday.


  Commit: 71832b594498f9870c5b6c879e2505882200a801
      
https://github.com/Dolibarr/dolibarr/commit/71832b594498f9870c5b6c879e2505882200a801
  Author: aspangaro <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog


  Commit: f054d624cdf4b1e74f926bdcbc934778e7305f3a
      
https://github.com/Dolibarr/dolibarr/commit/f054d624cdf4b1e74f926bdcbc934778e7305f3a
  Author: aspangaro <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/contrat/fiche.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/opensurvey/results.php
    M htdocs/societe/consumption.php

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


  Commit: 104df1d16d7662c24dfdc0baefb87b9244842aa2
      
https://github.com/Dolibarr/dolibarr/commit/104df1d16d7662c24dfdc0baefb87b9244842aa2
  Author: Juanjo Menent <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/salaries/fiche.php
    M htdocs/compta/tva/fiche.php

  Log Message:
  -----------
  Merge pull request #1866 from aspangaro/3.6

Payment VAT & Salaries :: Add controls on field required


  Commit: 2b9b110f9cbc9fabbedf6426dcad58add69023a6
      
https://github.com/Dolibarr/dolibarr/commit/2b9b110f9cbc9fabbedf6426dcad58add69023a6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

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

  Log Message:
  -----------
  Fix: Filter on direction of payment mode was not working.

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


  Commit: 31eb4bda8876b88ef6bf5e988d001eeba5994801
      
https://github.com/Dolibarr/dolibarr/commit/31eb4bda8876b88ef6bf5e988d001eeba5994801
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/categories/class/categorie.class.php

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

Conflicts:
        htdocs/categories/class/categorie.class.php
        htdocs/compta/facture.php


  Commit: 6d9cc15856f3372cc1219d1c7969386a0beefd20
      
https://github.com/Dolibarr/dolibarr/commit/6d9cc15856f3372cc1219d1c7969386a0beefd20
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Fix: Function unaccent was not enough complete.


  Commit: 996977a4a881029481770e4c56aeaeba2cd24211
      
https://github.com/Dolibarr/dolibarr/commit/996977a4a881029481770e4c56aeaeba2cd24211
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M htdocs/compta/deplacement/list.php

  Log Message:
  -----------
  Fix: Missing user name


  Commit: f62e7d6043e0199d729a691c7a70630782a5e6db
      
https://github.com/Dolibarr/dolibarr/commit/f62e7d6043e0199d729a691c7a70630782a5e6db
  Author: Cedric <address@hidden>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

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

  Log Message:
  -----------
  Little fix


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

  Changed paths:
    M COPYRIGHT
    M htdocs/includes/tcpdf/CHANGELOG.TXT
    M htdocs/includes/tcpdf/README.TXT
    M htdocs/includes/tcpdf/composer.json
    M htdocs/includes/tcpdf/config/tcpdf_config.php
    R htdocs/includes/tcpdf/fonts/aealarabiya.ctg.z
    R htdocs/includes/tcpdf/fonts/aealarabiya.z
    R htdocs/includes/tcpdf/fonts/aefurat.ctg.z
    R htdocs/includes/tcpdf/fonts/aefurat.z
    M htdocs/includes/tcpdf/fonts/cid0cs.php
    M htdocs/includes/tcpdf/fonts/cid0ct.php
    M htdocs/includes/tcpdf/fonts/cid0jp.php
    M htdocs/includes/tcpdf/fonts/cid0kr.php
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
    M htdocs/includes/tcpdf/fonts/dejavusans.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusans.php
    M htdocs/includes/tcpdf/fonts/dejavusans.z
    M htdocs/includes/tcpdf/fonts/dejavusansb.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansb.php
    M htdocs/includes/tcpdf/fonts/dejavusansb.z
    M htdocs/includes/tcpdf/fonts/dejavusansbi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansbi.php
    M htdocs/includes/tcpdf/fonts/dejavusansbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.php
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.php
    M htdocs/includes/tcpdf/fonts/dejavusansi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansi.php
    M htdocs/includes/tcpdf/fonts/dejavusansi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.php
    R htdocs/includes/tcpdf/fonts/dejavuserifi.z
    R htdocs/includes/tcpdf/fonts/freefont-20100919/AUTHORS
    R htdocs/includes/tcpdf/fonts/freefont-20100919/COPYING
    R htdocs/includes/tcpdf/fonts/freefont-20100919/CREDITS
    R htdocs/includes/tcpdf/fonts/freefont-20100919/ChangeLog
    R htdocs/includes/tcpdf/fonts/freefont-20100919/INSTALL
    R htdocs/includes/tcpdf/fonts/freefont-20100919/README
    A htdocs/includes/tcpdf/fonts/freefont-20120503/AUTHORS
    A htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING
    A htdocs/includes/tcpdf/fonts/freefont-20120503/CREDITS
    A htdocs/includes/tcpdf/fonts/freefont-20120503/ChangeLog
    A htdocs/includes/tcpdf/fonts/freefont-20120503/INSTALL
    A htdocs/includes/tcpdf/fonts/freefont-20120503/README
    A htdocs/includes/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
    A htdocs/includes/tcpdf/fonts/freefont-20120503/USAGE
    M htdocs/includes/tcpdf/fonts/freemono.ctg.z
    M htdocs/includes/tcpdf/fonts/freemono.php
    M htdocs/includes/tcpdf/fonts/freemono.z
    M htdocs/includes/tcpdf/fonts/freemonob.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonob.php
    M htdocs/includes/tcpdf/fonts/freemonob.z
    M htdocs/includes/tcpdf/fonts/freemonobi.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonobi.php
    M htdocs/includes/tcpdf/fonts/freemonobi.z
    M htdocs/includes/tcpdf/fonts/freemonoi.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonoi.php
    M htdocs/includes/tcpdf/fonts/freemonoi.z
    M htdocs/includes/tcpdf/include/barcodes/datamatrix.php
    M htdocs/includes/tcpdf/include/barcodes/pdf417.php
    M htdocs/includes/tcpdf/include/sRGB.icc
    M htdocs/includes/tcpdf/include/tcpdf_colors.php
    M htdocs/includes/tcpdf/include/tcpdf_filters.php
    M htdocs/includes/tcpdf/include/tcpdf_font_data.php
    M htdocs/includes/tcpdf/include/tcpdf_fonts.php
    M htdocs/includes/tcpdf/include/tcpdf_images.php
    M htdocs/includes/tcpdf/include/tcpdf_static.php
    M htdocs/includes/tcpdf/tcpdf.php
    M htdocs/includes/tcpdf/tcpdf_autoconfig.php
    M htdocs/includes/tcpdf/tcpdf_barcodes_1d.php
    M htdocs/includes/tcpdf/tcpdf_barcodes_2d.php
    M htdocs/includes/tcpdf/tcpdf_import.php
    M htdocs/includes/tcpdf/tcpdf_parser.php

  Log Message:
  -----------
  Upgrade tcpdf to 6.0.093 to get fixes and solve a problem of licence.


  Commit: c5ccf2998b520a65ee77159c1c648564d9419a6f
      
https://github.com/Dolibarr/dolibarr/commit/c5ccf2998b520a65ee77159c1c648564d9419a6f
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Fixed forgotten rename


  Commit: 367d225d3edf19de42d8909d68bd3936acce8010
      
https://github.com/Dolibarr/dolibarr/commit/367d225d3edf19de42d8909d68bd3936acce8010
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Fixed missing class include for task duplication


  Commit: 7851587a114cdb53652be2cfcddb293783236ae5
      
https://github.com/Dolibarr/dolibarr/commit/7851587a114cdb53652be2cfcddb293783236ae5
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-11 (Thu, 11 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Merge pull request #1869 from FHenry/3.6

Extrafield feature select from table should try to translate multiple column 
when not needed


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

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

  Log Message:
  -----------
  Merge pull request #1871 from KreizIT/3.6

Little fix


  Commit: 98d7ce94b8d012260c229eb67d79e2d23ea9ed6f
      
https://github.com/Dolibarr/dolibarr/commit/98d7ce94b8d012260c229eb67d79e2d23ea9ed6f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-11 (Thu, 11 Sep 2014)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Merge pull request #1873 from GPCsolutions/projectfixes

Projectfixes


  Commit: 8a3bc250297c7d4e61be3204bac35398037ace91
      
https://github.com/Dolibarr/dolibarr/commit/8a3bc250297c7d4e61be3204bac35398037ace91
  Author: Cubexed <address@hidden>
  Date:   2014-09-12 (Fri, 12 Sep 2014)

  Changed paths:
    M htdocs/projet/fiche.php

  Log Message:
  -----------
  -Renamed POST "project" to "projectstart" to avoid strange behavior at 
project start date selector, probably the generic name "project" was 
interfering with something


  Commit: 8dd935821455b81a9f40d806d5f1930f7ab9c2a9
      
https://github.com/Dolibarr/dolibarr/commit/8dd935821455b81a9f40d806d5f1930f7ab9c2a9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-13 (Sat, 13 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/liste.php
    M htdocs/cashdesk/index.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/info.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/compta/recap-compta.php
    M htdocs/contact/info.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/info.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/holiday/index.php
    M htdocs/opensurvey/list.php
    M htdocs/product/index.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/tasks/index.php

  Log Message:
  -----------
  Fix: SQL injection


  Commit: 09878a3a3210fb2b9db6f7a1b5b0b3e184ff8a89
      
https://github.com/Dolibarr/dolibarr/commit/09878a3a3210fb2b9db6f7a1b5b0b3e184ff8a89
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-13 (Sat, 13 Sep 2014)

  Changed paths:
    A htdocs/theme/amarok/img/object_address.png

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


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

  Changed paths:
    M ChangeLog
    M htdocs/adherents/class/adherent.class.php
    M htdocs/cashdesk/index.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/info.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/compta/recap-compta.php
    M htdocs/contact/info.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/info.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/holiday/index.php
    M htdocs/opensurvey/list.php
    M htdocs/product/index.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/tasks/index.php
    A htdocs/theme/amarok/img/object_address.png

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

Conflicts:
        htdocs/adherents/liste.php
        htdocs/compta/bank/bankid_fr.php
        htdocs/holiday/index.php
        htdocs/opensurvey/list.php


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

  Changed paths:
    M build/debian/control
    M build/debian/get-orig-source.sh

  Log Message:
  -----------
  Fix: typo on debian files


  Commit: 949ae2f160caf39293fd55918f31ca76c5a11c05
      
https://github.com/Dolibarr/dolibarr/commit/949ae2f160caf39293fd55918f31ca76c5a11c05
  Author: Marcos García de La Fuente <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:
  -----------
  [ bug #1591 ] Linked object block shows Total HT/TTC even if not having 
permission to read them


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

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  [ bug #1555 ] Update accountancy code of products does not throw 
PRODUCT_MODIFY trigger


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

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/paiement/fiche.php

  Log Message:
  -----------
  [ bug #1548 ] Supplier payment card shows type in French


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/account.php

  Log Message:
  -----------
  [ bug #1546 ] Incorrect page number when searching in the list of bank 
transactions


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

  Changed paths:
    M htdocs/projet/fiche.php

  Log Message:
  -----------
  Merge pull request #1879 from Cubexed/3.6

-Renamed POST "project" to "projectstart" in fiche.php


  Commit: 3daaaadf6542d0d3fa3087aeceed6639da37527d
      
https://github.com/Dolibarr/dolibarr/commit/3daaaadf6542d0d3fa3087aeceed6639da37527d
  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 pull request #1880 from marcosgdf/bug-1591

[ bug #1591 ] Linked object block shows Total HT/TTC even if not having 
permission to read them


  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


  Commit: 85338bacb4cac3ba8d41ccf943396f0215fe932c
      
https://github.com/Dolibarr/dolibarr/commit/85338bacb4cac3ba8d41ccf943396f0215fe932c
  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 'marcosgdf-bug-1577' into 3.5


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

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

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

Conflicts:
        ChangeLog


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

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

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


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

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/paiement/fiche.php

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

Conflicts:
        ChangeLog


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

  Changed paths:
    M ChangeLog
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/paiement/fiche.php

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


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/account.php

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

Conflicts:
        ChangeLog


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

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/account.php

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


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

  Changed paths:
    A htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js

  Log Message:
  -----------
  Fix: Missing source


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

  Changed paths:
    M build/debian/copyright

  Log Message:
  -----------
  Fix: Syntax for license key


  Commit: 9493e252c9ff75b06467a881fe23a5cc25093af7
      
https://github.com/Dolibarr/dolibarr/commit/9493e252c9ff75b06467a881fe23a5cc25093af7
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

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

  Log Message:
  -----------
  add refext into fecth product


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

  Changed paths:
    M htdocs/product/reassort.php

  Log Message:
  -----------
  Fix: bad translation key


  Commit: 9c70c2c3d0a7f04feb01aff2f7dfe35905d09dbc
      
https://github.com/Dolibarr/dolibarr/commit/9c70c2c3d0a7f04feb01aff2f7dfe35905d09dbc
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/dict.lang

  Log Message:
  -----------
  Fix: cents for indian ruppes are calle paisa and paise.


  Commit: 05f3a47018114385a59c427d10c08e4743a1f3f5
      
https://github.com/Dolibarr/dolibarr/commit/05f3a47018114385a59c427d10c08e4743a1f3f5
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M ChangeLog
    M build/debian/control
    M build/debian/copyright
    M build/debian/get-orig-source.sh
    M htdocs/admin/menus/edit.php
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/paiement/fiche.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php
    M htdocs/societe/soc.php

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

Conflicts:
        build/debian/control
        htdocs/compta/bank/account.php
        htdocs/fourn/paiement/fiche.php
        htdocs/product/class/product.class.php
        htdocs/product/fiche.php


  Commit: 2c0a2937f6d9017b39a51fb13fa3d06410d32562
      
https://github.com/Dolibarr/dolibarr/commit/2c0a2937f6d9017b39a51fb13fa3d06410d32562
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

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

  Log Message:
  -----------
  Merge pull request #1887 from FHenry/3.5

add refext into fecth product


  Commit: 9c54dc57dfea2b2f4d3177152f8b9bd5228f11f9
      
https://github.com/Dolibarr/dolibarr/commit/9c54dc57dfea2b2f4d3177152f8b9bd5228f11f9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Save some usefull cleaning requests into repair.sql


  Commit: d225d92c0b48f9937fb753eae301742445748f3b
      
https://github.com/Dolibarr/dolibarr/commit/d225d92c0b48f9937fb753eae301742445748f3b
  Author: Regis Houssin <address@hidden>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix: remove hook restriction !


  Commit: c6b5d0f96ca39d6b6bfbe0ff938873fb60241805
      
https://github.com/Dolibarr/dolibarr/commit/c6b5d0f96ca39d6b6bfbe0ff938873fb60241805
  Author: Regis Houssin <address@hidden>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M ChangeLog
    M build/debian/control
    M build/debian/copyright
    M build/debian/get-orig-source.sh
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/liste.php
    M htdocs/admin/menus/edit.php
    M htdocs/cashdesk/index.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/info.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/compta/recap-compta.php
    M htdocs/contact/info.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/info.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/paiement/fiche.php
    M htdocs/holiday/index.php
    A htdocs/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.js
    M htdocs/opensurvey/list.php
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php
    M htdocs/product/index.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/tasks/index.php
    M htdocs/societe/soc.php
    A htdocs/theme/amarok/img/object_address.png

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


  Commit: f18502870705ff76635228da1b3e05cc055604c4
      
https://github.com/Dolibarr/dolibarr/commit/f18502870705ff76635228da1b3e05cc055604c4
  Author: Regis Houssin <address@hidden>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix: remove hook restriction !


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

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix: Restore sort feature. Still did not see why previous commit is a
bug fix of dolibarr bug.


  Commit: ab83e22a127c5986b1829035429d2f59b47b7d75
      
https://github.com/Dolibarr/dolibarr/commit/ab83e22a127c5986b1829035429d2f59b47b7d75
  Author: Juanjo Menent <address@hidden>
  Date:   2014-09-18 (Thu, 18 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/paiement.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/langs/en_US/errors.lang

  Log Message:
  -----------
  Fix: Invoices payments may be older than invoices


  Commit: 039105a3f1ac80632b5478fefbcba51d874d20b3
      
https://github.com/Dolibarr/dolibarr/commit/039105a3f1ac80632b5478fefbcba51d874d20b3
  Author: Juanjo Menent <address@hidden>
  Date:   2014-09-18 (Thu, 18 Sep 2014)

  Changed paths:
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/fr_FR/errors.lang

  Log Message:
  -----------
  Fix: Invoices payments may be older than invoices. fr and es trans


  Commit: 015b0d80361207ef45fe9b916ec5f2b4f5d0f465
      
https://github.com/Dolibarr/dolibarr/commit/015b0d80361207ef45fe9b916ec5f2b4f5d0f465
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-18 (Thu, 18 Sep 2014)

  Changed paths:
    M htdocs/.gitignore
    M htdocs/core/lib/project.lib.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/projet/index.php
    M htdocs/projet/tasks/index.php

  Log Message:
  -----------
  Fix: Bad calculation of total
Fix: Warning message not translated


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

  Changed paths:
    M htdocs/.gitignore
    M htdocs/core/lib/functions2.lib.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/product/class/product.class.php
    M htdocs/projet/index.php
    M htdocs/projet/tasks/index.php

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

Conflicts:
        htdocs/core/lib/functions2.lib.php
        htdocs/langs/en_US/errors.lang
        htdocs/product/class/product.class.php


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

  Log Message:
  -----------
  Merge pb


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d686898343d3...e477b933994a

reply via email to

[Prev in Thread] Current Thread [Next in Thread]