[Dolibarr-git] [Dolibarr/dolibarr] 809729: FIX #4756

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 809729: FIX #4756

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 809729: FIX #4756
Date:	Wed, 06 Jul 2016 06:11:41 -0700
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8097298c805e96dee8427bfc0299da2817e03d7f
      
https://github.com/Dolibarr/dolibarr/commit/8097298c805e96dee8427bfc0299da2817e03d7f
  Author: florian HENRY <address@hidden>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M htdocs/install/pgsql/functions/functions.sql

  Log Message:
  -----------
  FIX #4756


  Commit: 855550e2742525e65aa2944366f0c03946e68f15
      
https://github.com/Dolibarr/dolibarr/commit/855550e2742525e65aa2944366f0c03946e68f15
  Author: florian HENRY <address@hidden>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M htdocs/install/pgsql/functions/functions.sql

  Log Message:
  -----------
  FIX 4926


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

  Changed paths:
    M htdocs/comm/action/card.php
    M htdocs/compta/bank/annuel.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/don/card.php
    M htdocs/fourn/card.php
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8


  Commit: 7118c8b39b51441db96a9fb19f8b5ee108cbf013
      
https://github.com/Dolibarr/dolibarr/commit/7118c8b39b51441db96a9fb19f8b5ee108cbf013
  Author: florian HENRY <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M htdocs/comm/action/card.php
    M htdocs/comm/index.php
    M htdocs/compta/bank/annuel.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/don/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/projet/tasks/time.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/consumption.php
    M htdocs/user/class/userbankaccount.class.php

  Log Message:
  -----------
  Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9


  Commit: 08fbc21bb16cfb7e1f7e33dd8d3abe8844044fa2
      
https://github.com/Dolibarr/dolibarr/commit/08fbc21bb16cfb7e1f7e33dd8d3abe8844044fa2
  Author: florian HENRY <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M htdocs/install/pgsql/functions/functions.sql

  Log Message:
  -----------
  llx_ecm_directories


  Commit: 2520ee921aa604f647e62321e9b9de3f7a8b96fa
      
https://github.com/Dolibarr/dolibarr/commit/2520ee921aa604f647e62321e9b9de3f7a8b96fa
  Author: florian HENRY <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M htdocs/install/pgsql/functions/functions.sql

  Log Message:
  -----------
  llx_ecm_directories


  Commit: 09b824d819233f504aa587cb14fecafa02d7f38c
      
https://github.com/Dolibarr/dolibarr/commit/09b824d819233f504aa587cb14fecafa02d7f38c
  Author: arnaud <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M htdocs/product/stats/card.php

  Log Message:
  -----------
  FIX product stats all bloc module without enbaled test


  Commit: cf5de9d0c878a3f35f9fd47ce6f4a0f28c15a5c2
      
https://github.com/Dolibarr/dolibarr/commit/cf5de9d0c878a3f35f9fd47ce6f4a0f28c15a5c2
  Author: arnaud <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

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

  Log Message:
  -----------
  FIX form_confirm to delete payment on supplier invoice


  Commit: 0639bafa6bf354d786ecac7fc3b876db32b940cc
      
https://github.com/Dolibarr/dolibarr/commit/0639bafa6bf354d786ecac7fc3b876db32b940cc
  Author: Frédéric FRANCE <address@hidden>
  Date:   2016-07-02 (Sat, 02 Jul 2016)

  Changed paths:
    M htdocs/fourn/commande/list.php

  Log Message:
  -----------
  Update list.php


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

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

  Log Message:
  -----------
  Merge pull request #5439 from 
atm-arnaud/FIX_ASK_DELETE_PAYMENT_SUPPLIER_INVOICE

FIX form_confirm to delete payment on supplier invoice


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

  Changed paths:
    M htdocs/product/stats/card.php

  Log Message:
  -----------
  Merge pull request #5438 from 
atm-arnaud/FIX_product_blocstat_without_module_enabled

FIX product stats all bloc module without enabled test


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

  Changed paths:
    M htdocs/fourn/commande/list.php

  Log Message:
  -----------
  Merge pull request #5440 from frederic34/patch-8

FIX Search on billed


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

  Changed paths:
    M htdocs/install/pgsql/functions/functions.sql

  Log Message:
  -----------
  Merge pull request #5431 from atm-florian/3.8

FIX #4756


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

  Changed paths:
    M htdocs/install/pgsql/functions/functions.sql

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

FIX #4926


  Commit: d658e2cf31c86199df52b629771a16bc4701222a
      
https://github.com/Dolibarr/dolibarr/commit/d658e2cf31c86199df52b629771a16bc4701222a
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

  Log Message:
  -----------
  FIX task ODT company object not correctly retrieved


  Commit: 50c5efc374a6591ae10ca76c18b803a7b166e022
      
https://github.com/Dolibarr/dolibarr/commit/50c5efc374a6591ae10ca76c18b803a7b166e022
  Author: fmarcet <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M htdocs/commande/orderstoinvoice.php
    M htdocs/fourn/commande/orderstoinvoice.php

  Log Message:
  -----------
  Fix: Don't load extrafields on orderstoinvoice


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

  Changed paths:
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

  Log Message:
  -----------
  Merge pull request #5448 from atm-maxime/fix_task_odt_model

FIX task ODT company object not correctly retrieved


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

  Changed paths:
    M htdocs/commande/orderstoinvoice.php
    M htdocs/fourn/commande/orderstoinvoice.php

  Log Message:
  -----------
  Merge pull request #5449 from fmarcet/3.8

Fix: Don't load extrafields on orderstoinvoice


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

  Changed paths:
    M build/pad/DoliWamp.pml
    M build/pad/Dolibarr.pml
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M htdocs/commande/orderstoinvoice.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
    M htdocs/install/pgsql/functions/functions.sql

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

Conflicts:
        htdocs/install/pgsql/functions/functions.sql


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

  Changed paths:
    M build/pad/DoliWamp.pml
    M build/pad/Dolibarr.pml
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M htdocs/commande/orderstoinvoice.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/fourn/facture/card.php
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
    M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/product/stats/card.php

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

Conflicts:
        htdocs/fourn/commande/list.php
        htdocs/fourn/commande/orderstoinvoice.php
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
        htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
        htdocs/install/pgsql/functions/functions.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8505c5db09e8...061ccadd03cc
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 809729: FIX #4756, Laurent Destailleur, 2016/07/02
- [Dolibarr-git] [Dolibarr/dolibarr] 809729: FIX #4756, Laurent Destailleur, 2016/07/06
- [Dolibarr-git] [Dolibarr/dolibarr] 809729: FIX #4756, Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 809729: FIX #4756
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] d22ef4: Fix Do not show status
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 809729: FIX #4756
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] 855550: FIX 4926
Index(es):
- Date
- Thread