[Dolibarr-git] [Dolibarr/dolibarr] 2e9952: Fix stat don in multicompany

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2e9952439eda99508431da5ad0aa6e2054ad9ae5
      
https://github.com/Dolibarr/dolibarr/commit/2e9952439eda99508431da5ad0aa6e2054ad9ae5
  Author: ptibogxiv <address@hidden>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M htdocs/don/index.php

  Log Message:
  -----------
  Fix stat  don in multicompany


  Commit: 780e8ce47005f4560e53ab963d1c099966eaa147
      
https://github.com/Dolibarr/dolibarr/commit/780e8ce47005f4560e53ab963d1c099966eaa147
  Author: ptibogxiv <address@hidden>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M htdocs/core/modules/mailings/fraise.modules.php

  Log Message:
  -----------
  fix for multicompany


  Commit: a9e4fcfdca6fa094e0115e215a728d36196f3874
      
https://github.com/Dolibarr/dolibarr/commit/a9e4fcfdca6fa094e0115e215a728d36196f3874
  Author: ptibogxiv <address@hidden>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M htdocs/core/modules/mailings/fraise.modules.php

  Log Message:
  -----------
  Update fraise.modules.php


  Commit: b14cb7a97f454c6ef5e368201f95c1a3d7f8cd20
      
https://github.com/Dolibarr/dolibarr/commit/b14cb7a97f454c6ef5e368201f95c1a3d7f8cd20
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M htdocs/accountancy/admin/categories_list.php
    M htdocs/accountancy/admin/fiscalyear.php
    M htdocs/core/class/fiscalyear.class.php

  Log Message:
  -----------
  Debug accountancy


  Commit: f8d689788805d81330232637e27d580a2aa8739f
      
https://github.com/Dolibarr/dolibarr/commit/f8d689788805d81330232637e27d580a2aa8739f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M htdocs/core/modules/printing/printgcp.modules.php

  Log Message:
  -----------
  Fix bug


  Commit: fa1bb9d6727ca52f0b310ea70e11db71d7936946
      
https://github.com/Dolibarr/dolibarr/commit/fa1bb9d6727ca52f0b310ea70e11db71d7936946
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M htdocs/don/index.php

  Log Message:
  -----------
  Merge pull request #7874 from ptibogxiv/patch-4

Fix stat  don in multicompany


  Commit: 3071796bc3136a6b8f2fe19de8ea5f87b6953780
      
https://github.com/Dolibarr/dolibarr/commit/3071796bc3136a6b8f2fe19de8ea5f87b6953780
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M htdocs/core/modules/mailings/fraise.modules.php

  Log Message:
  -----------
  Merge pull request #7876 from ptibogxiv/patch-6

fix for multicompany


  Commit: 07bdd3213ab5ed908a4bc40e3b1f35dcb4b026e7
      
https://github.com/Dolibarr/dolibarr/commit/07bdd3213ab5ed908a4bc40e3b1f35dcb4b026e7
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M htdocs/adherents/list.php
    M htdocs/admin/mails_senderprofile_list.php
    M htdocs/comm/action/list.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/list.php
    M htdocs/compta/facture/invoicetemplate_list.php
    M htdocs/compta/facture/list.php
    M htdocs/contact/list.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services_list.php
    M htdocs/core/modules/mailings/fraise.modules.php
    A htdocs/core/tpl/extrafields_list_print_fields.tpl.php
    A htdocs/core/tpl/extrafields_list_search_input.tpl.php
    A htdocs/core/tpl/extrafields_list_search_param.tpl.php
    A htdocs/core/tpl/extrafields_list_search_sql.tpl.php
    A htdocs/core/tpl/extrafields_list_search_title.tpl.php
    M htdocs/cron/list.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/list.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/main.inc.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/product/inventory/list.php
    M htdocs/product/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/productlot_list.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/list.php
    M htdocs/projet/tasks/time.php
    M htdocs/resource/list.php
    M htdocs/societe/list.php
    M htdocs/societe/website.php
    M htdocs/supplier_proposal/list.php
    M htdocs/user/index.php

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


  Commit: 3b98a06ebb9cc965b1dd35e779f75e1f13bf541a
      
https://github.com/Dolibarr/dolibarr/commit/3b98a06ebb9cc965b1dd35e779f75e1f13bf541a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/don/index.php

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

Conflicts:
        htdocs/core/modules/mailings/fraise.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/430c72bf0f6b...3b98a06ebb9c