[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f7c739: FIX wrong path sociales/index
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f7c739: FIX wrong path sociales/index.php doesnt exist any... |
|
Date: |
Tue, 30 Jul 2019 11:55:21 -0700 |
Branch: refs/heads/10.0
Home: https://github.com/Dolibarr/dolibarr
Commit: f7c739bba94e8d57524ec3fbc821e6a7b8efc4fe
https://github.com/Dolibarr/dolibarr/commit/f7c739bba94e8d57524ec3fbc821e6a7b8efc4fe
Author: atm-quentin <address@hidden>
Date: 2019-07-26 (Fri, 26 Jul 2019)
Changed paths:
M htdocs/compta/charges/index.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/list.php
M htdocs/compta/sociales/payments.php
Log Message:
-----------
FIX wrong path sociales/index.php doesnt exist anymore
Commit: 37ad5308e6f3483ec84898b0b888af284c3935ce
https://github.com/Dolibarr/dolibarr/commit/37ad5308e6f3483ec84898b0b888af284c3935ce
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-07-27 (Sat, 27 Jul 2019)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Fix holiday counter auto update
Commit: a2fc3689dace61795fd3761bb0f444fb34f5e92c
https://github.com/Dolibarr/dolibarr/commit/a2fc3689dace61795fd3761bb0f444fb34f5e92c
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-07-28 (Sun, 28 Jul 2019)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
Log Message:
-----------
Nowrap on amount
Commit: cd22cc70c8a307f4feda0cde338b7a799712fdb3
https://github.com/Dolibarr/dolibarr/commit/cd22cc70c8a307f4feda0cde338b7a799712fdb3
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-07-29 (Mon, 29 Jul 2019)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
Log Message:
-----------
FIX FEC Format - Save translation of the journal
Commit: bb168d7f54afcbc1fe4a241c7418c7ff44f31edc
https://github.com/Dolibarr/dolibarr/commit/bb168d7f54afcbc1fe4a241c7418c7ff44f31edc
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-07-29 (Mon, 29 Jul 2019)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/api/index.php
M htdocs/comm/action/list.php
M htdocs/comm/action/peruser.php
M htdocs/compta/prelevement/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Merge branch '9.0' into 9.0_FEC
Commit: 7a9f2b43c508958104281304c6215446c93cc4f6
https://github.com/Dolibarr/dolibarr/commit/7a9f2b43c508958104281304c6215446c93cc4f6
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-07-29 (Mon, 29 Jul 2019)
Changed paths:
M htdocs/adherents/card.php
Log Message:
-----------
FIX Language key
Commit: 87fc3c39689a35b872902e32aaba66850a81c663
https://github.com/Dolibarr/dolibarr/commit/87fc3c39689a35b872902e32aaba66850a81c663
Author: Marc de Lima Lucio <address@hidden>
Date: 2019-07-29 (Mon, 29 Jul 2019)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
FIX: expedition card: infinite loop for printObjectLine hook if return > 0
Commit: 449ef9200752de8e3feea2eefd606de80c037ee0
https://github.com/Dolibarr/dolibarr/commit/449ef9200752de8e3feea2eefd606de80c037ee0
Author: Marc de Lima Lucio <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
FIX: categories import: prevent mismatch between category type and object type
Commit: 6aefa648e71a4f336c2f336be4c87f3bc0c92b71
https://github.com/Dolibarr/dolibarr/commit/6aefa648e71a4f336c2f336be4c87f3bc0c92b71
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/viewimage.php
Log Message:
-----------
FIX CVE-2019-11199
Commit: de293c4ef2ec2aa3a5c60eace86d448437facaf4
https://github.com/Dolibarr/dolibarr/commit/de293c4ef2ec2aa3a5c60eace86d448437facaf4
Author: Florian Mortgat <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/install/step2.php
Log Message:
-----------
FIX issue #9300: install error with PostgreSQL when using custom table prefix
Commit: 703506c0e2674795fdf0dd2f9f78ee7f3c98b5b0
https://github.com/Dolibarr/dolibarr/commit/703506c0e2674795fdf0dd2f9f78ee7f3c98b5b0
Author: Marc de Lima Lucio <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
Log Message:
-----------
FIX: import filter error
Commit: 5ef5c5521fa9a0708188b4481009421bcd491212
https://github.com/Dolibarr/dolibarr/commit/5ef5c5521fa9a0708188b4481009421bcd491212
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/install/step2.php
Log Message:
-----------
Merge pull request #11597 from
atm-florianm/8.0-FIX_missing_prefix_replacement_in_database_function_initialization
FIX issue #9300: install error with PostgreSQL using custom table prefix
Commit: bb885cadf2433fe660e70119e2531ac3ba44fd7c
https://github.com/Dolibarr/dolibarr/commit/bb885cadf2433fe660e70119e2531ac3ba44fd7c
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/compta/charges/index.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/list.php
M htdocs/compta/sociales/payments.php
Log Message:
-----------
Merge pull request #11563 from atm-quentin/FIX_sociales_redirect_index
FIX wrong path sociales/index.php doesnt exist anymore
Commit: 24695a91125f49c80c8d208e44cce2d92f36120a
https://github.com/Dolibarr/dolibarr/commit/24695a91125f49c80c8d208e44cce2d92f36120a
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Merge pull request #11595 from ATM-Marc/FIX_8.0_import_bad_categories
FIX: categories import: prevent mismatch between category type and object type
Commit: c0808780836d961260efdcd3f9438910a18a11d8
https://github.com/Dolibarr/dolibarr/commit/c0808780836d961260efdcd3f9438910a18a11d8
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Merge pull request #11585 from
ATM-Marc/FIX_9.0_expedition_printObjectLine_loop
FIX: expedition card: infinite loop for printObjectLine hook if return > 0
Commit: 941b2c5325ed238ef88de8e5889755d6f8adcc14
https://github.com/Dolibarr/dolibarr/commit/941b2c5325ed238ef88de8e5889755d6f8adcc14
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/adherents/card.php
Log Message:
-----------
Merge pull request #11581 from aspangaro/9.0_adh
FIX Language key
Commit: a5e0dd56f4dc5d6c4da7a3091dc6e282c425067a
https://github.com/Dolibarr/dolibarr/commit/a5e0dd56f4dc5d6c4da7a3091dc6e282c425067a
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/class/bookkeeping.class.php
Log Message:
-----------
Merge pull request #11580 from aspangaro/9.0_FEC
FIX FEC Format - Save translation of the journal label in database & nowrap on
amount
Commit: ea92ba2a78f0f0c12c06b2a4b6a4c7ad9eb9774c
https://github.com/Dolibarr/dolibarr/commit/ea92ba2a78f0f0c12c06b2a4b6a4c7ad9eb9774c
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Update holiday.class.php
Commit: 9e622fe0427daf3f498f31da12620c76adfe89df
https://github.com/Dolibarr/dolibarr/commit/9e622fe0427daf3f498f31da12620c76adfe89df
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Merge pull request #11572 from atm-maxime/fix_holiday_update_solde
Fix holiday counter auto update
Commit: 5f2439bf0ab366c4bd4336507d4c7d73348d1d94
https://github.com/Dolibarr/dolibarr/commit/5f2439bf0ab366c4bd4336507d4c7d73348d1d94
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/install/step2.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: cb07d8068116ec1c840b0fdd7934b62fe8dd54c8
https://github.com/Dolibarr/dolibarr/commit/cb07d8068116ec1c840b0fdd7934b62fe8dd54c8
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/card.php
M htdocs/compta/charges/index.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/list.php
M htdocs/compta/sociales/payments.php
M htdocs/expedition/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 192fb45ce7a396abef07afe7d444e9f65067231f
https://github.com/Dolibarr/dolibarr/commit/192fb45ce7a396abef07afe7d444e9f65067231f
Author: Laurent Destailleur <address@hidden>
Date: 2019-07-30 (Tue, 30 Jul 2019)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/compta/charges/index.php
M htdocs/compta/sociales/list.php
M htdocs/compta/sociales/payments.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/expedition/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/install/step2.php
M htdocs/viewimage.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/bookkeeping/list.php
htdocs/adherents/card.php
htdocs/compta/sociales/list.php
htdocs/compta/sociales/payments.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/holiday/class/holiday.class.php
htdocs/viewimage.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/0ab16b739a99...192fb45ce7a3