lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
111,474 Commits 43 Branches 150 Tags 886 MiB
79830bee9e
Commit Graph

98858 Commits

Author SHA1 Message Date
Laurent Destailleur
628a368686 Add column position for llx_bank 2022-07-31 21:25:24 +02:00
Laurent Destailleur
9286f84b47 Fix php8 2022-07-31 21:06:08 +02:00
Laurent Destailleur
1fbd4b1c2d Clean code 2022-07-31 20:12:22 +02:00
Laurent Destailleur
9d38343cf8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-31 19:13:12 +02:00
Laurent Destailleur
9303177386 Fix regression 2022-07-31 19:12:49 +02:00
Florian HENRY
454fb6b0f5 new: Add IMAP port setting on email collector module 2022-07-31 13:10:38 +02:00
ptibogxiv
af4d8ef53e
FIX validation paymentok.php if advance rights 2022-07-30 15:32:18 +02:00
Laurent Destailleur
fe2a0e0340 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/hr_HR/errors.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/uk_UA/errors.lang
 2022-07-29 18:12:38 +02:00
ptibogxiv
8dcceeb127
FIX setup intent stripe 
Klarna not supported
 2022-07-29 18:12:17 +02:00
Laurent Destailleur
629689b13f Fix bad trans %n instead of %s 2022-07-29 18:06:49 +02:00
Laurent Destailleur
77389b3855 Fix trans 2022-07-29 17:35:39 +02:00
Laurent Destailleur
5d2d0384f8 Debug v16 2022-07-29 17:05:02 +02:00
Laurent Destailleur
c4323b99a9 css 2022-07-29 17:04:49 +02:00
Laurent Destailleur
d44da58083 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-29 16:03:36 +02:00
Laurent Destailleur
51d022914b Fix missing auto increment key. Fix error duplicate of type of contact. 2022-07-29 16:03:21 +02:00
lmarcouiller
05ca9da7e1 Fix : php 8.1 warnings 2022-07-29 15:46:13 +02:00
Laurent Destailleur
ab2afd772b
Merge pull request #21600 from ymollard/eventorg-fixes 
FIX: EventOrganization Missing databases entries and labels
 2022-07-29 15:40:21 +02:00
Laurent Destailleur
9cc9b84138
Update modEventOrganization.class.php 2022-07-29 15:39:37 +02:00
stickler-ci
75a8fdce11 Fixing style errors. 2022-07-29 13:33:16 +00:00
Laurent Destailleur
5e4ed0dea0
Update commonobject.class.php 2022-07-29 15:28:33 +02:00
Laurent Destailleur
c181b0bff4
Update commonobject.class.php 2022-07-29 15:27:20 +02:00
Laurent Destailleur
6d2219e00c
Update commonobject.class.php 2022-07-29 15:26:34 +02:00
Laurent Destailleur
8b813d211b
Merge pull request #21613 from bb2a/FIX---php-V8-pdf-lib 
FIX - php V8 pdf lib
 2022-07-29 15:19:57 +02:00
Laurent Destailleur
f45173df34
Merge pull request #21619 from defrance/patch-219 
PHP V8 warning
 2022-07-29 15:14:13 +02:00
Laurent Destailleur
a5f735a638
Merge pull request #21616 from ptibogxiv/patch-25 
Fix picto on stripe charge.php
 2022-07-29 15:13:28 +02:00
lmarcouiller
d1d5e0836f Fix : HasRight on user.class.php for $permlevel2 2022-07-29 15:12:25 +02:00
Laurent Destailleur
250d1b71b2
Merge pull request #21618 from Hystepik/develop#2 
Fix : HasRight on user.class.php for $permlevel2
 2022-07-29 15:09:27 +02:00
Laurent Destailleur
9796ec22bf
Merge pull request #21615 from bb2a/NEW---FTP-lib-and-lang-file 
NEW - FTP lib
 2022-07-29 15:05:52 +02:00
Laurent Destailleur
cc9cc7f832 Picto 2022-07-29 14:57:20 +02:00
Laurent Destailleur
f0c8523713 Debug v16 2022-07-29 14:57:11 +02:00
Laurent Destailleur
7404e8fb75 Debug v16 2022-07-29 14:50:21 +02:00
This Charlène
7ff956a1e2
PHP V8 warning 2022-07-29 14:24:29 +02:00
Laurent Destailleur
aca6b848d2 Picto 2022-07-29 13:58:30 +02:00
lmarcouiller
3dc0e14f0e Fix : HasRight on user.class.php for $permlevel2 2022-07-29 13:04:04 +02:00
Laurent Destailleur
e25b599ee3 Fix position of fields 2022-07-29 12:53:19 +02:00
Laurent Destailleur
59b2412bc2 Fix position of fields 2022-07-29 12:52:27 +02:00
Laurent Destailleur
64fc74087b NEW Add link to create an element from the category page 2022-07-29 12:31:51 +02:00
Laurent Destailleur
e13d5ea5aa Fix missing import key 2022-07-29 11:55:44 +02:00
Laurent Destailleur
31fa326615 Fix missing import key 2022-07-29 11:54:56 +02:00
Laurent Destailleur
79e0d59978 Fix regression 2022-07-29 11:48:17 +02:00
Laurent Destailleur
a4b7f38346 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_actions.php
	htdocs/core/boxes/box_contracts.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_services_expired.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
 2022-07-29 11:22:01 +02:00
Anthony Berton
1e8852d3fb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---FTP-lib 2022-07-29 11:14:59 +02:00
Anthony Berton
8e7fa102b8 Clean 2022-07-29 11:14:28 +02:00
Laurent Destailleur
f66dfb1c08 phpv8 2022-07-29 11:08:04 +02:00
Laurent Destailleur
0b568aebad Fix missing link to vcal for some tabs of user 2022-07-29 10:41:09 +02:00
Anthony Berton
cb59edb58b Fix 2022-07-29 10:06:19 +02:00
Anthony Berton
05c37bb1e9 Add functions 2022-07-29 10:05:54 +02:00
Anthony Berton
f10dd33440 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---FTP-lib 2022-07-29 09:40:18 +02:00
Anthony Berton
2554af450d Merge branch 'NEW---FTP-lib-and-lang-file' of https://github.com/bb2a/dolibarr into NEW---FTP-lib-and-lang-file 2022-07-29 08:51:59 +02:00
Anthony Berton
77b3e511be Del file lang 2022-07-29 08:51:57 +02:00
Laurent Destailleur
5d2c5d1016 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-28 19:52:33 +02:00
ptibogxiv
4bc54fc845
Fix picto on stripe charge.php 2022-07-28 19:43:58 +02:00
Laurent Destailleur
108292db3a
Merge pull request #21610 from bb2a/FIX---strlower-to-email 
FIX - strlower to email
 2022-07-28 19:05:59 +02:00
Laurent Destailleur
0c2c7d97ce
Merge pull request #21614 from bb2a/FIX---Add-colone-last_main_doc-in-societe-for-migration-Error-to-generate-doc 
FIX - Add colone last_main_doc in societe for migration Error to generate doc
 2022-07-28 19:02:42 +02:00
Laurent Destailleur
2cbb71f523
Merge pull request #21604 from bb2a/FIX---php-V8-user-right-actioncomm-class 
FIX - php V8 user right actioncomm class
 2022-07-28 19:01:56 +02:00
Laurent Destailleur
482f80d14a Close #21612 2022-07-28 19:00:17 +02:00
Laurent Destailleur
455f286ac1 Debug v17 2022-07-28 18:54:45 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-07-28 18:52:44 +02:00
Laurent Destailleur
e7200c5085 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-28 18:40:01 +02:00
Laurent Destailleur
0f154fa60c CSS 2022-07-28 18:36:50 +02:00
Laurent Destailleur
eac926e01d Fix phpv8 2022-07-28 18:30:26 +02:00
stickler-ci
f54b4baee0 Fixing style errors. 2022-07-28 16:21:53 +00:00
Anthony Berton
ce87eea3ec ErrorFTPNodisconnect 2022-07-28 18:18:04 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
Christophe Battarel
4b3fdcc9f6 use getDolGlobal... 2022-07-28 17:36:58 +02:00
Christophe Battarel
0fe441bc2a use getDolGlobal... 2022-07-28 17:29:09 +02:00
Anthony Berton
df727f3b5d FIX - Add colone last_main_doc in societe for migration Error to generate doc 2022-07-28 17:22:21 +02:00
Anthony Berton
915380202c FIX - php V8 pdf lib 2022-07-28 17:09:56 +02:00
Laurent Destailleur
f984af7d13 css 2022-07-28 15:35:57 +02:00
Anthony Berton
cfc9819e49 FIX - strlower for email 2022-07-28 15:13:13 +02:00
Laurent Destailleur
5c3139974c css 2022-07-28 14:55:47 +02:00
Anthony Berton
7301ef6bfa FIX - strlower to email 2022-07-28 14:55:42 +02:00
Laurent Destailleur
654e7bf638
Merge branch 'develop' into FIX---php-V8-user-right-order-card 2022-07-28 14:21:20 +02:00
Laurent Destailleur
96afacc4a6
Merge pull request #21605 from bb2a/FIX---php-V8-user-right-box 
FIX - php V8 user right box
 2022-07-28 14:19:48 +02:00
Laurent Destailleur
c7dde641f4
Merge pull request #21608 from ptibogxiv/patch-23 
NEW display currency in takepos menu
 2022-07-28 14:18:11 +02:00
Laurent Destailleur
c71a1e5ac1
Merge pull request #21593 from fappels/develop_fix_standard_label 
Fix standard label wrong var name
 2022-07-28 14:14:11 +02:00
Laurent Destailleur
ceaec6c581
Merge pull request #21586 from korabocintake/JP-coa-etc 
NEW: Adding JAPAN Chart-of-Account and regions/departments
 2022-07-28 14:13:44 +02:00
Laurent Destailleur
0800dc1d8a
Merge pull request #21602 from bb2a/NEW---Add-user-right-order-generete-doc 
NEW - Add user right order generete doc
 2022-07-28 14:03:43 +02:00
ptibogxiv
524c2e932c
NEW display currency in takepos menu 2022-07-28 13:35:43 +02:00
Anthony Berton
c1b98e8e73 FIX - php V8 user right box 2022-07-28 12:09:22 +02:00
Anthony Berton
9c0cf32ef7 FIX - php V8 user right actioncomm class 2022-07-28 11:56:07 +02:00
Anthony Berton
a778a5ff78 and order lib 2022-07-28 11:50:42 +02:00
Anthony Berton
03e265b080 FIX - php V8 user right order card 2022-07-28 11:43:00 +02:00
Anthony Berton
d8ae2361a9 NEW - Add user right order generete doc 2022-07-28 11:29:36 +02:00
Laurent Destailleur
c34579a2b0 CSS 2022-07-28 11:16:21 +02:00
Laurent Destailleur
1a61209c0d Fix fatal error in Stripe setup page 
Conflicts:
	htdocs/stripe/admin/stripe.php
 2022-07-28 10:55:38 +02:00
Laurent Destailleur
2020a58ebd Fix fatal error in Stripe setup page 2022-07-28 10:47:36 +02:00
Laurent Destailleur
6ce2b02207 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-28 02:39:27 +02:00
Laurent Destailleur
f6d54ca101 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/action/index.php
	htdocs/comm/action/peruser.php
 2022-07-28 02:36:57 +02:00
Laurent Destailleur
c000bd7f89 css 2022-07-28 02:31:47 +02:00
Laurent Destailleur
630dced71c Look and feel v17 2022-07-27 23:09:29 +02:00
Laurent Destailleur
37c725fc6c NEW Can delete a website even if not empty 2022-07-27 23:01:33 +02:00
Yoan Mollard
e9528443b2 Insert speaker contact type into db 2022-07-27 22:12:36 +02:00
Yoan Mollard
e271175de6 Display all errors 2022-07-27 21:37:06 +02:00
Yoan Mollard
5600fd63df Retrieve category and insert default const at init of eventorganization module 2022-07-27 21:36:57 +02:00
Yoan Mollard
244f3913b0 Qualify cactionevents for eventorganization 2022-07-27 21:35:52 +02:00
Yoan Mollard
6519edabc5 Error messages for category 2022-07-27 21:34:36 +02:00
Laurent Destailleur
5e94e46461 Trans 2022-07-27 20:11:57 +02:00
Laurent Destailleur
c5e5f2915e Look and feel v17 2022-07-27 19:01:26 +02:00
Anthony Berton
31d4d0dcd4 FIX - php V8 user right in propal card and use $user->hasRight 2022-07-27 18:09:11 +02:00
Laurent Destailleur
d400ee9703 Fix missing link to public interface 2022-07-27 15:15:16 +02:00
bagtaib
f1b3f51b3a add missing </tr> 2022-07-27 14:14:34 +02:00
Laurent Destailleur
13df3747d0 Fix look and feel v16 2022-07-27 13:59:01 +02:00
Laurent Destailleur
e1cd297d99 css 2022-07-27 13:49:28 +02:00
Laurent Destailleur
73d8477dc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-27 13:43:36 +02:00
Laurent Destailleur
267ea10f08 Fix missing link to public interface 2022-07-27 13:42:59 +02:00
Laurent Destailleur
fc9b3e3d70 Factorize code into a function dolJSToSetRandomPassword() 2022-07-27 13:42:43 +02:00
Francis Appels
40cc55cf91 Fix wrong varname 2022-07-27 11:54:55 +02:00
stickler-ci
1d8b39260b Fixing style errors. 2022-07-27 09:50:43 +00:00
bagtaib
26033b9297 changed the button to a link 2022-07-27 11:50:18 +02:00
Anthony Berton
f8a7f0290e FIX - php V8 setup module stock 2022-07-27 11:50:05 +02:00
atm-greg
54efa4a1af Merge branch '15.0' of https://github.com/Dolibarr/dolibarr into Fix_15.0_pdf_sponge_with_too_many_situation 2022-07-27 11:44:17 +02:00
atm-greg
afc41eaf65 fix totalTable breakpages 2022-07-27 11:43:33 +02:00
Anthony Berton
54c1e5c138 FIX - php V8 form setup 2022-07-27 11:41:31 +02:00
Anthony Berton
487729cfff error 2022-07-27 11:30:15 +02:00
Anthony Berton
62faa8ebcc FIX - PHP8 Warnning 2022-07-27 11:27:23 +02:00
Christophe Battarel
daa106113d fix translation string 2022-07-27 11:11:26 +02:00
Christophe Battarel
fd6838776f NEW : TAKEPOS - setup terminal name 2022-07-27 11:09:02 +02:00
Laurent Destailleur
78ee02408e
Merge pull request #21431 from fboitel/NEW-recursive-envents 
NEW : Recurrent events on agenda v1
 2022-07-27 11:01:26 +02:00
Laurent Destailleur
212a0f838a
Merge pull request #21363 from Quatadah/dolicloud-qnasdami-dropdownmenu 
adding dropdown menu in case of a lot of buttons in project
 2022-07-27 10:15:39 +02:00
OPEN\s.takeuchi
1706dfad3c Merge branch 'develop' of https://github.com/korabocintake/dolibarr into develop 2022-07-27 15:55:23 +09:00
Laurent Destailleur
a04bef1909 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-27 02:48:56 +02:00
Laurent Destailleur
f4b7b0d060 Trans 2022-07-27 02:41:55 +02:00
Laurent Destailleur
8439ed24b1 Trans 2022-07-27 01:58:29 +02:00
Quatadah Nasdami
0c0c4844c6 Adding template 03 2022-07-27 01:13:53 +02:00
bagtaib
3f81d21c7c make a button look like a link 2022-07-26 18:32:48 +02:00
bagtaib
4776c9fdaa change button position 2022-07-26 16:30:21 +02:00
Laurent Destailleur
b23304deb8 Debug v16 2022-07-26 16:14:38 +02:00
Christophe Battarel
3e930f92b8 add reshook test 2022-07-26 15:47:03 +02:00
Christophe Battarel
0c416a1e38 better hook management 2022-07-26 15:38:50 +02:00
Yoan Mollard
d8fa7d84cc Allow "smallint" values to store 0 in MySQL db without conversion to NULL 
It was an issue with ConferenceOrBoothAttendee instances
 2022-07-26 14:40:17 +02:00
Laurent Destailleur
3f04a91b07 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 14:16:44 +02:00
Laurent Destailleur
138e93402d Fix language font for PDF 2022-07-26 14:15:38 +02:00
Laurent Destailleur
60dd3577ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 13:15:37 +02:00
Laurent Destailleur
c42eaaf16c Clean code 2022-07-26 13:14:12 +02:00
Laurent Destailleur
ea7ef29ca2 Fix tooltip 2022-07-26 12:56:42 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
Laurent Destailleur
7c37774dba Fix injection 2022-07-26 12:42:59 +02:00
Laurent Destailleur
ba52b3314b
Merge pull request #21563 from cfoellmann/PR/fix-recruitment 
Fix recruitment
 2022-07-26 12:38:11 +02:00
Laurent Destailleur
ac21343227
Update recruitmentcandidature.class.php 2022-07-26 12:26:11 +02:00
OPEN\s.takeuchi
6ff83be2df Rev: add 'tncc' value 2022-07-26 19:24:52 +09:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
72dbe02958 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 12:19:09 +02:00
Laurent Destailleur
46d3647877 Merge 2022-07-26 12:18:56 +02:00
Christian Foellmann
de0e24b7d3 remove inactive users from user selectors 2022-07-26 12:16:45 +02:00
Laurent Destailleur
ab4eb1a9af Debug v16 2022-07-26 12:16:33 +02:00
Laurent Destailleur
f667180c56
Merge pull request #21570 from Hystepik/develop#2 
FIX : Yogosha report 11874 js injection in stockmovement.php
 2022-07-26 12:04:26 +02:00
Laurent Destailleur
64fd91c319 Trans 2022-07-26 11:58:47 +02:00
Laurent Destailleur
3eedf18344 Debug v16 2022-07-26 11:53:00 +02:00
Laurent Destailleur
d65ea8c333 Debug v16 2022-07-26 11:05:00 +02:00