dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] ae1817: Fix Performance improvement w

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] ae1817: Fix Performance improvement with many extrafields
Date: Mon, 01 Aug 2016 06:16:00 -0700 
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ae18178d5641abf01f10ae80334143e8dfdd920a
      
https://github.com/Dolibarr/dolibarr/commit/ae18178d5641abf01f10ae80334143e8dfdd920a
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-21 (Thu, 21 Jul 2016)

  Changed paths:
    M htdocs/societe/list.php

  Log Message:
  -----------
  Fix Performance improvement with many extrafields


  Commit: 5bbd8eded902724d6ef939a1bb4a44de58bace63
      
https://github.com/Dolibarr/dolibarr/commit/5bbd8eded902724d6ef939a1bb4a44de58bace63
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-22 (Fri, 22 Jul 2016)

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

  Log Message:
  -----------
  Code comment


  Commit: 250d29542fdfa5e46bd49cf041a3efed63f8ea91
      
https://github.com/Dolibarr/dolibarr/commit/250d29542fdfa5e46bd49cf041a3efed63f8ea91
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-25 (Mon, 25 Jul 2016)

  Changed paths:
    M htdocs/societe/list.php

  Log Message:
  -----------
  Merge pull request #5527 from simnandez/3.9

Fix Performance improvement with many extrafields


  Commit: a9d75b2c9142cb1c0ffbc264e2133898d1ad021f
      
https://github.com/Dolibarr/dolibarr/commit/a9d75b2c9142cb1c0ffbc264e2133898d1ad021f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-07-25 (Mon, 25 Jul 2016)

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

  Log Message:
  -----------
  FIX #5537 AJAX project search does not work properly


  Commit: 3ef3a038cf7b047d8aa7fbae8ee662c10ed01e7e
      
https://github.com/Dolibarr/dolibarr/commit/3ef3a038cf7b047d8aa7fbae8ee662c10ed01e7e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-07-25 (Mon, 25 Jul 2016)

  Changed paths:
    M ChangeLog
    M build/debian/dolibarr.docs
    M build/debian/watch
    M build/makepack-dolibarr.pl
    M dev/initdata/generate-invoice.php
    M dev/initdata/generate-order.php
    M dev/initdata/generate-product.php
    M dev/initdata/generate-proposal.php
    M dev/initdata/generate-thirdparty.php
    M htdocs/adherents/list.php
    M htdocs/comm/remx.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/don/class/don.class.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/payment/payment.php
    M htdocs/filefunc.inc.php
    R htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
    A htdocs/includes/jquery/plugins/layout/jquery.layout.js
    M htdocs/langs/en_US/companies.lang
    M htdocs/product/card.php
    M htdocs/product/index.php
    M htdocs/product/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/societe/list.php
    M htdocs/societe/soc.php
    M test/phpunit/FilesLibTest.php

  Log Message:
  -----------
  Merge branch '3.9' into bug-5537


  Commit: e59a4d510bd0bc2e98646526b9936e0fd2c89173
      
https://github.com/Dolibarr/dolibarr/commit/e59a4d510bd0bc2e98646526b9936e0fd2c89173
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-25 (Mon, 25 Jul 2016)

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

  Log Message:
  -----------
  Merge pull request #5538 from marcosgdf/bug-5537

FIX #5537 AJAX project search does not work properly


  Commit: 3029fd0fe134887e38d28e970d8a8de614f5be7f
      
https://github.com/Dolibarr/dolibarr/commit/3029fd0fe134887e38d28e970d8a8de614f5be7f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2016-07-25 (Mon, 25 Jul 2016)

  Changed paths:
    M htdocs/core/class/hookmanager.class.php

  Log Message:
  -----------
  FIX #5540 getFormMail is not registered as addReplace hook


  Commit: 8f0738f792df50be376a2660f55c743b5c4c9b59
      
https://github.com/Dolibarr/dolibarr/commit/8f0738f792df50be376a2660f55c743b5c4c9b59
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-25 (Mon, 25 Jul 2016)

  Changed paths:
    M htdocs/core/class/hookmanager.class.php

  Log Message:
  -----------
  Merge pull request #5541 from marcosgdf/bug-5540

FIX #5540 getFormMail is not registered as addReplace hook


  Commit: fc1c38420cb79adecc529bd191d97bcf8c9e210c
      
https://github.com/Dolibarr/dolibarr/commit/fc1c38420cb79adecc529bd191d97bcf8c9e210c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-25 (Mon, 25 Jul 2016)

  Changed paths:
    M htdocs/societe/list.php

  Log Message:
  -----------
  Revert "Fix Performance improvement with many extrafields"

This reverts commit ae18178d5641abf01f10ae80334143e8dfdd920a.


  Commit: 0e79cae9d4dae156148e81d9ea5b7c9f7cc18eef
      
https://github.com/Dolibarr/dolibarr/commit/0e79cae9d4dae156148e81d9ea5b7c9f7cc18eef
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M htdocs/core/js/lib_head.js.php

  Log Message:
  -----------
  FIX #5534


  Commit: b47e6e452072244f1973904e49cdebaba84bbc1e
      
https://github.com/Dolibarr/dolibarr/commit/b47e6e452072244f1973904e49cdebaba84bbc1e
  Author: Sergio Sanchis Climent <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

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

  Log Message:
  -----------
  FIX #5544 Disabled Contact still appear in lists to send emails


  Commit: c13c15188b7cfe96270762256921ef82453403c6
      
https://github.com/Dolibarr/dolibarr/commit/c13c15188b7cfe96270762256921ef82453403c6
  Author: florian HENRY <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

  Changed paths:
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  FIX: incoterms do not output into crabe invoice PDF


  Commit: 7b72965315cf0f5e3fbd6f55ad20668e52f59ae2
      
https://github.com/Dolibarr/dolibarr/commit/7b72965315cf0f5e3fbd6f55ad20668e52f59ae2
  Author: florian HENRY <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

  Changed paths:
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  FIX incoterms


  Commit: 5bc51a3439cc1ecdf865e8865943faa02dac8f4e
      
https://github.com/Dolibarr/dolibarr/commit/5bc51a3439cc1ecdf865e8865943faa02dac8f4e
  Author: Ferran Marcet <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

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

  Log Message:
  -----------
  FIX: Can't create withdrawal document


  Commit: 25a3f8a8fdf69199eab0475e1fe1ea8e606ee837
      
https://github.com/Dolibarr/dolibarr/commit/25a3f8a8fdf69199eab0475e1fe1ea8e606ee837
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

  Changed paths:
    M htdocs/expensereport/card.php

  Log Message:
  -----------
  Fix condition does not match workflow described into page
https://wiki.dolibarr.org/index.php/Module_Expense_Reports


  Commit: 80ac99e9b16369bb7033610a09b7ebb88b57969f
      
https://github.com/Dolibarr/dolibarr/commit/80ac99e9b16369bb7033610a09b7ebb88b57969f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

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

  Log Message:
  -----------
  Fix missing field into response


  Commit: 74a9bbbf38822e64d33dbb002d3f1e2967612667
      
https://github.com/Dolibarr/dolibarr/commit/74a9bbbf38822e64d33dbb002d3f1e2967612667
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

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

  Log Message:
  -----------
  FIX private property can't be read when building pdf


  Commit: 5d97ce038b2202929eaec2e1745e18184d692294
      
https://github.com/Dolibarr/dolibarr/commit/5d97ce038b2202929eaec2e1745e18184d692294
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-28 (Thu, 28 Jul 2016)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php

  Log Message:
  -----------
  Fix page break when using a large html footer.


  Commit: 20144c98832cfc52b0530757604d9d5d25330115
      
https://github.com/Dolibarr/dolibarr/commit/20144c98832cfc52b0530757604d9d5d25330115
  Author: aspangaro <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/index.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  FIX Accountancy - Problem with the manage of the zero at the end of an 
accounting account in dolibarr for somes countries. Add an option.


  Commit: e4f8b9a4b0423e6520460af7bc613c195d1c02bf
      
https://github.com/Dolibarr/dolibarr/commit/e4f8b9a4b0423e6520460af7bc613c195d1c02bf
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

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

  Log Message:
  -----------
  Merge pull request #5561 from olsesacl/#5544

FIX #5544 Disabled Contact still appear in lists to send emails


  Commit: a40ea9387b0f4c4017cc3b7220f4f9fb172c42ad
      
https://github.com/Dolibarr/dolibarr/commit/a40ea9387b0f4c4017cc3b7220f4f9fb172c42ad
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  Merge pull request #5562 from atm-florian/3.9

FIX: incoterms do not output into crabe invoice PDF


  Commit: 4cadf0e5a3ac2d3569e1e5b5f32a78daf9c8cc90
      
https://github.com/Dolibarr/dolibarr/commit/4cadf0e5a3ac2d3569e1e5b5f32a78daf9c8cc90
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

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

  Log Message:
  -----------
  Merge pull request #5563 from fmarcet/3.9

FIX: Can't create withdrawal document


  Commit: 501a25e1daa783bad1c3d1e74a7075c2042f32b0
      
https://github.com/Dolibarr/dolibarr/commit/501a25e1daa783bad1c3d1e74a7075c2042f32b0
  Author: Juanjo Menent <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/index.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Merge pull request #5564 from aspangaro/4.0-p36

FIX Accountancy - Problem with the manage of the zero at the end of an 
accounting account in dolibarr for somes countries. Add an option.


  Commit: 537a51b3676b30f1c5dbf3e908f440ec14ded484
      
https://github.com/Dolibarr/dolibarr/commit/537a51b3676b30f1c5dbf3e908f440ec14ded484
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

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

  Log Message:
  -----------
  Finally, better without the test


  Commit: 27243069cb911df4021b1e0e99535274b77675a3
      
https://github.com/Dolibarr/dolibarr/commit/27243069cb911df4021b1e0e99535274b77675a3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/core/modules/modProductBatch.class.php
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  FIX #5535 bad dependency.

Conflicts:
        htdocs/fourn/facture/list.php


  Commit: b3cdb1f163a7d7f9a3478e5c9610a516b5c157ab
      
https://github.com/Dolibarr/dolibarr/commit/b3cdb1f163a7d7f9a3478e5c9610a516b5c157ab
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php

  Log Message:
  -----------
  FIX tag for date rfc in odt substitution


  Commit: b85bb8c0f84f7a0a18c6f11b8417f0c3c1358268
      
https://github.com/Dolibarr/dolibarr/commit/b85bb8c0f84f7a0a18c6f11b8417f0c3c1358268
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/install/doctemplates/orders/template_order.odt
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.9' into 4.0

Conflicts:
        htdocs/core/modules/facture/doc/pdf_crabe.modules.php


  Commit: 45e37c82cd75915957870630214b4d0555dc12e9
      
https://github.com/Dolibarr/dolibarr/commit/45e37c82cd75915957870630214b4d0555dc12e9
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0

Conflicts:
        htdocs/fourn/facture/list.php


  Commit: 9fabfe029bb125c183ba1709a396738918dd05c2
      
https://github.com/Dolibarr/dolibarr/commit/9fabfe029bb125c183ba1709a396738918dd05c2
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/includes/odtphp/odf.php

  Log Message:
  -----------
  Remove debug logs


  Commit: 0c456add1352a1c7272b1e94464ed17a8ea34981
      
https://github.com/Dolibarr/dolibarr/commit/0c456add1352a1c7272b1e94464ed17a8ea34981
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/install/doctemplates/orders/template_order.odt

  Log Message:
  -----------
  A more complete example of odt template


  Commit: a7b21db21049b56bcda7226a6be72d5c27efb13f
      
https://github.com/Dolibarr/dolibarr/commit/a7b21db21049b56bcda7226a6be72d5c27efb13f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Fix code is not mandatory on vat table


  Commit: eafaa6f4ddea3f3e04e3c5e8ba637af70b9080f2
      
https://github.com/Dolibarr/dolibarr/commit/eafaa6f4ddea3f3e04e3c5e8ba637af70b9080f2
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/core/modules/modDocumentGeneration.class.php

  Log Message:
  -----------
  Fix doxygen


  Commit: 45d354ad82e7692e3f8b47507702761ea0f54d77
      
https://github.com/Dolibarr/dolibarr/commit/45d354ad82e7692e3f8b47507702761ea0f54d77
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN...


  Commit: ff9d6ce02a935fd311562363c6d37801fed88e26
      
https://github.com/Dolibarr/dolibarr/commit/ff9d6ce02a935fd311562363c6d37801fed88e26
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

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

  Log Message:
  -----------
  Fix missing translation


  Commit: 3c3df0c4f6294516244fea446d3ad258142c3af8
      
https://github.com/Dolibarr/dolibarr/commit/3c3df0c4f6294516244fea446d3ad258142c3af8
  Author: aspangaro <address@hidden>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M htdocs/compta/salaries/index.php
    M htdocs/expensereport/card.php
    M htdocs/societe/project.php
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Fix Presentation


  Commit: 5b4c215526862f8ef308b0fabd847fb9740d7761
      
https://github.com/Dolibarr/dolibarr/commit/5b4c215526862f8ef308b0fabd847fb9740d7761
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

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

  Log Message:
  -----------
  Fix size of field too small and bad translation


  Commit: b630f0b7107d31a028c86fa798eb58d580cbfdeb
      
https://github.com/Dolibarr/dolibarr/commit/b630f0b7107d31a028c86fa798eb58d580cbfdeb
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M build/doxygen/doxygen_footer.html

  Log Message:
  -----------
  Fix use https and not http


  Commit: 7a72b9bb09bac280b0869ed2d63211cedb47ad37
      
https://github.com/Dolibarr/dolibarr/commit/7a72b9bb09bac280b0869ed2d63211cedb47ad37
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/core/doxygen.php

  Log Message:
  -----------
  Use https links


  Commit: b3dab8a6f7904f09c637b73d2d868ecd2fb6637e
      
https://github.com/Dolibarr/dolibarr/commit/b3dab8a6f7904f09c637b73d2d868ecd2fb6637e
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/salaries.lang

  Log Message:
  -----------
  Better translation


  Commit: ceb6199e87fa72660bf38fb8ca996ad745f64fbd
      
https://github.com/Dolibarr/dolibarr/commit/ceb6199e87fa72660bf38fb8ca996ad745f64fbd
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/core/modules/modSociete.class.php
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Fix default numbering module of customer code was not enabled.


  Commit: e3f0ab9109822c3dd66e41f249a844deecfbb2a0
      
https://github.com/Dolibarr/dolibarr/commit/e3f0ab9109822c3dd66e41f249a844deecfbb2a0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M dev/initdata/README
    M dev/initdemo/initdemo.sh
    M htdocs/categories/index.php

  Log Message:
  -----------
  Fix tag was not visible


  Commit: a6147ee73b6894d4bd867753dccee96cf0d229c9
      
https://github.com/Dolibarr/dolibarr/commit/a6147ee73b6894d4bd867753dccee96cf0d229c9
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/contact/card.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/en_US/companies.lang

  Log Message:
  -----------
  Miscellaneous fixes


  Commit: 7678940e50d53e6d4a2b4a6e03dd5ee530ff5610
      
https://github.com/Dolibarr/dolibarr/commit/7678940e50d53e6d4a2b4a6e03dd5ee530ff5610
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M dev/initdemo/initdemo.sh
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/index.php
    M htdocs/ecm/tpl/enablefiletreeajax.tpl.php

  Log Message:
  -----------
  Fix refresh cache value of nb of files into a dir into ECM module


  Commit: 857de646071d19ac51011923da1b95763bb6924b
      
https://github.com/Dolibarr/dolibarr/commit/857de646071d19ac51011923da1b95763bb6924b
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    A dev/initdemo/updatedemo.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/compta/facture.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/langs/en_US/main.lang
    M htdocs/supplier_proposal/card.php

  Log Message:
  -----------
  Fix multicurrency


  Commit: e5583f1544498d012586a433925984511351e8c5
      
https://github.com/Dolibarr/dolibarr/commit/e5583f1544498d012586a433925984511351e8c5
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M dev/initdemo/updatedemo.php
    M htdocs/compta/bank/virement.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/langs/en_US/banks.lang

  Log Message:
  -----------
  Fix bad translation. Confusionbetween internal tranfert and bank
tranfert for payements


  Commit: 246321cd8f84d4560cf56c5131bb9145c9fe9528
      
https://github.com/Dolibarr/dolibarr/commit/246321cd8f84d4560cf56c5131bb9145c9fe9528
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M dev/initdemo/updatedemo.php
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/supplier_proposal/list.php

  Log Message:
  -----------
  Fix clean orphelins of leave request logs in repair tools
Fix date of supplier proposal missing.


  Commit: a87c2f9579c217bef1240f434131329f6c8914cd
      
https://github.com/Dolibarr/dolibarr/commit/a87c2f9579c217bef1240f434131329f6c8914cd
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M dev/initdemo/updatedemo.php
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Fix several fixes on margin reports


  Commit: 654ac318d4dd2a375f51d59f684141ea48c6f7a4
      
https://github.com/Dolibarr/dolibarr/commit/654ac318d4dd2a375f51d59f684141ea48c6f7a4
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    A dev/initdemo/mysqldump_dolibarr_4.0.0.sql
    M dev/initdemo/savedemo.sh

  Log Message:
  -----------
  Prepare dump for 4.0 demo


  Commit: 9191692bb201caef7aa852b7378b915fa2eba8ed
      
https://github.com/Dolibarr/dolibarr/commit/9191692bb201caef7aa852b7378b915fa2eba8ed
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    R dev/initdemo/documents_demo/doctemplates/invoices/template_invoice.odt
    R dev/initdemo/documents_demo/doctemplates/orders/template_order.odt
    R dev/initdemo/documents_demo/doctemplates/projects/template_project.odt
    R dev/initdemo/documents_demo/doctemplates/proposals/template_proposal.odt
    R dev/initdemo/documents_demo/doctemplates/tasks/template_task_summary.odt
    R 
dev/initdemo/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
    A dev/initdemo/documents_demo/produit/DOLICLOUD/dolicloud_logo.png
    A 
dev/initdemo/documents_demo/produit/DOLICLOUD/thumbs/dolicloud_logo_mini.png
    A 
dev/initdemo/documents_demo/produit/DOLICLOUD/thumbs/dolicloud_logo_small.png
    A dev/initdemo/documents_demo/societe/contact/10/eldy_php.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/ldestailleur_200x200.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/thumbs/ldestailleur_200x200_mini.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/thumbs/ldestailleur_200x200_small.jpg
    A dev/initdemo/documents_demo/societe/contact/10/thumbs/eldy_php_mini.jpg
    A dev/initdemo/documents_demo/societe/contact/10/thumbs/eldy_php_small.jpg
    A dev/initdemo/documents_demo/supplier_proposal/RQ1607-0001/RQ1607-0001.pdf
    A dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
    A dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
    A dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg

  Log Message:
  -----------
  More files for demo data


  Commit: 5aa5c5259d71887243233482275cb3baba33bfa4
      
https://github.com/Dolibarr/dolibarr/commit/5aa5c5259d71887243233482275cb3baba33bfa4
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M dev/initdemo/mysqldump_dolibarr_4.0.0.sql

  Log Message:
  -----------
  demo is in mode stable


  Commit: 04e814d1a6cc81be5a2a631cd026608156e9b6c8
      
https://github.com/Dolibarr/dolibarr/commit/04e814d1a6cc81be5a2a631cd026608156e9b6c8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/public/demo/index.php

  Log Message:
  -----------
  Update demo


  Commit: 8ada144f6ed24cc5255a0a4fb4c226e3420a9705
      
https://github.com/Dolibarr/dolibarr/commit/8ada144f6ed24cc5255a0a4fb4c226e3420a9705
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/public/demo/index.php

  Log Message:
  -----------
  Fix demo


  Commit: b165a31c0d4df94abe6e5c0a0419df361f09ea29
      
https://github.com/Dolibarr/dolibarr/commit/b165a31c0d4df94abe6e5c0a0419df361f09ea29
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/public/demo/index.php

  Log Message:
  -----------
  Fix old module to disable


  Commit: 44b02f1d6c64630c662fef2e48e5d4ff26a9bf50
      
https://github.com/Dolibarr/dolibarr/commit/44b02f1d6c64630c662fef2e48e5d4ff26a9bf50
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/public/demo/index.php

  Log Message:
  -----------
  Hide module cron


  Commit: 0414f09e487ef6451e5df4be32987890a171b865
      
https://github.com/Dolibarr/dolibarr/commit/0414f09e487ef6451e5df4be32987890a171b865
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Fix permissions


  Commit: e3df4b81f86fe1e607f56330790fac8f4cb905b3
      
https://github.com/Dolibarr/dolibarr/commit/e3df4b81f86fe1e607f56330790fac8f4cb905b3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-30 (Sat, 30 Jul 2016)

  Changed paths:
    M dev/initdemo/mysqldump_dolibarr_4.0.0.sql

  Log Message:
  -----------
  Update demo 4.0


  Commit: 64fbff3abc87e76cf3e398ac61a4ad2557caa454
      
https://github.com/Dolibarr/dolibarr/commit/64fbff3abc87e76cf3e398ac61a4ad2557caa454
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M build/exe/doliwamp/httpd.conf.install
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Fix for 4.0 doliwamp


  Commit: 1b6da075f72663f2118a96c87b24fd1bedc853c8
      
https://github.com/Dolibarr/dolibarr/commit/1b6da075f72663f2118a96c87b24fd1bedc853c8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    M build/exe/doliwamp/dolibarr.conf.install
    M build/exe/doliwamp/phpmyadmin.conf.install

  Log Message:
  -----------
  Fix new apache 2.4 directives


  Commit: 33495847b797798fe83c4dbda8ea36a5b758a4db
      
https://github.com/Dolibarr/dolibarr/commit/33495847b797798fe83c4dbda8ea36a5b758a4db
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    M htdocs/compta/salaries/index.php
    M htdocs/expensereport/card.php
    M htdocs/societe/project.php
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Merge branch '4.0-p36' of https://github.com/aspangaro/dolibarr into
aspangaro-4.0-p36

Conflicts:
        htdocs/societe/rib.php


  Commit: 0f544919e050e9cc156eb2e0f156d543a8d9eddc
      
https://github.com/Dolibarr/dolibarr/commit/0f544919e050e9cc156eb2e0f156d543a8d9eddc
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    M htdocs/compta/salaries/index.php
    M htdocs/expensereport/card.php
    M htdocs/societe/project.php
    M htdocs/societe/rib.php

  Log Message:
  -----------
  git push origin 4.0Merge branch 'aspangaro-4.0-p36' into 4.0


  Commit: 51e941b9b4a1ce8ae834e83edbae847c50e7adc3
      
https://github.com/Dolibarr/dolibarr/commit/51e941b9b4a1ce8ae834e83edbae847c50e7adc3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    M htdocs/bookmarks/bookmarks.lib.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix for option MAIN_OPTIMIZEFORTEXTBROWSER


  Commit: 5f0951dcda26690ff232f2952b742c074f3572c6
      
https://github.com/Dolibarr/dolibarr/commit/5f0951dcda26690ff232f2952b742c074f3572c6
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix for option MAIN_OPTIMIZEFORTEXTBROWSER


  Commit: ce3b01cf6adefb38c23c1a4813f7a47ed4612651
      
https://github.com/Dolibarr/dolibarr/commit/ce3b01cf6adefb38c23c1a4813f7a47ed4612651
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    R doc/images/dolimed.ico
    M doc/images/doliwampoff.ico
    M doc/images/doliwampon.ico

  Log Message:
  -----------
  Update icons


  Commit: 20a2282efc298ae85595b0e7349de65fa3349367
      
https://github.com/Dolibarr/dolibarr/commit/20a2282efc298ae85595b0e7349de65fa3349367
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    A 
dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png
    M doc/images/dolibarr_screenshot10_1280x800.png
    M doc/images/dolibarr_screenshot2_1280x800.png
    M doc/images/dolibarr_screenshot4_1280x800.png
    M doc/images/dolibarr_screenshot5_1280x800.png
    M doc/images/dolibarr_screenshot7_1280x800.png
    M doc/images/dolibarr_screenshot8_1280x800.png
    M doc/images/dolibarr_screenshot9_1280x800.png
    M htdocs/comm/mailing/card.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/md/ckeditor/config.js

  Log Message:
  -----------
  Updated screenshots


  Commit: 1e037a9b9519e075074eeeae5c9f4f31c5ce826e
      
https://github.com/Dolibarr/dolibarr/commit/1e037a9b9519e075074eeeae5c9f4f31c5ce826e
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    A doc/images/dolibarr_screenshot6_1280x800.png
    M htdocs/admin/security_file.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  Fix pb of responsive design


  Commit: ee7023422a7cd2db4ef9c375457332ddccb79b0d
      
https://github.com/Dolibarr/dolibarr/commit/ee7023422a7cd2db4ef9c375457332ddccb79b0d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-31 (Sun, 31 Jul 2016)

  Changed paths:
    M dev/initdemo/mysqldump_dolibarr_4.0.0.sql

  Log Message:
  -----------
  Update dump


  Commit: 63220eae180f77da23f728ec8e5ccc787d3ab90e
      
https://github.com/Dolibarr/dolibarr/commit/63220eae180f77da23f728ec8e5ccc787d3ab90e
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Presentation


  Commit: 30ec33f1522b8e3f891d23991805832942b65f68
      
https://github.com/Dolibarr/dolibarr/commit/30ec33f1522b8e3f891d23991805832942b65f68
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/langs/en_US/main.lang

  Log Message:
  -----------
  Missing key language


  Commit: 26f98a2ab74d31e4a536af468e9b646844ba693f
      
https://github.com/Dolibarr/dolibarr/commit/26f98a2ab74d31e4a536af468e9b646844ba693f
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/expensereport/document.php
    M htdocs/holiday/card.php

  Log Message:
  -----------
  Presentation


  Commit: 3cdb2d45c203d7c2babd4c49d01f6abfa30c9a12
      
https://github.com/Dolibarr/dolibarr/commit/3cdb2d45c203d7c2babd4c49d01f6abfa30c9a12
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/facture/note.php
    M htdocs/compta/facture/prelevement.php

  Log Message:
  -----------
  Uniformize presentation customer invoice


  Commit: 4ee4de4a0009a34fca9249f9896ed76cb7591c24
      
https://github.com/Dolibarr/dolibarr/commit/4ee4de4a0009a34fca9249f9896ed76cb7591c24
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/info.php
    M htdocs/fourn/facture/note.php

  Log Message:
  -----------
  Uniformize presentation supplier invoice


  Commit: 4a0eb496faeba9a035b96a2baf01f5f4dce10e40
      
https://github.com/Dolibarr/dolibarr/commit/4a0eb496faeba9a035b96a2baf01f5f4dce10e40
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M build/doxygen/doxygen_footer.html
    M build/exe/doliwamp/dolibarr.conf.install
    M build/exe/doliwamp/doliwamp.iss
    M build/exe/doliwamp/httpd.conf.install
    M build/exe/doliwamp/phpmyadmin.conf.install
    M build/makepack-dolibarr.pl
    M dev/initdata/README
    R dev/initdemo/documents_demo/doctemplates/invoices/template_invoice.odt
    R dev/initdemo/documents_demo/doctemplates/orders/template_order.odt
    R dev/initdemo/documents_demo/doctemplates/projects/template_project.odt
    R dev/initdemo/documents_demo/doctemplates/proposals/template_proposal.odt
    R dev/initdemo/documents_demo/doctemplates/tasks/template_task_summary.odt
    R 
dev/initdemo/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
    A 
dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png
    A dev/initdemo/documents_demo/produit/DOLICLOUD/dolicloud_logo.png
    A 
dev/initdemo/documents_demo/produit/DOLICLOUD/thumbs/dolicloud_logo_mini.png
    A 
dev/initdemo/documents_demo/produit/DOLICLOUD/thumbs/dolicloud_logo_small.png
    A dev/initdemo/documents_demo/societe/contact/10/eldy_php.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/ldestailleur_200x200.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/thumbs/ldestailleur_200x200_mini.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/thumbs/ldestailleur_200x200_small.jpg
    A dev/initdemo/documents_demo/societe/contact/10/thumbs/eldy_php_mini.jpg
    A dev/initdemo/documents_demo/societe/contact/10/thumbs/eldy_php_small.jpg
    A dev/initdemo/documents_demo/supplier_proposal/RQ1607-0001/RQ1607-0001.pdf
    A dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
    A dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
    A dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
    M dev/initdemo/initdemo.sh
    A dev/initdemo/mysqldump_dolibarr_4.0.0.sql
    M dev/initdemo/savedemo.sh
    A dev/initdemo/updatedemo.php
    M doc/images/dolibarr_screenshot10_1280x800.png
    M doc/images/dolibarr_screenshot2_1280x800.png
    M doc/images/dolibarr_screenshot4_1280x800.png
    M doc/images/dolibarr_screenshot5_1280x800.png
    A doc/images/dolibarr_screenshot6_1280x800.png
    M doc/images/dolibarr_screenshot7_1280x800.png
    M doc/images/dolibarr_screenshot8_1280x800.png
    M doc/images/dolibarr_screenshot9_1280x800.png
    R doc/images/dolimed.ico
    M doc/images/doliwampoff.ico
    M doc/images/doliwampon.ico
    M htdocs/admin/prelevement.php
    M htdocs/admin/security_file.php
    M htdocs/bookmarks/bookmarks.lib.php
    M htdocs/categories/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/contact/card.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/doxygen.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/index.php
    M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/public/demo/index.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/rib.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/list.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/ckeditor/config.js
    M htdocs/theme/md/style.css.php

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

Conflicts:
        htdocs/societe/rib.php


  Commit: 0b7a5a4af93bda0df9b4334cb0205ca299d7de6b
      
https://github.com/Dolibarr/dolibarr/commit/0b7a5a4af93bda0df9b4334cb0205ca299d7de6b
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/don/card.php
    M htdocs/don/document.php
    M htdocs/don/info.php

  Log Message:
  -----------
  Uniformize presentation donation


  Commit: 8ce5fcd9800098885952e44464cd0a8da26b9233
      
https://github.com/Dolibarr/dolibarr/commit/8ce5fcd9800098885952e44464cd0a8da26b9233
  Author: aspangaro <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/document.php
    M htdocs/compta/salaries/info.php

  Log Message:
  -----------
  Uniformize presentation salary payment


  Commit: e0c232548e2d96475acecae035614ec956d96517
      
https://github.com/Dolibarr/dolibarr/commit/e0c232548e2d96475acecae035614ec956d96517
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql

  Log Message:
  -----------
  Fix theme crazy after migration


  Commit: 417dd6465cad77a44ca3fb63d28a935f9ea3eb36
      
https://github.com/Dolibarr/dolibarr/commit/417dd6465cad77a44ca3fb63d28a935f9ea3eb36
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/facture/note.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/document.php
    M htdocs/compta/salaries/info.php
    M htdocs/don/card.php
    M htdocs/don/document.php
    M htdocs/don/info.php
    M htdocs/expensereport/document.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/info.php
    M htdocs/fourn/facture/note.php
    M htdocs/holiday/card.php
    M htdocs/langs/en_US/main.lang
    M htdocs/societe/rib.php

  Log Message:
  -----------
  Merge pull request #5570 from aspangaro/4.0-p36

Fix Presentation & uniformize code


  Commit: b267402df6350f30bf44f1458cae13e621adcf67
      
https://github.com/Dolibarr/dolibarr/commit/b267402df6350f30bf44f1458cae13e621adcf67
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M build/doxygen/doxygen_footer.html
    M build/exe/doliwamp/dolibarr.conf.install
    M build/exe/doliwamp/doliwamp.iss
    M build/exe/doliwamp/httpd.conf.install
    M build/exe/doliwamp/phpmyadmin.conf.install
    M build/makepack-dolibarr.pl
    M dev/initdata/README
    R dev/initdemo/documents_demo/doctemplates/invoices/template_invoice.odt
    R dev/initdemo/documents_demo/doctemplates/orders/template_order.odt
    R dev/initdemo/documents_demo/doctemplates/projects/template_project.odt
    R dev/initdemo/documents_demo/doctemplates/proposals/template_proposal.odt
    R dev/initdemo/documents_demo/doctemplates/tasks/template_task_summary.odt
    R 
dev/initdemo/documents_demo/doctemplates/thirdparties/template_thirdparty.odt
    A 
dev/initdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png
    A dev/initdemo/documents_demo/produit/DOLICLOUD/dolicloud_logo.png
    A 
dev/initdemo/documents_demo/produit/DOLICLOUD/thumbs/dolicloud_logo_mini.png
    A 
dev/initdemo/documents_demo/produit/DOLICLOUD/thumbs/dolicloud_logo_small.png
    A dev/initdemo/documents_demo/societe/contact/10/eldy_php.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/ldestailleur_200x200.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/thumbs/ldestailleur_200x200_mini.jpg
    A 
dev/initdemo/documents_demo/societe/contact/10/photos/thumbs/ldestailleur_200x200_small.jpg
    A dev/initdemo/documents_demo/societe/contact/10/thumbs/eldy_php_mini.jpg
    A dev/initdemo/documents_demo/societe/contact/10/thumbs/eldy_php_small.jpg
    A dev/initdemo/documents_demo/supplier_proposal/RQ1607-0001/RQ1607-0001.pdf
    A dev/initdemo/documents_demo/users/9/1/eldy_php.jpg
    A dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_mini.jpg
    A dev/initdemo/documents_demo/users/9/1/thumbs/eldy_php_small.jpg
    M dev/initdemo/initdemo.sh
    A dev/initdemo/mysqldump_dolibarr_4.0.0.sql
    M dev/initdemo/savedemo.sh
    A dev/initdemo/updatedemo.php
    M doc/images/dolibarr_screenshot10_1280x800.png
    M doc/images/dolibarr_screenshot2_1280x800.png
    M doc/images/dolibarr_screenshot4_1280x800.png
    M doc/images/dolibarr_screenshot5_1280x800.png
    A doc/images/dolibarr_screenshot6_1280x800.png
    M doc/images/dolibarr_screenshot7_1280x800.png
    M doc/images/dolibarr_screenshot8_1280x800.png
    M doc/images/dolibarr_screenshot9_1280x800.png
    R doc/images/dolimed.ico
    M doc/images/doliwampoff.ico
    M doc/images/doliwampon.ico
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/index.php
    M htdocs/admin/dict.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/security_file.php
    M htdocs/bookmarks/bookmarks.lib.php
    M htdocs/categories/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/virement.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/facture/note.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/document.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/salaries/info.php
    M htdocs/contact/card.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/doxygen.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/modDocumentGeneration.class.php
    M htdocs/core/modules/modOpenSurvey.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/don/card.php
    M htdocs/don/document.php
    M htdocs/don/info.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/index.php
    M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/document.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/info.php
    M htdocs/fourn/facture/note.php
    M htdocs/holiday/card.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/install/doctemplates/orders/template_order.odt
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/public/demo/index.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/project.php
    M htdocs/societe/rib.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/list.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/ckeditor/config.js
    M htdocs/theme/md/style.css.php

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

Conflicts:
        htdocs/compta/prelevement/class/bonprelevement.class.php
        htdocs/filefunc.inc.php
        htdocs/langs/en_US/main.lang
        htdocs/societe/rib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b999c71768bd...b267402df635
reply via email to
[Prev in Thread] Current Thread [Next in Thread]