Commit Graph

95956 Commits

Author SHA1 Message Date
Laurent Destailleur
b7a66769bb
Merge pull request #16603 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
2021-03-11 21:35:39 +01:00
Laurent Destailleur
e8bbef8d2d
Update interface_50_modEventOrganization_EventOrganization.class.php 2021-03-11 21:35:22 +01:00
Florian HENRY
6742241639 better tranaction and condition 2021-03-11 16:55:49 +01:00
Laurent Destailleur
50bf0b92e3
Merge pull request #16614 from frederic34/patch-3
replace value with constant
2021-03-11 15:58:19 +01:00
Laurent Destailleur
0b8f738c9e
Merge pull request #16618 from Hystepik/develop#3
Fix  #16617 : fix event add when removing boxes
2021-03-11 15:57:35 +01:00
Laurent Destailleur
1404c36a92
Merge pull request #16616 from Hystepik/develop#1
Fix #16615 : Adherent statistics color
2021-03-11 15:56:53 +01:00
Laurent Destailleur
5e75da3319 Fix return page if error 2021-03-11 14:10:50 +01:00
Laurent Destailleur
26cb59e2f9 Enhance regeneration of pages 2021-03-11 14:10:08 +01:00
Laurent Destailleur
245453f3c6 Add ignore 2021-03-11 12:47:55 +01:00
lmarcouiller
9aa20585be Fix #16617 : fix event add when removing boxes 2021-03-11 10:10:20 +01:00
lmarcouiller
1b242a8a19 Fix #16615 : Adherent statistics color 2021-03-11 09:43:56 +01:00
Laurent Destailleur
3007141b2b Fix phpcs 2021-03-10 20:40:34 +01:00
Laurent Destailleur
8bdc80918b trans 2021-03-10 18:57:24 +01:00
Laurent Destailleur
e015f66936 Fix filter on employee 2021-03-10 17:31:33 +01:00
Laurent Destailleur
46d835b2bd Fix css 2021-03-10 17:25:26 +01:00
Laurent Destailleur
3769a56c7a
Merge pull request #16589 from atm-adrien/FIX/salaries_card
FIX : Salaries card
2021-03-10 17:19:00 +01:00
Laurent Destailleur
2ff2640c8d
Update card.php 2021-03-10 17:16:49 +01:00
Laurent Destailleur
13d8807bb4
Merge pull request #16606 from tuxgasy/mo_allow_kits_option
Add hidden option ALLOW_USE_KITS_INTO_BOM_AND_MO
2021-03-10 17:05:45 +01:00
Laurent Destailleur
82d5c7289d Add property widgettype 2021-03-10 17:02:39 +01:00
Laurent Destailleur
8192349320 Fix migration 2021-03-10 16:49:42 +01:00
Laurent Destailleur
2e4a4b527b Fix migration 2021-03-10 16:45:28 +01:00
Laurent Destailleur
521e3b20dc Rename widget 2021-03-10 16:44:46 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Laurent Destailleur
514a9fb96a
Merge pull request #16561 from Hystepik/develop#1
Close #15917 : Improvement to ticket module
2021-03-10 15:49:20 +01:00
Frédéric FRANCE
204302ac15
replace value with constant 2021-03-10 15:43:50 +01:00
Adrien Raze
6a7ecf210f FIX : Travis returns 2021-03-10 15:38:01 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
2021-03-10 15:35:09 +01:00
Laurent Destailleur
fbe5ec8bb2 Complete test on setup 2021-03-10 13:12:28 +01:00
Laurent Destailleur
9a13ebfdb8 Fix look and feel v13 2021-03-10 11:08:39 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
stickler-ci
a9a8a177a2 Fixing style errors. 2021-03-10 09:54:43 +00:00
Laurent Destailleur
a0c7c6bad9 Fix selection of accounting account 2021-03-10 10:45:01 +01:00
TuxGasy
3a3793d509 Add hidden option ALLOW_USE_KITS_INTO_BOM_AND_MO 2021-03-10 10:24:20 +01:00
Laurent Destailleur
b1f4c29fde Fix missing alias 2021-03-09 20:12:14 +01:00
Laurent Destailleur
28f54eeb75 Fix translation 2021-03-09 19:55:47 +01:00
Laurent Destailleur
67f5837072 Fix permission to create a holiday when advanced permissions are set 2021-03-09 19:51:11 +01:00
Laurent Destailleur
8babacfe55 Look and feel v14 2021-03-09 19:10:41 +01:00
Florian HENRY
7aec2fc02b create task 2021-03-09 18:52:52 +01:00
Florian HENRY
7234d6dbfd Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-09 18:24:12 +01:00
Florian HENRY
34080b19a1 fix debug 2021-03-09 18:23:57 +01:00
Florian HENRY
3eb72ad833 truc 2021-03-09 17:55:51 +01:00
Laurent Destailleur
e82e812c36 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-09 17:01:53 +01:00
Laurent Destailleur
5b74fefb60 Fix look and feel v13 2021-03-09 17:01:20 +01:00
Laurent Destailleur
b778820fe2
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList
Dev allow alias in common object get filed list
2021-03-09 16:54:22 +01:00
Laurent Destailleur
5e68eee407 Fix filter 2021-03-09 16:47:38 +01:00
Laurent Destailleur
9cb4dce485 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing 2021-03-09 16:12:30 +01:00
Laurent Destailleur
1fe90091b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-09 15:35:25 +01:00
Laurent Destailleur
cf30e90b93 Work on inventory 2021-03-09 15:35:10 +01:00
Laurent Destailleur
6b37d392a8
Merge pull request #16597 from ksar-ksar/develop
FIX #16590
2021-03-09 15:14:31 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php 2021-03-09 15:13:20 +01:00