Frédéric FRANCE
|
412077ab51
|
doxygen
|
2020-10-30 08:24:02 +01:00 |
|
Laurent Destailleur
|
d4daf8b9ce
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security2.lib.php
|
2020-10-30 05:59:45 +01:00 |
|
Laurent Destailleur
|
5504e3b236
|
Fix phpcs
|
2020-10-30 05:58:40 +01:00 |
|
Laurent Destailleur
|
a24071492e
|
Start fix for php8 compatibility
|
2020-10-30 05:56:07 +01:00 |
|
Laurent Destailleur
|
b3333da5c1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/main.inc.php
|
2020-10-30 04:39:41 +01:00 |
|
Laurent Destailleur
|
1a02504792
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/security2.lib.php
|
2020-10-30 04:26:09 +01:00 |
|
Laurent Destailleur
|
f51b02026c
|
Fix regression
|
2020-10-30 04:24:06 +01:00 |
|
Laurent Destailleur
|
840ca73464
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/main.inc.php
htdocs/theme/eldy/info-box.inc.php
htdocs/theme/eldy/style.css.php
|
2020-10-30 04:21:07 +01:00 |
|
Laurent Destailleur
|
f5a156ee06
|
Fix regression
|
2020-10-30 04:17:02 +01:00 |
|
Laurent Destailleur
|
1b5bcaccc6
|
Fix remove warnings
|
2020-10-30 04:13:31 +01:00 |
|
Laurent Destailleur
|
ec0c8e0c79
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/tpl/advtarget.tpl.php
|
2020-10-30 03:35:40 +01:00 |
|
Laurent Destailleur
|
263b679af4
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/tpl/advtarget.tpl.php
|
2020-10-30 03:31:04 +01:00 |
|
Laurent Destailleur
|
925669ee33
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-10-30 03:25:52 +01:00 |
|
Laurent Destailleur
|
f22017080d
|
Fix for php8
|
2020-10-30 03:25:33 +01:00 |
|
Laurent Destailleur
|
d4db10a9e5
|
Merge pull request #15219 from frederic34/patch-8
phpcs
|
2020-10-30 02:55:12 +01:00 |
|
Laurent Destailleur
|
35224a673b
|
Merge pull request #15218 from frederic34/patch-6
fix undefined variable
|
2020-10-30 02:48:07 +01:00 |
|
Frédéric FRANCE
|
0507e71586
|
phpcs
|
2020-10-29 18:44:15 +01:00 |
|
Frédéric FRANCE
|
9e70d7ca65
|
fix undefined variable
|
2020-10-29 18:37:52 +01:00 |
|
Laurent Destailleur
|
8c646cdf4f
|
Merge pull request #15207 from frederic34/patch-11
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
|
2020-10-29 17:49:16 +01:00 |
|
Laurent Destailleur
|
d7ac505cd0
|
Merge pull request #15202 from ATM-Consulting/fix/10.0_make_formConfirm_an_addreplace_hook_2
FIX 10.0 - make formConfirm an addreplace-type hook
|
2020-10-29 17:47:56 +01:00 |
|
Laurent Destailleur
|
4071a3cfc2
|
Merge pull request #15205 from frederic34/patch-8
Update index.php
|
2020-10-29 17:46:51 +01:00 |
|
Laurent Destailleur
|
e79a061c19
|
Merge pull request #15204 from frederic34/patch-6
Update timeline.inc.php
|
2020-10-29 17:46:31 +01:00 |
|
Laurent Destailleur
|
f9713a5752
|
Merge pull request #15206 from frederic34/patch-10
The constant MissingIds was not found.
|
2020-10-29 17:46:16 +01:00 |
|
Laurent Destailleur
|
628b318613
|
Merge pull request #15211 from hregis/develop_bug2
FIX wrong check operator (create wrong $contextpage)
|
2020-10-29 17:45:56 +01:00 |
|
Laurent Destailleur
|
75cc5a210e
|
Merge pull request #15209 from frederic34/patch-13
doxygen
|
2020-10-29 17:45:36 +01:00 |
|
Laurent Destailleur
|
391224d221
|
Merge pull request #15214 from hregis/fix_date_not_recover_in_edit_mode
FIX extrafield date not recover in create/edit mode
|
2020-10-29 17:42:13 +01:00 |
|
Laurent Destailleur
|
45477aba0d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-29 13:10:50 +01:00 |
|
Laurent Destailleur
|
c187b41714
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-29 13:10:39 +01:00 |
|
Laurent Destailleur
|
ee4a827627
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/list.php
htdocs/core/db/DoliDB.class.php
|
2020-10-29 13:10:10 +01:00 |
|
Laurent Destailleur
|
d7225327e7
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-10-29 11:13:29 +01:00 |
|
Laurent Destailleur
|
2a386b6fea
|
Fix set subledger account
|
2020-10-29 11:13:18 +01:00 |
|
Laurent Destailleur
|
91cf5de54d
|
Fix bad sort order
|
2020-10-29 11:06:18 +01:00 |
|
Regis Houssin
|
032813fa19
|
FIX extrafield date not recover in create/edit mode
|
2020-10-29 11:05:45 +01:00 |
|
Laurent Destailleur
|
980cb095da
|
Fix sort order use last sortorder if several fields.
|
2020-10-29 11:05:43 +01:00 |
|
Laurent Destailleur
|
b1b7a7c725
|
Fix missing transaction
|
2020-10-29 10:40:50 +01:00 |
|
Laurent Destailleur
|
89dcbfae82
|
Merge pull request #15212 from Dolibarr/revert-15182-FIX_11.0_various_payment_subledger
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback"
|
2020-10-29 10:37:33 +01:00 |
|
Laurent Destailleur
|
c3f0f3cc4a
|
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback"
|
2020-10-29 10:36:48 +01:00 |
|
Regis Houssin
|
1c7d293a93
|
FIX wrong check operator
|
2020-10-29 10:10:10 +01:00 |
|
Frédéric FRANCE
|
f5673fd08a
|
doxygen
|
2020-10-28 22:47:29 +01:00 |
|
Frédéric FRANCE
|
7ef2aaf8af
|
Update user.class.php
|
2020-10-28 20:57:36 +01:00 |
|
Frédéric FRANCE
|
fcb343e891
|
Update societe.class.php
|
2020-10-28 20:53:29 +01:00 |
|
Frédéric FRANCE
|
e546e56b22
|
Update contact.class.php
|
2020-10-28 20:50:33 +01:00 |
|
Frédéric FRANCE
|
79941a8dde
|
Update adherent.class.php
|
2020-10-28 19:10:54 +01:00 |
|
Frédéric FRANCE
|
4d716e74bd
|
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
|
2020-10-28 19:06:45 +01:00 |
|
Frédéric FRANCE
|
09b8d166dd
|
The constant MissingIds was not found.
The constant MissingIds was not found. Maybe you did not declare it correctly or list all dependencies?
|
2020-10-28 18:21:45 +01:00 |
|
Frédéric FRANCE
|
cd7cee061a
|
Update index.php
|
2020-10-28 17:56:26 +01:00 |
|
Frédéric FRANCE
|
20c00d0c43
|
Update timeline.inc.php
|
2020-10-28 17:54:45 +01:00 |
|
Laurent Destailleur
|
cb0f1bc6d4
|
Merge pull request #15203 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
|
2020-10-28 17:51:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
208740c9c4
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-28 16:49:52 +00:00 |
|
Laurent Destailleur
|
f760b20bde
|
Fix double semi colon
|
2020-10-28 17:48:20 +01:00 |
|