[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] 89dd74: Fix clean old files
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr/dolibarr] 89dd74: Fix clean old files |
|
Date: |
Sat, 14 Dec 2019 13:54:16 +0000 (UTC) |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 89dd74c1151ffa963d0f1cfcafb7f8ea3b28d77f
https://github.com/Dolibarr/dolibarr/commit/89dd74c1151ffa963d0f1cfcafb7f8ea3b28d77f
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-04 (Wed, 04 Dec 2019)
Changed paths:
M htdocs/install/upgrade2.php
Log Message:
-----------
Fix clean old files
Commit: 18464de297ca61caf3d8f1123c1ef82712ee985c
https://github.com/Dolibarr/dolibarr/commit/18464de297ca61caf3d8f1123c1ef82712ee985c
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-04 (Wed, 04 Dec 2019)
Changed paths:
M htdocs/install/upgrade2.php
Log Message:
-----------
Clean old file
Commit: 139419c3e85928e3b7ecc6775f10f7369b8216df
https://github.com/Dolibarr/dolibarr/commit/139419c3e85928e3b7ecc6775f10f7369b8216df
Author: Florian Mortgat <address@hidden>
Date: 2019-12-05 (Thu, 05 Dec 2019)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
FIX 10.0: do not display single-letter values (indicating duration unit
without value) in product list
(this fix exists in develop)
Commit: 3f6715a377e5a6f094421140df6feb9b7efe7032
https://github.com/Dolibarr/dolibarr/commit/3f6715a377e5a6f094421140df6feb9b7efe7032
Author: Florian Mortgat <address@hidden>
Date: 2019-12-05 (Thu, 05 Dec 2019)
Changed paths:
M htdocs/adherents/document.php
M htdocs/adherents/subscription/info.php
M htdocs/bookmarks/card.php
M htdocs/comm/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/info.php
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/info.php
M htdocs/livraison/card.php
M htdocs/loan/card.php
M htdocs/loan/document.php
M htdocs/loan/info.php
M htdocs/loan/note.php
M htdocs/loan/schedule.php
M htdocs/product/stock/card.php
M htdocs/product/stock/info.php
M htdocs/product/stock/movement_card.php
M htdocs/product/stock/movement_list.php
M htdocs/reception/contact.php
M htdocs/reception/note.php
M htdocs/societe/paymentmodes.php
M htdocs/societe/price.php
M htdocs/ticket/card.php
M htdocs/user/bank.php
M htdocs/user/param_ihm.php
Log Message:
-----------
FIX: add URL param "restore_last_search_values=1" to all backlinks that point
to a list
Commit: 486f5980673c011f2b815801cccd97d36228429f
https://github.com/Dolibarr/dolibarr/commit/486f5980673c011f2b815801cccd97d36228429f
Author: atm-lena <address@hidden>
Date: 2019-12-05 (Thu, 05 Dec 2019)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
FIX getrights() request
Commit: 22f575dad050f56358e0b93a3718d23bf1625cc4
https://github.com/Dolibarr/dolibarr/commit/22f575dad050f56358e0b93a3718d23bf1625cc4
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-06 (Fri, 06 Dec 2019)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge pull request #12633 from atm-lena/FIX_getrights_request
FIX getrights() request
Commit: d73bd3ee9a6b433f513fec4cdedfdc2e0f8c9e21
https://github.com/Dolibarr/dolibarr/commit/d73bd3ee9a6b433f513fec4cdedfdc2e0f8c9e21
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-06 (Fri, 06 Dec 2019)
Changed paths:
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modService.class.php
Log Message:
-----------
Fix a supplier ref is mandatory for import
Commit: cafe26cfc34927914fc84f5be22384ad13282d1b
https://github.com/Dolibarr/dolibarr/commit/cafe26cfc34927914fc84f5be22384ad13282d1b
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-06 (Fri, 06 Dec 2019)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Update card.php
Commit: f51a68ceb10fe32d67e6c47c0ea74f9fe114ea2d
https://github.com/Dolibarr/dolibarr/commit/f51a68ceb10fe32d67e6c47c0ea74f9fe114ea2d
Author: Laurent Dinclaux <address@hidden>
Date: 2019-12-07 (Sat, 07 Dec 2019)
Changed paths:
M htdocs/takepos/takepos.php
Log Message:
-----------
Takepos: Well align the search field width, keep old CSS rule as fallback for
old browsers
Commit: d7390b51cd57276550e0e856cd50210141fec321
https://github.com/Dolibarr/dolibarr/commit/d7390b51cd57276550e0e856cd50210141fec321
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/takepos/takepos.php
Log Message:
-----------
Merge pull request #12645 from Gecka-Apps/10.0-takepos-fix-search-width
Takepos: Well align the search field width, keep old CSS rule as fallback
Commit: 94bab155288ae18c8e12674b395e7119345b1323
https://github.com/Dolibarr/dolibarr/commit/94bab155288ae18c8e12674b395e7119345b1323
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/admin/tools/dolibarr_export.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/utils.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/fr_FR/admin.lang
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
Commit: 70a8d93f6e6ffd3a3be8d87906808ac90eef95b8
https://github.com/Dolibarr/dolibarr/commit/70a8d93f6e6ffd3a3be8d87906808ac90eef95b8
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/takepos/takepos.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: f28e4c14e875915db7abe99ea4db5a03a49b25cd
https://github.com/Dolibarr/dolibarr/commit/f28e4c14e875915db7abe99ea4db5a03a49b25cd
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
FIX #12644
Commit: 94ae8e07afd38ad5d7d28f37a0879075ef28532b
https://github.com/Dolibarr/dolibarr/commit/94ae8e07afd38ad5d7d28f37a0879075ef28532b
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Merge pull request #12642 from frederic34/patch-11
fix #12628
Commit: 903c3771ba877a717f3efb3503ac68c55290149d
https://github.com/Dolibarr/dolibarr/commit/903c3771ba877a717f3efb3503ac68c55290149d
Author: Gérald Lelarge <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
FIX #12665 Mass invoice validation with stock management
Normally the mass invoice validation is not authorized due to the need to
choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed
to inform the user to do this
validation manually one by one.
The invoices should not be validated.
Commit: 1401daba39943a88b5a40228b61231f6bead95e9
https://github.com/Dolibarr/dolibarr/commit/1401daba39943a88b5a40228b61231f6bead95e9
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Merge pull request #12667 from
glelarge/12665-mass_invoice_validation_with_stock_management
FIX #12665 Mass invoice validation with stock management
Commit: 2fd6c690c08c0b0bd29db72596f5fde5d338f6e9
https://github.com/Dolibarr/dolibarr/commit/2fd6c690c08c0b0bd29db72596f5fde5d338f6e9
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/adherents/document.php
M htdocs/adherents/subscription/info.php
M htdocs/bookmarks/card.php
M htdocs/comm/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/info.php
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/info.php
M htdocs/livraison/card.php
M htdocs/loan/card.php
M htdocs/loan/document.php
M htdocs/loan/info.php
M htdocs/loan/note.php
M htdocs/loan/schedule.php
M htdocs/product/stock/card.php
M htdocs/product/stock/info.php
M htdocs/product/stock/movement_card.php
M htdocs/product/stock/movement_list.php
M htdocs/reception/contact.php
M htdocs/reception/note.php
M htdocs/societe/paymentmodes.php
M htdocs/societe/price.php
M htdocs/ticket/card.php
M htdocs/user/bank.php
M htdocs/user/param_ihm.php
Log Message:
-----------
Merge pull request #12632 from
atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks
pointing to lists
Commit: 407fe902b49019c9bd62549d12e40f7d237c6a11
https://github.com/Dolibarr/dolibarr/commit/407fe902b49019c9bd62549d12e40f7d237c6a11
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/core/class/utils.class.php
Log Message:
-----------
missing $db for line 711
Commit: 314a13a8dfe577efc302d8492370c294ea7a3670
https://github.com/Dolibarr/dolibarr/commit/314a13a8dfe577efc302d8492370c294ea7a3670
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/core/class/utils.class.php
Log Message:
-----------
Merge pull request #12668 from frederic34/patch-6
missing $db for line 711
Commit: 24e9d3fdf0b713e77a476c7ad18dadee6531ffc4
https://github.com/Dolibarr/dolibarr/commit/24e9d3fdf0b713e77a476c7ad18dadee6531ffc4
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Merge pull request #12631 from
atm-florianm/FIX_10.0_backporting_duration_fix_from_develop
FIX 10.0: do not display single-letter duration values in product list
Commit: a16e342af6b6e5e564e22c09b6812c5640351f08
https://github.com/Dolibarr/dolibarr/commit/a16e342af6b6e5e564e22c09b6812c5640351f08
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
typo
Commit: de741f5dd023715392c7fb7da9e66fa10482486e
https://github.com/Dolibarr/dolibarr/commit/de741f5dd023715392c7fb7da9e66fa10482486e
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-09 (Mon, 09 Dec 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
The variable $id seems to be never defined
Commit: 7ba5c2e9d8b44f1b81570b1f3213b5d6bdcc4edb
https://github.com/Dolibarr/dolibarr/commit/7ba5c2e9d8b44f1b81570b1f3213b5d6bdcc4edb
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #12669 from frederic34/patch-6
typo
Commit: c0e23c7b71592216f41957825d7bc9496f933772
https://github.com/Dolibarr/dolibarr/commit/c0e23c7b71592216f41957825d7bc9496f933772
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #12670 from frederic34/patch-7
The variable $id seems to be never defined
Commit: f4674a7558037a6d6c6f57fd16c362ec2b9cec45
https://github.com/Dolibarr/dolibarr/commit/f4674a7558037a6d6c6f57fd16c362ec2b9cec45
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
doxygen and $db bot defined
Commit: e66013275de9043cccf52339671258b2b09e6868
https://github.com/Dolibarr/dolibarr/commit/e66013275de9043cccf52339671258b2b09e6868
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Merge pull request #12675 from frederic34/patch-6
doxygen and $db not defined
Commit: 5d61e53140fa716e6916aa4ab491f27fb0804602
https://github.com/Dolibarr/dolibarr/commit/5d61e53140fa716e6916aa4ab491f27fb0804602
Author: Gérald Lelarge <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
FIX #12665 Mass invoice validation with stock management
Normally the mass invoice validation is not authorized due to the need to
choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed
to inform the user to do this
validation manually one by one.
The invoices should not be validated.
Commit: 97ec8b8e0261689194ba5a1be20d702aea6ff2a4
https://github.com/Dolibarr/dolibarr/commit/97ec8b8e0261689194ba5a1be20d702aea6ff2a4
Author: Gérald Lelarge <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
FIX #12665 Mass invoice validation with stock management
Normally the mass invoice validation is not authorized due to the need to
choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed
to inform the user to do this
validation manually one by one.
The invoices should not be validated.
Commit: b92ec604ecc4f7034e0bbaac0bea80213e7f3741
https://github.com/Dolibarr/dolibarr/commit/b92ec604ecc4f7034e0bbaac0bea80213e7f3741
Author: Mistral Oz - LWEP <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/modules/export/export_excel2007new.modules.php
Log Message:
-----------
New model "Excel 2007" : first col at wrong position
The first column start at id 0 instead of id 1. At id 0, the first column move
at Z position.
Documentation :
https://phpspreadsheet.readthedocs.io/en/latest/topics/migration-from-PHPExcel/#column-index-based-on-1
Commit: 2103cacf9e32a7e5d7e353a47815efd385339245
https://github.com/Dolibarr/dolibarr/commit/2103cacf9e32a7e5d7e353a47815efd385339245
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Merge pull request #12679 from
glelarge/80/12665-mass_invoice_validation_with_stock_management
FIX #12665 Mass invoice validation with stock management (branch 8.0)
Commit: 22a297ed4701af756b254cd0b44a01b36ef392f1
https://github.com/Dolibarr/dolibarr/commit/22a297ed4701af756b254cd0b44a01b36ef392f1
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/actions_massactions.inc.php
Log Message:
-----------
Merge pull request #12680 from
glelarge/90/12665-mass_invoice_validation_with_stock_management
FIX #12665 Mass invoice validation with stock management (branch 9.0)
Commit: c72e7e6a973bcb58ffb51a22944b68f371769bc0
https://github.com/Dolibarr/dolibarr/commit/c72e7e6a973bcb58ffb51a22944b68f371769bc0
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-10 (Tue, 10 Dec 2019)
Changed paths:
M htdocs/core/modules/export/export_excel2007new.modules.php
Log Message:
-----------
Merge pull request #12682 from mistraloz/patch-2
FIX : first col at wrong position in Export 2007 (new)
Commit: a527e72124f5b49aa2145542e87f64e8dd55f034
https://github.com/Dolibarr/dolibarr/commit/a527e72124f5b49aa2145542e87f64e8dd55f034
Author: Regis Houssin <address@hidden>
Date: 2019-12-12 (Thu, 12 Dec 2019)
Changed paths:
M htdocs/compta/resultat/index.php
M htdocs/compta/stats/index.php
Log Message:
-----------
FIX #12688
Commit: a0aa51fe0ce3ae51039a70329b43c43191a6bede
https://github.com/Dolibarr/dolibarr/commit/a0aa51fe0ce3ae51039a70329b43c43191a6bede
Author: gauthier <address@hidden>
Date: 2019-12-12 (Thu, 12 Dec 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
FIX : CommandeFournisseurLigne update function must not be able to return
other value than 1 if success
Commit: cad54c6d7a8421678d56a2390b6614534d0d35c2
https://github.com/Dolibarr/dolibarr/commit/cad54c6d7a8421678d56a2390b6614534d0d35c2
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-13 (Fri, 13 Dec 2019)
Changed paths:
M build/generate_filelist_xml.php
Log Message:
-----------
Update generate_filelist_xml.php
Commit: a923a48e64ffec14d956049d5ae60446653c35b5
https://github.com/Dolibarr/dolibarr/commit/a923a48e64ffec14d956049d5ae60446653c35b5
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-13 (Fri, 13 Dec 2019)
Changed paths:
M htdocs/admin/system/filecheck.php
Log Message:
-----------
Update filecheck.php
Commit: 030b78d79f1ab63f3b129363f4c1fff939dfc32e
https://github.com/Dolibarr/dolibarr/commit/030b78d79f1ab63f3b129363f4c1fff939dfc32e
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-13 (Fri, 13 Dec 2019)
Changed paths:
M build/generate_filelist_xml.php
Log Message:
-----------
Update generate_filelist_xml.php
Commit: 6e64a20f9e859d4b6f039ed1c1ad3d763bb156fb
https://github.com/Dolibarr/dolibarr/commit/6e64a20f9e859d4b6f039ed1c1ad3d763bb156fb
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-13 (Fri, 13 Dec 2019)
Changed paths:
M htdocs/admin/system/filecheck.php
Log Message:
-----------
Update filecheck.php
Commit: 18e3a4bcbb7f9018f3b9cd5a5102c335991047f8
https://github.com/Dolibarr/dolibarr/commit/18e3a4bcbb7f9018f3b9cd5a5102c335991047f8
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-13 (Fri, 13 Dec 2019)
Changed paths:
M build/generate_filelist_xml.php
Log Message:
-----------
Update generate_filelist_xml.php
Commit: 50937f8ca14c046ec76daba922006abf00fc64ea
https://github.com/Dolibarr/dolibarr/commit/50937f8ca14c046ec76daba922006abf00fc64ea
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-13 (Fri, 13 Dec 2019)
Changed paths:
M htdocs/admin/system/filecheck.php
Log Message:
-----------
Update filecheck.php
Commit: bac5c3800e2bfc25b70ae83c378339829b2b5cdc
https://github.com/Dolibarr/dolibarr/commit/bac5c3800e2bfc25b70ae83c378339829b2b5cdc
Author: Frédéric FRANCE <address@hidden>
Date: 2019-12-13 (Fri, 13 Dec 2019)
Changed paths:
M htdocs/api/class/api_setup.class.php
Log Message:
-----------
Update api_setup.class.php
Commit: 3a4b4e1559b20f6f275b63ae2c9b3d9de0337b54
https://github.com/Dolibarr/dolibarr/commit/3a4b4e1559b20f6f275b63ae2c9b3d9de0337b54
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M build/generate_filelist_xml.php
M htdocs/admin/system/filecheck.php
M htdocs/api/class/api_setup.class.php
Log Message:
-----------
Merge pull request #12706 from frederic34/patch-22
Update generate_filelist_xml.php
Commit: 9f2a628c3b1dd68d7cc56ebf5b2ff73c187a7b2a
https://github.com/Dolibarr/dolibarr/commit/9f2a628c3b1dd68d7cc56ebf5b2ff73c187a7b2a
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M build/generate_filelist_xml.php
M htdocs/admin/system/filecheck.php
Log Message:
-----------
Remove bak file
Commit: dcc9f7d8d395530cb6729c738f8468fb69ced063
https://github.com/Dolibarr/dolibarr/commit/dcc9f7d8d395530cb6729c738f8468fb69ced063
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #12696 from
atm-gauthier/10.0_fix_updateline_fourn_order_return_mustnot_be_zero
FIX : CommandeFournisseurLigne update function must not be able to re…
Commit: 371a2c62bd36c81b06ad86ecace9f7db45e0de95
https://github.com/Dolibarr/dolibarr/commit/371a2c62bd36c81b06ad86ecace9f7db45e0de95
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M htdocs/compta/resultat/index.php
M htdocs/compta/stats/index.php
Log Message:
-----------
Merge pull request #12695 from hregis/10.0_mc
FIX #12688
Commit: a8de7b850a9e8460b1e8902f7f22c7580d8080a5
https://github.com/Dolibarr/dolibarr/commit/a8de7b850a9e8460b1e8902f7f22c7580d8080a5
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M build/generate_filelist_xml.php
M htdocs/admin/system/filecheck.php
M htdocs/api/class/api_setup.class.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/files.lib.php
M htdocs/expedition/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/admin/system/filecheck.php
Commit: d1daf94b817ead120381a079886f2e9ef50cd32c
https://github.com/Dolibarr/dolibarr/commit/d1daf94b817ead120381a079886f2e9ef50cd32c
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M htdocs/core/class/utils.class.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 31a60ff30b8116f8fe7a8d14171699bd19aba835
https://github.com/Dolibarr/dolibarr/commit/31a60ff30b8116f8fe7a8d14171699bd19aba835
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M htdocs/core/class/utils.class.php
Log Message:
-----------
Fix $db
Commit: 17b99646787824caa0597d4b93b08f9f3a682d57
https://github.com/Dolibarr/dolibarr/commit/17b99646787824caa0597d4b93b08f9f3a682d57
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M build/generate_filelist_xml.php
M htdocs/admin/system/filecheck.php
M htdocs/api/class/api_setup.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/files.lib.php
M htdocs/expedition/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
Commit: 5e3698b0238cfbf3abc1e0fcb2373f5dd6897ca0
https://github.com/Dolibarr/dolibarr/commit/5e3698b0238cfbf3abc1e0fcb2373f5dd6897ca0
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M htdocs/core/class/utils.class.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/class/utils.class.php
Commit: 838633d0deba76a25ddb41fa3f98442aee1eaf14
https://github.com/Dolibarr/dolibarr/commit/838633d0deba76a25ddb41fa3f98442aee1eaf14
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-14 (Sat, 14 Dec 2019)
Changed paths:
M build/generate_filelist_xml.php
M htdocs/adherents/document.php
M htdocs/adherents/subscription/info.php
M htdocs/admin/system/filecheck.php
M htdocs/api/class/api_setup.class.php
M htdocs/bookmarks/card.php
M htdocs/comm/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/info.php
M htdocs/compta/facture/card.php
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/info.php
M htdocs/compta/resultat/index.php
M htdocs/compta/stats/index.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/utils.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/modules/export/export_excel2007new.modules.php
M htdocs/expedition/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/install/upgrade2.php
M htdocs/livraison/card.php
M htdocs/loan/card.php
M htdocs/loan/document.php
M htdocs/loan/info.php
M htdocs/loan/note.php
M htdocs/loan/schedule.php
M htdocs/product/stock/card.php
M htdocs/product/stock/info.php
M htdocs/product/stock/movement_card.php
M htdocs/product/stock/movement_list.php
M htdocs/reception/contact.php
M htdocs/reception/note.php
M htdocs/societe/paymentmodes.php
M htdocs/societe/price.php
M htdocs/takepos/takepos.php
M htdocs/ticket/card.php
M htdocs/user/bank.php
M htdocs/user/class/user.class.php
M htdocs/user/param_ihm.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/8b57e9fcf01f...838633d0deba