[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] 10c973: Fix complex export model loading
From: |
Laurent Destailleur |
Subject: |
[Dolibarr/dolibarr] 10c973: Fix complex export model loading |
Date: |
Sun, 19 Jan 2020 10:49:28 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 10c973f38f98e08587f2d7735f584e12ce22ebed
https://github.com/Dolibarr/dolibarr/commit/10c973f38f98e08587f2d7735f584e12ce22ebed
Author: John Botella <address@hidden>
Date: 2020-01-15 (Wed, 15 Jan 2020)
Changed paths:
M htdocs/exports/export.php
Log Message:
-----------
Fix complex export model loading
Commit: 536f835a3ee737973a572aedc3e82b2ce83aabfe
https://github.com/Dolibarr/dolibarr/commit/536f835a3ee737973a572aedc3e82b2ce83aabfe
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-15 (Wed, 15 Jan 2020)
Changed paths:
M htdocs/exports/export.php
Log Message:
-----------
Merge pull request #12850 from atm-john/10.0_fix_export_explode
FIX complex export model loading
Commit: 3cdb84b192bd5ea8c4f6c66eabc2f19215dee08e
https://github.com/Dolibarr/dolibarr/commit/3cdb84b192bd5ea8c4f6c66eabc2f19215dee08e
Author: atm-ph <address@hidden>
Date: 2020-01-16 (Thu, 16 Jan 2020)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix note started with <s> balise
Commit: 60d4f63205a0c8d03bfdf96825f0a5b1894f5ab3
https://github.com/Dolibarr/dolibarr/commit/60d4f63205a0c8d03bfdf96825f0a5b1894f5ab3
Author: VESSILLER <address@hidden>
Date: 2020-01-17 (Fri, 17 Jan 2020)
Changed paths:
M htdocs/expensereport/card.php
M htdocs/langs/fr_FR/trips.lang
Log Message:
-----------
FIX send expense report mail in HTML format
Commit: e14d933f3ef1ed5c8c1e214a2932fed5206517c0
https://github.com/Dolibarr/dolibarr/commit/e14d933f3ef1ed5c8c1e214a2932fed5206517c0
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-17 (Fri, 17 Jan 2020)
Changed paths:
M htdocs/expensereport/card.php
M htdocs/langs/fr_FR/trips.lang
Log Message:
-----------
Merge pull request #12879 from OPEN-DSI/v10-fix-expense-report-mail
FIX send expense report mail in HTML format
Commit: cf2001a1ae3b942323b9b58feb6adebacd1aa907
https://github.com/Dolibarr/dolibarr/commit/cf2001a1ae3b942323b9b58feb6adebacd1aa907
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-17 (Fri, 17 Jan 2020)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #12860 from atm-ph/fix_10.0_html_text
Fix note started with <s> balise
Commit: 83d1b673bbd6c48d90fdab0d3bcc26d243e9c52b
https://github.com/Dolibarr/dolibarr/commit/83d1b673bbd6c48d90fdab0d3bcc26d243e9c52b
Author: andreubisquerra <address@hidden>
Date: 2020-01-18 (Sat, 18 Jan 2020)
Changed paths:
M htdocs/takepos/admin/terminal.php
Log Message:
-----------
Visible receipt printer settings without stock module in TakePOS
Commit: f4ae8696782fb7e35c34fd749a470e8fd5cdebfe
https://github.com/Dolibarr/dolibarr/commit/f4ae8696782fb7e35c34fd749a470e8fd5cdebfe
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix error return when creating order with not enough stock
Commit: 8bc8a8f57caeeaf5ea3d67203faf71b0551417b8
https://github.com/Dolibarr/dolibarr/commit/8bc8a8f57caeeaf5ea3d67203faf71b0551417b8
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modSociete.class.php
M htdocs/expensereport/card.php
M htdocs/exports/export.php
M htdocs/langs/fr_FR/trips.lang
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 00cddc39fd33b0d6685f04143ebeec3a5a9d9622
https://github.com/Dolibarr/dolibarr/commit/00cddc39fd33b0d6685f04143ebeec3a5a9d9622
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/install/mysql/migration/repair.sql
Log Message:
-----------
Fix remove some orphelins in llx_ecm_files
Commit: 8c8d492a48d3b2c6f5d6f5661c33ed59c98832b4
https://github.com/Dolibarr/dolibarr/commit/8c8d492a48d3b2c6f5d6f5661c33ed59c98832b4
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/langs/en_US/errors.lang
Log Message:
-----------
FIX Protection to avoid blocking situation with negative lines
Commit: 6a958dd45b9fbb0a47c2254253344526408edace
https://github.com/Dolibarr/dolibarr/commit/6a958dd45b9fbb0a47c2254253344526408edace
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/admin/tools/listevents.php
Log Message:
-----------
FIX XSS vulnerability in description of list of audit events.
Commit: 041d5aeb463b9638a11ec3b0f477c104aa6b43cb
https://github.com/Dolibarr/dolibarr/commit/041d5aeb463b9638a11ec3b0f477c104aa6b43cb
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/admin/tools/listevents.php
Log Message:
-----------
FIX XSS vulnerability in description of list of audit events.
Commit: e803e06c0dd64019e24e2dcaff5480b7e3943440
https://github.com/Dolibarr/dolibarr/commit/e803e06c0dd64019e24e2dcaff5480b7e3943440
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/admin/tools/listevents.php
M htdocs/commande/class/commande.class.php
M htdocs/expensereport/card.php
M htdocs/exports/export.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/fr_FR/trips.lang
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/commande/class/commande.class.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/exports/export.php
Commit: d6bdbccf4f342fe3bc9cfb9e4cbcd2ab431dcd7e
https://github.com/Dolibarr/dolibarr/commit/d6bdbccf4f342fe3bc9cfb9e4cbcd2ab431dcd7e
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/compta/bank/releve.php
Log Message:
-----------
Fix link
Commit: 19ab802aafde2854f4065372e4eebbf86c6e3da2
https://github.com/Dolibarr/dolibarr/commit/19ab802aafde2854f4065372e4eebbf86c6e3da2
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/compta/bank/bankentries_list.php
Log Message:
-----------
Fix disabling of balance
Commit: e679e05f579fae7f5728b8c92ce748212f353319
https://github.com/Dolibarr/dolibarr/commit/e679e05f579fae7f5728b8c92ce748212f353319
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/admin/tools/listevents.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/bankentries_list.php
M htdocs/compta/bank/releve.php
M htdocs/compta/facture/card.php
M htdocs/expensereport/card.php
M htdocs/exports/export.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/errors.lang
M htdocs/langs/fr_FR/trips.lang
M htdocs/takepos/admin/terminal.php
Log Message:
-----------
Merge branch '11.0' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 526ae83e8f33ad50f02273ec342c69efe33557e4
https://github.com/Dolibarr/dolibarr/commit/526ae83e8f33ad50f02273ec342c69efe33557e4
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-19 (Sun, 19 Jan 2020)
Changed paths:
M htdocs/admin/tools/dolibarr_export.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/bank/various_payment/list.php
M htdocs/compta/facture/list.php
M htdocs/core/class/dolgraph.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/utils.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/expedition/list.php
M htdocs/exports/class/export.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/holiday/card.php
M htdocs/loan/list.php
M htdocs/salaries/list.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/f09ca62e93cb...526ae83e8f33