[Dolibarr-git] [Dolibarr/dolibarr] a6ab58: Merge pull request #1 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a6ab581683c8d5afe5c65ab998075d033243b766
      
https://github.com/Dolibarr/dolibarr/commit/a6ab581683c8d5afe5c65ab998075d033243b766
  Author: abcnet-lu <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M .travis.yml
    M .tx/config
    M ChangeLog
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/fiscalyear.php
    M htdocs/accountancy/admin/fiscalyear_card.php
    M htdocs/accountancy/admin/fiscalyear_info.php
    M htdocs/accountancy/admin/importaccounts.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journal.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/bookkeeping/balancebymonth.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/listbyyear.php
    M htdocs/accountancy/class/accountancysystem.class.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/index.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/accountancy/tpl/export_journal.tpl.php
    M htdocs/admin/barcode.php
    M htdocs/admin/websites.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/paiement/card.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/contact/card.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/menu.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/modProductBatch.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/expensereport/card.php
    M htdocs/fichinter/info.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_website.key.sql
    M htdocs/install/mysql/tables/llx_website.sql
    M htdocs/install/mysql/tables/llx_website_pages.key.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/users.lang
    A htdocs/langs/en_US/website.lang
    M htdocs/langs/en_US/workflow.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/main.inc.php
    M htdocs/product/class/product.class.php
    M htdocs/product/list.php
    M htdocs/websites/frametop.php
    M htdocs/websites/index.php
    A htdocs/websites/indexold.php
    M test/phpunit/FunctionsLibTest.php
    M test/phpunit/ModulesTest.php

  Log Message:
  -----------
  Merge pull request #1 from Dolibarr/develop

Update my fork from original


  Commit: d65ee2252934aca902450108777f1c3415f60329
      
https://github.com/Dolibarr/dolibarr/commit/d65ee2252934aca902450108777f1c3415f60329
  Author: abcnet-lu <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M htdocs/install/mysql/data/llx_c_tva.sql

  Log Message:
  -----------
  [Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix 
inverted labels)


  Commit: f518ef58bb25e6b003b2afcfc27367f2983f7f36
      
https://github.com/Dolibarr/dolibarr/commit/f518ef58bb25e6b003b2afcfc27367f2983f7f36
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M htdocs/install/mysql/data/llx_c_tva.sql

  Log Message:
  -----------
  Merge pull request #4557 from abcnet-lu/develop

Fix: Inverted labels of intermediary / reduced VAT rates for Luxembourg


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5a2647906e90...f518ef58bb25