Laurent Destailleur
1f8361ea9e
Tooltip
2019-11-25 21:02:26 +01:00
Frédéric FRANCE
d280eef1e0
Update expensereport_rules.php
2019-11-25 20:12:51 +01:00
Laurent Destailleur
712ae48e4e
Fix default setup
2019-11-24 18:07:38 +01:00
Laurent Destailleur
24bb345ee1
Fix bad name of function
2019-11-22 15:35:19 +01:00
Laurent Destailleur
1ed2eacbef
Debug add email profile
2019-11-22 12:40:17 +01:00
Laurent Destailleur
6191307865
Debug v11
2019-11-22 12:22:27 +01:00
Laurent Destailleur
2f2ac90fbf
Try to disable autocomplete
2019-11-21 21:35:16 +01:00
Laurent Destailleur
c9b79c8aa1
Fix norsh
2019-11-21 20:07:22 +01:00
Laurent Destailleur
ab7c5a7575
Fix connectstring imap
2019-11-21 19:12:25 +01:00
Laurent Destailleur
6ef01a09f3
Fix error management
2019-11-21 18:51:26 +01:00
Laurent Destailleur
f9045aa412
Fix var not defined
2019-11-21 18:39:41 +01:00
Scrutinizer Auto-Fixer
cd7523318d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00:00
Laurent Destailleur
ae0fdf014f
Debug email collector. Missing unique key. Fix initial setup.
2019-11-18 11:55:22 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
411e9c87e3
Debug feature to set sender profiles
2019-11-14 11:53:28 +01:00
Laurent Destailleur
52787b56b2
Fix when limit = 0
...
Look and feel v11
2019-11-14 11:00:49 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Laurent Destailleur
f65ce1d5d0
Fix var not declared
2019-11-12 10:17:46 +01:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
812d0af1d9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Scrutinizer Auto-Fixer
0b406172fd
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-07 11:59:59 +00:00
Laurent Destailleur
2aac4b382f
Merge pull request #12372 from OPEN-DSI/fix-admin-dict-transkey-not-defined
...
FIX var transkey not defined in input hidden
2019-11-07 12:56:21 +01:00
Laurent Destailleur
f29a176423
Merge pull request #12357 from frederic34/patch-19
...
can't edit socialnetwork dict
2019-11-07 11:41:57 +01:00
VESSILLER
146fa461c1
FIX var transkey not defined in input hidden
2019-11-07 11:36:17 +01:00
Frédéric FRANCE
6bd90b7e0a
can't edit socialnetwork dict
2019-11-06 07:29:43 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
204475efb9
Removed deprecated file
2019-11-05 19:10:29 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
2f05d79352
Merge pull request #12333 from frederic34/patch-14
...
missing newtoken
2019-11-05 10:06:06 +01:00
Laurent Destailleur
c84a17f58a
Merge pull request #12332 from frederic34/patch-13
...
missing newtoken
2019-11-05 10:05:31 +01:00
Frédéric FRANCE
c6c7d1f5e1
missing newtoken
2019-11-04 23:08:00 +01:00
Frédéric FRANCE
5d2386228b
missing newtoken
2019-11-04 23:04:30 +01:00
Frédéric FRANCE
77b05553d4
Update agenda_reminder.php
2019-11-04 23:02:43 +01:00
Frédéric FRANCE
96556dfd04
missing newtoken
2019-11-04 23:01:28 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Frédéric FRANCE
6ad983bb7b
Merge remote-tracking branch 'upstream/develop' into escpos
2019-11-04 18:52:29 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Laurent Destailleur
1f6a86e166
Fix look and feel v11
2019-11-04 13:32:34 +01:00
Laurent Destailleur
e2bae297ea
Look and feel v11
2019-11-04 13:27:01 +01:00
Laurent Destailleur
8aa2fd04ad
NEW The integrity checker now show the expected size of files
2019-11-04 13:23:48 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Frédéric FRANCE
5a3347104f
rework an experimental module
2019-11-03 12:57:06 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module
2019-11-03 00:50:58 +01:00
Frédéric FRANCE
59b30b9cec
wip ticket printer
2019-11-02 21:15:48 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
02ebbf17e9
Merge pull request #12250 from oscim/patch-8
...
Update modulehelp.php
2019-11-02 13:42:11 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
58ffb73627
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
5785cd101a
Merge pull request #12293 from frederic34/patch-18
...
Update translation.php
2019-11-02 11:41:55 +01:00
Frédéric FRANCE
e191dd7cc0
$key is overwriting a variable from outer foreach loop
2019-11-02 11:39:32 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Frédéric FRANCE
e98619745f
Update translation.php
2019-11-01 16:27:30 +01:00
Frédéric FRANCE
12b6e4fae6
Update translation.php
...
Are you sure the usage of print_barre_liste($title... '', 0, '', '', $limit) is correct as it seems to always return null.
2019-11-01 16:25:22 +01:00
Frédéric FRANCE
ec05e8e2c5
$key is overwriting a variable from outer foreach loop
2019-11-01 16:13:40 +01:00
Laurent Destailleur
135e65c4aa
Look and feel v11
...
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Laurent Destailleur
b8803fa8df
Work on MO
2019-10-31 22:56:08 +01:00
Laurent Destailleur
716c2bb531
Work on MO
2019-10-31 22:46:34 +01:00
Laurent Destailleur
f98df3c807
NEW Can edit link to the translation page in website module
2019-10-31 21:09:33 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Laurent Destailleur
645390c990
Work on BOM templates
2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
Laurent Destailleur
4ea69abd89
Merge pull request #12249 from oscim/patch-7
...
Update modulehelp.php
2019-10-30 02:44:32 +01:00
stickler-ci
9cfa20480f
Fixing style errors.
2019-10-29 10:18:10 +00:00
oscim
490ab95dfa
Update modulehelp.php
...
add function modulehelp_prepare_head
2019-10-29 11:12:27 +01:00
oscim
253e1530c1
Update modulehelp.php
...
how not loaded module hidden. If module is hidden, it is not link to display in modulehelp.
except in a specific context defined by the developer. In this case, this ligen blocks the information display capability of the module.
2019-10-29 10:45:57 +01:00
stickler-ci
f0f61ff0fe
Fixing style errors.
2019-10-29 09:41:47 +00:00
oscim
eb73459899
Update modulehelp.php
...
if module is not loaded, or not found, the $objMod display is last $objMod loaded but not this id for display
2019-10-29 10:39:15 +01:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
18aa03defe
Remove not used dangerous code
2019-10-23 15:14:20 +02:00
Laurent Destailleur
1c6df393a7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/supplier/index.php
2019-10-22 02:41:10 +02:00
Laurent Destailleur
6205913056
FIX CVE-2019-17578 CVE-2019-17577 CVE-2019-17576
2019-10-22 02:35:54 +02:00
Laurent Destailleur
b21bca17de
Add button Save and stay when editing property of web site
2019-10-21 00:55:52 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37:18 +02:00
Laurent Destailleur
e550acc688
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-20 13:22:38 +02:00
Laurent Destailleur
bf1b2242ea
Fix no focus if we are on edit mode directly
2019-10-20 13:22:29 +02:00
Frédéric FRANCE
360bf55f5b
clean indent
2019-10-20 01:09:11 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
de396dc9b3
Clean code for order of modules
2019-10-17 19:21:30 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
12f1962085
Better error message when module file is corrupted
2019-10-16 00:40:42 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Laurent Destailleur
ef09da8794
Fix CSRF check
2019-10-14 11:45:13 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-11 16:44:25 +02:00
Laurent Destailleur
7ce01c5ceb
Look and feel v11
2019-10-11 14:42:55 +02:00
Laurent Destailleur
60395f2a9c
NEW Look and feel v11: Some setup pages are by default on edit mode
2019-10-11 14:09:26 +02:00
Laurent Destailleur
96dad08db7
Fix option ADD_UNSPLASH_LOGIN_BACKGROUND
2019-10-11 13:51:07 +02:00
Laurent Destailleur
89161910ff
NEW Look and feel v11: Some setup pages are by default on edit mode
2019-10-11 13:45:51 +02:00
Laurent Destailleur
9251f04d63
Update thumbs of themes
2019-10-11 13:26:48 +02:00
Laurent Destailleur
ab8199f71a
Fix avoid deletion of file if we still need it
2019-10-11 11:38:49 +02:00
Laurent Destailleur
de107fb02e
NEW Can set a squarred icon on your company setup
2019-10-11 11:27:05 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Laurent Destailleur
aebae5ff83
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Laurent Destailleur
346e9f3e1b
Fix import of web site
...
Fix sort on constant setup page lost
2019-10-09 15:01:19 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-09 13:40:46 +02:00
Laurent Destailleur
a26281dab3
Merge pull request #12066 from fuhraih/feature1
...
NEW #4301
2019-10-09 11:52:45 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
Laurent Destailleur
6bfcecf207
Fight against colspan
2019-10-08 16:49:10 +02:00
Laurent Destailleur
f55a4d77e4
css
2019-10-08 16:41:03 +02:00
fuhraih
8aee2fa534
Update dict.php
2019-10-08 15:48:18 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +02:00
Laurent Destailleur
156eb7fa61
Merge branch '10.0' into hotfix/12041-security-generate-password
2019-10-07 20:22:19 +02:00
Laurent De Coninck
2ba8506608
validate the 0 as min value consecutive; meaning not take that rule into account
2019-10-07 17:53:23 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
...
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
2019-10-07 14:24:22 +02:00
Laurent Destailleur
21ab307cd6
Merge pull request #12020 from frederic34/patch-13
...
Update dav admin
2019-10-07 14:21:30 +02:00
Laurent Destailleur
1a32a3b7f1
Update dav.php
2019-10-07 14:21:22 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
71e922635b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 12:57:52 +02:00
Laurent Destailleur
68a4ab87a2
Fix can set min repeat to 0 for password
2019-10-07 12:57:24 +02:00
Laurent Destailleur
022c67ee68
Merge pull request #12045 from laudeco/hotfix/12041-security-generate-password
...
[fix #12041 ] - Generate password mode perso
2019-10-07 12:54:45 +02:00
Laurent Destailleur
91a922a454
Update security.php
2019-10-07 12:54:28 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-06 15:56:21 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
Laurent Destailleur
7f5ccf4b8e
Remove google+
2019-10-05 19:27:14 +02:00
stickler-ci
a509404636
Fixing style errors.
2019-10-04 16:26:26 +00:00
Laurent De Coninck
c8fb81710f
fix #12041 - Generate password
...
Secure the generate password method "perso".
Now the system checks the minimum possible value. If the value entered
is lower then the system will never trigger the update.
Since the update is done through GET parameters, I also added a check
backend wise. This checks should never be triggered nor in error.
[see: #12041 ]
2019-10-04 18:13:00 +02:00
Laurent Destailleur
503973cec9
FIX Edit of ticket module parameters erased others
2019-10-04 14:04:31 +02:00
Alexandre SPANGARO
ddadff5731
Add globe fa-icon
2019-10-03 21:32:55 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 18:37:14 +02:00
altairis
699a3391c9
FCKeditor setup for tickets
2019-10-03 16:51:05 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 18:59:18 +02:00
Frédéric FRANCE
fe0f190209
Update dav.php
2019-10-02 18:49:05 +02:00
Frédéric FRANCE
eb40d51dda
Update dav.php
2019-10-02 18:32:23 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
a6e429ff32
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-10-02 08:49:00 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 12:25:34 +02:00
Laurent Destailleur
326d176c95
NEW Add last change date of page "Other setup". Can sort on name/date
2019-10-01 12:17:53 +02:00
Laurent Destailleur
322786cabe
Look and feel v10
2019-10-01 11:36:06 +02:00
Laurent Destailleur
6ee17022c0
Fix bad key for type of contact of resources
2019-10-01 11:34:01 +02:00
Laurent Destailleur
35fdaaf355
Fix bad key for type of contact of resources
2019-10-01 11:33:43 +02:00
Frédéric FRANCE
c57c8eee88
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 07:41:10 +02:00
Alexandre SPANGARO
6726a7cbb0
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-10-01 07:07:57 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Laurent Destailleur
bd76c1da11
Look and feel v10
2019-10-01 01:35:11 +02:00
Alexandre SPANGARO
8dea427f58
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-30 21:23:27 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-30 19:34:35 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-29 11:28:54 +02:00
Alexandre SPANGARO
8e42ac8cd0
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-28 22:31:08 +02:00
Laurent Destailleur
86e5465197
Standardize extrafields code
2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +02:00
Alexandre SPANGARO
4b73e09c60
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-27 14:20:53 +02:00
Laurent Destailleur
138b494b98
Merge pull request #11936 from aspangaro/11.0_translation
...
Translate and some fix
2019-09-27 12:15:50 +02:00
Laurent Destailleur
f96c9c3bb5
FIX #11931 #11963
2019-09-27 11:51:34 +02:00
Alexandre SPANGARO
e38bb89a2e
NEW Add fa_icon on load_fiche_titre
2019-09-27 11:48:40 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Alexandre SPANGARO
f4929c5315
NEW Add fa_icon "tools" for load_fiche_titre
2019-09-25 15:24:52 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
19c78d42e9
Fix az09 -> aZ09
2019-09-24 14:20:29 +02:00
Laurent Destailleur
db334a3b94
FIX Var not enough sanitized
2019-09-24 14:16:24 +02:00
Laurent Destailleur
7b3e64d67f
NEW Support of Extrafields on Leave requests.
2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83
NEW Accountancy - Add an option to hide FAQ on index and add widget in area
2019-09-23 20:42:50 +02:00
Alexandre SPANGARO
bf6fd2a5e2
Translate & style
2019-09-20 09:25:46 +02:00
Alexandre SPANGARO
278312f38f
Translate
2019-09-20 07:02:14 +02:00
Alexandre SPANGARO
b3807bbb20
Merge branch 'develop' into 11.0_translation
2019-09-19 22:34:43 +02:00
Alexandre SPANGARO
4819414d3a
Translate and some fix
2019-09-19 22:33:26 +02:00
Laurent Destailleur
9bf387d43c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/main.inc.php
htdocs/user/card.php
2019-09-18 15:12:38 +02:00
Laurent Destailleur
7b512587aa
FIX XSS
2019-09-18 14:15:20 +02:00
Laurent Destailleur
434ab2965a
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
...
NEW check if a resource is in use in an event
2019-09-15 15:47:07 +02:00
Laurent Destailleur
477c0e2aa4
Merge pull request #11897 from aspangaro/11.0_colorization
...
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-15 10:40:34 +02:00
Alexandre SPANGARO
21e27389d4
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-14 20:58:12 +02:00
Frédéric FRANCE
6444c7378f
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 16:40:23 +02:00
Laurent Destailleur
9934f73574
Update ldap_groups.php
2019-09-14 16:36:04 +02:00
Laurent Destailleur
7965804a34
Update ldap_groups.php
2019-09-14 16:35:00 +02:00
Frédéric FRANCE
6f33874d75
add entity
2019-09-12 21:13:00 +02:00
Abbes Bahfir
5183a1ec7a
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
2019-09-11 22:45:52 +01:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
Laurent Destailleur
8381b93e80
Fix init of public holidays
2019-09-09 11:06:54 +02:00
Laurent Destailleur
231725e351
Fix scrutinizer
2019-09-06 19:12:43 +02:00
Laurent Destailleur
09d6826e62
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
2e8c915b88
Fix more consistent setup
2019-09-06 02:39:08 +02:00
Laurent Destailleur
80daf29d79
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
Conflicts:
htdocs/fourn/commande/card.php
2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
2019-09-06 01:52:51 +02:00
Laurent Destailleur
37a32af7b0
NEW Add dictionary to store public holidays.
2019-09-05 20:19:13 +02:00
Laurent Destailleur
e7e663a27e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-05 17:57:41 +02:00
VESSILLER
b70587c150
NEW check if a resource is in use in an event
2019-09-04 15:14:16 +02:00
Laurent Destailleur
f2f2621da8
FIX Can't save setup of mailman module
2019-09-04 11:33:07 +02:00
Laurent Destailleur
b445c0eec7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5
FIX Several pb in export of documents
...
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2019-09-03 22:39:24 +02:00
Laurent Destailleur
7438eecc64
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/type.php
2019-09-02 04:41:43 +02:00
Laurent Destailleur
a269082d70
Replace deprecated code with new one
2019-09-02 03:58:00 +02:00
Laurent Destailleur
f6c2fb77ae
Fix scrutinizer
2019-09-01 22:02:48 +02:00
Laurent Destailleur
df6472254d
Fix var not defined
2019-08-31 13:31:08 +02:00
Laurent Destailleur
b6adfed070
Fix var not defined
2019-08-31 13:09:31 +02:00
Laurent Destailleur
2f49fc6a7b
Fix scrutinizer
2019-08-31 02:49:54 +02:00
Laurent Destailleur
9fd4f839ec
Use css "pictomodule" for picto of modules
2019-08-28 19:28:50 +02:00
Laurent Destailleur
784f5ec097
Fix bad name of hidden constant
2019-08-27 03:23:25 +02:00
Laurent Destailleur
5c13f5d397
Update dolibarr_export.php
2019-08-26 16:33:38 +02:00
Laurent Destailleur
6771af4565
Update dolibarr_export.php
2019-08-26 16:33:22 +02:00
schhub
3c706ae28a
Update dolibarr_export.php
2019-08-23 08:53:43 +02:00
schhub
264763f6b7
Update dolibarr_export.php
2019-08-23 08:31:50 +02:00
schhub
9d3b4eb699
Update dolibarr_export.php
2019-08-23 08:05:44 +02:00
schhub
5bab233252
Delete action correction for documents backup.
...
correction of delete action always trying to delete files in document/admin/backup directory. Documents backups are stored in documents/admin/documents directory. If preg_match is too "heavy" it can be replaced by strpos.
2019-08-22 13:19:45 +02:00
Laurent Destailleur
30266b00eb
Trans
2019-08-22 01:25:25 +02:00
Laurent Destailleur
f5aede8256
NEW GeoIP v2 support is natively provided.
2019-08-21 19:38:45 +02:00
Laurent Destailleur
bfbabbf626
Update geoip v1
2019-08-21 18:26:41 +02:00
Laurent Destailleur
54203dda1f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2019-08-21 16:25:48 +02:00
Laurent Destailleur
9bd229bc7a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/admin/modules.php
2019-08-21 16:04:34 +02:00
Laurent Destailleur
ed7480ddbb
Fix phpcs
2019-08-21 16:03:49 +02:00
Laurent Destailleur
1b21905c55
Fix test on uploaded modules
...
Conflicts:
htdocs/admin/modules.php
2019-08-21 14:53:58 +02:00
Laurent Destailleur
e75d7e4686
Fix test on uploaded modules
2019-08-21 14:51:48 +02:00
Laurent Destailleur
85356603d0
Fix test on uploaded modules
2019-08-21 14:51:18 +02:00
Laurent Destailleur
70dc68426b
Param
2019-08-21 13:12:37 +02:00
Laurent Destailleur
ae3d232797
Look and feel
2019-08-21 04:48:47 +02:00
Laurent Destailleur
2c3b2cd1a0
Look and feel
2019-08-21 04:21:43 +02:00
Laurent Destailleur
bfe6f4a163
Fix RESTRICT_ON_API
2019-08-20 20:32:17 +02:00
Laurent Destailleur
fd3f890f7b
NEW Can restrict access using DAV module to some host IPs only
2019-08-20 14:15:04 +02:00
Laurent Destailleur
54234e011f
Add version of Sabre lib, add log on login errors.
...
Add compatibility with twoauth
2019-08-20 13:26:56 +02:00
Laurent Destailleur
fb8e66a662
Trans
2019-08-19 18:34:54 +02:00
Laurent Destailleur
b8e1cc8d16
Enhance #11643
2019-08-18 03:42:38 +02:00
Laurent Destailleur
ee50c41e74
Fix phpcs
2019-08-16 17:34:23 +02:00
Laurent Destailleur
48125fd957
Fix phpcs
2019-08-16 17:32:58 +02:00
Laurent Destailleur
163ae6d81a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-15 20:42:51 +02:00
Laurent Destailleur
12e6dabc43
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-08-15 20:41:56 +02:00
Laurent Destailleur
f4e58aab22
FIX Enable web site
2019-08-13 04:49:49 +02:00
Laurent Destailleur
155d41ee80
FIX Enable web site
2019-08-13 04:49:12 +02:00
Laurent Destailleur
8ad2081555
NEW Can select website templates from available default templates
2019-08-12 22:19:24 +02:00
Laurent Destailleur
a35a999d74
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 02:52:53 +02:00
Laurent Destailleur
00660d4885
Fix responsive
2019-08-12 02:52:36 +02:00
Laurent Destailleur
86d39b435b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 02:42:11 +02:00
Laurent Destailleur
49e2f447a8
Fix responsive
2019-08-12 02:41:27 +02:00
Ferran Marcet
cda8b15c7f
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-05 14:00:15 +02:00
Laurent Destailleur
3d8f6dca76
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:32 +02:00
Laurent Destailleur
d6ae62478c
FIX #10984 FIX reposition on "Build backup" button
...
FIX Fatal error on dol_htmloutput_mesg with corrupted array
2019-08-01 15:42:44 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
Laurent Destailleur
8f2e781df6
FIX #11537
2019-08-01 12:42:12 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
...
NEW Management of retained warranty on situation invoices
2019-07-30 21:53:09 +02:00
Laurent Destailleur
ecc0b4ed32
Add prefixsession in event table
2019-07-29 02:16:21 +02:00
Laurent Destailleur
bef3423764
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-07-22 19:12:27 +02:00
Laurent Destailleur
f5afc50067
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
2019-07-22 18:47:35 +02:00
Laurent Destailleur
f0f0b989e9
FIX Add warning when setup is strange
2019-07-21 16:41:01 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97
FIX Limit of uploaded files (max_post_size was not used)
2019-07-20 13:09:25 +02:00
Laurent Destailleur
9f9598ac99
FIX missing token
2019-07-20 11:44:54 +02:00
Laurent Destailleur
e85c2202e8
FIX missing token
2019-07-20 11:44:31 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries
2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
327e5ebe78
FIX Show list of events on tickets
2019-07-19 19:09:38 +02:00
Laurent Destailleur
f745d01bf3
Prepare change of properties "titre" into "title"
2019-07-19 13:22:54 +02:00
Laurent Destailleur
278c2d7152
Enhance the perf page
2019-07-19 12:58:21 +02:00
Laurent Destailleur
fe89e158fe
Fix: Avoid deletion of system entries in dictionary
2019-07-19 04:03:33 +02:00
Laurent Destailleur
2afefada40
Fix: Avoid deletion of system entries in dictionary
2019-07-19 04:02:42 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
b9fe874b5f
Revert "Merge pull request #11022 from altatof/freetext"
...
This reverts commit 879b4d8e7fddc01b4c27
2019-07-18 18:19:51 +02:00
Laurent Destailleur
c27ac63a3a
Revert "Fix phpcs"
...
This reverts commit 03e5cc16ca
2019-07-18 18:18:07 +02:00
Laurent Destailleur
a09d33b427
Fix responsive
2019-07-18 17:47:00 +02:00
Laurent Destailleur
03e5cc16ca
Fix phpcs
2019-07-18 17:33:47 +02:00
Laurent Destailleur
879b4d8e7f
Merge pull request #11022 from altatof/freetext
...
NEW : manage output languages for free text
2019-07-18 17:29:45 +02:00
Laurent Destailleur
c1df3ae5c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 11:10:18 +02:00
Laurent Destailleur
a23bae6c96
Work to mke the page perf.php public by default.
2019-07-18 11:10:09 +02:00
Alexandre SPANGARO
21bd46fc15
Merge remote-tracking branch 'upstream/develop' into 11.0_salaries
2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda
NEW Extrafields on salaries
2019-07-17 14:09:25 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Frédéric FRANCE
61c83117fe
Update ihm.php
2019-07-09 15:18:51 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
69db6e6aa7
Fix look and feel v10
2019-07-05 18:45:13 +02:00
Laurent Destailleur
ee109ac568
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-05 17:44:50 +02:00
Laurent Destailleur
42576eb27a
Fix status of email templates not visible for non admin users
2019-07-05 17:22:13 +02:00
Laurent Destailleur
5c6684bb73
Fix setup of ticket module
2019-07-05 11:53:33 +02:00
Laurent Destailleur
2fee41f712
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
John Botella
a75a2ae8e4
Fix missing hidden input and short label
2019-07-02 15:44:42 +02:00
John Botella
9c2e83dcae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-07-01 09:51:26 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
John Botella
75b55ac5d6
fix travis recommendations
2019-06-28 16:10:41 +02:00
John Botella
8b7c260180
fix travis recommendations
2019-06-26 12:13:52 +02:00
John Botella
a8157f865e
fix travis recommendations
2019-06-26 11:59:35 +02:00
John Botella
ee98f3e6d7
fix travis recommendations
2019-06-26 10:48:22 +02:00
John Botella
7e14a598e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-26 09:43:43 +02:00
John Botella
6b165d4a15
Fix function name and doc
2019-06-25 09:07:04 +02:00
Laurent Destailleur
a7bd734ece
Rename ->produit into ->product. Still permissions to rename.
2019-06-24 21:18:49 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Laurent Destailleur
2e5b4ee4e7
Fix phpcs
2019-06-23 19:32:29 +02:00
Laurent Destailleur
76f394cc43
Fix phpcs
2019-06-22 18:58:14 +02:00
Laurent Destailleur
eb20df8e64
Fix debug save of state into setup
2019-06-22 14:47:46 +02:00
Laurent Destailleur
22b91f3693
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 13:28:44 +02:00
Laurent Destailleur
ee8ddb5744
Fix link to fix table charset
2019-06-22 13:23:00 +02:00
Laurent Destailleur
9644b9c669
Merge pull request #10932 from tony13tv/patch-6
...
[CHANGE] Make State available in .odt templates...
2019-06-22 11:26:32 +02:00
Laurent Destailleur
e9a8eb19bb
Update company.php
2019-06-22 11:24:21 +02:00
Laurent Destailleur
3afa4175db
Update company.php
2019-06-22 11:22:04 +02:00
Laurent Destailleur
4ffa48d9bd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 13:50:47 +02:00
Laurent Destailleur
afb6362317
Fix look and feel v10
...
Fix link to direct debit payment order
2019-06-20 13:37:06 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
...
NEW add extrafields in warehouses
2019-06-20 03:16:49 +02:00
Laurent Destailleur
7afcdb46eb
Debug module ticket
2019-06-19 12:10:05 +02:00
Laurent Destailleur
08d5ca4ddb
Debug page to export accounting documents
2019-06-17 17:53:43 +02:00
Laurent Destailleur
a7ca177100
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-06-14 13:58:19 +02:00
Laurent Destailleur
239e41f6c4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-14 13:57:49 +02:00
Laurent Destailleur
e6b6246fea
Merge pull request #11334 from atm-florianm/8.0_FIX-print-dictionaries-escape
...
FIX: in edit mode, dictionary inputs do not escape the string inside …
2019-06-14 13:36:06 +02:00
atm-florian.m
787e1319b9
FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes
2019-06-13 16:21:07 +02:00
Laurent Destailleur
bf6f9dd7ea
Fix phpcs
2019-06-12 13:58:48 +02:00
Laurent Destailleur
27a5f1172b
Merge pull request #11322 from aspangaro/10.0_b3
...
FIX Define company opening hours information
2019-06-12 12:12:02 +02:00
Laurent Destailleur
5554bd231f
Update openinghours.php
2019-06-12 12:11:06 +02:00
Laurent Destailleur
6d5637c389
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/actions_massactions.inc.php
2019-06-12 12:03:46 +02:00
Laurent Destailleur
2d52537106
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-12 10:07:08 +02:00
Alexandre SPANGARO
293048f9fb
NEW Define company opening hours information
2019-06-11 22:10:28 +02:00
florian HENRY
beb2a0131c
fix travis
2019-06-06 16:11:12 +02:00
Maxime Kohlhaas
9c7c1ddceb
Fix multicurrency setup page
2019-06-06 11:20:10 +02:00
florian HENRY
d98ce172ad
multicurrency:fix display error message on failed update
2019-06-05 17:26:37 +02:00
Laurent Destailleur
0c331602e8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-06-04 20:03:51 +02:00
Laurent Destailleur
ab77051317
Fix time delay for purge
2019-06-04 20:03:27 +02:00
John BOTELLA
d7a393bbd3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-04 14:00:18 +02:00
Laurent Destailleur
fd50e68f9a
Fix look and feel v10
2019-06-04 02:15:52 +02:00
Lionel VESSILLER
439eafb637
NEW add extrafields in warehouses
...
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
2019-06-03 15:44:17 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
18f1952e2d
Fix set of properties
2019-05-22 14:49:18 +02:00
Laurent Destailleur
5707aff7c4
Look and feel v10
2019-05-21 21:52:04 +02:00
Laurent Destailleur
0415edb8cd
Fix phpcs
2019-05-21 16:17:32 +02:00
Laurent Destailleur
657bd5c2fe
Move module from develop to experimental
2019-05-21 15:50:16 +02:00
Laurent Destailleur
e463b17c15
Fix look and feel v10
2019-05-21 15:31:56 +02:00
Laurent Destailleur
42f5ebed2d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/external_rss.php
htdocs/admin/system/database-tables.php
htdocs/admin/tools/export_files.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/lib/files.lib.php
htdocs/core/lib/functions.lib.php
2019-05-21 15:13:25 +02:00
Laurent Destailleur
61ead06950
Fix Injection
2019-05-21 14:35:05 +02:00
Laurent Destailleur
479f8616e1
Fix sanitize data
2019-05-21 14:03:28 +02:00
Laurent Destailleur
ae3605d82d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf.php
htdocs/core/class/extrafields.class.php
2019-05-20 15:47:06 +02:00
Laurent Destailleur
2a2fcf6784
FIX only profid1 to 4 were editable for pdf option to show. Not 5 and 6.
2019-05-20 15:38:33 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +02:00
Laurent Destailleur
2bbb04085e
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
6c195d7bdf
Add warning delay for holidays
2019-05-18 17:07:29 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Laurent Destailleur
e95acc9a81
Add warning if missing module
2019-05-17 13:19:22 +02:00
Laurent Destailleur
a664cd6461
Fix check when uploading a non image as user photo
2019-05-10 20:09:41 +02:00
Laurent Destailleur
1206e465d9
Fix function name
2019-05-10 18:19:10 +02:00
Laurent Destailleur
0bd4c61009
Fix default setup of module workflow was not set
2019-05-10 18:15:09 +02:00
Laurent Destailleur
aaeb7dc9d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Laurent Destailleur
e87a32e92f
Fix Try to fix DAV pb with some buggy clients by disabling browser
2019-05-10 09:53:10 +02:00
Juanjo Menent
e36df726a1
Merge remote-tracking branch 'upstream/9.0' into 9.0
2019-05-09 20:42:04 +02:00
Juanjo Menent
2b182c1cc1
FIX : #11097
2019-05-09 20:39:30 +02:00
Laurent Destailleur
46b0545c4a
Debug module reception
2019-05-09 17:26:06 +02:00
Laurent Destailleur
57911150d1
CSS
2019-05-09 16:50:22 +02:00
Laurent Destailleur
52153d6aa2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-09 12:38:27 +02:00
Laurent Destailleur
af8d2e0e1a
Fix error message when module disabled
2019-05-09 12:31:51 +02:00
Laurent Destailleur
9115df7439
Debug v10
2019-05-03 11:25:53 +02:00
Laurent Destailleur
4f9ea912ab
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/website.inc.php
2019-05-02 14:41:56 +02:00
Laurent Destailleur
79754eb326
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/comm/remx.php
2019-05-02 14:39:30 +02:00
Laurent Destailleur
ae7ba162f2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-05-02 14:37:46 +02:00
Laurent Destailleur
e81f10c790
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
2019-05-02 13:45:49 +02:00
Laurent Destailleur
5145680279
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
2019-05-02 13:31:47 +02:00
Laurent Destailleur
4a81e8fd62
Debug call to apilayer
2019-05-02 13:24:28 +02:00
Laurent Destailleur
9955af5194
Debug ticket module
2019-05-01 17:53:41 +02:00
Laurent Destailleur
50b1a54dca
FIX Update/delete currency on same languages
2019-05-01 14:06:30 +02:00
Laurent Destailleur
3bda9be775
Fix error 500
2019-05-01 13:46:45 +02:00
Laurent Destailleur
8091cff009
Can edit param of operation for email collector
2019-04-29 15:44:16 +02:00
Laurent Destailleur
4bd732cc40
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
htdocs/core/class/utils.class.php
htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
01075081cb
FIX CVE-2019-11200
2019-04-25 22:25:19 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
d64e6a6a1b
Merge branch 'develop' into patch-6
2019-04-25 02:54:03 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
Christophe Battarel
c157cfad74
add freetextsubstitutionexclude parameter
2019-04-16 16:21:32 +02:00
Christophe Battarel
502b1e4d31
add lang management to freetext
2019-04-16 16:16:37 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Laurent Destailleur
d728af9ced
Add the test for ckeditor with mode "inline" in setup page of ckeditor
2019-04-12 17:44:22 +02:00
Laurent Destailleur
cf058e7d3b
NEW Ask date of invoice when using the Clone feature.
2019-04-12 12:12:08 +02:00
Laurent Destailleur
203cbd56c2
Finished debug of emailcollector module
2019-04-10 17:35:33 +02:00
Laurent Destailleur
05c14e4f2f
Look and feel v10
2019-04-10 15:54:29 +02:00
Laurent Destailleur
2eeb4b8734
Debug ticket module
2019-04-10 15:45:55 +02:00
Laurent Destailleur
26594fab98
Debug module ticket
2019-04-10 15:11:38 +02:00
Laurent Destailleur
ff629b2355
NEW Color for hover and for checked line is on by default
2019-04-09 15:57:26 +02:00
Laurent Destailleur
f9860e1425
Work on email collector
2019-04-09 13:23:30 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
22ca858b36
Enhance setup of email collector
2019-04-07 18:32:01 +02:00
Laurent Destailleur
fad2fa48dd
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
2019-04-07 15:44:17 +02:00
Laurent Destailleur
0091b65a83
Fix phpcs
2019-04-01 18:10:14 +02:00
Laurent Destailleur
c959c8b645
Fix api with prestashop
2019-03-31 18:21:00 +02:00
Laurent Destailleur
ecd049b4e6
Debug dolistore
2019-03-31 13:39:51 +02:00
Laurent Destailleur
bb2545c7b4
Clean code
2019-03-31 13:05:35 +02:00
Laurent Destailleur
b10682e5db
Fix search in dolistore
2019-03-31 13:03:38 +02:00
Laurent Destailleur
fca404e8d5
Show price without tax to prepare tax per customer country.
2019-03-30 19:30:58 +01:00
Laurent Destailleur
67c207db12
NEW Better explanation for setup of WebDav module
2019-03-30 11:58:49 +01:00
Laurent Destailleur
80f7cef0a8
Better translation
2019-03-28 09:20:05 +01:00
Cristian Torres
64e91fa25b
[CHANGE] Making State available in .odt templates...
...
...making use of the same strategy when loading Country info from single attribute.
Previously attempted on PR #10463 which has been closed
This also relates to #7428
2019-03-27 17:09:59 -06:00
Laurent Destailleur
d8212d84df
Debug emailcollector
2019-03-26 19:15:18 +01:00
Laurent Destailleur
f991d4ba99
Fix typo
2019-03-26 18:10:28 +01:00
Laurent Destailleur
9eaef2ce7a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/export.php
htdocs/langs/en_US/admin.lang
2019-03-26 12:40:36 +01:00
Laurent Destailleur
1787b31932
FIX setup of module export
2019-03-26 12:18:28 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd
Better responsive
2019-03-25 09:14:28 +01:00
Laurent Destailleur
a16b6daa92
Look and feel v10
2019-03-24 16:10:03 +01:00
Laurent Destailleur
77843ddeba
Allow use of log file or not for debugbar
2019-03-23 14:50:28 +01:00
Laurent Destailleur
df9e121ac6
Enhance the module debugbar. Do not scan the log anymore.
2019-03-23 14:37:54 +01:00
Laurent Destailleur
805493f43d
Merge pull request #10894 from grandoc/new_branch_20_03_2019
...
update with html5 compliant code
2019-03-21 18:23:40 +01:00
Philippe GRAND
e17ab64dbd
update with html5 compliant code
2019-03-20 09:56:17 +01:00
Philippe GRAND
569be67317
update with html5 compliant code
2019-03-20 09:55:34 +01:00
Philippe GRAND
dee46173ff
update with html5 compliant code
2019-03-20 09:53:29 +01:00
Philippe GRAND
5e6b451195
update with html5 compliant code
2019-03-20 09:52:33 +01:00
Philippe GRAND
963847c89c
update with html5 compliant code
2019-03-20 09:49:38 +01:00
Philippe GRAND
644743dce8
update with html5 compliant code
2019-03-20 09:47:06 +01:00
Philippe GRAND
427a3fc02d
update with html5 compliant code
2019-03-20 09:35:16 +01:00
Philippe GRAND
819253abee
update with html5 compliant code
2019-03-20 09:32:57 +01:00
Philippe GRAND
6aa4e82e20
update with html5 compliant code
2019-03-20 09:31:28 +01:00
Philippe GRAND
e519bfc64b
update with html5 compliant code
2019-03-20 09:27:28 +01:00
Philippe GRAND
8563d1e867
update with html5 compliant code
2019-03-19 14:19:40 +01:00
Philippe GRAND
1a21799585
update with html5 compliant code
2019-03-19 14:19:01 +01:00
Philippe GRAND
c9cd4260d6
update with html5 compliant code
2019-03-19 14:17:59 +01:00
Philippe GRAND
11c66a88bc
update with html5 compliant code
2019-03-19 14:17:20 +01:00
Philippe GRAND
200e7172ad
update with html5 compliant code
2019-03-19 14:16:42 +01:00
Laurent Destailleur
cb9f30ceeb
Look and feel v10
2019-03-19 10:36:37 +01:00
Laurent Destailleur
6a41819d0f
Enhance the perf page.
2019-03-17 00:55:18 +01:00
Laurent Destailleur
a6add0d8a9
Debug module debugbar
2019-03-17 00:48:12 +01:00
Laurent Destailleur
1abfd1f58e
Add page to setup module debugbar
...
Fix CSS
2019-03-17 00:32:39 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
bcf0dd0168
Merge branch 'develop' into patch-5
2019-03-14 16:47:08 +01:00
Frédéric FRANCE
f25ce3b40c
Update facture.php
2019-03-14 16:43:52 +01:00
Laurent Destailleur
cdf6e4b65a
Fix some PSR rules
2019-03-14 16:43:27 +01:00
Frédéric FRANCE
1222d90537
phpcs fix
2019-03-14 16:40:44 +01:00
Laurent Destailleur
39e6e71b0d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2019-03-14 14:20:34 +01:00
Laurent Destailleur
f8a4d9075b
Fix css for fontawesome 5
2019-03-14 11:48:25 +01:00
Laurent Destailleur
ae6b672204
Look and feel v10
2019-03-13 15:04:38 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
Regis Houssin
47057b431d
FIX translation
2019-03-12 07:56:22 +01:00
Regis Houssin
259fa0ac81
FIX check only if invoice module is enabled (bank is check after)
2019-03-12 07:42:25 +01:00
Regis Houssin
94c58072d7
FIX possibility to set up payment mode when invoice module is disabled
2019-03-12 07:29:29 +01:00
Laurent Destailleur
b710e28ffa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
2019-03-09 01:20:13 +01:00
Laurent Destailleur
1a96a7a88f
FIX More complete auto setup of barcode module
...
Add tooltip help on member setup module
2019-03-08 11:31:12 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
e67890bd22
NEW Can enter price with or without tax when entering expense repor line
2019-03-07 11:09:04 +01:00
Laurent Destailleur
31c296f44b
Fix bad tooltip to rm file
2019-03-06 20:01:21 +01:00
Laurent Destailleur
e66447eabc
Fix phpcs
2019-03-05 15:53:57 +01:00
Laurent Destailleur
b7066d92cc
More info
2019-03-04 20:37:03 +01:00
Laurent Destailleur
e974a3b2b3
Add more info
2019-03-04 20:36:05 +01:00
Laurent Destailleur
1cfbf5f551
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/security.php
2019-03-04 20:18:23 +01:00
Laurent Destailleur
15138aa543
FIX error on setup of password if pass generators have a .old file.
2019-03-04 20:00:36 +01:00
Laurent Destailleur
ff9b6c2f04
Module ticket
2019-03-04 19:19:20 +01:00
Laurent Destailleur
4a582485b9
Debug module ticket
2019-03-04 19:19:09 +01:00
Laurent Destailleur
bb9a64fd07
Fix phpcs
2019-03-04 17:25:13 +01:00
Laurent Destailleur
d8259f94e1
Work on BOM module
2019-03-04 13:40:16 +01:00
Laurent Destailleur
925def5390
Work on BOM module
2019-03-04 13:37:00 +01:00
Laurent Destailleur
7b7ff33fdf
Work on BOM module
2019-03-04 13:30:43 +01:00
Laurent Destailleur
34c179ab2b
Fix responsive
2019-03-04 10:42:09 +01:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
9b165f6b3f
add visibility
2019-02-27 20:45:07 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin
2019-02-27 01:16:21 +01:00
Laurent Destailleur
3a2a1b4a56
Debug module ticket
2019-02-26 13:43:09 +01:00
Alexandre SPANGARO
2da1447a0b
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Frédéric FRANCE
48de805bce
replace html code by html5 in admin
2019-02-23 21:57:35 +01:00
Laurent Destailleur
cdf85b0d00
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-23 16:02:35 +01:00
Laurent Destailleur
0081d3c25d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-23 16:02:10 +01:00
Laurent Destailleur
af6c482f26
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-02-23 16:01:30 +01:00
ptibogxiv
454ab2e866
FIX Stripe live Oauth
2019-02-22 14:54:26 +01:00
Laurent Destailleur
4a3751a054
Fix html5
2019-02-21 19:50:54 +01:00
gauthier
58d82eb477
FIX : function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it
2019-02-21 11:08:55 +01:00
Laurent Destailleur
e6e18ff616
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
2019-02-14 15:33:17 +01:00
Laurent Destailleur
3050366372
Fix table of units already exists. Merge duplicate c_measuring_units
...
with c_units.
2019-02-14 13:02:44 +01:00
Laurent Destailleur
fbfb4ce566
FIX creation of new left menu entry
2019-02-14 10:10:31 +01:00
florian HENRY
dd9896516b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
2019-02-13 12:52:07 +01:00
Laurent Destailleur
5c27ec5d25
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/compta/compta-files.php
2019-02-13 11:21:20 +01:00
florian HENRY
e2d13c0e1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
Laurent Destailleur
11f48460b2
Fix
2019-02-12 23:26:25 +01:00
Laurent Destailleur
d86017b8ff
Fix create left menu entry
2019-02-12 23:21:53 +01:00
Laurent Destailleur
639dfa09aa
Fix creation of left menu
2019-02-12 23:17:40 +01:00
Laurent Destailleur
1f9f335e44
FIX creation of menu entry with parent id not int
...
Conflicts:
htdocs/admin/menus/edit.php
2019-02-12 19:11:05 +01:00
Laurent Destailleur
986fb2ae38
FIX creation of menu entry with parent id not int
2019-02-12 19:09:27 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
843f7bea8d
Merge pull request #10546 from frederic34/patch-20
...
Update index.php
2019-02-12 13:46:33 +01:00
Laurent Destailleur
205152501e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Frédéric FRANCE
be9cfdae85
Update index.php
2019-02-11 00:05:38 +01:00
Frédéric FRANCE
4d6dcf400e
first parameter of print_liste_field_titre was translated
2019-02-10 17:30:34 +01:00
Frédéric FRANCE
ba32c3b782
first parameter of print_liste_field_titre was translated
2019-02-10 16:06:07 +01:00
Frédéric FRANCE
aecac3632f
wip
2019-02-10 11:08:48 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
7f4bbcf9a5
Some minor fix in default values and modulebuilder
2019-02-09 13:40:22 +01:00
Laurent Destailleur
aa574c2a47
Merge pull request #10517 from frederic34/patch-18
...
fix phpcs
2019-02-08 09:56:50 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite
...
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Frédéric FRANCE
c0686733e8
fix phpcs
2019-02-06 15:56:13 +01:00
Laurent Destailleur
9e28db4202
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
2019-02-06 00:51:10 +01:00
Laurent Destailleur
44f5223c90
Remove warning
2019-02-05 18:54:38 +01:00
Laurent Destailleur
d49dd8d593
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-05 15:16:44 +01:00
Laurent Destailleur
bb8b3d4e5c
Add br
2019-02-05 00:25:42 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Frédéric FRANCE
b2e2b2e186
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-31 18:27:27 +01:00
Philippe GRAND
0cc8053708
update with html5 compliant code
2019-01-31 12:42:38 +01:00
Philippe GRAND
1cda3106b2
update with html5 compliant code
2019-01-31 12:40:50 +01:00
Philippe GRAND
2a9c378c1f
update with html5 compliant code
2019-01-31 12:35:49 +01:00
Philippe GRAND
ff46a0ee30
update with html5 compliant code
2019-01-31 12:33:01 +01:00
Laurent Destailleur
4c31749f4b
Add tooltip on setup
2019-01-31 11:11:56 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Laurent Destailleur
3198f9fbbe
Merge pull request #10441 from aspangaro/10.0_email
...
Move my email to the new one
2019-01-30 14:59:58 +01:00
Laurent Destailleur
6d3529b606
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-30 14:47:28 +01:00
Laurent Destailleur
340412ed00
FIX generation of document for supplie rinvoice
2019-01-30 14:07:50 +01:00
