Laurent Destailleur
312968eeac
Clean code
2021-06-22 11:38:02 +02:00
Laurent Destailleur
8887f71c26
Doc
2021-06-22 10:57:16 +02:00
Laurent Destailleur
05c0bc4fac
css
2021-06-22 10:44:49 +02:00
ATM john
b8244edb89
Merge branch 'new_validation_method_for_common_object' of github.com:atm-john/dolibarr into new_validation_method_for_common_object
2021-06-21 21:54:53 +02:00
ATM john
4d043b713c
WIP - create validation method for common object
2021-06-21 21:54:03 +02:00
Alexandre SPANGARO
23f6e183d3
Forget information in tooltip for direct download
2021-06-21 21:51:41 +02:00
Laurent Destailleur
6702a452e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-21 20:58:58 +02:00
Laurent Destailleur
6014e4407f
Clean code
2021-06-21 20:50:56 +02:00
Laurent Destailleur
a0b594fbdc
Debug emailcollector
2021-06-21 19:47:43 +02:00
damien clochard
05bb2c720d
FIX #17996 : Avoid implicit type casts for llx_adherent_type.subscription
...
The llx_adherent_type.subscription column is VARCHAR so we need to
compare it with a string, not an int.
2021-06-21 18:24:52 +02:00
Laurent Destailleur
31db1dc412
Fix management of visibility of export/import templates.
2021-06-21 15:03:45 +02:00
Laurent Destailleur
5697e86c09
Fix columns for export/import profile
2021-06-21 14:12:33 +02:00
Laurent Destailleur
ac8564dc34
Fix disable token renewal on .css.php, .js.php and .json.php
2021-06-21 13:06:40 +02:00
Laurent Destailleur
aca190d977
Fix css
2021-06-21 12:46:24 +02:00
Laurent Destailleur
9c0ab1960b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-21 12:46:15 +02:00
Laurent Destailleur
ab2e50ef49
Fix css
2021-06-21 12:46:03 +02:00
Laurent Destailleur
561e75d0f8
Merge pull request #17992 from frederic34/patch-8
...
fix warnings
2021-06-21 11:39:40 +02:00
Laurent Destailleur
6ed1cd31d0
Merge pull request #17991 from frederic34/patch-7
...
fix warning
2021-06-21 11:38:28 +02:00
Laurent Destailleur
bb8d5cec1b
More complete management of
...
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:36:28 +02:00
Laurent Destailleur
30e5f5f96a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-21 11:24:14 +02:00
Laurent Destailleur
5bfd82e528
Clean code
2021-06-21 11:23:53 +02:00
Laurent Destailleur
59a7d5b89d
Introduce option
...
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:13:30 +02:00
Frédéric FRANCE
9fd06537b7
move admin warnings on top instead bottom
2021-06-21 10:42:20 +02:00
Laurent Destailleur
0dc16b135d
FIX allow disabling of a module (not dangerous) even if pb with token.
2021-06-21 00:05:01 +02:00
Alexandre SPANGARO
c8326c1365
FIX Accoutancy Limit date payment not register on purchases operations
2021-06-20 21:55:48 +02:00
Maxime Kohlhaas
2d9d46b9b5
Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_mo_stuff
2021-06-20 21:08:28 +02:00
Frédéric FRANCE
c9c3cef5d7
Update syslog.php
2021-06-20 20:15:19 +02:00
Frédéric FRANCE
9ee9556200
Update user.php
2021-06-20 18:37:43 +02:00
Frédéric FRANCE
6fb17b9777
fix warnings
2021-06-20 18:28:25 +02:00
Frédéric FRANCE
cff5edd604
Update syslog.php
2021-06-20 18:24:00 +02:00
Frédéric FRANCE
40afa5b1cc
fix warning
...
there is already an array called $option
2021-06-20 18:21:10 +02:00
Laurent Destailleur
21edb498c0
Merge pull request #17987 from daraelmin/daraelmin-patch-1
...
Fix 17986 error on comparing integer and string in strict sql
2021-06-20 17:26:56 +02:00
Laurent Destailleur
002471b1fe
Update adherentstats.class.php
2021-06-20 17:25:58 +02:00
Laurent Destailleur
b40b3df86e
Merge pull request #17990 from frederic34/patch-9
...
remove not used var and fix php warnings
2021-06-20 17:22:16 +02:00
Laurent Destailleur
c78f4a9248
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-20 17:20:24 +02:00
Laurent Destailleur
65110411ac
Doc
2021-06-20 17:20:12 +02:00
daraelmin
cfd7c610db
Use dolSqlDateFilter instead of SQL function YEAR
2021-06-20 17:14:28 +02:00
Frédéric FRANCE
c820193d11
remove not used var and fix php warnings
2021-06-20 17:01:41 +02:00
Laurent Destailleur
f486595e13
Fix dolSqlDateFilter
2021-06-20 16:55:22 +02:00
Laurent Destailleur
7ec3ff4bdc
Merge pull request #17989 from frederic34/patch-8
...
fix php warnings
2021-06-20 16:40:34 +02:00
Laurent Destailleur
3b09cc8e16
Merge pull request #17988 from frederic34/patch-7
...
fix php warning
2021-06-20 16:40:25 +02:00
Laurent Destailleur
5ad999e46d
css
2021-06-20 16:39:30 +02:00
Laurent Destailleur
6aeba1b79d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-20 16:36:05 +02:00
Laurent Destailleur
68b8a6a916
css
2021-06-20 16:35:49 +02:00
Frédéric FRANCE
4e7af173a6
fix php warnings
2021-06-20 16:33:41 +02:00
Frédéric FRANCE
4739694ad7
fix php warning
2021-06-20 16:24:58 +02:00
daraelmin
a54a955a65
Use year() instead of date_format
2021-06-20 15:40:32 +02:00
daraelmin
831cc4f4b7
Fix 17986 error on comparing integer and string in strict sql
2021-06-20 14:19:05 +02:00
Laurent Destailleur
23c0edf854
Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking
...
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
2021-06-20 12:55:30 +02:00
Laurent Destailleur
ab34a105c7
Merge pull request #17985 from grandoc/new_branch_20_06_2021
...
internationalization
2021-06-20 12:54:18 +02:00
Laurent Destailleur
a9dd5e8764
Fix css hidoneprint
2021-06-20 12:52:04 +02:00
Laurent Destailleur
633a6081fc
Merge pull request #17984 from atm-john/fix_search_drop_down
...
Fix : search drop down
2021-06-20 12:44:56 +02:00
Philippe GRAND
ebe7b696a6
internationalization
2021-06-20 12:02:52 +02:00
Philippe GRAND
5bde0dbc16
internationalization
2021-06-20 12:00:27 +02:00
Philippe GRAND
ae293d61c6
internationalization
2021-06-20 11:59:02 +02:00
Philippe GRAND
fb13d74467
internationalization
2021-06-20 11:56:49 +02:00
Philippe GRAND
dbee213db1
internationalization
2021-06-20 11:54:51 +02:00
Philippe GRAND
1480123f7d
internationalization
2021-06-20 11:53:21 +02:00
Philippe GRAND
e33db2876a
internationalization
2021-06-20 11:51:02 +02:00
Philippe GRAND
c06fcd36fb
internationalization
2021-06-20 11:48:30 +02:00
Philippe GRAND
d60d15883f
internationalization
2021-06-20 11:46:22 +02:00
Philippe GRAND
a4e63a1a26
internationalization
2021-06-20 11:43:05 +02:00
Philippe GRAND
057e78d8c3
internationalization
2021-06-20 11:40:54 +02:00
Philippe GRAND
b07d2f257a
internationalization
2021-06-20 11:37:51 +02:00
Philippe GRAND
14af45057c
internationalization
2021-06-20 11:35:37 +02:00
Philippe GRAND
748c10c2f9
internationalization
2021-06-20 11:32:25 +02:00
Philippe GRAND
1207944761
internationalization
2021-06-20 11:29:47 +02:00
Philippe GRAND
9ccc9d0d3d
internationalization
2021-06-20 11:27:49 +02:00
Philippe GRAND
93512fd501
internationalization
2021-06-20 11:26:25 +02:00
Philippe GRAND
ddaa9ecfc1
internationalization
2021-06-20 11:24:36 +02:00
Philippe GRAND
9acbb984a1
internationalization
2021-06-20 11:22:17 +02:00
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
stickler-ci
82f195dc30
Fixing style errors.
2021-06-14 19:15:53 +00:00
ATM john
be367c589f
WIP - create validation method for common object
2021-06-14 21:12:48 +02:00
ATM john
23765bf459
WIP - create validation method for common object
2021-06-14 20:59:46 +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
Laurent Destailleur
67e00e5cf5
Fix regression. Missing rollback.
2021-06-13 19:05:48 +02:00
Laurent Destailleur
95ee0f630d
Fix phpcs
2021-06-13 18:10:04 +02:00
Francis Appels
a019996bc8
Fix create image thumbs on php 8.0
2021-06-13 17:36:51 +02:00
Laurent Destailleur
a72f66b456
Fix: dictionnaries are edited per entity
2021-06-13 16:32:06 +02:00
Laurent Destailleur
e0abbb2525
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-13 16:24:21 +02:00
Laurent Destailleur
0cbcba7bc4
Merge pull request #17916 from frederic34/patch-16
...
fix warnings
2021-06-13 16:21:44 +02:00
Laurent Destailleur
205a6fac98
Merge pull request #17910 from frederic34/patch-11
...
fix PDF BACKGROUND not found
2021-06-13 16:21:05 +02:00
Laurent Destailleur
e9dc9b87b2
Merge pull request #17911 from frederic34/patch-12
...
Update pdf_standard_recruitmentjobposition.modules.php
2021-06-13 16:20:34 +02:00
Laurent Destailleur
48b604e4d5
Merge pull request #17905 from aspangaro/14a26
...
Accountancy - Maxi debug of new functionnality date validation
2021-06-13 16:19:44 +02:00
Laurent Destailleur
bc00a1a0f3
Merge pull request #17903 from dolibit-ut/patch-342
...
Update llx_c_chargesociales.sql
2021-06-13 16:17:04 +02:00
Laurent Destailleur
6708800d54
Merge pull request #17902 from frederic34/patch-9
...
fix warnings
2021-06-13 16:16:21 +02:00
Laurent Destailleur
172f1b5260
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-13 16:16:17 +02:00
Laurent Destailleur
1c7f141f06
Merge pull request #17901 from frederic34/patch-8
...
fix warning
2021-06-13 16:16:06 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7
...
fix warnings
2021-06-13 16:15:58 +02:00
Laurent Destailleur
ec87115177
Merge pull request #17915 from frederic34/patch-15
...
fix warning
2021-06-13 16:15:51 +02:00
Laurent Destailleur
56a943b2ea
Merge pull request #17914 from frederic34/patch-14
...
fix warnings
2021-06-13 16:15:44 +02:00
Laurent Destailleur
c4cba43bad
FIX Broken Access Control reported by Ahsan Aziz.
2021-06-13 16:15:05 +02:00
Frédéric FRANCE
20f6a34249
Update list.php
2021-06-13 16:12:46 +02:00
Frédéric FRANCE
d774e19afe
fix warnings
2021-06-13 16:10:45 +02:00
Frédéric FRANCE
791e4ab056
fix warning
2021-06-13 15:59:22 +02:00
Frédéric FRANCE
519d7f1d0f
fix warnings
2021-06-13 15:47:42 +02:00
Frédéric FRANCE
ebc0cc75dd
fix warning
2021-06-13 15:37:54 +02:00
Laurent Destailleur
497e9edbb2
Trans
2021-06-13 15:17:47 +02:00
Laurent Destailleur
abfc87c1de
Fix separator extrafields must not appear as selected fields
2021-06-13 13:32:41 +02:00
Frédéric FRANCE
8a6517efb5
Merge remote-tracking branch 'upstream/develop' into patch-9
2021-06-13 08:54:57 +02:00
Frédéric FRANCE
e9913fa9d0
Merge remote-tracking branch 'upstream/develop' into patch-8
2021-06-13 08:53:44 +02:00
Alexandre SPANGARO
cf723d5120
Look a feel v14 CSS Amount
2021-06-13 06:37:44 +02:00
Alexandre SPANGARO
11959ec1ab
Fix some date problems
2021-06-13 06:07:01 +02:00
Alexandre SPANGARO
94850cd25b
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-06-13 06:06:33 +02:00
Laurent Destailleur
bb48da988b
css
2021-06-13 01:32:14 +02:00
Laurent Destailleur
8b9af8f5ab
Responsive
2021-06-13 01:27:04 +02:00
Frédéric FRANCE
6ff97ca2c6
Update pdf_standard_recruitmentjobposition.modules.php
2021-06-12 19:28:58 +02:00
Frédéric FRANCE
74e06353e9
fix PDF BACKGROUND not found
2021-06-12 19:25:47 +02:00
Laurent Destailleur
9ba0fe07f0
Fix phpcs
2021-06-12 18:47:29 +02:00
Frédéric FRANCE
a723a8f93e
remove phpcs warning
2021-06-12 18:40:00 +02:00
Laurent Destailleur
7cb647e5b5
Complete log
2021-06-12 17:02:24 +02:00
Laurent Destailleur
a8401ca30d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-12 15:47:18 +02:00
Laurent Destailleur
f13dcb5376
Fix merge
2021-06-12 15:44:03 +02:00
Alexandre SPANGARO
53d0909a7c
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-06-12 14:20:00 +02:00
Alexandre SPANGARO
7444ff5412
Update notified
2021-06-12 14:18:44 +02:00
ATM john
43ecba2e63
WIP - create validation method for common object
2021-06-12 14:16:40 +02:00
ATM john
578dc9adde
WIP - create validation method for common object
2021-06-12 12:58:20 +02:00
UT from dolibit
c3a27b5ab9
Update llx_c_chargesociales.sql
2021-06-12 10:32:42 +02:00
Frédéric FRANCE
4138353d7f
fix warnings
2021-06-12 09:11:12 +02:00
Frédéric FRANCE
3ca8de8fab
fix warning
2021-06-12 07:20:41 +02:00
Frédéric FRANCE
56afefd6ad
fix warnings
2021-06-12 07:12:45 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm
...
New : Missing hook for stock movements list
2021-06-11 19:58:21 +02:00
Laurent Destailleur
306b7779ff
Merge branch 'develop' into 11p1
2021-06-11 19:55:37 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts
...
add more capabilities for zapier
2021-06-11 19:51:01 +02:00
Laurent Destailleur
d3815cbb93
css
2021-06-11 19:42:36 +02:00
Laurent Destailleur
04a500f516
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat
...
Adding hooks on product stat in order to allow to expand stat on othe…
2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305
Update product.lib.php
2021-06-11 19:33:07 +02:00
Laurent Destailleur
37ebedcafa
Update product.lib.php
2021-06-11 19:32:25 +02:00
Laurent Destailleur
c4d0086b8a
Fix hook context names
2021-06-11 19:24:26 +02:00
Laurent Destailleur
dd1f49b4b0
Merge pull request #17794 from atm-quentin/FIX_jointure_cabyprod
...
Fix jointure cabyprod
2021-06-11 19:12:29 +02:00
Laurent Destailleur
663cf28eba
Fix lost code during previous merge
2021-06-11 19:05:33 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
cfbf051fca
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-11 18:47:09 +02:00
Laurent Destailleur
4fd9d36eb9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/price.php
2021-06-11 18:46:51 +02:00
Laurent Destailleur
65f8405ca4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-11 18:44:45 +02:00
Laurent Destailleur
6bf9a72dab
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-11 18:44:37 +02:00
Laurent Destailleur
eefc6ddf83
Fix phpcs
2021-06-11 18:44:01 +02:00
Laurent Destailleur
06201fa9bb
Merge pull request #17848 from atm-greg/FIX_update_only_vat_on_multiprice
...
verify vat change to update multiprice
2021-06-11 18:22:40 +02:00
Laurent Destailleur
4e66e134bd
Update price.php
2021-06-11 18:21:00 +02:00
Laurent Destailleur
4cde4f6162
Merge pull request #17875 from OPEN-DSI/new-doactions-hook-on-bank-card
...
NEW do actions hook on bank card
2021-06-11 18:18:06 +02:00
Laurent Destailleur
a057f17e56
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice
...
remove useless check on invoice line content when generating pdf
2021-06-11 18:13:58 +02:00
Laurent Destailleur
a8f11fec31
Update perweek.php
2021-06-11 18:12:39 +02:00
Laurent Destailleur
057d91698f
Update perday.php
2021-06-11 18:11:55 +02:00
Laurent Destailleur
0315f45198
Update permonth.php
2021-06-11 18:10:57 +02:00
Laurent Destailleur
bdded2af17
Update movement_list.php
2021-06-11 18:09:17 +02:00
Laurent Destailleur
c1745c6fc3
Merge pull request #17881 from frederic34/patch-9
...
fix warnings
2021-06-11 18:03:54 +02:00
Laurent Destailleur
9e6890c719
Merge pull request #17884 from frederic34/patch-12
...
fix warning
2021-06-11 18:02:54 +02:00
Laurent Destailleur
ffb879d152
Merge pull request #17880 from frederic34/patch-8
...
fix warning
2021-06-11 18:02:45 +02:00
Laurent Destailleur
fbe970c739
Merge pull request #17879 from frederic34/patch-7
...
try to fix
2021-06-11 18:02:29 +02:00
Laurent Destailleur
0b4385b554
Merge pull request #17885 from frederic34/patch-13
...
fix warnings
2021-06-11 18:00:48 +02:00
Laurent Destailleur
0bbe2210f2
FIX #17649
2021-06-11 17:58:52 +02:00
Laurent Destailleur
92dc0d28ce
Fix disallow reserved values for field name
2021-06-11 17:50:52 +02:00
Laurent Destailleur
ac965bf49a
FIX #16551
2021-06-11 17:40:04 +02:00
Laurent Destailleur
73a1119b26
Clean code
2021-06-11 15:21:24 +02:00
Laurent Destailleur
c2b910f6ed
Clean code
2021-06-11 15:08:54 +02:00
Laurent Destailleur
1605564d5e
Clean code
2021-06-11 14:54:18 +02:00
John BOTELLA
99cada2d43
Fix missing hooks
2021-06-11 14:42:51 +02:00
Laurent Destailleur
52f0de00f6
Fix missing fields
2021-06-11 13:17:22 +02:00
Laurent Destailleur
a88efc9065
Fix permission on produce and consume
...
Missing API to produce
2021-06-11 09:58:03 +02:00
Laurent Destailleur
e17ab1cca6
Clean code
2021-06-11 09:22:01 +02:00
Laurent Destailleur
b0b2bb4d86
Fix trans
2021-06-11 09:20:59 +02:00
Marc de Lima Lucio
3f72f9b544
FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment
2021-06-10 23:29:37 +02:00
Marc de Lima Lucio
96656ff148
FIX: project time spent by day/week: quote mismatch is SQL query to assign to check task assigment
2021-06-10 23:26:33 +02:00
Frédéric FRANCE
f58cf14ae9
Update html.formmail.class.php
2021-06-10 22:28:19 +02:00
Frédéric FRANCE
86f39795c0
fix warnings
2021-06-10 22:26:58 +02:00
Frédéric FRANCE
acc41adb8d
fix warning
2021-06-10 22:22:24 +02:00
stickler-ci
82feb57fcf
Fixing style errors.
2021-06-10 19:56:03 +00:00
Marc de Lima Lucio
1e7df0ba9f
NEW: holiday: handle monthly updates with cronjob
2021-06-10 21:53:06 +02:00
Frédéric FRANCE
759472f5d1
fix warning
2021-06-10 20:58:56 +02:00
Frédéric FRANCE
86eea2c4fc
Update list.php
2021-06-10 20:55:00 +02:00
Frédéric FRANCE
3f40a65f26
fix warnings
2021-06-10 20:53:29 +02:00
Frédéric FRANCE
3cb17d7535
fix warning
2021-06-10 20:40:10 +02:00
Frédéric FRANCE
648c1ef3a6
try to fix
2021-06-10 20:32:45 +02:00
Laurent Destailleur
77efbda148
Fix responsive
2021-06-10 20:04:21 +02:00
Laurent Destailleur
4e87a08282
Try fix for #17866
2021-06-10 19:02:53 +02:00
Laurent Destailleur
e938d875fb
FIX #17855
2021-06-10 18:34:43 +02:00
Alexis LAURIER
1a2434818d
remove useless check on deposit line content when generating pdf
2021-06-10 18:00:49 +02:00
Laurent Destailleur
8065283f28
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-10 16:53:27 +02:00
Laurent Destailleur
1bf63c7862
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
c44a368213
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-10 16:47:53 +02:00
Laurent Destailleur
24f8b6386e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2021-06-10 16:47:45 +02:00
Laurent Destailleur
f3b6c8bf17
Merge pull request #17876 from AlexisLaurier/bugfix/supplierBankTransfertWrongCodeCheckMassAction
...
bugfix/supplierBankTransfertWrongCodeCheckMassAction
2021-06-10 16:44:32 +02:00
Laurent Destailleur
693ac3eab6
Code comment
2021-06-10 16:38:09 +02:00
Laurent Destailleur
1950e50c89
Fix test
2021-06-10 16:31:28 +02:00
Laurent Destailleur
548e11d3d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-10 16:30:46 +02:00
Alexis LAURIER
03cd88d145
bugfix/supplierBankTransfertWrongCodeCheckMassAction
2021-06-10 16:29:56 +02:00
Laurent Destailleur
c8c9fb7700
FIX #17847
2021-06-10 16:29:30 +02:00
lvessiller
ed53301cec
NEW do actions hook on bank card
2021-06-10 16:18:20 +02:00
Laurent Destailleur
1798707cce
Merge pull request #17703 from tuxgasy/Fix_new_honorific_title_label
...
No try to translate label field in dictionary for new
2021-06-10 15:38:55 +02:00
Laurent Destailleur
5d6735f364
Merge pull request #17826 from ptibogxiv/patch-428
...
Fix date_start of last subscription
2021-06-10 13:01:07 +02:00
Laurent Destailleur
8cfe957962
Merge branch 'develop' into patch-7
2021-06-10 13:00:16 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade
...
FIX : childtablesoncascade doc
2021-06-10 12:59:19 +02:00
Laurent Destailleur
b7ba9df6b4
Update societe.class.php
2021-06-10 12:59:04 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php
2021-06-10 12:58:42 +02:00
Laurent Destailleur
c013b397a7
Merge pull request #17833 from frederic34/patch-8
...
fix warning
2021-06-10 12:53:24 +02:00
Laurent Destailleur
4fb568e5aa
Merge pull request #17838 from dolibit-ut/patch-340
...
Update llx_c_chargesociales.sql
2021-06-10 12:52:24 +02:00
Laurent Destailleur
5a6a3561b3
Merge pull request #17834 from frederic34/knowledge
...
clean code
2021-06-10 12:52:00 +02:00
Laurent Destailleur
0c6f3a2616
Merge pull request #17862 from atm-gauthier/fix_rounding_on_formatted_tags
...
FIX : auto rounding on "_FORMATED_" tags
2021-06-10 12:50:50 +02:00
Laurent Destailleur
d3c4cf50ca
Merge pull request #17846 from frederic34/patch-9
...
avoid fatal error
2021-06-10 12:22:36 +02:00
Laurent Destailleur
1666e1277b
Merge pull request #17851 from atm-john/13.0_fix_php7_warning
...
Fix php 7 warning : Only variables should be passed by reference
2021-06-10 12:20:26 +02:00
Laurent Destailleur
95bea52984
Merge pull request #17854 from frederic34/patch-11
...
add warning if outstanding limit is exceeded
2021-06-10 12:19:50 +02:00
Laurent Destailleur
f5be9b6244
Merge pull request #17859 from aspangaro/12p14
...
FIX Missing link to language file
2021-06-10 12:19:19 +02:00
Laurent Destailleur
85a8a66545
Merge pull request #17856 from FHenry/dev_fix_imagnethumbnail_project_files
...
fix : #17827
2021-06-10 12:18:21 +02:00
Laurent Destailleur
9ed7a3a5c5
Merge pull request #17863 from marc-dll/11.0_FIX_holiday_massaction_delete_right
...
FIX: holiday list: bad right for mass deletion
2021-06-10 12:13:10 +02:00
Laurent Destailleur
729c12a8e4
Merge pull request #17864 from DorianVabre/FIX_11.0_CSMSFile_count
...
Fix: using strlen() instead of count() to measure a message length on CSMSFile
2021-06-10 12:12:43 +02:00
Laurent Destailleur
32491dc668
Merge pull request #17868 from prolyfix/patch-1
...
bug resolution: exception
2021-06-10 12:09:20 +02:00
Laurent Destailleur
c4dcad5e6b
Fix regression
2021-06-10 11:57:42 +02:00
Laurent Destailleur
c0c773dd1d
css
2021-06-10 11:32:09 +02:00
Alexandre SPANGARO
08186fdff1
Fix warning - search_societe is already present
2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60
FIX Customer invoice list - Pagination lost search_date_xxx information
2021-06-10 06:22:03 +02:00
stickler-ci
17bdd0b5bc
Fixing style errors.
2021-06-10 04:03:51 +00:00
Alexandre SPANGARO
3d26ad4cf8
NEW Add field date from/to in supplier invoice list
2021-06-10 05:59:29 +02:00
Laurent Destailleur
53af424a3d
Fix total tva
2021-06-10 02:12:29 +02:00
Laurent Destailleur
5f925d9e3b
Fix total -> total_ht
2021-06-10 02:10:58 +02:00
Laurent Destailleur
ae6d2ba9b5
Fix missing user creation/modif of template invoice
2021-06-10 01:56:20 +02:00
Laurent Destailleur
4c89a1146c
Fix popup
2021-06-10 01:13:50 +02:00
Laurent Destailleur
ea0db5a574
Fix popup of invoice
2021-06-10 01:10:35 +02:00
Laurent Destailleur
c40bc085b2
Fix v14
2021-06-10 00:55:10 +02:00
Laurent Destailleur
9afe8e54a7
Fix
2021-06-10 00:41:15 +02:00
Laurent Destailleur
3cc478b133
Fix use of get url
2021-06-10 00:13:23 +02:00
Laurent Destailleur
067f37e22e
Clean code
2021-06-10 00:09:38 +02:00
Laurent Destailleur
7b31ef0ff3
Fix warnings
2021-06-10 00:00:49 +02:00
Laurent Destailleur
9b7795dc44
Debug v14
2021-06-09 23:55:56 +02:00
Laurent Destailleur
f3d54aada5
Clean code
2021-06-09 23:48:28 +02:00
prolyfix
e4d3fd4861
bug resolution: exception
...
when a user test the send mail functionality, an exception is thrown: $object is null in the method_exists's function. and thus not allowed.
Adding is_object resolve the problem
2021-06-09 23:09:31 +02:00
Laurent Destailleur
c00bef83a8
Fix php unit
2021-06-09 18:05:56 +02:00
Laurent Destailleur
16f1210e8a
Fix phpcs
2021-06-09 17:51:22 +02:00
Laurent Destailleur
f472ff4fd9
Add phpunit for dol_eval
2021-06-09 17:47:27 +02:00
Laurent Destailleur
f1c94ac659
NEW Reduce scope of dol_eval function.
2021-06-09 17:44:42 +02:00
lvessiller
c37c371392
FIX clone invoice with acount line
2021-06-09 17:18:01 +02:00
Laurent Destailleur
0b7b12685f
Clean code
2021-06-09 16:41:43 +02:00
Laurent Destailleur
2681d58107
FIx CVE ID: CVE-2021-33816
2021-06-09 16:41:31 +02:00
Nicolas
4e1fe23b7e
FIX: add check display payment link if invoice module is enabled
2021-06-09 15:48:31 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
Dorian Vabre
0a23cf029d
using strlen instead of count
2021-06-09 14:13:50 +02:00
Laurent Destailleur
d4ca6bf42a
Clean code
2021-06-09 13:56:03 +02:00
Laurent Destailleur
e915e3403c
Trans
2021-06-09 13:36:37 +02:00
Laurent Destailleur
458ef9f8da
Fix security test
2021-06-09 13:31:00 +02:00
Laurent Destailleur
997674aebc
Fix trans
2021-06-09 13:15:47 +02:00
Laurent Destailleur
a78d29bb71
Fix trans
2021-06-09 13:05:32 +02:00
Laurent Destailleur
14e3d04e25
Add more info on security page
2021-06-09 13:02:17 +02:00
Laurent Destailleur
c375668ab6
Clean code
2021-06-09 12:41:53 +02:00
Marc de Lima Lucio
5d9aa40065
FIX: holiday list: bad right for mass deletion
2021-06-09 12:40:34 +02:00
Gauthier PC portable 024
4b6fb7dd47
FIX : auto rounding on "_FORMATED_" tags
2021-06-09 12:26:28 +02:00
stickler-ci
c62c668c68
Fixing style errors.
2021-06-09 09:29:22 +00:00
Marc de Lima Lucio
d383941596
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop_NEW_project_block_timesheet
2021-06-09 11:24:17 +02:00
Marc de Lima Lucio
7317aad41f
FIX: projet time spent: also restrict to X months back for update and delete
2021-06-09 11:08:38 +02:00
Marc de Lima Lucio
4c6dfd8d5c
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop
2021-06-09 11:03:04 +02:00
MOREAU FRANCK
a141d722ad
Adding hooks on product stat in order to allow to expand stat on other modules
...
stickler-ci test corrections
2021-06-09 08:39:06 +02:00
Alexandre SPANGARO
a4f3792cec
FIX Missing link to language file
2021-06-09 07:42:05 +02:00
Laurent Destailleur
cfa268e0d3
Fix we must add total vat on cash fence receipts (Ticket Z)
2021-06-09 04:13:57 +02:00
Laurent Destailleur
f17e7a6979
Add more info
2021-06-09 03:54:19 +02:00
Laurent Destailleur
27f803cab0
Fix receipt of cash fence must contains more legal information
2021-06-09 03:35:22 +02:00
Florian HENRY
71dbb8733d
fix : #17827
2021-06-08 20:18:31 +02:00
Marc de Lima Lucio
6733d278d8
NEW: project time spent: conf to prevent recording time after X months
2021-06-08 18:13:18 +02:00
MOREAU FRANCK
4b8dfc1abe
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 18:11:59 +02:00
Frédéric FRANCE
af6bbe23ca
add warning if outstanding limit is exceeded
2021-06-08 17:39:13 +02:00
Laurent Destailleur
fa4786a3f6
Fix permission
2021-06-08 16:19:21 +02:00
Laurent Destailleur
facf594b2d
FIX Date of invoice generated from membership must be current date
2021-06-08 16:01:26 +02:00
Laurent Destailleur
6eab0f5661
Fix css
2021-06-08 15:49:26 +02:00
MOREAU FRANCK
2e66509245
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 15:47:20 +02:00
Laurent Destailleur
1aeb91eb9a
FIX entry menus that has been lost in v13
...
Look and feel v14
2021-06-08 13:44:11 +02:00
John BOTELLA
5131ab5199
Fix php 7 warning : Only variables should be passed by reference
2021-06-08 12:36:08 +02:00
MOREAU FRANCK
207dc1df55
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 12:34:26 +02:00
Frédéric FRANCE
4e530c2486
Update card.php
2021-06-08 12:05:45 +02:00
Frédéric FRANCE
0ea0966b09
Update card.php
2021-06-08 12:01:05 +02:00
Laurent Destailleur
7e95c5ec20
Clean code
2021-06-08 11:40:50 +02:00
atm-greg
37433ffee7
verify vat change to update multiprice
2021-06-08 11:39:04 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error
2021-06-08 10:38:34 +02:00
Gauthier PC portable 024
e64c27e1c3
FIX : need to add payment sum to getlibstatus function in object linked block
2021-06-08 10:27:33 +02:00
Laurent Destailleur
cac63ddd3f
Add missing translation
2021-06-07 12:16:11 +02:00
Laurent Destailleur
0144d6c0fd
Inventory is now stable feature
2021-06-07 11:30:46 +02:00
Quentin VIAL-GOUTEYRON
2a4f6882c5
Merge branch 'FIX_jointure_cabyprod' of github.com:atm-quentin/dolibarr into FIX_jointure_cabyprod
2021-06-07 10:11:19 +02:00
Quentin VIAL-GOUTEYRON
af913cd29f
remove and
2021-06-07 10:10:42 +02:00
stickler-ci
98aa374185
Fixing style errors.
2021-06-07 08:10:05 +00:00
Laurent Destailleur
4f6a5cf5f7
Debug v14
2021-06-07 10:08:31 +02:00
Quentin VIAL-GOUTEYRON
80af5e2216
keep where but remove join
2021-06-07 10:05:24 +02:00
UT from dolibit
2dbf9537b3
Update llx_c_chargesociales.sql
2021-06-07 08:59:47 +02:00
Laurent Destailleur
beca3c8ad3
Debug v14
2021-06-07 01:51:56 +02:00
Laurent Destailleur
d6cbb9007f
Debug ticket form to add a local file
2021-06-07 01:43:24 +02:00
Laurent Destailleur
242f8b2544
Debug v14
2021-06-07 01:23:34 +02:00
Maxime Kohlhaas
a63d3364b4
Fix links in box last MO
2021-06-06 22:51:27 +02:00
ATM john
801f6cab2d
WIP - create validation method for common object
2021-06-06 21:58:59 +02:00
ATM john
f1b1dcd1b1
WIP - create validation method for common object
2021-06-06 21:53:17 +02:00
Frédéric FRANCE
a06fb441d3
clean code
2021-06-06 21:40:47 +02:00
Alexandre SPANGARO
86331c1b7e
Merge branch '11.0' into 11p1
2021-06-06 21:36:30 +02:00
Frédéric FRANCE
a586afd8b3
clean code
2021-06-06 21:35:39 +02:00
Alexandre SPANGARO
ffb1b232d4
Fix Withdraw - link is missing in llx_bank_url when the debit is rejected
2021-06-06 21:27:48 +02:00
Frédéric FRANCE
f3a3ce90e1
Update partnership_card.php
2021-06-06 21:18:23 +02:00
ATM john
aa94d40ad0
WIP - create validation method for common object
2021-06-06 21:12:03 +02:00
Frédéric FRANCE
d54d4da8cd
Update setup.php
2021-06-06 19:18:02 +02:00
Frédéric FRANCE
a47df82468
fix warning
2021-06-06 19:14:42 +02:00
Frédéric FRANCE
8401fa3ce7
add trigger member
2021-06-06 17:57:48 +02:00
Frédéric FRANCE
8a359c9009
Update partnership.class.php
2021-06-06 17:34:03 +02:00
Frédéric FRANCE
ccc35326a5
Update partnershiputils.class.php
2021-06-06 17:25:44 +02:00
Frédéric FRANCE
594cd90c4b
Update partnershipindex.php
2021-06-06 17:22:20 +02:00
Frédéric FRANCE
b1ff123155
Update partnership_note.php
2021-06-06 17:19:20 +02:00
Frédéric FRANCE
0eb61a6063
Update partnership_list.php
2021-06-06 17:17:50 +02:00
Frédéric FRANCE
4ac3576a74
Update partnership_document.php
2021-06-06 17:16:27 +02:00
Frédéric FRANCE
5fecaa2a5b
Update partnership_contact.php
2021-06-06 17:15:36 +02:00
Frédéric FRANCE
83cd127f0b
Update partnership_card.php
2021-06-06 17:14:02 +02:00
Frédéric FRANCE
cc24013d42
Update partnership_agenda.php
2021-06-06 17:13:18 +02:00
Frédéric FRANCE
a0f0c86ae6
Merge remote-tracking branch 'upstream/develop' into zapier_create_contacts
2021-06-06 17:09:35 +02:00
Laurent Destailleur
46a06f8e95
Fix phpcs
2021-06-06 16:37:45 +02:00
Laurent Destailleur
9f177a0c63
Debug v14
2021-06-06 16:36:41 +02:00
Laurent Destailleur
a1bb7129da
Debug v14
2021-06-06 15:29:49 +02:00
ATM john
1aca7efce3
Fix childtablesoncascade doc
2021-06-06 13:15:03 +02:00
Frédéric FRANCE
efb5ec2901
search by name or email
2021-06-06 10:32:04 +02:00
Alexandre SPANGARO
c1757bdbd8
Remove warning
2021-06-06 06:28:38 +02:00
Alexandre SPANGARO
51bce78e6e
NEW Add field date start/end from/to in expense report list
2021-06-06 06:05:47 +02:00
Laurent Destailleur
92b6425ce0
Debug v14
2021-06-05 18:20:07 +02:00
Laurent Destailleur
70af18148b
Debug modulebuilder v14
2021-06-05 17:49:01 +02:00
Laurent Destailleur
273c4c2880
Fix typo
2021-06-05 15:28:41 +02:00
Laurent Destailleur
fb0d2cdddc
Debug v14
2021-06-05 15:27:49 +02:00
Laurent Destailleur
1e657b8621
Fix value of showoncombobox
2021-06-05 15:14:10 +02:00
ptibogxiv
36accba5c9
Fix date_start of last subscription
2021-06-05 14:43:40 +02:00
Laurent Destailleur
4695bbbd60
Trans
2021-06-05 12:59:19 +02:00
Laurent Destailleur
be97d66f5b
Look and feel v14
2021-06-05 12:58:14 +02:00
Laurent Destailleur
ddbfb5d734
Fix translation of note of product
2021-06-05 11:14:06 +02:00
Laurent Destailleur
7a93365836
Fix bad name of var
2021-06-05 11:07:38 +02:00
Frédéric FRANCE
f6bc1c6414
add trigger contact
2021-06-05 09:37:38 +02:00
Alexandre SPANGARO
a92bd31ce1
Fix search_datexxx
2021-06-05 07:39:15 +02:00
Alexandre SPANGARO
6922359114
Merge remote-tracking branch 'upstream/develop' into 14b10
2021-06-05 07:22:38 +02:00
Alexandre SPANGARO
7608ac2ded
Merge remote-tracking branch 'upstream/develop' into 14b11
2021-06-05 07:20:31 +02:00
Alexandre SPANGARO
466bc26256
Fix with search_date_startxxx
2021-06-05 07:16:43 +02:00
Laurent Destailleur
865bf3b849
CSS
2021-06-05 02:42:49 +02:00
Laurent Destailleur
b6ba1de3b3
Fix remove use of captcha on backoffice for ticket creation
2021-06-05 02:18:45 +02:00
Laurent Destailleur
b77f2be2e1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-05 02:14:16 +02:00
Laurent Destailleur
703001c625
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks
...
New Hooks to rename Supplier Orders statuses
2021-06-05 02:11:29 +02:00
Laurent Destailleur
39adaec7eb
Fix var not found
2021-06-05 01:29:24 +02:00
Laurent Destailleur
3e53ab5bfe
Fix scrutinizer
2021-06-05 01:17:16 +02:00
Laurent Destailleur
5d063ab880
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-05 01:11:16 +02:00
Laurent Destailleur
f0118183c8
Clean code
2021-06-05 01:11:05 +02:00
Laurent Destailleur
6ae4a75ac2
Update fournisseur.commande.class.php
2021-06-05 01:04:09 +02:00
Laurent Destailleur
246cb09ba5
Update newpayment.php
2021-06-05 00:56:28 +02:00
Laurent Destailleur
420bf440ef
Update newpayment.php
2021-06-05 00:53:07 +02:00
daraelmin
c94946b934
Fix #17743 - token was hashed with membersubscription
...
#Fix #17743 - token was hashed with membersubscription
for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member
2021-06-04 23:14:31 +02:00
TuxGasy
56bb2bbd14
On dict, test $obj->code if empty before translation
2021-06-04 17:10:26 +02:00
Laurent Destailleur
0147ffa737
Fix css
2021-06-04 14:38:22 +02:00
Laurent Destailleur
e8aec4824b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 14:37:05 +02:00
Laurent Destailleur
2182e7fd54
Look and feel v14
2021-06-04 14:36:52 +02:00
Laurent Destailleur
27018bd4b4
Fix group by
2021-06-04 14:25:32 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest
...
new: working on conference or booth object and event type #FoundationFunding
2021-06-04 13:12:32 +02:00
Laurent Destailleur
333cd9f48a
Merge pull request #17750 from daraelmin/patch-2
...
Fix #17743 newpayement source membersubscription is member
2021-06-04 13:04:17 +02:00
Laurent Destailleur
bcd028c040
Merge pull request #17739 from fbosman/patch-6
...
Update card.php
2021-06-04 12:57:51 +02:00
Laurent Destailleur
8b5922a0df
Update card.php
2021-06-04 12:57:43 +02:00
Laurent Destailleur
43be7cf996
Update card.php
2021-06-04 12:56:40 +02:00
Laurent Destailleur
292d5f6a15
Update card.php
2021-06-04 12:55:03 +02:00
Laurent Destailleur
2feffa8ab3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 12:48:27 +02:00
Laurent Destailleur
34955b1cf9
Fix sql
2021-06-04 12:48:18 +02:00
Laurent Destailleur
3fb0dabae3
Merge pull request #17745 from FHenry/fix_dev_inventory_rollbac
...
fix: bad syntax "rollbac" instead of "rollback"
2021-06-04 12:43:09 +02:00
Laurent Destailleur
d0fb90feed
Merge pull request #17736 from frederic34/patch-9
...
fix warnings
2021-06-04 12:42:53 +02:00
Laurent Destailleur
ff61a027e5
Merge pull request #17735 from frederic34/patch-8
...
fix warnings
2021-06-04 12:42:44 +02:00
Laurent Destailleur
8d77f498a8
Merge pull request #17734 from frederic34/patch-7
...
fix warning
2021-06-04 12:42:36 +02:00
Laurent Destailleur
d1d305e470
Merge pull request #17738 from frederic34/patch-11
...
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-06-04 12:42:26 +02:00
Laurent Destailleur
c29347b0f8
Merge pull request #17740 from dolibit-ut/patch-334
...
Update llx_c_email_templates.sql
2021-06-04 12:40:33 +02:00
Francis Appels
01f5a5fb18
Fix update receipt eatby
2021-06-04 12:38:04 +02:00
Laurent Destailleur
8d5c419f92
Merge pull request #17744 from fappels/14_fix_trigger_delete_dispatch
...
Fix dispatch receipt edit and delete
2021-06-04 12:37:05 +02:00
Laurent Destailleur
a48b18aced
Merge pull request #17741 from dolibit-ut/patch-335
...
Update llx_c_chargesociales.sql
2021-06-04 12:35:37 +02:00
Laurent Destailleur
a94ef88549
Merge pull request #17748 from frederic34/patch-13
...
Update pdf_canelle.modules.php
2021-06-04 12:34:27 +02:00
Laurent Destailleur
5f3296fa70
Merge pull request #17737 from frederic34/patch-10
...
fix warnings
2021-06-04 12:34:07 +02:00
Laurent Destailleur
5a3d7663d1
Merge pull request #17764 from Hystepik/develop#3
...
Fix of a bug on mass mailing
2021-06-04 12:32:48 +02:00
Laurent Destailleur
f656214a66
Merge pull request #17746 from frederic34/patch-12
...
doxygen
2021-06-04 12:32:26 +02:00
Laurent Destailleur
e5ab721660
Fix sanitize
2021-06-04 12:30:46 +02:00
Laurent Destailleur
920f8b0b58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 12:29:04 +02:00
Laurent Destailleur
3dd53f58f9
Merge pull request #17759 from Hystepik/develop#1
...
Fix inventory/inventory.php
2021-06-04 12:28:55 +02:00
lmarcouiller
c77dee0922
changes to fetch after send
2021-06-04 12:27:50 +02:00
Laurent Destailleur
e26f0f155f
Update inventory.php
2021-06-04 12:00:54 +02:00
Laurent Destailleur
1136e7dec5
Update inventory.php
2021-06-04 11:57:59 +02:00
Laurent Destailleur
84f2e06b91
Merge pull request #17754 from frederic34/patch-16
...
fix warnings
2021-06-04 11:55:14 +02:00
Laurent Destailleur
08b44b3348
Merge pull request #17755 from frederic34/patch-17
...
fix warning
2021-06-04 11:54:58 +02:00
Laurent Destailleur
900cfb7a9d
Merge pull request #17756 from frederic34/patch-18
...
fix warnings
2021-06-04 11:54:38 +02:00
Laurent Destailleur
f7c5a9e13a
Merge pull request #17757 from frederic34/patch-19
...
fix warning
2021-06-04 11:54:26 +02:00
Laurent Destailleur
4d460b1383
Merge pull request #17763 from FHenry/13_fix_paiementpage_badgetpost_test
...
13 fix paiementpage bad GETPOST test
2021-06-04 11:54:14 +02:00
Laurent Destailleur
ca1da3c83c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 11:53:21 +02:00
Laurent Destailleur
e73dad30bb
Warning
2021-06-04 11:53:12 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20
...
fix warnings
2021-06-04 11:52:53 +02:00
Laurent Destailleur
5650deec58
Merge branch 'develop' into patch-15
2021-06-04 11:52:29 +02:00
Laurent Destailleur
c67ea954f7
Merge pull request #17752 from frederic34/patch-14
...
fix warnings
2021-06-04 11:51:01 +02:00
Laurent Destailleur
bd72edc534
Merge pull request #17760 from Hystepik/develop#2
...
Fix error name of menu knowledge management system
2021-06-04 11:50:46 +02:00
Laurent Destailleur
c3ed30345e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 11:45:24 +02:00
Laurent Destailleur
8e80d65b7e
Merge pull request #17765 from softwehrler/fix-subledger-label
...
Fix label of subaccount
2021-06-04 11:42:35 +02:00
Laurent Destailleur
25a169e15b
Merge pull request #17766 from FHenry/fix_uploaddir_productlot
...
fix: uploaddir for productlot (fix #17675 )
2021-06-04 11:27:46 +02:00
Laurent Destailleur
2586fcd1a3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commandestats.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/holiday/month_report.php
htdocs/product/class/product.class.php
htdocs/product/stock/class/mouvementstock.class.php
htdocs/societe/list.php
2021-06-04 11:20:38 +02:00
Laurent Destailleur
131d666d1d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-04 11:05:08 +02:00
Laurent Destailleur
6f1c49abcc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/commande/class/commandestats.class.php
htdocs/user/class/usergroup.class.php
2021-06-04 11:04:18 +02:00
Laurent Destailleur
86a5eead5a
Merge pull request #17769 from frederic34/patch-21
...
force reload css after activate/desactivate module
2021-06-04 10:40:34 +02:00
Laurent Destailleur
b31b210324
Merge pull request #17773 from Hystepik/develop#4
...
New : add of a new param in selectGroupTicket
2021-06-04 10:37:18 +02:00
Laurent Destailleur
ede911361d
Merge pull request #17774 from dolibit-ut/patch-336
...
Update llx_00_c_country.sql
2021-06-04 10:36:09 +02:00
Laurent Destailleur
82757f0989
Merge pull request #17775 from dolibit-ut/patch-337
...
Update list.php
2021-06-04 10:35:51 +02:00
Laurent Destailleur
3a201fa017
Merge pull request #17776 from dolibit-ut/patch-338
...
Update card.php
2021-06-04 10:35:28 +02:00
Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339
...
Update card.php
2021-06-04 10:35:11 +02:00
Laurent Destailleur
7608f0b383
Merge pull request #17778 from tuxgasy/fix_check_stock_with_batch
...
Fix: Do a strict comparison when check if stock is enough
2021-06-04 10:34:29 +02:00
Laurent Destailleur
174c6f8a45
Update mouvementstock.class.php
2021-06-04 10:33:13 +02:00
Laurent Destailleur
2069eeceda
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 10:30:02 +02:00
Laurent Destailleur
8c9bec3e3b
Code comment
2021-06-04 10:29:30 +02:00
Laurent Destailleur
47eb2471f1
Merge pull request #17779 from OGPayet/fix/addMissingHooksInSocieteList
...
add missing hooks in societe list.php
2021-06-04 10:10:54 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note
...
ADD note to supplier order refusal
2021-06-04 10:10:17 +02:00
Laurent Destailleur
402d90554a
Clean code
2021-06-04 10:04:56 +02:00
Laurent Destailleur
9b0605f979
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-04 09:41:35 +02:00
Laurent Destailleur
5f74e378a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 09:39:36 +02:00
Laurent Destailleur
164fe9fb4a
Merge pull request #17786 from FHenry/12_fix_ordersupplierstats
...
FIX: order supplier stats by category now display figures
2021-06-04 09:39:17 +02:00
Laurent Destailleur
6c8341a43f
Merge pull request #17787 from Hystepik/develop#5
...
Fix #17726 : holliday with advanced perms works
2021-06-04 09:37:32 +02:00
Laurent Destailleur
c7e21daee7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 09:36:20 +02:00
Laurent Destailleur
621aa9e6f3
Fix typo
2021-06-04 09:27:33 +02:00
Laurent Destailleur
d8aa7a7f33
Merge pull request #17792 from Hystepik/develop#6
...
Fix #17791 : Error when loading chart of accounts
2021-06-04 09:25:24 +02:00
Laurent Destailleur
935ba6ae18
Merge pull request #17796 from atm-john/13.0_fix_warehouse_id
...
FIX Warehouse id
2021-06-04 09:09:18 +02:00
Laurent Destailleur
81cc8cef75
Merge pull request #17797 from Hystepik/develop#7
...
Fix propal/index.php error on thirdparty display
2021-06-04 09:07:53 +02:00
Laurent Destailleur
d79be7615c
Merge pull request #17799 from atm-john/13.0_fix_wrong_context
...
FIX : wrong hook context
2021-06-04 09:07:02 +02:00
Laurent Destailleur
5e0eef68d0
Merge pull request #17809 from atm-gauthier/fix_status_holiday_list
...
FIX : field name is search_status and not search_statut
2021-06-04 08:59:07 +02:00
Laurent Destailleur
ce64ebc167
Merge pull request #17805 from frederic34/patch-22
...
fix warning
2021-06-04 08:58:53 +02:00
Laurent Destailleur
c39c7d6a81
Merge pull request #17806 from frederic34/patch-23
...
fix warning
2021-06-04 08:58:43 +02:00
Laurent Destailleur
3ae3137eaf
Missing picto
2021-06-04 08:57:48 +02:00
Laurent Destailleur
8ba651bb88
Merge pull request #17812 from frederic34/patch-24
...
fix warning
2021-06-04 08:57:10 +02:00
Laurent Destailleur
a8aacb3150
Merge pull request #17818 from frederic34/setmodetransport
...
debug intracomm report transport mode
2021-06-04 08:41:42 +02:00
Laurent Destailleur
350a421544
Update card.php
2021-06-04 08:41:26 +02:00
Laurent Destailleur
b674835d89
Merge pull request #17813 from frederic34/patch-25
...
fix warning
2021-06-04 08:39:20 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode
2021-06-03 21:47:10 +02:00
Frédéric FRANCE
0b28587e65
fix warnings
2021-06-03 15:28:47 +02:00
Frédéric FRANCE
e83e399cb6
fix warning
2021-06-03 15:19:54 +02:00
Frédéric FRANCE
ee55a5568f
fix warning
2021-06-03 15:14:31 +02:00
Inovea Conseil
c534b7fcce
FIX delete object actionComm
2021-06-03 14:36:47 +02:00
Gauthier PC portable 024
093705a1b5
FIX : field name is search_status and not search_statut
2021-06-03 11:32:41 +02:00
ATM john
a7300d01b0
WIP - create validation method for common object
2021-06-03 09:49:07 +02:00
lmarcouiller
71856984a3
Fix #17791 : fix for at account
2021-06-03 09:35:31 +02:00
lmarcouiller
fa71402a9b
Fix 17791 : fix for at account
2021-06-03 09:34:49 +02:00
lmarcouiller
8f7daf7f57
Fix 17791 : fix for at account
2021-06-03 09:32:58 +02:00
lmarcouiller
583acfbad4
Fix #17791 : fix at account
2021-06-03 09:29:12 +02:00
lmarcouiller
aa1ade5224
Fix #17791 : fix for SKR03
2021-06-03 09:13:48 +02:00
Frédéric FRANCE
c3d58ad044
fix warning
2021-06-03 08:36:50 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning
2021-06-03 08:33:44 +02:00
Laurent Destailleur
456356ded7
Fix migration
2021-06-02 18:45:48 +02:00
Nicolas
e46faacac1
FIX : Add process payment with online link order
2021-06-02 18:11:47 +02:00
ATM john
38423ba260
Fix wrong hook context
2021-06-02 16:31:31 +02:00
Laurent Destailleur
1468761073
Fix select
2021-06-02 16:29:38 +02:00
Laurent Destailleur
da7d821a3e
css
2021-06-02 15:32:39 +02:00
lmarcouiller
431691cec4
Fix propal/index.php error on thirdparty display
2021-06-02 15:18:45 +02:00
Laurent Destailleur
db5bcd1b99
Fix css
2021-06-02 13:41:08 +02:00
Laurent Destailleur
b5680a91d0
css
2021-06-02 13:03:20 +02:00
ATM john
3aca9bdb9e
Fix warehouse id
2021-06-02 12:02:27 +02:00
Quentin VIAL-GOUTEYRON
b8b30a9af6
wrong where cabyprodserv
2021-06-02 10:53:04 +02:00
Quentin VIAL-GOUTEYRON
89f6b66c2a
wrong join, request too long
2021-06-02 10:32:30 +02:00
atm-greg
f875bcfe09
update ->nom field if different from ->name
2021-06-02 10:30:48 +02:00
lmarcouiller
6d049f5c2e
Fix #17791 : Error when loading chart of accounts
2021-06-02 09:31:04 +02:00
Christian Foellmann
68579f9cda
fix html linebreak
2021-06-02 08:17:34 +02:00
Laurent Destailleur
33a4c98dc3
Fix popup
2021-06-02 04:34:10 +02:00
Laurent Destailleur
5a260865dc
FIX Creation of reception (missing extrafields). Lose data if error.
...
Conflicts:
htdocs/reception/card.php
2021-06-02 04:23:19 +02:00
Laurent Destailleur
bda42403b2
FIX Creation of reception (missing extrafields). Lose data if error.
2021-06-02 04:15:21 +02:00
Alexandre SPANGARO
c35124f036
NEW Add field date from/to in supplier payment list
2021-06-01 23:23:00 +02:00
Alexandre SPANGARO
3744ccdd28
Look & feel v14
2021-06-01 22:50:55 +02:00
Alexandre SPANGARO
b5904e49a0
NEW Add field date from/to in customer payment list
2021-06-01 22:43:43 +02:00
ATM john
f13388122c
Add fetch stock order
2021-06-01 21:43:05 +02:00
Laurent Destailleur
49f4de8728
Fix massaction on cron
2021-06-01 16:57:55 +02:00
lmarcouiller
af509742e6
Fix #17726 : holliday with advanced perms works
2021-06-01 16:34:39 +02:00
Florian HENRY
c91b9d613a
FIX: order supplier stats by category now display figures
2021-06-01 15:30:17 +02:00
stickler-ci
3cc65989c1
Fixing style errors.
2021-06-01 07:25:29 +00:00
ATM john
cf9c9ec882
fix condition
2021-06-01 09:07:05 +02:00
ATM john
a5c2ce1727
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
2021-06-01 08:45:45 +02:00
Laurent Destailleur
d18c1ea0c0
css
2021-06-01 00:41:51 +02:00
Laurent Destailleur
9d44df8a64
Fix escape
2021-06-01 00:05:43 +02:00
Laurent Destailleur
2dc9ca334f
CSS
2021-05-31 23:36:37 +02:00
Laurent Destailleur
c19f624eb5
Code comment
2021-05-31 16:00:03 +02:00
Laurent Destailleur
0071d63fbb
Fix for ro-md language
2021-05-31 13:35:03 +02:00
Pierre Payet
90ae16372c
add missing hooks in societe list.php
2021-05-31 12:11:16 +02:00
Laurent Destailleur
ffc7ae0389
Fix missing test
2021-05-31 12:02:03 +02:00
TuxGasy
e1de510c38
Do a strict comparison when check if stock is enough
2021-05-31 11:06:52 +02:00
Christian Foellmann
55d48077a3
ADD note to supplier order refusal
2021-05-31 10:45:34 +02:00
UT from dolibit
7aae5be54a
Update card.php
2021-05-31 10:36:43 +02:00
UT from dolibit
fed7878d18
Update card.php
...
$lineid was duplicate
2021-05-31 10:33:36 +02:00
UT from dolibit
a97efdbdfa
Update list.php
...
$title = $langs->trans('Supplier')." - ".$langs->trans('ProductsAndServices');
2021-05-31 10:31:25 +02:00
UT from dolibit
2c6eee2528
Update llx_00_c_country.sql
...
Roumanie -> Romania
Rwanda = Rwanda
Sainte-Hélène -> Saint Helena
Saint-Christophe-et-Niévès -> Saint Kitts and Nevis
Sainte-Lucie -> Saint Lucia
Saint-Pierre-et-Miquelon -> Saint Pierre and Miquelon
Saint-Vincent-et-les-Grenadines -> Saint Vincent and the Grenadines
Samoa = Samoa
Saint-Marin -> San Marino
Sao Tomé-et-Principe -> Saint Thomas and Prince
Serbie -> Serbia
Seychelles = Seychelles
Sierra Leone = Sierra Leone
Slovaquie -> Slovakia
Slovénie -> Slovenia
2021-05-31 10:26:05 +02:00
lmarcouiller
301d6ecd57
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-05-31 09:31:58 +02:00
lmarcouiller
ab64f467f5
add of a new param in selectGroupTicket
2021-05-31 09:31:38 +02:00
Laurent Destailleur
ea21e1dbfb
Fix color selection for ticket graph
2021-05-30 20:19:02 +02:00
Laurent Destailleur
356e349944
Fix reposition
2021-05-30 20:01:29 +02:00
Laurent Destailleur
d2bda7ad09
Set a maxlength on fields
2021-05-30 19:01:43 +02:00
Laurent Destailleur
2f969f154e
More examples
2021-05-30 17:10:38 +02:00
Laurent Destailleur
1834d642b3
Fix phpcs
2021-05-30 17:04:12 +02:00
Frédéric FRANCE
baea57ec05
force reload css after activate/desactivate module
2021-05-30 08:38:07 +02:00
Laurent Destailleur
48867c39aa
Fix missing link to edit translation
2021-05-29 04:54:53 +02:00
Laurent Destailleur
ab4941a558
Fix not visible button when missing permission
2021-05-29 02:22:30 +02:00
Laurent Destailleur
4f6385338a
Fix option CAT_HIGH_QUALITY_IMAGES
2021-05-28 18:15:26 +02:00
Florian HENRY
f33869bf1c
fix: uploaddir for productlot
2021-05-28 18:08:01 +02:00
Laurent Destailleur
81a94f5642
FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE
2021-05-28 18:04:45 +02:00
Laurent Destailleur
94467ea8cf
Fix selection
2021-05-28 17:05:26 +02:00
Laurent Destailleur
1c75ce8862
Code comment
2021-05-28 14:12:22 +02:00
Matthias Haberl
fed5db032a
Fix label of subaccount
2021-05-28 11:26:55 +02:00
Florian HENRY
c4f7a8194c
remove space
2021-05-28 10:32:53 +02:00
Florian HENRY
11bbd2ace3
fix: bad GETPOST test on payment module configuration
2021-05-28 10:31:54 +02:00
lmarcouiller
05a966b93e
Fix of a bug on mass mailing
2021-05-28 10:29:46 +02:00
lmarcouiller
e3a5abe20e
Fix error name of menu knowledge management system
2021-05-28 10:02:48 +02:00
lmarcouiller
e87d175041
Fix inventory/inventory.php
2021-05-28 09:57:21 +02:00
Florian Mortgat
e6deab5c85
FIX proposed new feature: autocomplete for accounting account groups
2021-05-28 08:42:38 +02:00
Florian Mortgat
c29d5fa747
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_autocomplete_accounting_account_groups
2021-05-28 08:19:55 +02:00
Frédéric FRANCE
ca0654323f
fix warnings
2021-05-27 23:11:05 +02:00
Frédéric FRANCE
d0b8a80c7a
fix warning
2021-05-27 22:56:20 +02:00
Frédéric FRANCE
4c1503a93b
fix warnings
2021-05-27 22:50:56 +02:00
Frédéric FRANCE
0b6457d83f
fix warning
2021-05-27 22:44:05 +02:00
Frédéric FRANCE
e1a427f160
fix warnings
2021-05-27 22:40:26 +02:00
Frédéric FRANCE
3b381dccc3
fix warnings
2021-05-27 22:33:25 +02:00
Frédéric FRANCE
52d44bd75e
fix warnings
2021-05-27 22:28:59 +02:00
daraelmin
4095c69582
Fix #17743 newpayement source membersubscription is member
...
Fix #17743 newpayement source membersubscription is not valid anymore
@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
2021-05-27 21:09:49 +02:00
Frédéric FRANCE
f1b32dce17
Update pdf_canelle.modules.php
2021-05-27 17:07:59 +02:00
Frédéric FRANCE
00d60aa65a
doxygen
2021-05-27 16:54:41 +02:00
Florian HENRY
14fdd4d0c6
fix rollback to rollbac
2021-05-27 16:43:49 +02:00
stickler-ci
dfb2e54750
Fixing style errors.
2021-05-27 14:25:42 +00:00
Frans Bosman
fd2d10d443
Update card.php
2021-05-27 16:23:33 +02:00
Francis Appels
48f5cea917
Fix update receipt eatby
2021-05-27 16:03:17 +02:00
Francis Appels
8ed24d6796
Add missing trigger LINERECEPTION_DELETE
2021-05-27 16:02:12 +02:00
Laurent Destailleur
819e6e1122
Fix duplicate
2021-05-27 14:59:44 +02:00
Laurent Destailleur
a33f6a8977
css
2021-05-27 14:57:16 +02:00
Laurent Destailleur
cc0560c73d
css
2021-05-27 14:47:06 +02:00
Laurent Destailleur
e7f9d317c3
css
2021-05-27 14:45:16 +02:00
Laurent Destailleur
e9cf33dac5
css
2021-05-27 14:35:20 +02:00
Laurent Destailleur
61138b8210
Fix look and feel v14
2021-05-27 14:25:00 +02:00
UT from dolibit
d0a8dc9df9
Update llx_c_chargesociales.sql
...
idea: fk_pays at first - id as second (based on fk_pays)
2021-05-27 13:25:00 +02:00
UT from dolibit
ca7e52d861
Update llx_c_email_templates.sql
...
- formatting
- removed *tms* at eventorganization
2021-05-27 13:09:03 +02:00
stickler-ci
c31530e7ed
Fixing style errors.
2021-05-27 10:24:18 +00:00
Frans Bosman
61753791b4
Update card.php
...
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
2021-05-27 12:20:42 +02:00
Laurent Destailleur
5a5fa1edbb
Fix regression amount was always empty.
2021-05-27 11:57:17 +02:00
Laurent Destailleur
531dee31fd
Fix securekey
2021-05-27 11:16:23 +02:00
Laurent Destailleur
2caaa52e85
Doc
2021-05-27 02:52:51 +02:00
Laurent Destailleur
4f61286ae2
Small perf fix
2021-05-27 02:36:16 +02:00
Laurent Destailleur
240ca50a84
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-27 01:53:06 +02:00
Laurent Destailleur
7983ce941e
Fix performance page
2021-05-27 01:52:52 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-05-27 00:02:01 +02:00
Frédéric FRANCE
4237b374dd
Update list.php
2021-05-26 23:45:45 +02:00
Frédéric FRANCE
223ece5ca5
Update list.php
2021-05-26 23:43:14 +02:00
Frédéric FRANCE
0d62d3bace
fix warnings
2021-05-26 23:36:36 +02:00
Frédéric FRANCE
879a401724
fix warnings
2021-05-26 20:00:23 +02:00
Frédéric FRANCE
9b51699228
fix warnings
2021-05-26 19:55:47 +02:00
Frédéric FRANCE
60250443a1
fix warning
2021-05-26 18:55:48 +02:00
Frédéric FRANCE
371f2e4f37
fix warnings
2021-05-26 18:24:06 +02:00
Laurent Destailleur
5372912b0b
Merge pull request #17642 from Givriz/dev
...
Compatibility phpv8
2021-05-26 18:22:46 +02:00
Laurent Destailleur
3187c096c3
Merge pull request #17731 from atm-adrien/FIX_add_parameters_for_user_DoActions_hook
...
FIX : Add parameters (object and action) for user list DoActions hook
2021-05-26 17:48:42 +02:00
Laurent Destailleur
9720dddc9f
Merge pull request #17730 from ibuiv/patch-form-fourn-products
...
Fix param in select_produits_fournisseur_list
2021-05-26 17:47:32 +02:00
Laurent Destailleur
9952fdb6d3
FIX #17648 #17712
2021-05-26 17:45:45 +02:00
Laurent Destailleur
8b1b2019f8
Update html.form.class.php
2021-05-26 17:24:27 +02:00
Laurent Destailleur
c3c0ad1c8d
Update html.form.class.php
2021-05-26 17:20:09 +02:00
Antonin MARCHAL
d11d1a2018
lint(stickler)
2021-05-26 17:10:12 +02:00
Adrien Raze
9c83bdff51
FIX : Add parameters (object and action) for user list DoActions hook
2021-05-26 17:02:34 +02:00
Antonin MARCHAL
8dd2af42df
fix(param) select_produits_fournisseur_list
2021-05-26 16:44:35 +02:00
Laurent Destailleur
421681cda4
FIX Navigation in list of holiday
...
Conflicts:
htdocs/holiday/view_log.php
2021-05-26 15:25:44 +02:00
Laurent Destailleur
48945533e4
Clean code
2021-05-26 15:22:56 +02:00
Laurent Destailleur
7c41be7f0a
FIX Navigation in list of holiday
2021-05-26 15:22:49 +02:00
Maxime Kohlhaas
b3a6bcd34f
Fix Winfic accountancy export for due date
2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19
Fix Quadra accountancy export for due date
2021-05-26 14:59:28 +02:00
Laurent Destailleur
38ef028310
Clean code. Fix check for lot that must be unique.
2021-05-26 12:44:15 +02:00
Laurent Destailleur
83fdc2841a
Merge pull request #17725 from frederic34/patch-7
...
fix warning
2021-05-26 10:55:47 +02:00
Dorian Vabre
fe6b25ede6
fix on $value
2021-05-26 09:48:13 +02:00
Frédéric FRANCE
60196c0417
Update card.php
2021-05-26 08:53:17 +02:00
Frédéric FRANCE
9a51333662
fix warning
2021-05-26 08:49:54 +02:00
Frédéric FRANCE
eec254f066
fix warning
2021-05-26 08:42:35 +02:00
Laurent Destailleur
156279d6a1
Fix nojs
2021-05-26 00:34:52 +02:00
Laurent Destailleur
80c5aa7271
Merge pull request #17722 from frederic34/patch-10
...
Update api_stockmovements.class.php
2021-05-26 00:31:28 +02:00
Laurent Destailleur
8302ad4490
Merge pull request #17721 from frederic34/patch-9
...
fix warning
2021-05-26 00:31:03 +02:00
Laurent Destailleur
3e049479c7
Merge pull request #17718 from frederic34/patch-7
...
fix status/percent
2021-05-26 00:30:33 +02:00
Laurent Destailleur
f839ea9059
Merge pull request #17720 from frederic34/patch-8
...
fix warning
2021-05-26 00:30:07 +02:00
Laurent Destailleur
27d9606ca8
Merge pull request #17719 from frederic34/patch-5
...
fix warnings
2021-05-26 00:29:56 +02:00
Frédéric FRANCE
429ebe6662
Update api_stockmovements.class.php
2021-05-25 23:49:49 +02:00
Laurent Destailleur
94c8246f68
Debug v14
2021-05-25 23:30:06 +02:00
Laurent Destailleur
f9d6438bae
Debug v14
2021-05-25 23:26:03 +02:00
Frédéric FRANCE
8221011d7d
Update list.php
2021-05-25 23:22:43 +02:00
Frédéric FRANCE
e316437a0e
fix warning
2021-05-25 23:20:55 +02:00
Frédéric FRANCE
4067ac19dc
fix warning
2021-05-25 23:17:34 +02:00
Frédéric FRANCE
1662d4a829
fix warnings
2021-05-25 23:14:36 +02:00
Laurent Destailleur
f252748dbf
Merge pull request #17343 from atm-gauthier/develop_new_collapse_batch_detail
...
NEW : collapse batch detail
2021-05-25 23:04:50 +02:00
Frédéric FRANCE
9e3de39245
fix status/percent
...
in sql it is a.datep as dp, not datep
2021-05-25 23:00:21 +02:00
Laurent Destailleur
c75da78a22
Merge pull request #17717 from frederic34/comm_action_card
...
fix warnings
2021-05-25 22:54:41 +02:00
Laurent Destailleur
a22a659d6e
Merge pull request #17716 from frederic34/patch-5
...
fix allowed preview
2021-05-25 22:53:28 +02:00
Laurent Destailleur
8576cf1b72
Fix combo when we must no hide value with key -1
2021-05-25 22:51:37 +02:00
Frédéric FRANCE
332d8c9105
fix warnings
2021-05-25 22:24:46 +02:00
Frédéric FRANCE
4c698ce798
Update html.form.class.php
2021-05-25 22:11:30 +02:00
Frédéric FRANCE
c76cf60e15
Update html.form.class.php
2021-05-25 22:09:58 +02:00
Laurent Destailleur
8f9de222c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-25 21:53:56 +02:00
Laurent Destailleur
9aee8a2a0b
FIX #17406
2021-05-25 21:53:44 +02:00
Laurent Destailleur
9b2fb74dca
Merge pull request #17635 from FHenry/fix_13_cyan_salesman_as_note
...
fix : hidden option MAIN_ADD_CREATOR_IN_NOTE should use dol_concatdesc rather than php concat oparator
2021-05-25 21:40:12 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php
2021-05-25 21:39:50 +02:00
Laurent Destailleur
2ac9099e7d
Merge pull request #17618 from piernov/12.0-fix-addUserToGroupLDAP
...
Fix add/del user to group modifies LDAP group
2021-05-25 21:23:17 +02:00
Laurent Destailleur
4b47611e23
Debug v14
2021-05-25 21:21:09 +02:00
Laurent Destailleur
c7a56e3f99
Merge pull request #17690 from Givriz/dev_1
...
Compatibility phpv8
2021-05-25 20:36:56 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier
...
NEW translate supplier order menus and button
2021-05-25 20:34:17 +02:00
Laurent Destailleur
988660025a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-25 20:32:42 +02:00
Laurent Destailleur
a09db63c7b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/contrat/list.php
htdocs/don/class/api_donations.class.php
htdocs/societe/class/societe.class.php
2021-05-25 20:17:54 +02:00
Laurent Destailleur
98d60870d5
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-25 20:12:46 +02:00
Laurent Destailleur
1b5f7b78b5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-25 20:12:34 +02:00
Laurent Destailleur
307c5cb276
Merge pull request #17702 from r3dge/13.0
...
bug fix : replacing orders by donations and setting required field to…
2021-05-25 20:12:07 +02:00
Laurent Destailleur
0d31db0ba5
Update don.class.php
2021-05-25 20:11:46 +02:00
Laurent Destailleur
80e77f597d
Merge pull request #17701 from FHenry/13.0_fix_formconfirm
...
fix: formconfim if type radio must be :checked to get correct value
2021-05-25 20:03:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1
2021-05-25 19:55:31 +02:00
Laurent Destailleur
3dfb22b05e
Update task.class.php
2021-05-25 19:54:09 +02:00
Laurent Destailleur
9d6e93fd01
Update security.php
2021-05-25 19:50:53 +02:00
Laurent Destailleur
2b8e1cb46b
Merge pull request #17697 from dolibit-ut/patch-333
...
Update llx_00_c_country.sql
2021-05-25 19:48:35 +02:00
stickler-ci
708deaac00
Fixing style errors.
2021-05-25 17:47:28 +00:00
Laurent Destailleur
67372ff7d4
Merge branch 'develop' into patch-1
2021-05-25 19:45:56 +02:00
Laurent Destailleur
f1169a4f22
Merge pull request #17705 from andreubisquerra/master
...
FIX Search bug when hide product images in TakePOS
2021-05-25 19:39:35 +02:00
Laurent Destailleur
daababb97f
Update index.php
2021-05-25 19:39:06 +02:00
Laurent Destailleur
2cb8401921
Merge pull request #17695 from aspangaro/14b10
...
NEW Add hook on balance list
2021-05-25 19:38:24 +02:00
Laurent Destailleur
6d637bf1e1
Merge pull request #17707 from FHenry/12_fix_export_balance
...
fix: export balance with double quote
2021-05-25 19:36:57 +02:00
Laurent Destailleur
40a6159bb8
Merge pull request #17714 from Hystepik/develop#3
...
Fix #11882 : fix of module opensurvey for datesurvey
2021-05-25 19:32:20 +02:00
lmarcouiller
263f1c8101
Fix #11882 : fix of module opensurvey for datesurvey
2021-05-25 17:26:56 +02:00
Laurent Destailleur
b9de8561a9
Fix regression
2021-05-25 15:59:36 +02:00
Laurent Destailleur
d18fc6ca3c
Fix init
2021-05-25 15:38:12 +02:00
Laurent Destailleur
a840afa72a
Fix missing entry into table
2021-05-25 15:24:28 +02:00
Laurent Destailleur
71b35ef0e5
Fix regression - can't reset parent company
2021-05-25 12:11:06 +02:00
Laurent Destailleur
fb6aea72b8
Fix syntax error
2021-05-25 12:06:29 +02:00
Laurent Destailleur
857be16e12
Log
2021-05-25 12:03:38 +02:00
Laurent Destailleur
fedf7645b1
Fix regression, can't reset parent company.
2021-05-25 12:02:33 +02:00
Laurent Destailleur
97154f8267
Fix timezone into widgets
2021-05-25 00:29:32 +02:00
Laurent Destailleur
dd48c3ee9d
Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__)
2021-05-25 00:08:06 +02:00
Laurent Destailleur
bb64a25638
Fix CWE-269 - huntr - Fix set of email without edit user permission
2021-05-24 22:11:24 +02:00
Laurent Destailleur
31af74f852
FIX CWE-269 - huntr - Can download files of an agenda event
2021-05-24 20:07:04 +02:00
Laurent Destailleur
d4310f49c4
FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES
2021-05-24 19:46:19 +02:00
Laurent Destailleur
cdf3b7f9a8
Fix responsive
2021-05-24 19:05:25 +02:00
piernov
60176f7f5e
Fix add/del user to group modifies LDAP group
...
Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
2021-05-24 18:01:27 +02:00
Florian HENRY
7d223beae5
fix: export balance with doublequote
2021-05-24 12:51:58 +02:00
r3dge
647997af28
fixing error on date
2021-05-23 18:15:00 +02:00
r3dge
f81136231a
fixing PUT request for donation update
2021-05-23 18:09:10 +02:00
jove@bisquerra.com
83245d321b
FIX Search bug when hide product images
2021-05-23 09:55:01 +02:00
gmilad
89f150dd95
Fix #16100 Update utils.class.php
...
Fix #16100
End French Forum :
https://www.dolibarr.fr/forum/t/erreur-sauvegarde-dump-base-de-donnees/35009/7
2021-05-22 21:28:45 +02:00
TuxGasy
2fdd8486c9
No try to translate label field in dictionary for new
2021-05-22 06:13:16 +02:00
Laurent Destailleur
a0418fc17d
FIX CWE-269 huntr - download of files of project
2021-05-21 18:53:09 +02:00
Laurent Destailleur
4df70dc3f4
Fix CWE-269 huntr
2021-05-21 16:22:45 +02:00
Dorian Vabre
12d10adc17
Merge branch 'dev_EventOrganizer_suggest' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
2021-05-21 16:02:22 +02:00
Dorian Vabre
fe272d3292
wip name of contact to add on ics file
2021-05-21 16:01:44 +02:00
r3dge
67cab8c1f2
bug fix : replacing orders by donations and setting required field to allow post action in rest API for url donations. See issue #17700
2021-05-21 16:01:04 +02:00
Laurent Destailleur
11fa523070
FIX CWE-269
2021-05-21 15:54:11 +02:00
Florian HENRY
609d405685
fix: formconfim if type radio must be :checked to get correct value
2021-05-21 15:38:03 +02:00
lvessiller
38bd595ebd
NEW translate supplier order menus and button
2021-05-21 14:18:46 +02:00
Laurent Destailleur
b5af3b17d5
Update doc
2021-05-21 14:03:52 +02:00
UT from dolibit
a5001899eb
Update llx_00_c_country.sql
...
Nouvelle-Calédonie -> New Caledonia
Nouvelle-Zélande -> New Zealand
Nicaragua = Nicaragua
Niger = Niger
Nigeria = Nigeria
Nioué -> Niue
Ile Norfolk -> Norfolk Island
Mariannes du Nord -> Northern Mariana Islands
Norvège -> Norway
Oman = Oman
Pakistan = Pakistan
Palaos -> Palau
Territoire Palestinien Occupé -> Palestinian territories
Panama = Panama
Papouasie-Nouvelle-Guinée -> Papua New Guinea
Paraguay = Paraguay
Peru = Peru
Philippines = Philippines
Iles Pitcairn -> Pitcairn Islands
Pologne -> Poland
Porto Rico -> Puerto Rico
Qatar = Qatar
2021-05-21 13:32:09 +02:00
Laurent Destailleur
fbe491c4da
FIX CWE-79 huntr
2021-05-21 12:17:56 +02:00
Alexandre SPANGARO
ac9d9e9314
NEW Add hook on balance list
2021-05-21 07:04:58 +02:00
Laurent Destailleur
cfd035e1de
css
2021-05-20 21:25:36 +02:00
Laurent Destailleur
7833ac8fb0
Code comment
2021-05-20 17:53:28 +02:00
stickler-ci
6f050fc23a
Fixing style errors.
2021-05-20 15:48:04 +00:00
Givriz
0c5a934e10
Compatibility phpv8
2021-05-20 17:40:44 +02:00
Dorian Vabre
bbce806cb5
typo
2021-05-20 17:32:48 +02:00
Dorian Vabre
83555da795
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest
2021-05-20 17:26:07 +02:00
Dorian Vabre
720a368b29
link ics ok (todo: add name of speaker)
2021-05-20 17:24:27 +02:00
Laurent Destailleur
c561669edf
Code comment
2021-05-20 17:02:22 +02:00
Dorian Vabre
ab4ae85eb8
fix: getpost exportagenda apha to alpha
2021-05-20 16:33:04 +02:00
Dorian Vabre
df81ac8622
wip
2021-05-20 16:30:49 +02:00
Dorian Vabre
307ab92bc0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest
2021-05-20 16:13:42 +02:00
Laurent Destailleur
625aab34d6
Fix phpcs
2021-05-20 15:30:33 +02:00
Laurent Destailleur
eb0f4d9765
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-20 15:26:26 +02:00
Laurent Destailleur
93501a1147
Fix phpcs
2021-05-20 15:25:56 +02:00
Laurent Destailleur
3359ae93d8
Merge pull request #17654 from atm-adrien/FIX_missing_hooks
...
FIX : Missing hook in cibles.php (for mailing)
2021-05-20 15:24:12 +02:00
Laurent Destailleur
5191a419d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/product/price.php
2021-05-20 15:05:30 +02:00
Laurent Destailleur
04e9f2c988
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/translation.php
2021-05-20 15:00:39 +02:00
Laurent Destailleur
93558d5bbb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2021-05-20 14:58:57 +02:00
Laurent Destailleur
865ecf7a94
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/translation.php
2021-05-20 14:58:50 +02:00
Laurent Destailleur
91f85abb7e
Fix only comment to understand code are allowed
2021-05-20 14:55:37 +02:00
Laurent Destailleur
7a24d6399b
Merge pull request #17680 from SylvainLegrand/13.0
...
avoid an infinite loop between a parent company and a branch when updating customer rates
2021-05-20 14:54:28 +02:00
Laurent Destailleur
28487fac12
Create societe.class.php
2021-05-20 14:53:50 +02:00
stickler-ci
94ca682cbf
Fixing style errors.
2021-05-20 12:51:53 +00:00
Laurent Destailleur
b64c307358
Update societe.class.php
2021-05-20 14:50:02 +02:00
Laurent Destailleur
890d0f8040
Update societe.class.php
2021-05-20 14:38:24 +02:00
Laurent Destailleur
5eeb7d474c
Merge pull request #17655 from ATM-Consulting/FIX_13.0_wrong_error_message_MAIN_DISABLE_ALL_MAILS
...
FIX 13.0 - wrong error message for mail sending failure
2021-05-20 14:33:40 +02:00
Laurent Destailleur
e6e6574cb8
Merge pull request #17667 from aspangaro/11p1
...
FIX wrong variable fk_code_ventilation register for addline
2021-05-20 14:31:52 +02:00
Laurent Destailleur
90443e26ac
Merge pull request #17660 from gmilad/gmilad-fix-17608-b11
...
Fix issue #17608 for branch 11
2021-05-20 14:30:30 +02:00
Laurent Destailleur
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1
...
Compatibility phpv8
2021-05-20 14:29:18 +02:00
Laurent Destailleur
30ab0b05b7
Update list.php
2021-05-20 14:28:43 +02:00
Laurent Destailleur
eec1fefaa5
Update list.php
2021-05-20 14:25:54 +02:00
Laurent Destailleur
2604b8f9b5
Update list.php
2021-05-20 14:18:00 +02:00
Laurent Destailleur
b71eb6b75e
Merge pull request #17668 from atm-john/13.0_fix_dirt
...
FIX : Remove forgotten echo
2021-05-20 14:14:25 +02:00
Laurent Destailleur
a0dc991fb1
Merge pull request #17672 from dolibit-ut/patch-331
...
Update llx_00_c_country.sql
2021-05-20 14:13:58 +02:00
Laurent Destailleur
1414a24fdd
Merge pull request #17671 from dolibit-ut/patch-330
...
Update llx_20_c_departements.sql
2021-05-20 14:13:35 +02:00
Laurent Destailleur
854292b77e
Merge pull request #17665 from frederic34/patch-4
...
Fix issue when loading external libs (pb with autoloader conflict and luracast)
2021-05-20 14:06:27 +02:00
Florian HENRY
d70bbe29b5
fix
2021-05-20 14:03:18 +02:00
Florian HENRY
7a9102ac60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_massaction_paid_custom_invoice
2021-05-20 14:02:05 +02:00
Florian HENRY
4d7b09ff2a
done
2021-05-20 14:00:43 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var
...
fix: change societe by company varaible name in all file
2021-05-20 13:54:01 +02:00
Laurent Destailleur
c80c261db5
Merge pull request #17684 from FHenry/dev_fix_inventorylink_into_stockmvt
...
add inventory link into mvt stock list
2021-05-20 13:52:54 +02:00
Laurent Destailleur
1ada0ddcb1
Merge pull request #17682 from frederic34/patch-5
...
complete tooltip product
2021-05-20 13:52:25 +02:00
Florian HENRY
5e6d6ccf67
same bug on invoie list
2021-05-20 13:45:52 +02:00
Florian HENRY
7c6ac86d32
ongoing
2021-05-20 13:41:23 +02:00
Florian HENRY
d83dbd1922
fix: on mass action confirm box tag filter must not make LEFT JOIN
2021-05-20 13:24:30 +02:00
Florian HENRY
62bc6e9e1f
on going
2021-05-20 13:15:32 +02:00
Florian HENRY
7874be6e37
bad comment remove
2021-05-20 12:48:18 +02:00
Florian HENRY
d93cf0beb7
fix: change societe by company varaible name in all file
2021-05-20 12:36:26 +02:00
Florian HENRY
1e6f3d0624
add inventory link into mvt stock list
2021-05-20 12:30:02 +02:00
Laurent Destailleur
a3c28edfbb
Fix regenerate wrapper when rebuilding cache
2021-05-20 10:34:49 +02:00
Laurent Destailleur
1a8b10328f
Fix title of rss file
2021-05-20 10:07:50 +02:00
Laurent Destailleur
dc3b5846fb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-20 09:24:09 +02:00
Laurent Destailleur
dbd7292cd6
Replace doubleval into floatval
2021-05-20 09:22:55 +02:00
Laurent Destailleur
03c81acb42
Merge pull request #17676 from dolibit-ut/patch-332
...
Update mo_agenda.php
2021-05-20 09:18:16 +02:00
Laurent Destailleur
7390f4653a
Merge pull request #17674 from frederic34/phpcs_enable
...
fix phpcs was disabled
2021-05-20 09:18:00 +02:00
Frédéric FRANCE
c8b1eb180a
doxygen
2021-05-20 08:50:15 +02:00
Frédéric FRANCE
0d8c75268e
Update card.php
2021-05-19 23:32:14 +02:00
Frédéric FRANCE
b214fcb5e0
complete tooltip product
2021-05-19 23:29:35 +02:00
Laurent Destailleur
20c3ebeb51
Make SimplePOS deprecated
2021-05-19 19:46:46 +02:00
Sylvain Legrand
70c85cfd72
Merge branch '13.0' of https://github.com/SylvainLegrand/dolibarr into 13.0
2021-05-19 19:09:27 +02:00
Sylvain Legrand
a3d1b49c65
Error in list when using alias name of thirdparty
2021-05-19 19:08:58 +02:00
stickler-ci
b5ac78d9a0
Fixing style errors.
2021-05-19 16:56:52 +00:00
Sylvain Legrand
8a9c21c642
Update societe.class.php
2021-05-19 18:47:07 +02:00
UT from dolibit
50637ab76b
Update mo_agenda.php
2021-05-19 16:07:27 +02:00
Frédéric FRANCE
83521311dc
fix phpcs was disabled
2021-05-19 15:48:08 +02:00
Laurent Destailleur
217ee260c2
css
2021-05-19 15:11:47 +02:00
Laurent Destailleur
cf0da5cee7
css
2021-05-19 15:00:44 +02:00
Laurent Destailleur
fdf6dd2d9c
css
2021-05-19 14:50:41 +02:00
Laurent Destailleur
3550fa2be4
Fix css
2021-05-19 14:48:30 +02:00
Laurent Destailleur
92ccf5982a
Fix responsive
2021-05-19 14:38:39 +02:00
lvessiller
e2e6d4ba14
FIX keep special code on supplier order lines for external modules
2021-05-19 14:29:46 +02:00
Laurent Destailleur
8f5c898dae
CSS
2021-05-19 14:13:42 +02:00
Laurent Destailleur
173ef6e877
Look and feel v14
2021-05-19 14:04:01 +02:00
UT from dolibit
f9fb296ea6
Update llx_00_c_country.sql
...
République Tchèque -> Czech Republic
Danemark -> Denmark
Djibouti = Djibouti
Dominique -> Dominica
République Dominicaine -> Dominican Republic
Equateur -> Republic of Ecuador
Egypte -> Egypt
Salvador -> El Salvador
Guinée Equatoriale -> Equatorial Guinea
Erythrée -> Eritrea
2021-05-19 13:59:36 +02:00
Laurent Destailleur
a8d36a3a55
Debug v14
2021-05-19 13:56:13 +02:00
UT from dolibit
82e819d059
Update llx_20_c_departements.sql
...
USA
2021-05-19 13:43:13 +02:00
Laurent Destailleur
026cc1b35a
Debug for smartphone
2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f
Debug v14
2021-05-19 13:07:25 +02:00
Laurent Destailleur
e472d2d5d1
Fix bad permission position for external modules
2021-05-19 12:44:26 +02:00
Laurent Destailleur
059c286262
css
2021-05-19 12:19:18 +02:00
Laurent Destailleur
75f7ab41f0
css
2021-05-19 12:13:21 +02:00
Laurent Destailleur
90835eaab4
css
2021-05-19 12:08:17 +02:00
ATM john
3bf71d456d
fix doc
2021-05-19 12:01:47 +02:00
ATM john
1512abf96a
Remove hpcs:disable
2021-05-19 12:00:27 +02:00
Laurent Destailleur
7b4ed859eb
css
2021-05-19 11:57:12 +02:00
ATM john
9219dcfecb
Fix price log spam
2021-05-19 11:52:34 +02:00
Laurent Destailleur
78cf2b59c8
Debug feature copy-paste on smarpthone
2021-05-19 11:47:58 +02:00
Florian Mortgat
8eb8889b17
NEW: autocomplete account group when editing an account card
2021-05-19 11:12:34 +02:00
ATM john
5fd02992c0
Remove forgotten echo
2021-05-19 10:26:04 +02:00
Alexandre SPANGARO
f86e10b453
FIX wrong variable fk_code_ventilation register for addline
2021-05-19 06:37:02 +02:00
Frédéric FRANCE
dffb244776
Update AutoLoader.php
2021-05-18 21:04:43 +02:00
Laurent Destailleur
4d42235670
Complete experimental module knowledge management
2021-05-18 20:46:14 +02:00
Givriz
1cf7d0cee7
Compatibility phpv8
2021-05-18 20:13:26 +02:00
gmilad
4bb18db905
Fix issue #17608 for branch 11
...
Fix issue #17608 for branch 11
2021-05-18 19:53:35 +02:00
gmilad
57732d4265
Fix issue #17608 for branch 10
...
Fix issue #17608 for branch 10
2021-05-18 19:45:15 +02:00
Anthony Berton
c02e3eed6b
checked
2021-05-18 18:45:07 +02:00
Laurent Destailleur
8e39eff180
Look and feel v14
2021-05-18 18:18:00 +02:00
Florian Mortgat
6cccd77508
FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance)
2021-05-18 17:57:23 +02:00
Laurent Destailleur
f99b1b261a
Fix phpcs
2021-05-18 17:25:31 +02:00
Laurent Destailleur
271ba884db
css
2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918
css
2021-05-18 17:00:20 +02:00
Laurent Destailleur
ba595d8b74
Minor fix
2021-05-18 16:56:57 +02:00
Laurent Destailleur
2974a23332
css
2021-05-18 16:54:31 +02:00
Laurent Destailleur
a829d8cedc
css
2021-05-18 16:31:59 +02:00
Laurent Destailleur
f3803bab91
Responsive
2021-05-18 16:28:30 +02:00
Damien BENOIT
38a5dfb263
Update listevents.php
...
Added $optioncss
2021-05-18 15:26:55 +02:00
Damien BENOIT
e7ac39fe35
Update modules.php
...
Added $param
2021-05-18 15:23:29 +02:00
Adrien Raze
90d159fbc3
FIX : Missing hook in cibles.php (for mailing)
2021-05-18 14:58:46 +02:00
Laurent Destailleur
fbaba3b81b
css
2021-05-18 14:13:08 +02:00
Laurent Destailleur
c2cb055b0a
Fix look and feel v14
2021-05-18 14:00:29 +02:00
Laurent Destailleur
7569275d28
Fix generation of invoice
2021-05-18 13:36:07 +02:00
Laurent Destailleur
74f35177ff
Fix group by
2021-05-18 13:20:14 +02:00
Laurent Destailleur
303d60a0bd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-18 12:45:34 +02:00
Laurent Destailleur
0c4884bb2c
Fix sql error
2021-05-18 12:44:56 +02:00
Laurent Destailleur
40ed79aa06
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-18 12:44:10 +02:00
Laurent Destailleur
5babd107a0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenish.php
2021-05-18 12:43:52 +02:00
Laurent Destailleur
23514c957c
Merge pull request #17641 from WimpyMan/fix_sql_projects
...
html.form.class.php: Fixed SQL error (projects)
2021-05-18 12:36:18 +02:00
Laurent Destailleur
495d2e79f4
Update html.form.class.php
2021-05-18 12:35:30 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list
2021-05-18 12:27:30 +02:00
Laurent Destailleur
a34401aacb
Merge pull request #17646 from aspangaro/14b10
...
FIX Social contrib. - Missing language file
2021-05-18 12:16:14 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list
...
Add popup thirdparty info in list
2021-05-18 12:15:51 +02:00
Laurent Destailleur
7ececbb174
Merge pull request #17645 from aspangaro/14b9
...
Fix Title salary
2021-05-18 12:12:40 +02:00
Laurent Destailleur
6d34c34cb5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/stock/replenish.php
2021-05-18 12:11:33 +02:00
Laurent Destailleur
6b12dd4143
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-18 12:02:52 +02:00
Laurent Destailleur
6170b28c3b
FIx #17651
2021-05-18 11:58:49 +02:00
Laurent Destailleur
2771d50ffe
code comment
2021-05-18 11:55:56 +02:00
Gauthier PC portable 024
078fc892a2
FIX : cast int
2021-05-18 09:01:55 +02:00
Alexandre SPANGARO
9b0988e7be
FIX Social contrib. - Missing language file
2021-05-18 08:40:28 +02:00
Alexandre SPANGARO
90d7a851b4
Merge remote-tracking branch 'upstream/develop' into 14b9
2021-05-18 04:19:54 +02:00
Laurent Destailleur
f51e892a97
Fix phpcs
2021-05-18 02:06:35 +02:00
Laurent Destailleur
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Anthony Berton
70a062e2c1
change position
2021-05-17 23:59:42 +02:00
Anthony Berton
6fe9fe330d
delete fetch
2021-05-17 23:54:31 +02:00
Laurent Destailleur
ba0e95a4ff
FIX huntr CWE-79
2021-05-17 23:47:16 +02:00
Anthony Berton
58db723502
thirdparty info popup list
2021-05-17 23:27:33 +02:00
Alexandre SPANGARO
91b8b6a600
Fix Title salary info card
2021-05-17 22:41:00 +02:00
Alexandre SPANGARO
c3c760c269
Fix Title salary document card
2021-05-17 22:18:46 +02:00
Alexandre SPANGARO
4236471a6f
Fix Title salary card
2021-05-17 22:12:01 +02:00
Laurent Destailleur
de6134965b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 19:50:19 +02:00
Laurent Destailleur
cc1f98329d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/product/stock/replenish.php
htdocs/ticket/card.php
htdocs/user/class/api_users.class.php
2021-05-17 19:50:10 +02:00
Laurent Destailleur
d3ece31969
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/user/class/api_users.class.php
2021-05-17 19:29:03 +02:00
Laurent Destailleur
df2297bca3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/user/class/api_users.class.php
2021-05-17 19:21:58 +02:00
Laurent Destailleur
a865f49d72
Fix phpcs
2021-05-17 19:19:26 +02:00
Givriz
6bbd6db84b
Compatibility phpv8
2021-05-17 18:39:08 +02:00
Bastien Schils
1a38d075a6
html.form.class.php: Fixed SQL error (projects)
...
1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
2021-05-17 18:35:50 +02:00
Anthony Berton
31cd71d8a3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list
2021-05-17 18:34:41 +02:00
Anthony Berton
68130ec637
Merge branches 'develop' and 'develop' of https://github.com/Dolibarr/dolibarr into salesrepresentativeinorderandinvoicelist
2021-05-17 18:34:20 +02:00
Anthony Berton
9dcf2044a9
Update list.php
2021-05-17 18:33:27 +02:00
Anthony Berton
09ab930806
sale_representative_order_invoice_list
2021-05-17 18:31:19 +02:00
Anthony Berton
0b7f474dd3
look_feel user author in list
2021-05-17 18:04:21 +02:00
Laurent Destailleur
51a8ef8853
Merge pull request #17638 from bb2a/add_infos_user_popup
...
Modif info in user popup info
2021-05-17 16:30:41 +02:00
Laurent Destailleur
d888e4b3bf
Merge pull request #17385 from Givriz/dev_1
...
Compatibility phpv8
2021-05-17 16:29:49 +02:00
Laurent Destailleur
caea6f8d6c
Update listevents.php
2021-05-17 16:29:00 +02:00
Laurent Destailleur
caf1c625a3
Update listevents.php
2021-05-17 16:28:19 +02:00
Laurent Destailleur
c8758c53d2
Update listevents.php
2021-05-17 16:27:14 +02:00
Laurent Destailleur
68fe68b844
Update listevents.php
2021-05-17 16:25:25 +02:00
Laurent Destailleur
3c9d8bc931
Fix perms on API user
2021-05-17 16:17:03 +02:00
Laurent Destailleur
c54e010126
Fix perms on API user
2021-05-17 16:16:45 +02:00
Anthony Berton
9bde70feba
Update user.class.php
2021-05-17 16:08:48 +02:00
Laurent Destailleur
c0274e74ed
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 15:52:48 +02:00
Florian HENRY
6f3d19b7b6
dol_concatdesc better than concat operator
2021-05-17 15:12:25 +02:00
Antonin MARCHAL
779c868eae
fix mistake and removed hookmanager unused
2021-05-17 13:48:21 +02:00
Laurent Destailleur
bffdc8fa95
Merge pull request #17587 from FHenry/dev_fix_sale_top_menu_supplieronly
...
fix: when only supplier module is Active top menu should be displayed
2021-05-17 13:48:03 +02:00
Laurent Destailleur
4a488ad60a
Update eldy.lib.php
2021-05-17 13:47:48 +02:00
Antonin MARCHAL
c6aa078892
renamed LibStatut hook + removed useless hook
2021-05-17 13:46:01 +02:00
Laurent Destailleur
4e5a3a22c8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 13:36:48 +02:00
Laurent Destailleur
7d82a20995
Add missing property
2021-05-17 13:36:27 +02:00
Laurent Destailleur
0121150e02
Merge pull request #17631 from fappels/14_reception
...
Fix: Add test to delete supplier order if reception exist
2021-05-17 13:22:34 +02:00
stickler-ci
a3aba28c95
Fixing style errors.
2021-05-17 10:06:41 +00:00
Francis Appels
c3bea1b46e
Fix: Add test to delete supplier order if reception exist
2021-05-17 12:00:56 +02:00
Dorian Vabre
547f1dd370
Fix: user rest api rights
2021-05-17 11:54:53 +02:00
Florian HENRY
f95bd2f439
fixw that
2021-05-17 11:40:36 +02:00
Laurent Destailleur
1b25c4daa0
Fix phpcs
2021-05-17 11:29:51 +02:00
Laurent Destailleur
f25c57b1f6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496
Fix colors
2021-05-17 11:26:31 +02:00
Laurent Destailleur
082ae2e627
Fix trans
2021-05-17 11:11:17 +02:00
Laurent Destailleur
b2ba1f5540
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/product/stock/replenish.php
2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-17 10:31:25 +02:00
Laurent Destailleur
35c27b8eb8
Merge pull request #17588 from frederic34/completeTabHead
...
add sample completeTabHead for template modulebuilder
2021-05-17 10:29:51 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1
...
Fix #17475 : Add of List-Unsubscribe in mass emailing
2021-05-17 10:23:21 +02:00
Ferran Marcet
f923c70f38
Fix: Before there was no mistake
2021-05-17 10:17:54 +02:00
Laurent Destailleur
21896370a6
Merge pull request #17528 from bb2a/phone_head_document
...
Add phone and address in popup Thirdparty info
2021-05-17 10:16:49 +02:00
Laurent Destailleur
261414cb7f
Update societe.class.php
2021-05-17 10:16:33 +02:00
Laurent Destailleur
1093e66d26
Update societe.class.php
2021-05-17 10:14:14 +02:00
Laurent Destailleur
296c1c2978
Merge pull request #17583 from AisukoWasTaken/develop
...
Fix SQL error for Panama Provinces
2021-05-17 10:09:15 +02:00
Laurent Destailleur
979b66177d
Merge pull request #17589 from dolibit-ut/patch-321
...
Update llx_00_c_country.sql
2021-05-17 10:07:23 +02:00
Laurent Destailleur
6217d83846
Merge pull request #17599 from fbagnol/develop
...
Add soc in categories contacts list
2021-05-17 09:54:26 +02:00
Laurent Destailleur
f95f0748e3
Update viewcat.php
2021-05-17 09:54:04 +02:00
Laurent Destailleur
fd6147578a
Merge pull request #17611 from atm-maxime/fix/supplier_discount_replenish
...
Fix use supplier relative discount in replenish order creation
2021-05-17 09:44:39 +02:00
Laurent Destailleur
2f9a504dce
Fix label
2021-05-17 09:30:09 +02:00
Laurent Destailleur
7bb71dd89f
FIX #17602
2021-05-17 09:25:18 +02:00
Florian HENRY
6ffbc2744e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_sale_top_menu_supplieronly
2021-05-17 09:22:51 +02:00
Laurent Destailleur
c013a22008
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 09:20:40 +02:00
Laurent Destailleur
88d1ce7e49
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-17 09:19:39 +02:00
Laurent Destailleur
af2f40cc18
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
2021-05-17 09:19:31 +02:00
Laurent Destailleur
892a38e681
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-17 09:15:21 +02:00
Laurent Destailleur
592cfb5e93
Merge pull request #17602 from fmarcet/11.0
...
FIX: Impossible to add multiple localtax2
2021-05-17 09:13:58 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426
...
NEW report contact/adresses on credit note from invoice
2021-05-17 09:12:12 +02:00
Laurent Destailleur
6a9fa11539
Merge branch 'develop' into 11.0-fix-LDAPposixAccount
2021-05-17 09:07:30 +02:00
Laurent Destailleur
8dc6241aee
Clean dead code
2021-05-17 08:58:02 +02:00
Laurent Destailleur
ac95302fa7
Clean comment
2021-05-17 08:48:02 +02:00
Laurent Destailleur
242db33311
Merge pull request #17620 from atm-maxime/fix/hrm
...
Fix quick create dropdown + translations
2021-05-17 08:31:54 +02:00
stickler-ci
67fc5bce5f
Fixing style errors.
2021-05-17 06:30:30 +00:00
Laurent Destailleur
6308c17c5f
Update main.inc.php
2021-05-17 08:30:12 +02:00
Laurent Destailleur
77bcd7ecff
Merge pull request #17628 from atm-maxime/fix/ticket3
...
Fix missing substitutionarray on ticket presend
2021-05-17 08:01:21 +02:00
Laurent Destailleur
d4162f3076
Update card.php
2021-05-17 08:00:33 +02:00
Laurent Destailleur
4768729c09
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
2021-05-17 07:57:32 +02:00
stickler-ci
bdf876ead4
Fixing style errors.
2021-05-17 05:38:46 +00:00
Laurent Destailleur
dd88f9cd76
Update card.php
2021-05-17 07:37:01 +02:00
Laurent Destailleur
c36f231f41
Update card.php
2021-05-17 07:34:56 +02:00
Laurent Destailleur
ea78462167
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-17 07:33:37 +02:00
Laurent Destailleur
2f2ba933f8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/user/class/usergroup.class.php
2021-05-17 07:33:28 +02:00
Laurent Destailleur
b8b2928dd1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/user/class/usergroup.class.php
2021-05-17 07:29:19 +02:00
Laurent Destailleur
17b08cc22f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0
Fix remove some $_REQUEST
2021-05-17 07:27:02 +02:00
Laurent Destailleur
6236721067
Merge pull request #17607 from fappels/14_selectwarehouses
...
fix implode on string for formproduct loadwarehouse
2021-05-17 07:20:15 +02:00
Laurent Destailleur
84ae2a2f91
Merge pull request #17624 from atm-maxime/patch-2
...
Update box_dolibarr_state_board.php
2021-05-17 07:15:50 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId
...
Fix: properly set gid for Group LDAP synchro
2021-05-17 07:14:25 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3
...
avoid sql error with sql_mode=only_full_group_by
2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php
2021-05-17 07:11:41 +02:00
Laurent Destailleur
3428c1f165
Merge pull request #17619 from atm-maxime/fix/usergroup_entity
...
Fix entity was set to 0 on group creation (HOT FIX)
2021-05-17 07:09:11 +02:00
Laurent Destailleur
7d0fa95d81
Update card.php
2021-05-17 07:08:45 +02:00
Laurent Destailleur
0cc519a26d
Merge pull request #17622 from atm-maxime/fix/expense_id
...
Fix id of expense report must be before object fetch (HOT FIX)
2021-05-17 07:01:25 +02:00
Laurent Destailleur
428ab1b67a
Merge pull request #17626 from atm-maxime/fix/ticket
...
Fix ticket when module societe not enabled
2021-05-17 06:59:32 +02:00
Laurent Destailleur
c7fff29c54
Merge pull request #17623 from atm-maxime/fix/hrm_homepage
...
Fix HRM homepage
2021-05-17 06:58:57 +02:00
Laurent Destailleur
ea5d374f23
Update index.php
2021-05-17 06:57:21 +02:00
Laurent Destailleur
90d6f70bce
Comment
2021-05-17 06:54:39 +02:00
Laurent Destailleur
78b38f75a1
Minor fixes
2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590
Add comment
2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b
Add missing field
...
Fix duplicate / in url
2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
1fbd53993f
Fix missing substitutionarray on ticket presend
2021-05-16 19:07:36 +02:00
Maxime Kohlhaas
d3ff549b21
Fix ticket when module societe not enabled
2021-05-16 18:48:18 +02:00
Maxime Kohlhaas
d4aa0ae422
Update box_dolibarr_state_board.php
...
Global stats box is always enabled
2021-05-16 18:26:26 +02:00
Maxime Kohlhaas
78633ccb2b
Fix expensereport and recruitment homepages
2021-05-16 16:20:46 +02:00
Maxime Kohlhaas
240137b768
Fix HRM homepage
2021-05-16 16:04:19 +02:00
Aisuko
3aa40e97cb
Merge branch 'Dolibarr:develop' into develop
2021-05-16 13:56:01 +02:00
Maxime Kohlhaas
c820231363
Fix id of expense report must be before object fetch
2021-05-16 12:24:27 +02:00
Maxime Kohlhaas
7af0bda3a5
Update admin_extrafields_view.tpl.php
2021-05-16 11:33:07 +02:00
Maxime Kohlhaas
c8b725165e
Fix use img_picto in quick create dropdown
2021-05-16 11:16:07 +02:00
Maxime Kohlhaas
3c3613a71a
Fix missing quick create holiday and expense report
2021-05-16 11:06:49 +02:00
Maxime Kohlhaas
baf0dda19c
Fix missing load langs for my company info in user block
2021-05-16 10:52:51 +02:00
Maxime Kohlhaas
3859e7f00e
Fix translations on expensereport list
2021-05-16 10:49:00 +02:00
Maxime Kohlhaas
e5e317bae3
Fix entity was set to 0 on group creation
2021-05-16 09:58:34 +02:00
piernov
1cbe0e3f2d
Fix: properly set gid for Group LDAP synchro
...
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
2021-05-15 18:01:34 +02:00
piernov
beff175de1
Fix use login for User homedir in LDAP
...
posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a homedir.
Always set a homedir in LDAP for the User class even if user does not have a firstname by using the login instead.
Additionally on Linux the login is typically used for the home directory rather than the first name.
It also avoids having accentuated or other special characters (commonly found in names) in the home directory path.
2021-05-15 16:48:43 +02:00
piernov
014b34acc6
Fix default gid 65534 for User in LDAP
...
posixAccount objectclass (intended to be used with the uid/gid/homedir fields) requires a gid.
Always set a gid in LDAP for the User class even if the user does not belong to any group.
By default 65534 which corresponds to the nobody group on major distributions (incl. Debian).
2021-05-15 16:44:46 +02:00
Maxime Kohlhaas
db32f882e8
Fix use of DatePropal instead of Date
2021-05-15 07:45:04 +02:00
Anthony Berton
334f37052c
Update card.php
2021-05-15 02:36:56 +02:00
Anthony Berton
1d7765ce12
update phone and address in popup
2021-05-15 02:29:15 +02:00
Frédéric FRANCE
cff0b69ce0
avoid sql error with sql_mode=only_full_group_by
...
SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
2021-05-14 18:30:56 +02:00
Maxime Kohlhaas
acadef72c1
Fix use supplier relative discount in replenish order creation
2021-05-14 18:01:22 +02:00
stickler-ci
50d4d28c14
Fixing style errors.
2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a
FIX: Filter of the dates in the lists is lost
2021-05-14 13:50:12 +02:00
Francis Appels
009588e04d
fix implode on string for formproduct loadwarehouse
2021-05-14 11:02:55 +02:00
Laurent Destailleur
a9ddf2a5ad
Fix phpcs
2021-05-13 19:07:47 +02:00
Laurent Destailleur
d1f36ec20c
Fix phpcs
2021-05-13 15:45:47 +02:00
Ferran Marcet
c577d1c51e
FIX: Impossible to add multiple localtax2
2021-05-13 13:35:28 +02:00
stickler-ci
05ea8761a1
Fixing style errors.
2021-05-13 08:28:14 +00:00
ptibogxiv
b9336570ff
NEW report contact/adresses on credit note from invoice
...
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
2021-05-13 10:26:09 +02:00
stickler-ci
79b51baa3d
Fixing style errors.
2021-05-12 22:46:09 +00:00
Frédéric Bagnol
8d035f5ec2
Add soc in categories contacts list
2021-05-13 00:40:56 +02:00
Laurent Destailleur
5917a9f73e
Fix phpcs
2021-05-12 23:08:52 +02:00
Frédéric FRANCE
59e046112c
Merge remote-tracking branch 'upstream/develop' into completeTabHead
2021-05-12 22:57:23 +02:00
Laurent Destailleur
e471181089
css
2021-05-12 22:52:50 +02:00
Laurent Destailleur
097f493315
css
2021-05-12 22:43:47 +02:00
Laurent Destailleur
488f242e25
css
2021-05-12 22:42:10 +02:00
Laurent Destailleur
5e0f2f9781
Debug v14. Fix regression.
2021-05-12 22:35:21 +02:00
Laurent Destailleur
ba6e675273
css
2021-05-12 22:21:20 +02:00
Laurent Destailleur
19a203bd40
Fix amount of memberships
2021-05-12 22:09:06 +02:00
UT from dolibit
95a5e480a1
Update llx_00_c_country.sql
2021-05-12 21:55:31 +02:00
Laurent Destailleur
9eda9c1e21
Enhance setup
2021-05-12 19:55:16 +02:00
Laurent Destailleur
f504cbcec4
Fix log
2021-05-12 19:18:51 +02:00
Givriz
81d899947d
Update listevents.php
2021-05-12 18:41:41 +02:00
Laurent Destailleur
aa2d85276e
Debug v14
2021-05-12 18:38:22 +02:00
Frédéric FRANCE
23fe7d1b63
add sample completeTabHead
2021-05-12 18:29:56 +02:00
Laurent Destailleur
75bd440591
Trans
2021-05-12 18:29:02 +02:00
stickler-ci
ea0d860593
Fixing style errors.
2021-05-12 14:55:32 +00:00
Antonin MARCHAL
1bfcfc3a0c
rename Hook and moved it into LibStatut method
2021-05-12 16:55:03 +02:00
Laurent Destailleur
866c9d012f
Fix fetch for customer and vendor relative discount
2021-05-12 14:19:12 +02:00
Florian HENRY
394d43543d
fix: when only supplier module is ON top menu should be displayed
2021-05-12 12:04:50 +02:00
Laurent Destailleur
a665ff5bda
Copy-Paste works also for hidden fields
2021-05-12 11:51:39 +02:00
Laurent Destailleur
ce8c606132
Clean APIs
2021-05-12 11:04:22 +02:00
Quentin VIAL-GOUTEYRON
56d78cf12a
FIX missing town and zip filter in contract list sql request
2021-05-12 11:02:27 +02:00
Laurent Destailleur
cfded75d11
Debug v14
2021-05-12 09:27:04 +02:00
Laurent Destailleur
f334f2a255
Fix inventory
2021-05-12 09:22:49 +02:00
lmarcouiller
06c1817930
Update mailing-send script and mailling card
2021-05-12 09:21:28 +02:00
lmarcouiller
cd4583a841
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-12 09:08:19 +02:00
Laurent Destailleur
b8254186ce
Clean code
2021-05-12 09:07:36 +02:00
Laurent Destailleur
dd00feae00
Clean code
2021-05-12 08:57:06 +02:00
Laurent Destailleur
fac32ee913
Better performance
2021-05-12 08:54:36 +02:00
Laurent Destailleur
3ea6cd1c66
Fix missing columns
2021-05-12 08:53:29 +02:00
Laurent Destailleur
dd7ed720e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-12 00:01:04 +02:00
Laurent Destailleur
49f7f85762
Fix example
2021-05-12 00:00:51 +02:00
Laurent Destailleur
8971fde420
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 23:49:59 +02:00
Laurent Destailleur
f84817f0f6
FIX rss module on servers with allow_url_fopen=0
2021-05-11 23:49:33 +02:00
Aisuko Hakumei
8a4fd56b23
Fix SQL error for Panama Provinces
2021-05-11 22:54:26 +02:00
Laurent Destailleur
7454b8ff0b
Merge pull request #17581 from frederic34/patch-3
...
fix phpcs
2021-05-11 22:26:28 +02:00
Frédéric FRANCE
a948fc4ed8
Update extrafields.class.php
2021-05-11 22:12:15 +02:00
Laurent Destailleur
60dd26f21d
Fix do not lose selection if error
2021-05-11 22:10:40 +02:00
Frédéric FRANCE
4a735ccc4d
fix phpcs
2021-05-11 22:09:45 +02:00
Laurent Destailleur
3b0f79c3e2
Clean code
2021-05-11 21:46:19 +02:00
Laurent Destailleur
670b604d24
Clean code
2021-05-11 21:45:37 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields
...
Stock product card traceability fields
2021-05-11 21:40:50 +02:00
stickler-ci
b8a3485c4c
Fixing style errors.
2021-05-11 19:33:23 +00:00
Laurent Destailleur
b5a43c8d1d
FIX #17502
2021-05-11 21:31:43 +02:00
kastoras
cd9ea9566b
Change parameter name to MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE
2021-05-11 22:31:38 +03:00
kastoras
55caff1dd9
Merge remote-tracking branch 'origin/create_share_on_file_upload_with_other_setup' into develop
2021-05-11 22:23:12 +03:00
Laurent Destailleur
4ec763a436
Merge pull request #17497 from Hystepik/develop_v13#2
...
Fix #17491 : date extrafield filter works well now
2021-05-11 21:15:50 +02:00
Laurent Destailleur
91312f0411
Fix url for emailing unsubscribe
2021-05-11 21:13:52 +02:00
Laurent Destailleur
207aa8550a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-11 21:02:38 +02:00
Laurent Destailleur
dc2c5aa0a8
Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe
...
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/theme/eldy/global.inc.php
htdocs/theme/eldy/info-box.inc.php
2021-05-11 21:02:27 +02:00
Laurent Destailleur
5a81395ffa
Merge pull request #17474 from dolibit-ut/patch-318
...
Update llx_20_c_departements.sql
2021-05-11 20:51:35 +02:00
Laurent Destailleur
d576e56129
Merge pull request #17526 from daraelmin/daraelmin-V13-DarkMode-1
...
Fix #17114 dark display for enabled module in dark mode
2021-05-11 20:44:24 +02:00
Laurent Destailleur
8cf99448e1
Merge pull request #17523 from bb2a/warhouse_mod_stock_activ
...
Warehouse filter if stock activate and not sending
2021-05-11 20:43:28 +02:00
Laurent Destailleur
aa05788d62
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/class/account.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/security.lib.php
htdocs/core/modules/societe/mod_codeclient_elephant.php
htdocs/filefunc.inc.php
test/phpunit/CodingPhpTest.php
2021-05-11 20:34:46 +02:00
Laurent Destailleur
c0689b3884
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 20:18:36 +02:00
Laurent Destailleur
8dc1e1cb33
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-11 20:17:24 +02:00
Laurent Destailleur
3683461c40
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
.travis.yml
htdocs/societe/consumption.php
2021-05-11 20:17:15 +02:00
Laurent Destailleur
971d611eb6
Fix phpcs
2021-05-11 20:12:25 +02:00
Laurent Destailleur
63db00486d
Fix setup
2021-05-11 19:57:20 +02:00
Laurent Destailleur
b090516a73
Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy
...
Fix missing FORCEMORPHY in new member form setup
2021-05-11 19:52:35 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey
...
New substitution key for member new form url in mailing
2021-05-11 19:41:12 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete
...
bug fix - deletion of invoice supplier payment
2021-05-11 19:27:05 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode
...
uniformize supplier cards
2021-05-11 19:25:26 +02:00
Laurent Destailleur
6bec5d7e3c
Update document.php
2021-05-11 19:23:46 +02:00
Laurent Destailleur
70451050ae
Update contact.php
2021-05-11 19:22:46 +02:00
Laurent Destailleur
1c477d2131
Update card.php
2021-05-11 19:21:38 +02:00
Laurent Destailleur
bccd1b9a41
Update prelevement.php
2021-05-11 19:21:08 +02:00
Laurent Destailleur
74de4edc42
Merge pull request #17531 from daraelmin/daraelmin-patch-1
...
Fix vulnerability - Wrong permission in adherent card
2021-05-11 19:17:33 +02:00
Laurent Destailleur
0ff473aba7
Update card.php
2021-05-11 19:15:30 +02:00
Laurent Destailleur
fe21c318d4
Merge pull request #17534 from ibuiv/patch-8
...
Fix bug PMP per entity
2021-05-11 19:13:53 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity
...
add entity check on verif_dispo mod_codeclient_elephant
2021-05-11 19:13:17 +02:00
Laurent Destailleur
e3cb04e235
Merge pull request #17540 from ibuiv/ibuiv-supplierorder-hooks
...
New Hooks for Supplier Order Card tabs
2021-05-11 19:12:24 +02:00
Laurent Destailleur
a4f9025843
Merge pull request #17541 from fappels/14_debug_dispatch
...
Fix edit-delete from dispatch card when reception activated.
2021-05-11 19:03:18 +02:00
Laurent Destailleur
8024e769fd
Merge pull request #17552 from aspangaro/14b2
...
Fix Title customer proposal
2021-05-11 18:55:02 +02:00
Laurent Destailleur
fe4227d04d
Merge pull request #17546 from kastoras/fix_get_documents_response_problem
...
Fix #17545 /get /documents response data problem
2021-05-11 18:53:02 +02:00
Laurent Destailleur
3aac68d65b
Update ecmfiles.class.php
2021-05-11 18:52:49 +02:00
Laurent Destailleur
3cce99d706
Merge pull request #17548 from aspangaro/14b1
...
FIX Migration script
2021-05-11 18:50:43 +02:00
Laurent Destailleur
c37588025f
Update 13.0.0-14.0.0.sql
2021-05-11 18:50:02 +02:00
Laurent Destailleur
dce5ce66eb
Merge pull request #17563 from frederic34/filecheck
...
align filecheck code
2021-05-11 18:46:09 +02:00
Laurent Destailleur
e4aff1a97e
Merge pull request #17578 from frederic34/patch-4
...
fix php8 warning
2021-05-11 18:45:27 +02:00
Laurent Destailleur
fe9b6c0799
Merge pull request #17579 from frederic34/patch-5
...
fix $db in class
2021-05-11 18:45:01 +02:00
Laurent Destailleur
d4616ff0ac
Merge pull request #17549 from frederic34/patch-3
...
Delete files not needed
2021-05-11 18:44:34 +02:00
Laurent Destailleur
f5909be16f
Merge pull request #17551 from grandoc/new_branch_09_05_2021
...
comment translation
2021-05-11 18:43:31 +02:00
Frédéric FRANCE
dc90103526
Update document.php
2021-05-11 18:36:27 +02:00
Frédéric FRANCE
e0cc6a4981
fix $db in class
2021-05-11 18:34:43 +02:00
Frédéric FRANCE
23858f0ab1
fix php8 warning
2021-05-11 18:25:20 +02:00
Laurent Destailleur
5943f17b94
Merge pull request #17553 from aspangaro/14b3
...
Fix Title company card
2021-05-11 18:19:58 +02:00
Laurent Destailleur
f87f80b004
Merge pull request #17554 from aspangaro/14b4
...
Fix Title customer order
2021-05-11 18:19:11 +02:00
Laurent Destailleur
eab3ac0615
Merge pull request #17558 from aspangaro/14b6
...
Fix Title supplier proposal
2021-05-11 18:18:35 +02:00
Laurent Destailleur
22b1d87973
Merge pull request #17555 from andreubisquerra/develop
...
NEW DOL_VALUE_PLACE tag in TakePOS template
2021-05-11 18:17:01 +02:00
Laurent Destailleur
88ca25903d
Merge pull request #17559 from aspangaro/14b7
...
Fix Title supplier order
2021-05-11 18:15:02 +02:00
Laurent Destailleur
8a2a996595
Merge pull request #17562 from oscim/patch-42
...
Update card.php
2021-05-11 18:10:07 +02:00
Laurent Destailleur
ce8d6c77ed
Merge pull request #17565 from ksar-ksar/patch-4
...
FIX #13955
2021-05-11 18:09:14 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode
2021-05-11 18:09:05 +02:00
Frédéric FRANCE
0c997e4260
Merge remote-tracking branch 'upstream/develop' into filecheck
2021-05-11 18:06:17 +02:00
Frédéric FRANCE
4c77e07a1b
Merge remote-tracking branch 'upstream/develop' into filecheck
2021-05-11 18:04:04 +02:00
Laurent Destailleur
d98e046fbd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-11 18:02:37 +02:00
Laurent Destailleur
56b0b5a1f1
Merge pull request #17575 from frederic34/patch-12
...
fix php8 warning
2021-05-11 18:00:29 +02:00
Laurent Destailleur
1900e1cc54
Merge pull request #17567 from frederic34/patch-4
...
fix $mysoc not defined (php8 warning)
2021-05-11 17:59:50 +02:00
Laurent Destailleur
f2d70e2be0
Merge pull request #17571 from frederic34/patch-8
...
fix php8 warnings
2021-05-11 17:59:29 +02:00
Laurent Destailleur
8eae14fb01
Merge pull request #17572 from frederic34/patch-9
...
fix php8 warning
2021-05-11 17:59:14 +02:00
Laurent Destailleur
bea1b83e3f
Merge pull request #17570 from frederic34/patch-7
...
fix php8 warning
2021-05-11 17:58:59 +02:00
Laurent Destailleur
1294f6d912
Merge pull request #17573 from frederic34/patch-10
...
fix php8 warning
2021-05-11 17:58:41 +02:00
Laurent Destailleur
1c79b47147
Merge pull request #17574 from frederic34/patch-11
...
fix php8 warning
2021-05-11 17:58:17 +02:00
Laurent Destailleur
5178100c1d
Merge pull request #17569 from frederic34/patch-5
...
fix php8 warning
2021-05-11 17:58:07 +02:00
Laurent Destailleur
d8cbb735a3
Fix rtl language for pdf
2021-05-11 17:58:00 +02:00
Laurent Destailleur
c37ccc10b1
Debug v14
2021-05-11 14:50:04 +02:00
atm-lena
8fb474c687
Add Hook Extrafields Update - init extrafieldssdao
2021-05-11 11:35:54 +02:00
Laurent Destailleur
200c36836b
v14
2021-05-11 10:44:53 +02:00
Laurent Destailleur
73972bcbd0
More complete log
2021-05-11 10:30:46 +02:00
Frédéric FRANCE
eccfa40396
fix php8 warning
...
remove variables not used
2021-05-11 08:28:35 +02:00
Frédéric FRANCE
7e1ed07910
fix php8 warning
2021-05-11 08:26:03 +02:00
Frédéric FRANCE
0c8b74b54c
fix php8 warning
2021-05-11 08:20:31 +02:00
Frédéric FRANCE
da7f5e4626
fix php8 warning
2021-05-11 08:15:44 +02:00
Frédéric FRANCE
edad8cdf8f
Update card.php
2021-05-11 08:13:40 +02:00
Frédéric FRANCE
3c52636c22
fix php8 warnings
2021-05-11 08:09:56 +02:00
Frédéric FRANCE
9725c8f309
fix php8 warning
2021-05-11 08:05:30 +02:00
Frédéric FRANCE
c2de343b4e
fix php8 warning
2021-05-11 08:01:13 +02:00
Alexandre SPANGARO
44514475b6
Merge remote-tracking branch 'upstream/develop' into 14b2
2021-05-11 07:04:07 +02:00
Alexandre SPANGARO
461673d814
Merge remote-tracking branch 'upstream/develop' into 14b3
2021-05-11 07:03:43 +02:00
Alexandre SPANGARO
a67ab81b4d
Merge remote-tracking branch 'upstream/develop' into 14b4
2021-05-11 07:03:18 +02:00
Alexandre SPANGARO
427221c8d3
Merge remote-tracking branch 'upstream/develop' into 14b6
2021-05-11 07:02:04 +02:00
Alexandre SPANGARO
a830e498de
Merge remote-tracking branch 'upstream/develop' into 14b7
2021-05-11 07:01:39 +02:00
Frédéric FRANCE
20724efd44
fix $mysoc not defined (php8 warning)
2021-05-11 00:04:11 +02:00
Laurent Destailleur
b01e795723
Fix of build package
2021-05-10 21:28:11 +02:00
Laurent Destailleur
837c828b1d
Prepare 13.0.3
2021-05-10 21:06:48 +02:00
Laurent Destailleur
d7a5e342ab
Optimize some widgets
2021-05-10 20:16:51 +02:00
Laurent Destailleur
f8581a1a01
Look and feel v14
2021-05-10 19:33:45 +02:00
Laurent Destailleur
1ca73e609c
Clean code
2021-05-10 19:26:47 +02:00
Laurent Destailleur
23d19a8af3
Fix permissions
2021-05-10 19:20:17 +02:00
Laurent Destailleur
73f63509e3
Fix permissions
2021-05-10 19:12:03 +02:00
Dorian Vabre
1e90e618f0
wip filter
2021-05-10 17:25:00 +02:00
Dorian Vabre
e31d8f89f5
wip filter
2021-05-10 17:13:57 +02:00
Dorian Vabre
c85b75924f
wip on adding a filter for the ics file + fix on class name
2021-05-10 16:57:48 +02:00
Dorian Vabre
48bbb500d3
fix on replacing thirdparty in attendees when merging multiple thirdparties
2021-05-10 16:25:44 +02:00
Dorian Vabre
bf25fd0834
confattendee merge OK to replace thirdparty
2021-05-10 16:04:13 +02:00
Dorian Vabre
f6956d6a62
using validate() function instead of settStatut(1) to validate an attendee
2021-05-10 15:58:54 +02:00
Dorian Vabre
7d0c3dcf6d
transition done from cookies to session
2021-05-10 15:50:29 +02:00
ksar
107374748e
FIX #13955
2021-05-10 15:42:24 +02:00
Dorian Vabre
d71dc37a75
fix
2021-05-10 15:39:39 +02:00
Dorian Vabre
ee4e8dd99f
cookies to session transition
2021-05-10 15:37:25 +02:00
Dorian Vabre
c5dc20b9dc
opti
2021-05-10 15:31:52 +02:00
Laurent Destailleur
6499270619
v14
2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f
Fix look and feel v14
2021-05-10 15:24:07 +02:00
Frédéric FRANCE
81008fa0da
greenlight
2021-05-10 14:39:40 +02:00
Frédéric FRANCE
0d3afb573a
align check code
2021-05-10 14:33:26 +02:00
stickler-ci
b9bdd9ed8a
Fixing style errors.
2021-05-10 12:13:50 +00:00
oscim
dfe0ccee45
Update card.php
...
Add hook for block boxstats in fourn card
2021-05-10 14:10:54 +02:00
Dorian Vabre
0e62edfd42
fix error on fetching thirdparty when there is none
2021-05-10 12:47:09 +02:00
Laurent Destailleur
a2cd181435
FIX Debug reception module
2021-05-10 11:53:19 +02:00
Laurent Destailleur
ed18045807
FIX The comment of a reception was not correctly managed
2021-05-10 11:30:37 +02:00
lmarcouiller
d293be56ce
Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2
2021-05-10 10:41:56 +02:00
Dorian Vabre
0dce9ee359
now using correct email templates after booth/conf suggestion
2021-05-10 10:22:45 +02:00
Francis Appels
cd8c71497d
replace deprecated warehouse 'libelle'
2021-05-10 10:10:30 +02:00
Dorian Vabre
d86b393d60
useless line removed
2021-05-10 09:54:26 +02:00
Gauthier PC portable 024
f9afe7e81a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail
2021-05-10 09:17:15 +02:00
Alexandre SPANGARO
7993e4634a
Fix Title supplier order info card
2021-05-10 07:01:24 +02:00
Alexandre SPANGARO
eccd883156
Fix Title supplier order document card
2021-05-10 06:54:17 +02:00
Alexandre SPANGARO
db50f8c27b
Fix Title supplier order note card
2021-05-10 06:49:49 +02:00
Alexandre SPANGARO
9f0cdb0153
Fix Title supplier order contact card
2021-05-10 06:48:27 +02:00
Alexandre SPANGARO
1f00689831
Fix Title supplier order card
2021-05-10 06:46:07 +02:00
Alexandre SPANGARO
6089332a2b
Fix Title supplier proposal document card
2021-05-10 06:40:14 +02:00
Alexandre SPANGARO
7a105a054a
Fix Title supplier proposal info card
2021-05-10 06:40:01 +02:00
Alexandre SPANGARO
d66d38a846
Fix Title supplier proposal note card
2021-05-10 06:36:22 +02:00
Alexandre SPANGARO
100b0f297e
Fix Title supplier proposal contact card
2021-05-10 06:32:28 +02:00
Alexandre SPANGARO
c0062e2d41
Move title to v14 ergonomy
2021-05-10 06:26:58 +02:00
Alexandre SPANGARO
7e44494a98
Fix Title supplier proposal card
2021-05-10 06:24:30 +02:00
stickler-ci
3ee26fc881
Fixing style errors.
2021-05-09 21:37:58 +00:00
andreubisquerra
8aa8c14323
Fix
2021-05-09 22:53:05 +02:00
Alexandre SPANGARO
14d743db1e
Fix Title customer order sendings card
2021-05-09 22:41:52 +02:00
Alexandre SPANGARO
e5d0999073
Fix Title customer order info card
2021-05-09 22:37:05 +02:00
andreubisquerra
5a5811a716
NEW DOL_VALUE_PLACE tag in TakePOS template
...
Very important in restaurant orders
2021-05-09 22:37:00 +02:00
Alexandre SPANGARO
7ad4f13036
Fix Title customer order documents card
2021-05-09 22:36:02 +02:00
Alexandre SPANGARO
a908d302b2
Fix Title customer order note card
2021-05-09 22:33:37 +02:00
Alexandre SPANGARO
222c1d9b89
Fix Title customer order contact card
2021-05-09 22:31:46 +02:00
Alexandre SPANGARO
c8e30203f8
Fix Title customer order card
2021-05-09 22:31:33 +02:00
Alexandre SPANGARO
09674359d5
Fix Title company payment information card
2021-05-09 22:23:15 +02:00
Laurent Destailleur
19bae333c9
Add option MAIN_SHOW_PASSWORD_INTO_LOG
2021-05-09 22:07:08 +02:00
Alexandre SPANGARO
6e9597cd90
Fix Title company customer card
2021-05-09 22:06:05 +02:00
Alexandre SPANGARO
7bd5306ae5
Fix Title company contact card
2021-05-09 22:04:53 +02:00
Alexandre SPANGARO
c2319c0a20
Fix Title customer proposal info card
2021-05-09 21:19:13 +02:00
Alexandre SPANGARO
9cec7e5936
Fix Title customer proposal documents card
2021-05-09 21:15:54 +02:00
Alexandre SPANGARO
dbccb75294
Fix Title customer proposal notes card
2021-05-09 21:13:29 +02:00
Alexandre SPANGARO
dd76ff0f24
Fix Title customer proposal contact card
2021-05-09 21:11:14 +02:00
Alexandre SPANGARO
2dc2256545
Fix Title customer proposal card
2021-05-09 21:08:55 +02:00
Frédéric FRANCE
3b13c4a269
fix syntax error
2021-05-09 21:03:39 +02:00
Frédéric FRANCE
fe2f22a024
Merge remote-tracking branch 'upstream/develop' into uniformizecode
2021-05-09 21:01:46 +02:00
Laurent Destailleur
a349f6c6e7
Fix hide a non ready feature
2021-05-09 20:30:42 +02:00
Laurent Destailleur
1fb5b0f681
Fix rtl languages
2021-05-09 20:25:57 +02:00
Laurent Destailleur
3ad8827c8a
Clean code
2021-05-09 20:17:17 +02:00
Philippe GRAND
1e844a78a6
comment translation
2021-05-09 16:46:38 +02:00
Laurent Destailleur
8cc100012d
Fix vulnerabiity: External users can set a public note
2021-05-09 12:50:46 +02:00
Frédéric FRANCE
20cbc9a36f
Delete ChangeLog.md
2021-05-09 09:02:45 +02:00
Frédéric FRANCE
a848fb65b6
Delete COPYING
2021-05-09 09:02:01 +02:00
Alexandre SPANGARO
c81b4f8c31
FIX Migration script
2021-05-09 08:31:36 +02:00
stickler-ci
db9c423794
Fixing style errors.
2021-05-08 20:07:12 +00:00
kastoras
6fa85efd0f
Fix/FIX #17545 get documents, false data problem
...
Fix on getting wrong data for products comparing with like operator
2021-05-08 23:03:08 +03:00
antonin_tdj
60671f1c78
Merge pull request #1 from ibuiv/ibuiv-develop
...
Ibuiv develop
2021-05-08 15:55:15 +02:00
UT from dolibit
c64fec53e2
Update llx_20_c_departements.sql
...
so now fixed
2021-05-08 15:26:52 +02:00
John BOTELLA
2fda3b1b46
FIX ; var case
...
On this page $datePrint is not used but $dateprint yes
2021-05-08 13:53:20 +02:00
Francis Appels
7101c2445d
Fix dispatch, only edit received lines on draft reception.
...
No stock movement on reception.
2021-05-08 12:42:58 +02:00
Antonin MARCHAL
44e49e7161
git commit duplication
2021-05-08 11:46:32 +02:00
Antonin MARCHAL
a6267a8ade
add (hooks) init hooks on all tabs for supplier order
2021-05-08 11:43:46 +02:00
Alexis LAURIER
e4a430f638
add entity check on verif_dispo mod_codeclient_elephant
2021-05-08 10:24:08 +02:00
daraelmin
22d9c4c166
Update card.php
2021-05-08 09:35:41 +02:00
daraelmin
2e1158934b
Copyright
2021-05-08 09:20:59 +02:00
daraelmin
33d68db9a1
add entity in new subst publiclink_newmemberform
2021-05-08 09:18:41 +02:00
Alexis LAURIER
d04c741a3b
add payment_fourn delete proper check into security.lib
2021-05-08 09:12:17 +02:00
stickler-ci
fc26e5eecf
Fixing style errors.
2021-05-07 20:42:53 +00:00
kastoras
1a385052f6
New Create share link on file upload
...
Create MAIN_CREATE_SHARE_ON_FILE_UPLOAD, when this set to 1 and a file is uploaded a shared link will be created
2021-05-07 23:39:14 +03:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards
2021-05-07 21:28:35 +02:00
antonin_tdj
35c8bb6b29
fix bug PMP per entity
...
wrong alias in SQL query
2021-05-07 18:28:30 +02:00
Laurent Destailleur
907ea1a8bd
Fix sql error
2021-05-07 18:21:11 +02:00
Dorian Vabre
058bef1a79
clean viewandvote page
2021-05-07 17:20:36 +02:00
daraelmin
7c27e9f931
too much underscore
2021-05-07 17:19:33 +02:00
daraelmin
bfac47c84e
Too much underscore
2021-05-07 17:16:58 +02:00
daraelmin
a75d6e9050
Add tooltip
2021-05-07 17:14:33 +02:00
daraelmin
0173d8db5f
Add substitution key for membernewform url in mailing
2021-05-07 17:09:59 +02:00
Antonin MARCHAL
a91d1b2e07
add(list) hook
2021-05-07 17:09:39 +02:00
Antonin MARCHAL
c6d646f39e
add(prop)list
2021-05-07 17:08:36 +02:00
Antonin MARCHAL
9ab12e2455
add (getNomUrl)
2021-05-07 17:06:53 +02:00
daraelmin
2c8da5703f
Fix Wrong test for permission in adherent car
2021-05-07 16:52:44 +02:00
Dorian Vabre
05bbb3dbf6
improved welcome msg on suggestbooth/conf pages
2021-05-07 16:39:03 +02:00
Dorian Vabre
c48234409b
added copyright
2021-05-07 16:15:13 +02:00
Dorian Vabre
d344ce5e08
clean viewandvote page
2021-05-07 15:59:25 +02:00
lmarcouiller
f054169036
revert of last push error of branch
2021-05-07 15:56:33 +02:00
Laurent Destailleur
97ca6895d8
Missing profid1 and 2 in get API
2021-05-07 15:50:07 +02:00
lmarcouiller
0466704dc7
Fix #17477 : Sql error in invoices cards
2021-05-07 15:49:49 +02:00
altairis-noe
61f8a03df6
commisionning_date out, we said
2021-05-07 15:41:48 +02:00
altairis-noe
6d92eb2e84
little correction
2021-05-07 15:38:46 +02:00
altairis-noe
8e61fc44fa
traceability must be a choice and we’ll see later about commisioning date
2021-05-07 15:34:11 +02:00
Dorian Vabre
dfd3742d91
fix on label on payment page
2021-05-07 15:33:00 +02:00
lmarcouiller
bf64bde571
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-07 15:22:10 +02:00
Anthony Berton
fa73fde312
phone_head_document
2021-05-07 15:12:23 +02:00
Laurent Destailleur
1cf46f9ae9
cast int
2021-05-07 15:11:28 +02:00
Dorian Vabre
dbde0f0b02
fix on status change when a booth is paid
2021-05-07 15:05:37 +02:00
Dorian Vabre
6111f43946
security fix, id was encoded where it should not be encoded
2021-05-07 14:49:00 +02:00
Dorian Vabre
2169a106fa
note is now saved in database
2021-05-07 14:34:29 +02:00
daraelmin
61786d328f
Update members.lang
2021-05-07 14:09:35 +02:00
Laurent Destailleur
ff14d2817d
css
2021-05-07 14:08:39 +02:00
daraelmin
c61383baf7
Update members.lang
2021-05-07 14:04:55 +02:00
stickler-ci
cbac815c66
Fixing style errors.
2021-05-07 11:56:20 +00:00
daraelmin
bd35b9aad2
Fix missing FORCEMORPHY in new member form setup
2021-05-07 13:54:53 +02:00
daraelmin
cb793cb762
Fix #17114 dark display for enabled module in dark mode
2021-05-07 13:19:02 +02:00
daraelmin
078f586299
@daraelmin Add enabled module color in var
2021-05-07 13:15:22 +02:00
Dorian Vabre
5bb100de29
conforbooth class required in paymentok to confirm the booth
2021-05-07 13:02:34 +02:00
Laurent Destailleur
31f63442f8
Merge pull request #17516 from bb2a/filter_warehouse_users_liste
...
Filter on warehouse users liste
2021-05-07 12:24:51 +02:00
Laurent Destailleur
9c23a449ba
Merge pull request #17515 from frederic34/patch-4
...
remove declaration already in commonobject
2021-05-07 12:24:24 +02:00
Dorian Vabre
27cffbddf3
vote page ok
2021-05-07 12:21:15 +02:00
Laurent Destailleur
8a4661fb6c
Merge pull request #17517 from frederic34/patch-5
...
fix mulitple module using completeTabsHead
2021-05-07 12:13:01 +02:00
lmarcouiller
b41a87ff70
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-07 12:06:46 +02:00
Laurent Destailleur
b7686f4bab
Merge pull request #17524 from daraelmin/daraelmin-patch-newmemberform
...
Fix public new member form use adh type amount
2021-05-07 12:04:30 +02:00
Laurent Destailleur
44f81ef242
Merge pull request #17514 from frederic34/patch-3
...
phpcs
2021-05-07 12:01:47 +02:00
Laurent Destailleur
cc79fc6eee
Lang
2021-05-07 11:30:27 +02:00
stickler-ci
d108496c67
Fixing style errors.
2021-05-07 07:47:49 +00:00
lmarcouiller
c39dbd81b3
Fix #17491 : Update of fix date extrafield filter
2021-05-07 09:47:15 +02:00
lmarcouiller
5dcdb06e91
Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2
2021-05-07 09:46:37 +02:00
lmarcouiller
f4291dc985
commit missing file
2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d
Fix #17475 : Update of previous fix
2021-05-07 09:19:44 +02:00
Laurent Destailleur
5dfa18758c
CSS
2021-05-07 01:36:59 +02:00
daraelmin
6504f96188
Copyright
2021-05-07 00:43:01 +02:00
stickler-ci
949e797390
Fixing style errors.
2021-05-06 22:31:41 +00:00
daraelmin
912995a558
Create new.php
2021-05-07 00:28:03 +02:00
daraelmin
9af05f3c6e
Update new.php
2021-05-07 00:25:38 +02:00
daraelmin
2e2b6af98e
Update new.php
2021-05-07 00:23:46 +02:00
daraelmin
82bf9cd3e9
Fix public new member form use adh type amount
2021-05-07 00:13:49 +02:00
Anthony Berton
d84b0bae9d
init
2021-05-06 23:23:50 +02:00
Frédéric FRANCE
a56dc4ff65
fix mulitple module using completeTabsHead
...
complete $template['head'] in module and return 0 to not replace instead return $head and replace
2021-05-06 22:28:03 +02:00
Anthony Berton
7b0d0805f2
Update list.php
2021-05-06 22:14:45 +02:00
Anthony Berton
842268df10
Update list.php
2021-05-06 22:11:41 +02:00
Laurent Destailleur
e791f9b863
Debug MRP feature
2021-05-06 21:34:59 +02:00
Laurent Destailleur
36d50c940a
Clean code
2021-05-06 21:21:11 +02:00
Laurent Destailleur
589370496a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-06 21:15:32 +02:00
Laurent Destailleur
a7649a5bc2
Trans
2021-05-06 21:15:20 +02:00
Laurent Destailleur
f655cab5eb
Clean code
2021-05-06 21:11:39 +02:00
Frédéric FRANCE
f377b8129a
remove declaration already in commonobject
2021-05-06 21:06:25 +02:00
Frédéric FRANCE
4ef53234f1
Update partnership.class.php
2021-05-06 20:39:36 +02:00
Frédéric FRANCE
7897469963
Update account.class.php
2021-05-06 20:34:45 +02:00
Frédéric FRANCE
7b8d4c2656
phpcs
2021-05-06 20:32:41 +02:00
Laurent Destailleur
48a1e5c75e
Merge pull request #17499 from bb2a/trigger_update_thirpartie
...
Add events trigger update Thirparty and Contact
2021-05-06 19:14:02 +02:00
Laurent Destailleur
457050f1c5
Add pen to edit dictionary
2021-05-06 18:45:20 +02:00
Laurent Destailleur
b8b6919cb0
Fix label of dictionaries
2021-05-06 18:41:27 +02:00
Laurent Destailleur
3e34557066
Clean code
2021-05-06 18:36:02 +02:00
Laurent Destailleur
6159321bed
NEW Show picto of module into the list of dictionaries
2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b
Clean code
2021-05-06 18:06:19 +02:00
Noé Cendrier
b608038370
Merge branch 'develop' into productcard_traceability_fields
2021-05-06 17:41:11 +02:00
Dorian Vabre
166e15633b
factorisation
2021-05-06 17:30:11 +02:00
Laurent Destailleur
6019df2dfc
Merge branch 'batch_status_dict' of
...
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict
# Conflicts:
# htdocs/langs/fr_FR/productbatch.lang
2021-05-06 17:29:41 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master
...
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
2021-05-06 17:20:46 +02:00
Laurent Destailleur
d5c737ddb6
Update modTakePos.class.php
2021-05-06 17:19:28 +02:00
Laurent Destailleur
bd5e141d26
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/societe/consumption.php
2021-05-06 17:07:44 +02:00
Laurent Destailleur
3090c124f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-06 16:59:06 +02:00
Laurent Destailleur
8410f4a9c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/societe/consumption.php
htdocs/user/class/user.class.php
2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/consumption.php
2021-05-06 16:52:36 +02:00
Laurent Destailleur
0daab6a55a
Code comment
2021-05-06 16:50:22 +02:00
Laurent Destailleur
a26d00428e
Merge pull request #17444 from Hystepik/develop_v13#1
...
Fix #17361 : change of llx_export_model type to varchar(64)
2021-05-06 16:48:46 +02:00
Dorian Vabre
2e7d5e6d46
Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
2021-05-06 16:48:30 +02:00
Laurent Destailleur
b7601cb662
Merge pull request #17496 from daraelmin/daraelmin-patch-4
...
Fix amnt can be paid for member as membersubscription
2021-05-06 16:47:41 +02:00
Laurent Destailleur
824a601014
Merge pull request #17507 from atm-john/11.0_fix_search_accent_in_description
...
FIX : search accented words in product description (consumption page)
2021-05-06 16:45:21 +02:00
Laurent Destailleur
98a4f603f2
Complete merge of thirdparty into API
2021-05-06 16:41:06 +02:00
Laurent Destailleur
0dbd68564c
Merge pull request #17493 from FHenry/13_fix_bank_url_merge_account
...
FIX: merge thirparty also work for bank URL entry
2021-05-06 16:39:13 +02:00
Laurent Destailleur
7386a223e8
Update account.class.php
2021-05-06 16:38:34 +02:00
Laurent Destailleur
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2
...
New 5 substitutions keys "online payment link" in mailing
2021-05-06 16:36:10 +02:00
Dorian Vabre
295c63468b
wip vote page
2021-05-06 16:32:39 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment
...
new: working on conference or booth object and event type #FoundationFunding
2021-05-06 16:31:30 +02:00
Laurent Destailleur
0867be4af5
Merge pull request #17513 from dolibit-ut/patch-320
...
Update modules_member.class.php
2021-05-06 16:27:45 +02:00
Laurent Destailleur
475ed369ed
Merge pull request #17490 from marc-dll/FIX_develop_expense_report_db_field
...
FIX: expense report: column last_main_doc forgotten in v14 migration script
2021-05-06 16:27:01 +02:00
lmarcouiller
7d649dd90e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-06 16:26:30 +02:00
Laurent Destailleur
864c2a0bf7
Merge pull request #17506 from atm-gauthier/FIX_column_adding_management_in_dom_added_with_ajax_case
...
FIX : if dom is added with ajax, selector needs to keep working
2021-05-06 16:24:26 +02:00
Laurent Destailleur
9ce23ac6b2
Merge pull request #17494 from atm-john/fix_not_enabled_email_template
...
FIX saving template email
2021-05-06 16:22:19 +02:00
Laurent Destailleur
5a927702c0
Merge pull request #17500 from fmarcet/develop
...
NEW: Add import on BOM
2021-05-06 16:21:09 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership
...
Dolibarr partnership
2021-05-06 16:11:13 +02:00
Laurent Destailleur
4c20aa6a60
Merge pull request #17485 from kastoras/add_pagination_to_get_products
...
Close #17484 Add pagination to get products
2021-05-06 16:05:06 +02:00
UT from dolibit
9cd78e6ecf
Update modules_member.class.php
2021-05-06 16:00:49 +02:00
Laurent Destailleur
a0f85044fc
Merge pull request #17510 from Hystepik/develo#2
...
Fix #17501 : Undownloable attached file
2021-05-06 16:00:20 +02:00
Laurent Destailleur
21ce99338b
Merge pull request #17504 from FHenry/13.0
...
fix missing token
2021-05-06 15:57:45 +02:00
Laurent Destailleur
04ac12b477
Merge pull request #17508 from dolibit-ut/patch-319
...
Update llx_00_c_country.sql
2021-05-06 15:57:17 +02:00
Anthony Berton
2615a1f152
Update list.php
2021-05-06 15:34:45 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields
2021-05-06 15:21:48 +02:00
altairis-noe
c1b5d26ca0
reconcile before PR - second take
2021-05-06 15:20:49 +02:00
altairis-noe
b979fad859
reconcile before PR
2021-05-06 15:19:29 +02:00
Dorian Vabre
2f7dd4e807
wip vote page
2021-05-06 14:53:23 +02:00
altairis-noe
2bdea3732d
days in lifetime trans
2021-05-06 14:52:48 +02:00
Dorian Vabre
a00c9c44c3
now adding contact to conforbooth, not only to thirdparty
2021-05-06 14:26:41 +02:00
Dorian Vabre
9c20e92e17
country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change
2021-05-06 14:06:53 +02:00
Dorian Vabre
abeb1c644c
country now only required when paying a booth, dates of start and end required
2021-05-06 13:50:13 +02:00
Dorian Vabre
4d8d94bfbf
fixes: show only correspond button on specific page, id no longer encoded in hidden parameter
2021-05-06 12:13:49 +02:00
Dorian Vabre
c56c7afa89
update on specifications on suggesting a booth/conf since its now two separated pages
2021-05-06 11:59:24 +02:00
Dorian Vabre
df78aaff88
now 2 distinct pages to suggest a conf or a booth
2021-05-06 11:49:00 +02:00
Dorian Vabre
099ad77d44
encryption change for url
2021-05-06 11:32:07 +02:00
Dorian Vabre
10c9e9b77c
wip
2021-05-06 11:31:23 +02:00
Dorian Vabre
a68a7c1f67
wip
2021-05-06 11:27:48 +02:00
Dorian Vabre
4c50d210dd
creation of the 3 main pages
2021-05-06 11:26:42 +02:00
Laurent Destailleur
6f4e151b91
Fix permissions
2021-05-06 11:25:46 +02:00
Laurent Destailleur
644079ff00
Fix sql
2021-05-06 11:18:35 +02:00
altairis-noe
7c53e2bb18
too much td
2021-05-06 11:16:22 +02:00
altairis-noe
cce132b8da
one more space
2021-05-06 10:04:54 +02:00
altairis-noe
435cbcd16c
spaces after !
2021-05-06 10:01:53 +02:00
altairis-noe
8a108ae5e8
qcstatus out of formproduct and corrections in syntax
2021-05-06 09:59:33 +02:00
lmarcouiller
d55309c847
fix rename file
2021-05-06 09:46:54 +02:00
UT from dolibit
6b89b99dfd
Update llx_00_c_country.sql
2021-05-05 23:07:52 +02:00
Laurent Destailleur
19f78b2e8f
More compact gui
2021-05-05 19:13:40 +02:00
ATM john
63292255cc
Fix search accented words in product description
2021-05-05 18:45:23 +02:00
altairis-noe
5be2bdd123
qcstatus is not for this branch
2021-05-05 18:01:47 +02:00
altairis-noe
b1a4031bde
no qcstatus in productlot class
2021-05-05 17:47:01 +02:00
Gauthier PC portable 024
9108651a7a
FIX : if dom is added with ajax, selector need to keep working
2021-05-05 17:25:12 +02:00
Florian HENRY
adc8620506
fix: allow webdavs link type
2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7
fix missing token
2021-05-05 17:05:51 +02:00
altairis-noe
94e485aa06
qc_frequency in days and qcstatus elsewhere
2021-05-05 16:56:25 +02:00
lmarcouiller
020ad5aebe
Add endofline in errors.lang
2021-05-05 16:49:51 +02:00
lmarcouiller
6589bab20a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f
Fix #17501 : Undownloable attached file
2021-05-05 16:48:04 +02:00
Ferran Marcet
6f66efacb8
New: Add import on BOM
2021-05-05 13:47:43 +02:00
