[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 05:53:26 -0700 |
Branch: refs/heads/3.9
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: 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: 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: 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: 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
Compare:
https://github.com/Dolibarr/dolibarr/compare/e9797538b370...a8f06d78b182