Philippe GRAND
e5083d18af
internationalization
2021-06-20 11:20:20 +02:00
Philippe GRAND
5977fe23e7
internationalization
2021-06-20 11:18:07 +02:00
Philippe GRAND
f8187eb70e
internationalization
2021-06-20 11:16:03 +02:00
Philippe GRAND
0d60323e41
internationalization
2021-06-20 11:13:31 +02:00
Philippe GRAND
e2ef205036
internationalization
2021-06-20 11:11:41 +02:00
Philippe GRAND
d3a9b03c89
internationalization
2021-06-20 11:08:53 +02:00
Philippe GRAND
f4199ca99e
internationalization
2021-06-20 11:06:04 +02:00
Philippe GRAND
e5f43cc678
internationalization
2021-06-20 11:03:28 +02:00
Philippe GRAND
33ffb8b943
internationalization
2021-06-20 11:01:38 +02:00
Philippe GRAND
fa3e75c68a
internationalization
2021-06-20 10:58:20 +02:00
Philippe GRAND
e61d60e125
internationalization
2021-06-20 10:49:05 +02:00
Laurent Destailleur
e3e2dfd764
Fix generation of ODT (test if temporary directory is writable)
2021-06-20 05:11:46 +02:00
Laurent Destailleur
1a6647e690
Debug v14
2021-06-20 04:10:25 +02:00
Laurent Destailleur
ce818d4f44
Debug doc templates of ODF
2021-06-20 03:41:45 +02:00
Laurent Destailleur
6e27ae6029
Fix path
2021-06-20 01:56:26 +02:00
Laurent Destailleur
4b6427f920
Fix menu entry
2021-06-20 01:55:56 +02:00
Laurent Destailleur
2efd432946
Fix list of security events enabled
2021-06-20 01:54:55 +02:00
Laurent Destailleur
597bdee0bc
Trans
2021-06-20 01:39:07 +02:00
Laurent Destailleur
8df9815049
Add warning to help understand bug of post_max_size.
2021-06-20 01:04:16 +02:00
Laurent Destailleur
0e80784de9
Add warning to help understand bug of post_max_size.
2021-06-20 00:32:25 +02:00
Laurent Destailleur
bf460526c0
Add warning when submiting file larger than post_max_size.
2021-06-20 00:27:24 +02:00
Laurent Destailleur
4a3da84098
Clean code
2021-06-19 23:52:52 +02:00
Laurent Destailleur
414b5e612f
Better info on upload size limit
2021-06-19 22:11:16 +02:00
Laurent Destailleur
edb4cf4130
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
README.md
htdocs/filefunc.inc.php
2021-06-19 20:05:25 +02:00
Laurent Destailleur
5d6b26ddb7
Fix css
2021-06-19 19:45:13 +02:00
Laurent Destailleur
77ee317f8a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-19 19:24:46 +02:00
Laurent Destailleur
bbb2cdfbdf
Prepare 13.0.4
2021-06-19 19:24:32 +02:00
Laurent Destailleur
94ab340bba
Fix css
2021-06-19 19:23:56 +02:00
ATM john
8cc2cec560
Fix search drop down
2021-06-19 16:56:08 +02:00
Laurent Destailleur
6911cc93d1
Fix: do not open the section to link files automatically after submit
2021-06-19 15:53:36 +02:00
Laurent Destailleur
f303e6664b
Fix reposition do not add several times the page_y parameter.
2021-06-19 15:32:20 +02:00
Laurent Destailleur
1067d91f12
Merge pull request #17975 from OPEN-DSI/fix-17965
...
FIX 17965 - Keep enter key only to submit expense lines form
2021-06-19 15:02:42 +02:00
stickler-ci
26f72b7fff
Fixing style errors.
2021-06-19 12:58:08 +00:00
Laurent Destailleur
3669600242
Update commande.class.php
2021-06-19 14:55:41 +02:00
Laurent Destailleur
194637cfda
Merge branch 'develop' into oldline
2021-06-19 14:54:44 +02:00
Laurent Destailleur
dfa5c419b3
Update commande.class.php
2021-06-19 14:52:06 +02:00
Laurent Destailleur
8372a79c1d
Clean code
2021-06-19 14:22:41 +02:00
Laurent Destailleur
0fd200083f
Merge pull request #17970 from a-schild/develop
...
Allow to update ref_ext via webservices
2021-06-19 14:20:28 +02:00
Laurent Destailleur
d529f8071f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-19 14:16:46 +02:00
Laurent Destailleur
7046791377
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-19 14:16:39 +02:00
Marc GUENNEUGUES
4346958455
Correct rights in core/ajax/row.php
2021-06-18 20:03:03 +02:00
Laurent Destailleur
ad105e97d1
Allow creation of client
2021-06-18 13:57:08 +02:00
Laurent Destailleur
b026c28cee
Hide pass
2021-06-18 13:20:55 +02:00
Frédéric FRANCE
9b4a8aca1b
fix typo can't set mandatory
2021-06-18 11:00:00 +02:00
lvessiller
af634b7f2b
FIX 17965 - Keep enter key only to submit expense lines form
2021-06-18 10:51:39 +02:00
Laurent Destailleur
53295a0cb1
Fix phpcs
2021-06-18 01:06:28 +02:00
Laurent Destailleur
88ff0e4795
Fix PHPCS
2021-06-18 00:59:18 +02:00
Laurent Destailleur
ceaa2a9c5e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/ticket/class/actions_ticket.class.php
2021-06-17 22:06:26 +02:00
Laurent Destailleur
10dadb2247
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-17 22:02:29 +02:00
Laurent Destailleur
51eaecdc6b
Fix phpcs
2021-06-17 22:02:06 +02:00
Laurent Destailleur
62cbea6bca
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-17 21:35:42 +02:00
Laurent Destailleur
5063f29532
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/mailing/class/mailing.class.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/replenish.php
2021-06-17 21:35:31 +02:00
Laurent Destailleur
98a0959b64
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-17 21:31:00 +02:00
Laurent Destailleur
e4056b8a1d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-17 21:30:50 +02:00
stickler-ci
d4fa284f67
Fixing style errors.
2021-06-17 16:18:55 +00:00
a-schild
597e8ef671
Allow to update ref_ext via webservices
...
See issue #17967
2021-06-17 18:17:08 +02:00
Laurent Destailleur
c8a25c9dad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-17 18:02:45 +02:00
Laurent Destailleur
5b8c93b090
FIX #17967
2021-06-17 18:01:31 +02:00
Laurent Destailleur
bbc6e9d8ac
Merge pull request #17965 from OPEN-DSI/new-expensereport-prevent-submit-on-enter-key
...
NEW prevent default submit form on enter key in expense card
2021-06-17 17:51:56 +02:00
stickler-ci
047b9715fb
Fixing style errors.
2021-06-17 15:26:31 +00:00
Georg Meißner
3134f5be8f
Make some product fields hidable
...
This commit allows to hide some more fields in the product card (e.g. you can hide SIZE but not WEIGHT).
To allow the product card to be customized a bit better, following new variables can be set to hide the corresponding fields:
PRODUCT_DISABLE_PUBLIC_URL
PRODUCT_DISABLE_STOCK_LEVELS
PRODUCT_DISABLE_NATURE
PRODUCT_DISABLE_WEIGHT
PRODUCT_DISABLE_PRICES
PRODUCT_DISABLE_ACCOUNTING
The documentation has to be adapted accordingly.
2021-06-17 17:22:37 +02:00
lvessiller
7fb19b3ef9
NEW prevent default submit form on enter key in expense card
2021-06-17 15:27:17 +02:00
Laurent Destailleur
ce9dbfccd7
Merge pull request #17953 from atm-gauthier/fix_trackingnumber_line_not_displaied_if_empty
...
FIX : Tracking number label shouldn't be displaied on "espadon" model…
2021-06-17 13:36:42 +02:00
Laurent Destailleur
ac6bbc1914
Merge pull request #17961 from Hystepik/develop#1
...
Fix #17906 : fix access denied
2021-06-17 13:30:45 +02:00
Laurent Destailleur
3ff4f7c722
Merge pull request #17959 from dolibit-ut/patch-360
...
Update month_report.php
2021-06-17 13:30:15 +02:00
Laurent Destailleur
378184564a
Merge pull request #17957 from dolibit-ut/patch-358
...
Update define_holiday.php
2021-06-17 13:30:03 +02:00
Laurent Destailleur
70309d8a3e
Merge pull request #17956 from dolibit-ut/patch-357
...
Update card.php
2021-06-17 13:29:52 +02:00
Laurent Destailleur
de1f21082f
Merge pull request #17955 from dolibit-ut/patch-356
...
Update llx_00_c_country.sql
2021-06-17 13:29:29 +02:00
Laurent Destailleur
2f4f8648af
Merge pull request #17960 from dolibit-ut/patch-361
...
Update view_log.php
2021-06-17 13:29:09 +02:00
Gauthier PC portable 024
50bc832532
FIX : better correction
2021-06-17 10:48:48 +02:00
atm-lena
9769e33eab
notigger parameter
2021-06-17 10:41:55 +02:00
atm-lena
5b8a6f1d71
Add Trigger "MAILING_DELETE"
2021-06-17 10:41:03 +02:00
Juanjo Menent
eeef78760a
fix: Bad position of the printFieldListWhere hook
2021-06-17 10:29:43 +02:00
lmarcouiller
cf3761eb2e
Fix #17906 : fix access denied
2021-06-17 10:09:07 +02:00
Juanjo Menent
99655eeb39
FIX: styles failure in tickets with very long messages
2021-06-17 09:28:45 +02:00
UT from dolibit
23b24c589e
Update view_log.php
...
$title
2021-06-17 09:15:24 +02:00
UT from dolibit
789a2744f2
Update month_report.php
...
$title
2021-06-17 09:13:54 +02:00
UT from dolibit
c1297d561d
Update document.php
2021-06-17 09:11:07 +02:00
UT from dolibit
e62e6d9696
Update define_holiday.php
...
$title
2021-06-17 09:08:59 +02:00
UT from dolibit
053f8f8338
Update card.php
2021-06-17 09:07:17 +02:00
UT from dolibit
e67062aea1
Update llx_00_c_country.sql
...
Ouganda -> Uganda
Ukraine = Ukraine
United Arab Emirates (is yet EN)
Iles mineures éloignées des États-Unis -> United States Minor Outlying Islands
Uruguay = Uruguay
Ouzbékistan -> Uzbekistan
Vanuatu = Vanuatu
Vénézuela -> Venezuela
Viêt Nam -> Vietnam
Iles Vierges britanniques -> British Virgin Islands
Iles Vierges américaines -> Virgin Islands of the United States (also called: American Virgin Islands)
Wallis-et-Futuna -> Wallis and Futuna
Sahara occidental -> Western Sahara
Yémen -> Yemen
Zambie -> Zambia
Zimbabwe = Zimbabwe
Guernesey -> Guernsey
Ile de Man -> Isle of Man
Jersey = Jersey
Monténégro -> Montenegro
Saint-Barthélemy (Saint Barthélemy)
Saint-Martin (Saint Martin)
Kosovo = Kosovo
2021-06-17 09:04:41 +02:00
Laurent Destailleur
61bd572a9c
Fix token for ajax call
2021-06-17 03:37:52 +02:00
Laurent Destailleur
3754c2c3c9
Fix name of field
2021-06-17 00:59:11 +02:00
Laurent Destailleur
e04cf7d53a
css
2021-06-16 22:17:44 +02:00
Laurent Destailleur
c4e8866727
Clean code
2021-06-16 21:20:27 +02:00
Laurent Destailleur
f850f058fa
Look and feel v14
2021-06-16 21:06:55 +02:00
Laurent Destailleur
834fc289b6
Fix look and feel v14
2021-06-16 20:35:55 +02:00
Laurent Destailleur
ac1e6c9966
FIX sql error on strict mysql
2021-06-16 20:17:21 +02:00
Laurent Destailleur
19ddfc8fc6
Fix warning
2021-06-16 19:44:58 +02:00
Laurent Destailleur
8db0ecd4db
Add fix of corrupted data
2021-06-16 19:40:43 +02:00
Laurent Destailleur
8c18837095
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-16 19:01:03 +02:00
Laurent Destailleur
f6998d7c32
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2021-06-16 19:00:52 +02:00
Gauthier PC portable 024
657972b79b
FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty
2021-06-16 16:49:24 +02:00
Laurent Destailleur
3020cce9ee
Merge pull request #17951 from frederic34/patch-7
...
fix warning
2021-06-16 14:32:36 +02:00
Laurent Destailleur
b2221d2c3a
Update extrafields.class.php
2021-06-16 14:31:22 +02:00
Antonin MARCHAL
d5cb81982d
fix wrong display on extrafields type = double
2021-06-16 14:21:23 +02:00
Frédéric FRANCE
11a1cba68a
fix warning
2021-06-16 12:10:21 +02:00
Laurent Destailleur
daff2c25f7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-16 12:08:47 +02:00
Laurent Destailleur
06b09f614a
Fix var not defined
2021-06-16 12:08:34 +02:00
Laurent Destailleur
d8e144808f
Merge pull request #17950 from frederic34/patch-9
...
fix unknown right
2021-06-16 12:04:29 +02:00
Laurent Destailleur
89442c9ab5
Merge pull request #17949 from frederic34/patch-8
...
fix php warning
2021-06-16 12:02:54 +02:00
Frédéric FRANCE
cf9c595568
fix unknown right
...
supprimer doesn't exists
2021-06-16 12:01:52 +02:00
Frédéric FRANCE
fca75a5842
fix php warning
2021-06-16 11:54:33 +02:00
Frédéric FRANCE
5d79143401
fix php warning
2021-06-16 11:50:52 +02:00
Laurent Destailleur
0baa992ded
Merge pull request #17945 from dolibit-ut/patch-354
...
Update llx_00_c_country.sql
2021-06-16 11:31:33 +02:00
Laurent Destailleur
b28395dd05
Merge pull request #17942 from aspangaro/14a26
...
Look & feel v14
2021-06-16 11:31:16 +02:00
UT from dolibit
b8824435d2
Update llx_00_c_country.sql
...
Taïwan -> Taiwan
Tadjikistan -> Tajikistan
Tanzanie -> Tanzania
Thaïlande -> Thailand
Timor Oriental -> East Timor / Timor-Leste
Tokélaou -> Tokelau
Tonga = Tonga
Trinité-et-Tobago -> Trinidad and Tobago
Turquie -> Turkey
Turkménistan -> Turkmenistan
Iles Turks-et-Caicos -> Turks and Caicos Islands
Tuvalu = Tuvalu
2021-06-16 09:40:45 +02:00
Alexandre SPANGARO
7f0d2b009e
FIX SQL Error on automatic binding with functionality "company per entity" activated
2021-06-16 06:23:50 +02:00
Alexandre SPANGARO
e848579495
Look & feel v14
2021-06-16 06:00:00 +02:00
Laurent Destailleur
e503f73e95
Comment dead code
2021-06-15 22:28:39 +02:00
Laurent Destailleur
8b238c43ce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-15 22:23:46 +02:00
Laurent Destailleur
b6f90c3299
Merge pull request #17939 from Hystepik/develop#2
...
Fix #17930 : input boxes can be empty as previously on survey
2021-06-15 22:20:03 +02:00
Laurent Destailleur
244ff0b35a
Merge pull request #17937 from Hystepik/develop#1
...
Close #17890 : produceandconsume into api finished
2021-06-15 22:19:21 +02:00
Laurent Destailleur
df41691377
Merge pull request #17936 from dolibit-ut/patch-352
...
Update index.php
2021-06-15 22:18:38 +02:00
Laurent Destailleur
36f599519e
Merge pull request #17935 from frederic34/patch-8
...
fix php warning
2021-06-15 22:18:26 +02:00
Laurent Destailleur
6bf8e425c5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-15 22:18:07 +02:00
Laurent Destailleur
87a19af86d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/contacts.tpl.php
2021-06-15 22:17:53 +02:00
Laurent Destailleur
5cccf901c8
Merge pull request #17931 from dolibit-ut/patch-350
...
Update llx_00_c_country.sql
2021-06-15 22:12:56 +02:00
Laurent Destailleur
2a3b330e1e
Fix newToken()
2021-06-15 22:10:59 +02:00
Laurent Destailleur
1aad151e19
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-15 22:08:50 +02:00
Laurent Destailleur
ac7ad64737
Merge pull request #17934 from frederic34/patch-7
...
fix php warning
2021-06-15 22:08:37 +02:00
stickler-ci
26cae49faf
Fixing style errors.
2021-06-15 20:06:48 +00:00
Laurent Destailleur
5ddf12b29c
Fix set language
2021-06-15 22:06:26 +02:00
Laurent Destailleur
78f41bf60e
Update card.php
2021-06-15 22:04:31 +02:00
Laurent Destailleur
dc6512e5af
Merge pull request #17940 from Hystepik/develop#3
...
Fix #17907 : import of the undefined function
2021-06-15 22:00:17 +02:00
Laurent Destailleur
f1cd3a7044
Merge pull request #17941 from frederic34/recruitement
...
replace recruitement by recruitment
2021-06-15 21:59:56 +02:00
Laurent Destailleur
1c87420895
Fix #yogosha6411
2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679
Clean code
2021-06-15 20:16:05 +02:00
Frédéric FRANCE
f79e16e3b1
replace recruitement by recruitment
2021-06-15 19:08:08 +02:00
Laurent Destailleur
adfbb9d7d5
Fix VAT column missing
2021-06-15 17:53:25 +02:00
Laurent Destailleur
f6274b8418
Fix nb of holidays can be float
2021-06-15 16:29:42 +02:00
Laurent Destailleur
d0173044ac
css
2021-06-15 16:18:15 +02:00
lmarcouiller
674bd53b32
Fix #17907 : import of the undefined function
2021-06-15 16:11:25 +02:00
Laurent Destailleur
162da2a5b1
css
2021-06-15 15:24:12 +02:00
Laurent Destailleur
83ec4cbd71
Reponsive
2021-06-15 15:19:46 +02:00
lmarcouiller
d070c5b75d
Fix #17930 : input boxes can be empty as previously
2021-06-15 15:13:25 +02:00
Laurent Destailleur
5f7dddbdcb
Fix permissions
2021-06-15 14:49:08 +02:00
Laurent Destailleur
43c5dd2aea
Fix permissions
2021-06-15 14:29:07 +02:00
Laurent Destailleur
3cd4f3e4af
Fix permissions
2021-06-15 14:26:59 +02:00
Laurent Destailleur
80760d7960
Fix permissions
2021-06-15 14:18:09 +02:00
Laurent Destailleur
7f3c8b4cd5
Fix user can't edit record
2021-06-15 13:54:52 +02:00
Laurent Destailleur
d1ffd4fcc8
Trans
2021-06-15 13:48:00 +02:00
kevin
9ff0efbcc2
FIX fatal error when adding message to a ticket
2021-06-15 12:04:24 +02:00
lmarcouiller
2688b902b6
Close #17890 : produceandconsume into api finished
2021-06-15 11:35:41 +02:00
UT from dolibit
77f0645c0e
Update index.php
2021-06-15 10:30:58 +02:00
Frédéric FRANCE
5ceb957059
fix php warning
2021-06-15 08:48:52 +02:00
Frédéric FRANCE
8fbdde9ec3
Update contacts.tpl.php
2021-06-15 08:43:14 +02:00
Frédéric FRANCE
cd615b1717
fix php warning
2021-06-15 08:31:08 +02:00
Laurent Destailleur
a1e6236df0
Fix regression sql error
2021-06-15 02:15:45 +02:00
Laurent Destailleur
3b9936f7e2
Fix responsive
2021-06-15 01:18:17 +02:00
UT from dolibit
41549af751
Update llx_00_c_country.sql
...
Iles Salomon -> Solomon Islands
Somalie -> Somalia
South Africa
Iles Géorgie du Sud et Sandwich du Sud -> South Georgia and the South Sandwich Islands
Sri Lanka = Sri Lanka
Soudan -> Sudan
Suriname = Suriname
Iles Svalbard et Jan Mayen -> Svalbard and Jan Mayen
Swaziland = Swaziland & new also: Eswatini
Syrie -> Syria
2021-06-14 21:45:11 +02:00
Laurent Destailleur
7e7800c110
Fix phpcs
2021-06-14 20:37:21 +02:00
Laurent Destailleur
347c6ae8a8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/projet/class/project.class.php
htdocs/projet/list.php
2021-06-14 20:13:27 +02:00
Laurent Destailleur
d154ec2344
FIX Collector to create lead was broken
2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02
Add info to allow debug of email collector
2021-06-14 19:58:12 +02:00
Laurent Destailleur
165d0d76d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 19:29:03 +02:00
Laurent Destailleur
8b0c2d997c
Clean code
2021-06-14 19:28:38 +02:00
stickler-ci
745ad8b403
Fixing style errors.
2021-06-14 15:10:24 +00:00
Gauthier PC portable 024
564a3b66c2
FIX : method exists
2021-06-14 17:08:16 +02:00
Gauthier PC portable 024
33553f3347
FIX : same thing on supplier orders
2021-06-14 17:01:59 +02:00
Laurent Destailleur
5fade1148d
Merge pull request #17829 from aspangaro/14b12
...
NEW Add field date start/end from/to in expense report list
2021-06-14 16:11:13 +02:00
Laurent Destailleur
dd27d38d5e
Merge pull request #17869 from aspangaro/14b13
...
NEW Add field date from/to in supplier invoice list
2021-06-14 16:02:50 +02:00
Laurent Destailleur
4b7292e405
Merge pull request #17928 from dolibit-ut/patch-349
...
Update card.php
2021-06-14 15:47:44 +02:00
Laurent Destailleur
b64f54c86f
Merge pull request #17927 from dolibit-ut/patch-348
...
Update card.php
2021-06-14 15:46:49 +02:00
stickler-ci
afa1e117c5
Fixing style errors.
2021-06-14 13:37:39 +00:00
Scrutinizer Auto-Fixer
55c9f37ffa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
d04fe12ce9
# WARNING: head commit changed in the meantime
...
Clean code
2021-06-14 15:05:54 +02:00
Laurent Destailleur
261bc88545
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:50:26 +02:00
Laurent Destailleur
617338cccd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:50:15 +02:00
Laurent Destailleur
4464aeb639
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee
Clean code
2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line
...
FIX clone invoice with acount line
2021-06-14 14:41:05 +02:00
Laurent Destailleur
9a820ba974
Merge pull request #17925 from dolibit-ut/patch-347
...
Update agenda.php
2021-06-14 14:27:56 +02:00
Laurent Destailleur
094315d708
Merge pull request #17926 from daraelmin/daraelmin-patch-1
...
Clean code (use Adh constant and precise comment)
2021-06-14 14:27:40 +02:00
Laurent Destailleur
3cacad795f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:26:07 +02:00
UT from dolibit
d2a19b530f
Update card.php
2021-06-14 14:24:21 +02:00
Laurent Destailleur
988dbd25b3
Fix sql syntax error
2021-06-14 14:24:18 +02:00
Laurent Destailleur
d0b033548c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
2021-06-14 14:21:53 +02:00
Laurent Destailleur
46752186fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:15:53 +02:00
Laurent Destailleur
f988f4c352
Fix contact
2021-06-14 14:15:32 +02:00
UT from dolibit
45e0f8a7ee
Update card.php
2021-06-14 14:11:21 +02:00
Laurent Destailleur
b588aee704
Merge pull request #17917 from fappels/14_create_thumbs_php8.0
...
Fix create image thumbs on php 8.0
2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4
Update images.lib.php
2021-06-14 14:05:48 +02:00
Laurent Destailleur
91933dda4e
Merge pull request #17924 from dolibit-ut/patch-346
...
Update bom_agenda.php
2021-06-14 14:03:24 +02:00
Laurent Destailleur
5cc86d2319
Fix #yogosha6370
2021-06-14 13:51:09 +02:00
daraelmin
023453e73b
Update geo.php
2021-06-14 12:45:13 +02:00
daraelmin
8423ad823b
Update list.php
2021-06-14 12:41:32 +02:00
daraelmin
80f4278c42
Clean code
2021-06-14 12:24:58 +02:00
daraelmin
f5ec96bfce
Clean code (use Adh constant and precise comment)
2021-06-14 12:19:24 +02:00
UT from dolibit
2143395d70
Update agenda.php
2021-06-14 11:02:43 +02:00
UT from dolibit
ba4f7a66d3
Update bom_agenda.php
2021-06-14 10:55:29 +02:00
Adrien Raze
0f91c4cfa2
FIX : Allow to set bookmarks on list filtered by multiselect fields
2021-06-14 10:02:44 +02:00
Laurent Destailleur
046215f64a
Fix PHP8
2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c
Debug v14
2021-06-14 01:33:01 +02:00
Laurent Destailleur
aceeb9558f
css
2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3
Look and feel v14
2021-06-14 01:11:39 +02:00
Laurent Destailleur
465ee6e643
Fix security check on public pages
2021-06-13 20:37:53 +02:00
Laurent Destailleur
3eea92c6e6
Clean code
2021-06-13 20:36:12 +02:00
Laurent Destailleur
6f97a551ef
Clean code
2021-06-13 20:32:11 +02:00