Commit Graph

97656 Commits

Author SHA1 Message Date
Martin Neubauer
7b59a3ac2b Factor out generating EAN bars 2021-03-12 13:11:17 +01:00
lmarcouiller
4a185ba063 add warehouse quabtity + fix input new quantity 2021-03-12 12:47:58 +01:00
Laurent Destailleur
706ba46295 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-12 12:46:49 +01:00
Laurent Destailleur
cab0e0ee05 Prepare 13.0.2 2021-03-12 12:45:45 +01:00
Laurent Destailleur
777ba369c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-12 12:44:25 +01:00
Laurent Destailleur
9956373a14 Backport the log to detect module that claim a new token. 2021-03-12 12:42:26 +01:00
Laurent Destailleur
a79c9a9019 Fix help of an option 2021-03-12 12:07:38 +01:00
Laurent Destailleur
f9918dd51f Code comment 2021-03-12 11:50:48 +01:00
Laurent Destailleur
63465fb7b1
Merge pull request #16627 from hregis/fix_missing_mp4_mime
FIX missing mp4 video mime
2021-03-12 11:15:27 +01:00
Laurent Destailleur
aee3fda3d1
Merge pull request #16280 from bafbes/abb120358
New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users
2021-03-12 11:14:31 +01:00
Florian HENRY
3841005806 fix message creted teicket trans no entities 2021-03-12 10:41:21 +01:00
Regis Houssin
5375add08c FIX just add mp4 2021-03-12 08:41:56 +01:00
Regis Houssin
290f49a3e0 FIX wrong extension 2021-03-12 08:39:36 +01:00
Regis Houssin
05532ca6b7 FIX missing video mime 2021-03-12 08:35:13 +01:00
Florian HENRY
f17aa47ad6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-03-11 22:03:51 +01:00
Laurent Destailleur
fc08c48bf3
Merge pull request #16591 from Givriz/dev
Replace gender and civility by a picto
2021-03-11 21:36:16 +01:00
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
862926316a working on list 2021-03-11 19:09:42 +01:00
Damien BENOIT
420a3a73dd
Update html.form.class.php 2021-03-11 18:15:22 +01:00
Florian HENRY
3ae93679cf Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_draft 2021-03-11 16:59:13 +01:00
Florian HENRY
3af4f3fbca Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-03-11 16:59:08 +01:00
Florian HENRY
6742241639 better tranaction and condition 2021-03-11 16:55:49 +01:00
stickler-ci
345fe648b3 Fixing style errors. 2021-03-11 15:37:27 +00:00
Laurent Destailleur
c596eb91a8
Merge branch 'develop' into abb120358 2021-03-11 16:35:21 +01:00
Laurent Destailleur
6a5d3bdec2
Merge pull request #16602 from fmarcet/13.0
FIX: Buttons to disable bindings not working
2021-03-11 16:05:12 +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
Christophe Battarel
14ba83f81f try to fix sticker 2021-03-11 14:20:50 +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
Christophe Battarel
7529a5cd7c try to fix sticker 2021-03-11 11:46:12 +01:00
Christophe Battarel
229c581a25 try to fix sticker 2021-03-11 11:30:12 +01:00
Christophe Battarel
e8aacc7acf try to fix sticker 2021-03-11 11:12:03 +01:00
Christophe Battarel
eb0ce8aa0c Merge branch 'master' into pr_batch_masks 2021-03-11 11:02:37 +01:00
Christophe Battarel
461e4981bd remove multicompany 2021-03-11 10:59:58 +01:00
Christophe Battarel
ba51c5dc70 differentiate masks for lot management and serial numbers management 2021-03-11 10:44:55 +01:00
lmarcouiller
9aa20585be Fix #16617 : fix event add when removing boxes 2021-03-11 10:10:20 +01:00
Christophe Battarel
2c711f1a2d add masks for batch 2021-03-11 10:02:31 +01:00
Christophe Battarel
d2650d31cf add multicompany module 2021-03-11 09:50:05 +01:00
lmarcouiller
1b242a8a19 Fix #16615 : Adherent statistics color 2021-03-11 09:43:56 +01:00
Bahfir Abbes
0158cbb893
Update security.lib.php 2021-03-11 04:02:30 +01:00
Bahfir Abbes
1359326337
Update card.php 2021-03-11 04:01:43 +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