[Dolibarr-git] [Dolibarr/dolibarr] 432cc4: NEW: Accountancy - Add category

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 432cc44ab635a721b047b652c1f7fb27cc0c274e
      
https://github.com/Dolibarr/dolibarr/commit/432cc44ab635a721b047b652c1f7fb27cc0c274e
  Author: aspangaro <address@hidden>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/class/accountingaccount.class.php
    A htdocs/core/class/html.formaccounting.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  NEW: Accountancy - Add category


  Commit: 436fb91901f6cce57a4f5a0ea5c27f057b414b8b
      
https://github.com/Dolibarr/dolibarr/commit/436fb91901f6cce57a4f5a0ea5c27f057b414b8b
  Author: aspangaro <address@hidden>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/admin/dict.php
    M htdocs/core/class/html.formaccounting.class.php

  Log Message:
  -----------
  Uniformize name of table


  Commit: cbecb37c59e395708bbc097a0bdcd1944ee55259
      
https://github.com/Dolibarr/dolibarr/commit/cbecb37c59e395708bbc097a0bdcd1944ee55259
  Author: aspangaro <address@hidden>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/core/class/html.formaccounting.class.php

  Log Message:
  -----------
  debug


  Commit: 2be979569d0ca6993d64ccc3832e10ecd5e151b9
      
https://github.com/Dolibarr/dolibarr/commit/2be979569d0ca6993d64ccc3832e10ecd5e151b9
  Author: aspangaro <address@hidden>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/core/class/html.formaccounting.class.php

  Log Message:
  -----------
  Debug II


  Commit: 1f31163e5ed045f5894094b8b913de15ce65afc7
      
https://github.com/Dolibarr/dolibarr/commit/1f31163e5ed045f5894094b8b913de15ce65afc7
  Author: aspangaro <address@hidden>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M htdocs/accountancy/class/accountingaccount.class.php

  Log Message:
  -----------
  Correct travis


  Commit: c9271e04a0548238a3eec26f6d37620a150bfc96
      
https://github.com/Dolibarr/dolibarr/commit/c9271e04a0548238a3eec26f6d37620a150bfc96
  Author: aspangaro <address@hidden>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M htdocs/admin/modules.php
    M htdocs/admin/tools/export.php
    M htdocs/admin/translation.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/perso.php
    M htdocs/core/class/html.formadmin.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modCron.class.php
    M htdocs/cron/card.php
    M htdocs/cron/list.php
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    A htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
    A htdocs/install/mysql/tables/llx_c_accounting_category.sql
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/societe/commerciaux.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into 4.0-p9

Conflicts:
        htdocs/install/mysql/migration/3.9.0-4.0.0.sql


  Commit: 26e017f4ef1c3a716e9671ec248fb549e236af61
      
https://github.com/Dolibarr/dolibarr/commit/26e017f4ef1c3a716e9671ec248fb549e236af61
  Author: aspangaro <address@hidden>
  Date:   2016-03-30 (Wed, 30 Mar 2016)

  Changed paths:
    M htdocs/accountancy/admin/card.php
    M htdocs/admin/tools/update.php
    M htdocs/comm/action/card.php
    M htdocs/contact/card.php
    M htdocs/contact/perso.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/tasks/time.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/object_category.png
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into 4.0-p9

Conflicts:
        htdocs/accountancy/admin/card.php


  Commit: ef03dc34548e7281dba863866ee59092b984acca
      
https://github.com/Dolibarr/dolibarr/commit/ef03dc34548e7281dba863866ee59092b984acca
  Author: aspangaro <address@hidden>
  Date:   2016-03-30 (Wed, 30 Mar 2016)

  Changed paths:
    M htdocs/accountancy/admin/card.php

  Log Message:
  -----------
  Youps !


  Commit: c730312a9f6034b4e4b09a5004a1403f2d1dd399
      
https://github.com/Dolibarr/dolibarr/commit/c730312a9f6034b4e4b09a5004a1403f2d1dd399
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-30 (Wed, 30 Mar 2016)

  Changed paths:
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/admin/dict.php
    A htdocs/core/class/html.formaccounting.class.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Merge pull request #4903 from aspangaro/4.0-p9

NEW: Accountancy - Add category


Compare: 
https://github.com/Dolibarr/dolibarr/compare/334cdbc2f5c0...c730312a9f60