Alexandre SPANGARO
9879a43cf4
NEW Add social networks of the company
2019-12-30 21:17:41 +01:00
Laurent Destailleur
ece8390277
Add tables to store translation of all objects (like llx_product_lang)
2019-12-26 13:23:18 +01:00
Laurent Destailleur
ea4c236311
fix alignment
2019-12-26 13:05:03 +01:00
VESSILLER
e03222b831
FIX var transkey not defined in input hidden
2019-12-23 14:38:01 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
d59357d88d
Fix help
2019-12-22 21:34:52 +01:00
Laurent Destailleur
693551069b
Fix look and feel v11
2019-12-22 21:32:35 +01:00
Laurent Destailleur
30b8affdb7
Fix look and feel v11
2019-12-22 21:32:19 +01:00
Laurent Destailleur
05a7e62bf4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-22 12:56:25 +01:00
Laurent Destailleur
e2451bcd26
Update images
...
Fix value of delay for warning on project not closed
2019-12-21 17:11:21 +01:00
Laurent Destailleur
ad039ff968
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/repair.php
2019-12-21 14:03:45 +01:00
Laurent Destailleur
583aa3c619
CSS
2019-12-20 11:50:13 +01:00
Laurent Destailleur
92da6c7549
Fix hash for ping
2019-12-20 11:41:18 +01:00
Laurent Destailleur
2ae779a13e
Fix can set zero as value for max number of decimal
2019-12-19 11:08:42 +01:00
Laurent Destailleur
dd0a1b3e10
Merge branch 'develop' into develop_project
2019-12-19 10:56:03 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
4a734e53a6
Fix column too low.
...
Fix automatic event not found if from a module with several objects
2019-12-17 14:47:58 +01:00
Laurent Destailleur
6e2e02fd40
Look and feel v11
2019-12-16 21:06:32 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
28bcb49957
Fix css
2019-12-16 11:32:27 +01:00
Laurent Destailleur
d979f6f0f4
Debug module ticket. Add error if sender email is not defined.
2019-12-15 20:02:56 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
17b9964678
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2019-12-14 14:43:14 +01:00
Laurent Destailleur
a8de7b850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/admin/system/filecheck.php
2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
9f2a628c3b
Remove bak file
2019-12-14 13:25:21 +01:00
Frédéric FRANCE
50937f8ca1
Update filecheck.php
2019-12-13 12:56:48 +01:00
Frédéric FRANCE
6e64a20f9e
Update filecheck.php
2019-12-13 11:16:46 +01:00
Frédéric FRANCE
a923a48e64
Update filecheck.php
2019-12-13 10:44:12 +01:00
Laurent Destailleur
95141550fa
NEW Support of deployement of metapackages
2019-12-12 15:40:06 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
66805a502a
doxygen
2019-12-11 22:53:57 +01:00
Frédéric FRANCE
c98ab917dd
doxygen
2019-12-11 20:33:58 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo
2019-12-11 19:11:13 +01:00
Laurent Destailleur
ae6d536d1d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
652e99600a
Look and feel v11
2019-12-09 09:43:38 +01:00
Florian Mortgat
4846885eea
NEW 9.0: enable user to use the mysqldump '--quick' option
...
(useful if the server has low RAM or large tables)
2019-12-02 16:54:05 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Laurent Destailleur
f5f8459930
Look and feel v11
2019-11-28 12:50:38 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
1e84b0ea97
Merge pull request #12522 from Dolibarr/scrutinizer-patch-15
...
Scrutinizer Auto-Fixes
2019-11-28 12:19:43 +01:00
Laurent Destailleur
c22fea52e5
Fix do not ping name of server
2019-11-27 11:38:30 +01:00
Scrutinizer Auto-Fixer
057ab6a059
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-26 11:52:04 +00:00
Laurent Destailleur
334265ee6e
Merge pull request #12510 from frederic34/patch-8
...
fk_user fk_usergroup are int
2019-11-26 09:21:27 +01:00
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
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +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
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
ecc30b8ffe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines
2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Laurent Destailleur
3c88816bf8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-27 17:44:13 +01:00
Laurent Destailleur
d59097f65c
Fix upload of module file
2019-01-27 17:40:56 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany
2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
f96d730943
Merge pull request #10391 from grandoc/new_branch_22_01_2019
...
update with html5 compliant code
2019-01-26 14:09:15 +01:00
Laurent Destailleur
e42fe4022a
Uniformize lenght of small list
2019-01-25 15:22:36 +01:00
Philippe GRAND
0a45d87f4a
update with html5 compliant code
2019-01-22 11:56:09 +01:00
Philippe GRAND
a75ecc0832
update with html5 compliant code
2019-01-22 11:51:03 +01:00
Philippe GRAND
a609c11383
update with html5 compliant code
2019-01-22 11:48:15 +01:00
Philippe GRAND
05b33c149c
update with html5 compliant code
2019-01-22 11:46:12 +01:00
Philippe GRAND
7a7a7e7aa9
update with html5 compliant code
2019-01-22 11:40:53 +01:00
Philippe GRAND
8d877fd289
update with html5 compliant code
2019-01-22 11:37:23 +01:00
Philippe GRAND
e671c6705c
update with html5 compliant code
2019-01-21 22:37:42 +01:00
Philippe GRAND
218636271a
update with html5 compliant code
2019-01-21 22:36:14 +01:00
Laurent Destailleur
fbf5a1c056
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 20:48:19 +01:00
Laurent Destailleur
3cf81d14e3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-21 20:47:44 +01:00
Laurent Destailleur
6f553db93d
Remove bad text
2019-01-21 20:47:07 +01:00
Philippe GRAND
37c7837bd3
update with html5 compliant code
2019-01-21 09:52:49 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays
...
Add configurable days to SEPA Withdrawal Execution Date
2019-01-20 19:47:57 +01:00
markus
a45ea9239d
Rename consts and cleanup
2019-01-19 14:24:20 +01:00
ptibogxiv
b3cbbc1b11
FIX lang for dolistore in module.php
2019-01-19 11:41:47 +01:00
ptibogxiv
ff99927f65
FIX lang for dolistore in module.php
2019-01-19 11:18:07 +01:00
markus
de9b8f427d
Add configurable days to SEPA Withdrawal Execution Date
2019-01-18 16:16:55 +01:00
Laurent Destailleur
3187636c1c
Merge pull request #10352 from hregis/develop_mc
...
FIX DAV compatibility with mutlicompany
2019-01-17 18:58:32 +01:00
Philippe GRAND
98e5397e38
update with html5 compliant code
2019-01-17 14:19:15 +01:00
Regis Houssin
528f1d6f5c
FIX DAV add url public
2019-01-17 08:28:51 +01:00
Laurent Destailleur
e7943ae844
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
21741b6409
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 13:57:42 +01:00
Laurent Destailleur
a72d92006b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 13:57:33 +01:00
Philippe GRAND
c743b7803e
Clean code and add translation
2019-01-16 13:15:10 +01:00
Laurent Destailleur
c357cb8c4e
Clean code
2019-01-16 12:42:54 +01:00
Laurent Destailleur
1f87b8bb18
FIX Position of price symbol (before) for nl_NL
2019-01-16 01:54:08 +01:00
ptibogxiv
a4d1c663ef
NEW add company schedule
2019-01-15 13:29:53 +01:00
Laurent Destailleur
1aa2b7a164
FIX SQL injection on rowid of dict.php
2019-01-10 03:26:34 +01:00
Laurent Destailleur
5d0ff28556
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/card.php
2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/admin/defaultvalues.php
htdocs/societe/card.php
2019-01-08 01:53:00 +01:00
Laurent Destailleur
f85389ac29
Fix missing td column
2019-01-08 01:11:34 +01:00
Laurent Destailleur
34413727d8
Fix
2019-01-07 13:50:59 +01:00
Laurent Destailleur
6e078105ab
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
Laurent Destailleur
38ec05f2f1
Fix search filter lost
2019-01-06 01:17:11 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
dbbfdd984a
Fix emailcollector can't be used without syntax rules
2019-01-03 11:47:27 +01:00
Laurent Destailleur
8c1d362e8d
Merge pull request #10286 from ptibogxiv/patch-103
...
New Use ajax switch into on socialnetworks.php
2019-01-02 20:00:44 +01:00
Laurent Destailleur
d613041703
Merge pull request #10282 from ptibogxiv/patch-99
...
NEW: Use ajax swith button on setup of multi-currency module
2019-01-02 19:58:20 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
...
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
ptibogxiv
511579a24b
FIX: Ajax on socialnetworks.php
2018-12-30 19:48:04 +01:00
ptibogxiv
82d597ade2
FIX: ajax on stock.php
2018-12-30 19:07:21 +01:00
ptibogxiv
b9baaafe19
Update multicurrency.php
2018-12-30 17:15:11 +01:00
ptibogxiv
8adecf0689
Update multicurrency.php
2018-12-30 17:09:38 +01:00
ptibogxiv
dec4e1f6a6
New option use currency on document + toggle
...
- change with toogle
- new option use currency on document for online payment
2018-12-30 16:49:54 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Regis Houssin
1a15698f96
FIX replace deprecated "print_titre" with "load_fiche_titre"
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2018-12-25 08:36:42 +01:00
Regis Houssin
8f4c452075
FIX replace deprecated "print_fiche_titre" with "load_fiche_titre"
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2018-12-25 08:34:26 +01:00
Laurent Destailleur
7b61fc8fd1
Fix setup of dav module
2018-12-23 14:03:19 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
59bc15377d
CSS
2018-12-14 18:58:55 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
b0941967f0
Fix sort of email templates
2018-12-13 12:13:28 +01:00
Laurent Destailleur
4882615c8a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-12 11:53:06 +01:00
Laurent Destailleur
13f5476678
Responsive
2018-12-12 11:50:10 +01:00
Laurent Destailleur
434cf2e046
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-11 09:58:14 +01:00
Laurent Destailleur
3213b3be07
Standardize code: Move jabberid into social network module
2018-12-11 09:17:02 +01:00
Laurent Destailleur
bdb4295379
Fix menu editor
2018-12-10 18:24:05 +01:00
Laurent Destailleur
b35a9c0e64
FIX Edition of menu fails (mainmenu required for top menu)
2018-12-10 17:50:58 +01:00
Laurent Destailleur
f755457236
Test imap available
2018-12-07 14:54:25 +01:00
Laurent Destailleur
cf00519e90
Test imap available
2018-12-06 21:40:51 +01:00
Laurent Destailleur
1d9c0f6b77
Fix look and feel
2018-12-04 13:26:19 +01:00
Laurent Destailleur
d9bb39970f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/barcode.php
2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
2018-12-04 13:17:25 +01:00
Laurent Destailleur
275eeca135
Trans
2018-12-04 13:09:58 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Philippe GRAND
8ec2bac36a
FIX #3234
2018-12-02 10:02:05 +01:00
Frédéric FRANCE
d2d623b0b6
GETPOSTISSET has only one param
2018-12-02 09:26:24 +01:00
Philippe GRAND
3800fde225
fix typo error
2018-11-26 14:29:25 +01:00
Laurent Destailleur
1d4c756783
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-22 11:44:37 +01:00
Laurent Destailleur
b6dac7da20
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-21 15:40:15 +01:00
Laurent Destailleur
93929a652b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-21 15:35:15 +01:00
Laurent Destailleur
084516b885
Fix ip detection of geoip
2018-11-21 15:11:57 +01:00
Laurent Destailleur
0ea6f2778b
Fix examples
2018-11-20 22:01:38 +01:00
Laurent Destailleur
c891f6ed10
Disable javascript feature with no javascript
2018-11-20 21:26:22 +01:00
Laurent Destailleur
f455e32bef
FIX Some modules templates were visible when it should not
2018-11-20 16:22:16 +01:00
Laurent Destailleur
4b82538941
Better module position
2018-11-20 14:56:14 +01:00
Laurent Destailleur
1e1ccd4c88
Fix pagination in action/event list
2018-11-19 14:25:34 +01:00
Regis Houssin
7cba680f38
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-18 17:07:03 +01:00
Laurent Destailleur
7f33403d43
Fix translation
2018-11-17 22:55:13 +01:00
Laurent Destailleur
028be21070
Debug
2018-11-16 16:55:53 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused
2018-11-15 22:15:45 +01:00
Laurent Destailleur
6d640ab83c
Fix feature to drag and drop rows of table (not generic)
2018-11-15 19:58:06 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Laurent Destailleur
c04fcf170b
Work on emailcollector
2018-11-15 16:23:07 +01:00
Laurent Destailleur
e94b545cb6
Fix field not required
2018-11-14 18:38:09 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Laurent Destailleur
01e7b5747d
FIX user param is null not 0 when not defined
...
FIX properties email_xx were not set
2018-11-12 15:27:59 +01:00
Regis Houssin
ce317e6110
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_project
Conflicts:
htdocs/admin/limits.php
2018-11-12 08:37:21 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
0b57faa7b4
Fix help
2018-11-11 14:42:11 +01:00
Laurent Destailleur
de259e9db6
Code comment
2018-11-11 14:36:35 +01:00
Regis Houssin
854bb99cc0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_project
2018-11-11 08:52:20 +01:00
Laurent Destailleur
e86e3ec7ac
Work on email collector
2018-11-09 19:30:44 +01:00
Laurent Destailleur
f1287578f3
Work on emailcollector
2018-11-09 18:18:17 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
773e2da4cc
Fix example of number for holiday
2018-11-09 11:41:27 +01:00
Laurent Destailleur
193b153fbf
Work on email collector
2018-11-07 18:02:08 +01:00
Laurent Destailleur
6ba78b2bb3
Work on email collector
2018-11-07 16:33:06 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
c4db549f94
Work on emailcollector
2018-11-06 19:49:52 +01:00
Laurent Destailleur
a976dd74db
Fix Report error if file size too large
2018-11-06 18:44:51 +01:00
Laurent Destailleur
e0070bd348
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2018-11-06 18:30:57 +01:00
Laurent Destailleur
7e33af6677
Fix max size
2018-11-06 17:40:59 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
dd70f1bf08
Debug emailcollector
2018-11-05 16:59:40 +01:00
Laurent Destailleur
eb9defcf1d
Debug emailcollector
2018-11-05 16:42:29 +01:00
Laurent Destailleur
0c7f33e1ba
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-05 09:56:57 +01:00
Maxime Kohlhaas
d1133916e0
Fix tracking field in dictionnary should not be mandatory
2018-11-01 15:33:14 +01:00
Laurent Destailleur
970f501147
Debug modulebuilder
2018-10-31 20:10:20 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Regis Houssin
6e77067638
FIX better check
2018-10-30 17:59:14 +01:00
Regis Houssin
26b00dc5ca
NEW possibility to defined rounding rules by currency
2018-10-30 17:40:05 +01:00
Laurent Destailleur
d309f22e55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf
FIX #9907
2018-10-30 13:54:11 +01:00
Laurent Destailleur
4611b96da8
Fix phpcs
2018-10-28 20:18:09 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
35ab3c9aad
Update holiday.php
2018-10-26 18:24:04 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
8b601bd7fd
Fix numbering of holidays
2018-10-25 18:50:53 +02:00
Laurent Destailleur
1ba716b82c
Fix do not allow use of second or third tax without using 1st one.
2018-10-25 14:39:54 +02:00
Laurent Destailleur
25a374bd9a
NEW Notification module support expense report+holiday validation and
...
approval event.
2018-10-25 12:45:13 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
atm-quentin
04eb9ca167
fix dont change num version
2018-10-23 17:06:21 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76
...
NEW move ticket dictionary in API /setup
2018-10-16 21:39:30 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
...
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Philippe GRAND
729ff0b9bb
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-16 14:20:11 +02:00
Maxime Kohlhaas
c66823d72f
Fix numbering of supplier credit notes (issue #9624 )
2018-10-14 17:07:38 +02:00
Laurent Destailleur
abf8867061
Merge pull request #8207 from atm-john/New_invoice_default_documents
...
NEW hidden option to define an invoice template for each invoice type
2018-10-14 16:36:37 +02:00
Philippe GRAND
9551cb12f5
Standardize and update code
2018-10-13 09:59:33 +02:00
atm-quentin
4b23b46e48
NEW workflow set reception billed on validate supplier bill
2018-10-11 14:49:19 +02:00
jfefe
8fc4e2066f
FIX : position 0 for emails templates
...
Closes #9548 #8737 #9478
2018-10-10 18:18:02 +02:00
atm-greg
2d395b23c4
fix for travis
2018-10-10 14:35:25 +02:00
atm-greg
6eeb860514
delete useless code
2018-10-10 14:09:38 +02:00
atm-greg
24988f075c
Add archive generation for documents directory
2018-10-10 14:01:20 +02:00
atm-quentin
489ccc3c49
NEW list and fix conf
2018-10-10 12:19:57 +02:00
Philippe GRAND
bba6669f03
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-09 08:47:26 +02:00
Laurent Destailleur
df7f218d01
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-07 21:47:32 +02:00
Laurent Destailleur
d4b6429ccd
Fix regression into backup feature
2018-10-07 21:45:20 +02:00
Laurent Destailleur
b61f3b4313
Look and feel v8
2018-10-07 17:31:35 +02:00
Philippe GRAND
5583211246
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-06 12:00:24 +02:00
Laurent Destailleur
e24117e75b
Fix position of modules is string on 2 digits
2018-10-06 11:57:53 +02:00
Philippe GRAND
c7c3780400
clean code
2018-10-05 15:34:32 +02:00
Laurent Destailleur
31916c94f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/pdf.lib.php
2018-10-04 17:56:56 +02:00
Laurent Destailleur
16aef0e9fc
Merge pull request #9651 from frederic34/patch-9
...
fix td filecheck
2018-10-04 17:09:46 +02:00
Laurent Destailleur
111d589474
NEW Can mix offset before and after with rules for due date of invoices
2018-10-04 16:06:26 +02:00
Laurent Destailleur
75c968b4ae
FIX Backup of database without mysqladmin available from cron.
2018-10-04 13:10:48 +02:00
atm-quentin
00f532c436
validation modèle de données
2018-10-04 09:50:39 +02:00
Laurent Destailleur
fd859d3162
Add a component to select lang into a web site
2018-10-03 18:40:54 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
atm-quentin
41d8cb87a3
debut reception setup page
2018-10-03 12:22:41 +02:00
John BOTELLA
af66a8971a
NEW Hidden conf INVOICE_USE_DEFAULT_DOCUMENT
2018-10-02 15:51:17 +02:00
Frédéric FRANCE
96139d88a4
fix td filecheck
2018-10-01 13:45:17 +02:00
Alexandre SPANGARO
14627abb27
FIX Title problem on admin RSS module
2018-10-01 01:14:43 +02:00
Alexandre SPANGARO
825f774b53
FIX Title problem on admin RSS module
2018-09-29 15:28:03 +02:00
Laurent Destailleur
851fd4cc18
NEW Can set the default focus of each page.
...
NEW Can set if a field is mandatory on form level.
2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830
Work on mandatory form fields
2018-09-27 16:38:18 +02:00
Laurent Destailleur
62b31df069
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/rssparser.class.php
htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
96c1814793
FIX XSS vulnerability reported by Mary Princy E
2018-09-27 11:33:28 +02:00
Laurent Destailleur
df64961c6b
FIX nb of session in title
2018-09-24 21:56:57 +02:00
Laurent Destailleur
8aa22f2c33
NEW Add option to swap sender/recipient address on PDF
2018-09-23 14:57:44 +02:00
Laurent Destailleur
a078951a94
Add an help for user to avoid bad configuration
2018-09-21 11:12:08 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
b421c29ea7
FIX #9510
2018-09-20 19:20:15 +02:00
Laurent Destailleur
d35687c8b3
Work on module social network
2018-09-19 01:45:56 +02:00
Laurent Destailleur
99d214abd5
Fix family of module Payment of employee salaries
2018-09-18 16:38:51 +02:00
Laurent Destailleur
e2e3354807
Clean code
2018-09-18 16:35:38 +02:00
Laurent Destailleur
1a1219ee2a
Trans
2018-09-18 14:52:50 +02:00
Laurent Destailleur
e07ce644e8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Laurent Destailleur
98f26bfcfb
NEW Can set 2 url in url field of thirdparty
2018-09-17 14:31:30 +02:00
Laurent Destailleur
f3ce7cb5a5
Quick hack to provide help to fix pb of undesirable files
2018-09-17 10:40:42 +02:00
Laurent Destailleur
75f3dd94c6
Merge pull request #9506 from frederic34/printing
...
printing remove no camelcaps function
2018-09-15 17:29:21 +02:00
Laurent Destailleur
80fb1e0657
NEW Each user can set its prefered default calendar
2018-09-14 11:23:15 +02:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function
2018-09-13 11:13:32 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2
...
start changing phpcs:ignore
2018-09-12 21:14:34 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop
...
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Laurent Destailleur
7d726f9734
Merge pull request #9457 from frederic34/selectbarcodetype
...
Selectbarcodetype
2018-09-12 19:02:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
6291f18179
Merge pull request #9440 from frederic34/patch-5
...
Upper Lower Casing
2018-09-12 18:24:02 +02:00
Laurent Destailleur
3bf296c9cf
Merge pull request #9448 from frederic34/loadfichetitre
...
remove deprecated
2018-09-12 18:23:24 +02:00
Laurent Destailleur
da37302dc2
Merge pull request #9437 from grandoc/new_branch_08_09_2018
...
New branch 08 09 2018
2018-09-12 17:29:33 +02:00
Frédéric FRANCE
312a606345
deprecate formbarcode:select_barcode_type
2018-09-10 23:50:48 +02:00
Frédéric FRANCE
0e0db9d1ee
remove deprecated
2018-09-09 15:52:55 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Laurent Destailleur
700e3b9748
Standardize code for modulepart=mycompany like others modulepart.
2018-09-09 12:53:30 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date
2018-09-09 11:25:59 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date
2018-09-09 09:36:12 +02:00
Frédéric FRANCE
863886a621
Update salaries.php
2018-09-08 23:19:56 +02:00
Philippe GRAND
a6b25093e7
Standardize and update code
2018-09-08 12:57:11 +02:00
Philippe GRAND
c65505fdca
Standardize clean and update code
2018-09-08 12:24:10 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Philippe GRAND
572eb35167
Standardize and update code
2018-09-08 10:30:10 +02:00
Philippe GRAND
035b2be2eb
Standardize and update call to langs
2018-09-07 14:58:22 +02:00
Frédéric FRANCE
ab4ae0f7bb
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-06 21:28:30 +02:00
Laurent Destailleur
c5695db3e4
NEW Can disable meteo on smartphone only
2018-09-06 11:09:51 +02:00
Ferran Marcet
b658626e21
NEW: Highlight lines on lists when they are checked
2018-09-04 11:54:13 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-02 18:19:45 +02:00
Laurent Destailleur
887a40cf1d
Remove TODO
2018-09-02 16:46:01 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore
2018-09-02 14:01:37 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Frédéric FRANCE
945eede4a5
doxygen fixs
2018-08-31 23:12:55 +02:00
Frédéric FRANCE
ebcf43ec73
function Comment Missing
2018-08-31 21:39:23 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
6ca9854a34
Fix to avoid fetch when no accounting account defined
2018-08-29 21:07:00 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-25 09:07:04 +02:00
Laurent Destailleur
7a35b560a6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-23 19:51:52 +02:00
Laurent Destailleur
de2cdfc70f
FIX Language selection lost if error during creation of email template
2018-08-22 13:23:46 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing
2018-08-21 13:40:04 +02:00
Laurent Destailleur
1b1258b2ef
Fix url in tooltip
2018-08-16 11:19:22 +02:00
Laurent Destailleur
71c1d2275b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-16 11:18:18 +02:00
Laurent Destailleur
bbd19010d0
Fix url in tooltip
2018-08-16 11:18:03 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Frédéric FRANCE
7bb781eea8
function declaration
2018-08-15 14:28:34 +02:00
Frédéric FRANCE
5146ab9177
trim
2018-08-14 15:34:44 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Frédéric FRANCE
1b27cca91c
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-13 08:53:07 +02:00
Laurent Destailleur
6a8ed56c3d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-13 01:23:43 +02:00
Laurent Destailleur
31c42c9a32
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/societe/canvas/actions_card_common.class.php
2018-08-13 01:23:03 +02:00
Laurent Destailleur
21555a7435
Fix firstname/lastname
2018-08-13 01:10:51 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
John BOTELLA
d6d8f98f38
add retained warranty cond field and add forms
2018-08-10 15:06:00 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
John BOTELLA
06be98c638
add date field
2018-08-08 17:36:39 +02:00
Laurent Destailleur
d79778a67e
Fix reponsive
2018-08-08 17:00:16 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
John BOTELLA
3036c94198
Add new situation retained warranty field
2018-08-07 15:18:42 +02:00
Philippe GRAND
42fe2b78de
clean and update code
2018-08-07 10:44:26 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018
...
standardize
2018-08-02 11:27:02 +02:00
Philippe GRAND
892174cbf8
standardize
2018-07-29 10:29:12 +02:00
Philippe GRAND
36ea20b7d4
standardize
2018-07-28 18:03:14 +02:00
Philippe GRAND
9cc40fcb21
standardize
2018-07-28 17:26:56 +02:00
Philippe GRAND
f17275845d
standardize
2018-07-28 14:29:28 +02:00
Frédéric FRANCE
8312d95174
trim trailing
2018-07-26 18:22:16 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Regis Houssin
20a1ffe810
FIX field is autoincrement but not "rowid"
2018-07-24 12:15:54 +02:00
Laurent Destailleur
ccd7332647
Fix default value of joinfile when creating a new email template
2018-07-24 01:46:14 +02:00
Philippe GRAND
3297554102
clean and update code
2018-07-23 17:45:38 +02:00
Laurent Destailleur
e9fccec055
Fix website deletion
2018-07-22 16:56:11 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
35ed89a517
Fix scrutinizer
2018-07-16 10:11:52 +02:00
Laurent Destailleur
1e775ffa6e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:12:01 +02:00
Laurent Destailleur
c27dd8d301
Fix phpcs
2018-07-13 09:11:46 +02:00
Laurent Destailleur
e4be3ab954
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:09:51 +02:00
Laurent Destailleur
b203421ac6
Fix log
2018-07-11 10:54:42 +02:00
Laurent Destailleur
2e36e5afa5
Some fix with dolistore api
2018-07-11 10:47:55 +02:00
Laurent Destailleur
f3de1af601
Finish webdav experimental module
2018-07-10 14:56:04 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-07-10 13:57:24 +02:00
Laurent Destailleur
8184eff66c
Fix for #9079
2018-07-09 15:25:14 +02:00
Laurent Destailleur
45d1a14c8e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 16:10:37 +02:00
Laurent Destailleur
05ed721a8c
Fix name of constant for module TICKET
2018-07-06 13:09:07 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Laurent Destailleur
cfb41d4329
FIX: If module workflow disabled, we must disable autoclassification too
2018-07-03 11:43:50 +02:00
Laurent Destailleur
982a1ffbaf
NEW Automatic position of scroll when creating an extrafield
2018-06-30 14:22:05 +02:00
Laurent Destailleur
df96c5ca81
Merge pull request #8796 from defrance/patch-113
...
introduce serial and document for holiday module
2018-06-30 02:09:28 +02:00
Laurent Destailleur
f6774de773
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-30 02:00:46 +02:00
Laurent Destailleur
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop
...
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-30 01:26:08 +02:00
Laurent Destailleur
e4388e63fa
Merge pull request #8891 from inoveaconseil/develop
...
NEW: ADD url to see the last version of a external module
2018-06-30 01:17:10 +02:00
Laurent Destailleur
fba9caab5d
Merge pull request #8944 from bafbes/abb7008
...
New: Option to see line numbers in modules page
2018-06-29 20:05:19 +02:00
Laurent Destailleur
75e9f1bf9a
Update modules.php
2018-06-29 20:05:12 +02:00
STAGIAIRE-PC\Pierre
19eaa3df66
ajout de la modification dans la base de données
2018-06-27 11:29:46 +02:00
STAGIAIRE-PC\Pierre
a94eeaa500
adding the possibility to personnalize ent_to_end and ustrd of a bank levy
2018-06-27 10:53:45 +02:00
Regis Houssin
48ad03c56d
Fix: remove unused and blocking field
2018-06-27 09:33:21 +02:00
Laurent Destailleur
9f1cfbdb72
For better compatibility
2018-06-25 12:25:43 +02:00
Regis Houssin
a6729b0bd1
Fix: change field name and remove obsolete data
2018-06-25 09:10:24 +02:00
Laurent Destailleur
2520ebcfae
Fix line
2018-06-24 18:56:49 +02:00
Philippe GRAND
41a0175827
clean and upsdate code
2018-06-18 14:17:43 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
03b6bec8b8
Fix email template for test
2018-06-13 17:03:46 +02:00
Abbes Bahfir
74d92dd91f
New: Optiopn to see line numbers in modules page
2018-06-11 23:10:40 +01:00
gauthier
baf9d4a806
FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def.
2018-06-08 17:11:59 +02:00
Laurent Destailleur
f28a6e59c8
Look and feel v8
2018-06-05 16:30:16 +02:00
Laurent Destailleur
7cb66e8e0c
Fix reset of filters
2018-06-05 10:04:57 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Inovea Conseil
0f9fa09d3f
Fix after the comment
2018-05-31 09:13:18 +02:00
Mavyre
e59a91bdae
Stopped using AJAX for the synchro
2018-05-30 21:12:28 +02:00
Inovea Conseil
e0c1e33012
NEW: ADD url to see the last version of a external module
2018-05-30 00:20:31 +02:00
Frédéric FRANCE
67e0abdd66
loadlangs
2018-05-26 18:52:14 +02:00
Frédéric FRANCE
f53f7bbf40
loadlangs
2018-05-26 18:41:16 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml
...
new : add adv targt emailing amdin with main feature level 1
2018-05-25 11:10:51 +02:00
Laurent Destailleur
de84f0e687
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
2018-05-21 23:35:09 +02:00
Laurent Destailleur
afa57fd66d
Fix syntax error
2018-05-21 23:33:20 +02:00
Laurent Destailleur
69141c9493
Fix PSR True->true and GETPOST file name for local checksum check
2018-05-21 22:24:27 +02:00
Laurent Destailleur
c141c3ecfd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff
Fix missing lang
2018-05-21 19:35:12 +02:00
florian HENRY
22cdbffb0a
new : add adv targt emailing amdin with main feature level 1
2018-05-21 10:58:16 +02:00
Laurent Destailleur
f211cfaf0c
Merge pull request #8777 from grandoc/new_branch_11_05_2018
...
clean and update code
2018-05-18 12:20:22 +02:00
John
05bb98f4c0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-05-16 11:49:37 +02:00
Laurent Destailleur
d52305cef8
NEW Add entry for the GDPR contact
2018-05-15 11:50:42 +02:00
Laurent Destailleur
94ccb44673
Fix bad url wor external subscription page
2018-05-12 11:02:44 +02:00
Philippe GRAND
edbe32ea0c
clean and update code
2018-05-11 22:31:17 +02:00
Philippe GRAND
e5d8dec2f9
clean and update code
2018-05-11 12:18:45 +02:00
BENKE Charlene
e3963c3518
Create holiday.php
2018-05-07 22:48:43 +02:00
Laurent Destailleur
95bd249ec6
Merge pull request #8740 from grandoc/new_branch_04_05_2018
...
Clean and update code
2018-05-05 13:49:54 +02:00
Laurent Destailleur
e9008e9461
Merge pull request #8734 from grandoc/new_branch_03_05_2018
...
clean and update code
2018-05-05 13:28:47 +02:00
Laurent Destailleur
634e58b7c9
Look and feel v8
2018-05-04 18:24:00 +02:00
Philippe GRAND
b5f222f45a
Clean and update code
2018-05-04 14:14:04 +02:00
Philippe GRAND
f3a70a40d7
clean and update code
2018-05-03 21:27:52 +02:00
Laurent Destailleur
24518803fc
Clean code
2018-05-02 19:15:16 +02:00
Laurent Destailleur
dfe6e4bfc1
Doxygen
2018-05-02 19:08:59 +02:00
Laurent Destailleur
2f2d17926d
Sort list
2018-05-01 20:52:25 +02:00
Laurent Destailleur
c3b5664fb5
Fix sort order of email templates
2018-05-01 16:24:40 +02:00
Laurent Destailleur
55f982e504
Removed deprecated FPDI option and reorganise PDF setup page
2018-04-30 09:28:24 +02:00
Laurent Destailleur
e168240ab0
Debug module DAV
2018-04-29 18:32:15 +02:00
Laurent Destailleur
c376cc5779
Merge pull request #8686 from grandoc/new_branch_26_04_2018
...
clean code
2018-04-27 11:39:32 +02:00
Laurent Destailleur
cee4df9b27
Merge pull request #8667 from grandoc/new_branch_23_04_2018
...
clean code
2018-04-27 09:46:55 +02:00
Laurent Destailleur
69db960a92
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/activity/perweek.php
2018-04-26 18:33:02 +02:00
Philippe GRAND
966419254d
clean code
2018-04-26 15:44:15 +02:00
Philippe GRAND
502c837e04
Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018
2018-04-26 15:36:15 +02:00
Laurent Destailleur
83b762b681
FIX CVE-2018-9019
2018-04-25 16:01:06 +02:00
Laurent Destailleur
ae412f228d
NEW Experimental DAV module provides a public and private directory
2018-04-25 12:22:02 +02:00
Philippe GRAND
458dc42692
clean and update code
2018-04-25 11:50:58 +02:00
Philippe GRAND
c22ef109ac
clean and add new code
2018-04-24 17:42:13 +02:00
Philippe GRAND
bf1e5bc618
Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018
2018-04-24 17:31:10 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Philippe GRAND
9e9d52a662
clean and update code
2018-04-23 16:23:30 +02:00
Philippe GRAND
bcf5c5d78a
clean code
2018-04-23 16:04:52 +02:00
Laurent Destailleur
32511422ab
Fix PSR2
2018-04-22 20:08:29 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
68a0b45141
Merge pull request #8648 from grandoc/new_branch_20_04_2018
...
clean and update code
2018-04-22 19:31:46 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
769a1f507b
Debug asset module
2018-04-22 11:26:59 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Philippe GRAND
410d1ee07d
Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018
2018-04-21 12:05:50 +02:00
Laurent Destailleur
cef9782179
Clean defined constant at begin of pages
2018-04-21 12:00:55 +02:00
Philippe GRAND
53efccd98e
Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018
2018-04-20 16:46:53 +02:00
Laurent Destailleur
38d200d8a6
Fix left menu
2018-04-20 13:23:34 +02:00
Philippe GRAND
1ebdcae538
clean and update code
2018-04-20 11:30:40 +02:00
Philippe GRAND
33505411a7
clean and update code
2018-04-20 11:17:45 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
788fd62205
Merge pull request #8636 from hregis/develop_pgsql
...
Fix: avoid Warning: A non-numeric value encountered + wrong var name
2018-04-20 01:20:19 +02:00
Laurent Destailleur
16e27a445b
Sort type of email template combo list
2018-04-19 20:42:03 +02:00
Laurent Destailleur
17dd96ef31
Fix filter on email template
2018-04-19 20:17:54 +02:00
Laurent Destailleur
1389ce9e48
FIX Template of modules not enabled must not be visible
2018-04-19 20:12:43 +02:00
Laurent Destailleur
8acc752195
Debug ticket module
2018-04-19 14:44:21 +02:00
Laurent Destailleur
8aab183567
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-19 14:00:18 +02:00
Laurent Destailleur
6b3e5e2085
FIX sanitize setup params
2018-04-18 12:19:23 +02:00
Laurent Destailleur
5d121b2d3a
FIX CVE-2018-10092
2018-04-18 11:58:36 +02:00
Regis Houssin
eaecf7190a
Fix: avoid Warning: A non-numeric value encountered + wrong var name
2018-04-18 08:34:48 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
72de21537c
Clean code
2018-04-15 20:09:09 +02:00
Laurent Destailleur
77b686500c
css
2018-04-14 21:07:20 +02:00
Laurent Destailleur
ecfabc6633
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-13 23:18:39 +02:00
Laurent Destailleur
32ff8ae132
Fix link
2018-04-13 18:02:25 +02:00
Laurent Destailleur
ace55ba569
Debug usage of extrafields for ticket module
2018-04-12 23:17:46 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser
...
NEW : Can select from the user list into send form email (For field to and CC)
2018-04-11 17:55:40 +02:00
Laurent Destailleur
ea35a445a1
Merge branch 'develop' into 8.0-a15
2018-04-11 13:17:12 +02:00
John
24bf8cb162
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-04-09 16:21:37 +02:00
Laurent Destailleur
aa01afc0d5
Fix direct link on transifex using new search url
2018-04-09 13:57:09 +02:00
Laurent Destailleur
0475cb8018
FIX Permission for bookkeeper
2018-04-09 10:51:58 +02:00
Laurent Destailleur
6529043182
Clean code
2018-04-08 10:49:59 +02:00
Laurent Destailleur
98b9f6bb47
DAV module
2018-04-07 19:12:41 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Alexandre SPANGARO
741a14993a
NEW Add file number in accountant card and update export filename
2018-04-07 06:21:49 +02:00
Laurent Destailleur
1a321e19c8
FIX XSS in company setup page
2018-04-06 19:12:13 +02:00
Laurent Destailleur
b412f0b76b
Better interaction to setup email
2018-04-06 16:38:47 +02:00
Laurent Destailleur
85d4f7115b
Better position of the substitution tooltip for emails
2018-04-06 16:16:08 +02:00
Laurent Destailleur
6c409b2670
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 18:08:19 +02:00
Laurent Destailleur
b59d8a6473
Merge pull request #8501 from ATM-Consulting/develop_atm
...
NEW: send mails from project card
2018-04-05 16:39:06 +02:00
Laurent Destailleur
ab27b105c0
Merge pull request #8490 from hregis/7.0_bug6
...
FIX limit access of email template page to internal users
2018-04-05 16:11:04 +02:00
Laurent Destailleur
eeb2d5a4da
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/cron/list.php
2018-04-05 13:24:36 +02:00
Laurent Destailleur
1b1a8f7e81
Fix trigger name
2018-04-05 13:21:00 +02:00
florian HENRY
cc0fb830b8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-04-05 10:53:17 +02:00
Laurent Destailleur
8595d7621b
Fix POST mut use method POST no GET
2018-04-02 23:30:23 +02:00
Laurent Destailleur
fba40575f7
Remove dead code
2018-04-02 16:39:48 +02:00
Regis Houssin
c720345e6d
Fix: better test
2018-04-01 11:47:10 +02:00
Regis Houssin
20e80a58a8
Fix: limit access to internal users
2018-04-01 11:43:39 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
3aff363998
NEW: mail templates for projects
2018-03-28 17:08:26 +02:00
Laurent Destailleur
8102ae6705
Work on setup for vat of product payments
2018-03-25 18:25:52 +02:00
Laurent Destailleur
8a3e6a0750
More logical setup behavior
2018-03-25 17:53:32 +02:00
florian HENRY
ffbeb17ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-03-25 17:19:27 +02:00
Laurent Destailleur
7363ae17ee
Move setup of email for module module into email templates
2018-03-23 16:09:46 +01:00
florian HENRY
e2e1fae5e6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-03-21 22:58:33 +01:00
Laurent Destailleur
517301f014
Work on subscription reminder
2018-03-21 16:40:09 +01:00
florian HENRY
dc6f4c1f4d
NEW : option to send email to salaries
2018-03-21 11:48:30 +01:00
Laurent Destailleur
7272ee806e
Fix field not mandatory
2018-03-19 12:55:13 +01:00
Laurent Destailleur
ae17ce6f9a
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:52:09 +01:00
Alexandre SPANGARO
93b087dbe0
NEW Add a tab to specify accountant/auditor of the company
2018-03-18 06:09:50 +01:00
Laurent Destailleur
ba47b6d051
NEW Add tab contact on supplier proposals
2018-03-16 10:21:53 +01:00
Laurent Destailleur
852bf8dab7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +01:00
Laurent Destailleur
4957ea9178
Fix SQLi reported by op7ica
2018-03-15 01:55:16 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
2018-03-14 10:49:54 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
ae82d045f8
Dolibarrize module ticket
2018-03-11 23:56:17 +01:00
Laurent Destailleur
51c94fadfa
Look and feel v7
2018-03-11 21:31:34 +01:00
Frédéric FRANCE
ad05ddfe5c
Update ticketsup_extrafields.php
2018-03-11 20:42:39 +01:00
Frédéric FRANCE
111bbd98ce
Update ticketsup.php
2018-03-11 20:36:52 +01:00
Regis Houssin
ecb44e2f53
Fix: wrong copy/paste
2018-03-11 18:57:36 +01:00
Regis Houssin
7c3984c9db
Fix: dolibarrizzzz
2018-03-11 18:54:38 +01:00
Regis Houssin
741d69fabe
Fix: dolibarrize
2018-03-11 18:23:02 +01:00
florian HENRY
cfdaa7c88d
ticket sup make it work
2018-03-11 16:07:13 +01:00
jfefe
79acb79ae0
Begin integration of module « Ticketsup »
...
Related to #4948
2018-03-11 09:44:58 +01:00
Laurent Destailleur
b2677c35e2
Merge pull request #8317 from frederic34/swifmailer
...
Add dkim signing with Swiftmailer
2018-03-10 18:48:08 +01:00
Laurent Destailleur
cc7ac2a0da
Merge pull request #8313 from atm-florian/7.0_fix8241
...
7.0 fix8241
2018-03-09 22:47:43 +01:00
Laurent Destailleur
40d04482b0
Fix set time
2018-03-09 22:45:16 +01:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer
2018-03-09 22:44:57 +01:00
Laurent Destailleur
4d885310c7
Merge pull request #8311 from inoveaconseil/patch-1
...
Fix set time limit to 0
2018-03-09 22:41:15 +01:00
florian HENRY
bb8525614c
better fix
2018-03-09 19:37:39 +01:00
Inovea Conseil
d763bfcbf1
Fix set time limit to 0
...
If the dolibarr was installed on a pc and not on server or in the doliwamp.
2018-03-09 17:56:49 +01:00
Marc de Lima Lucio
d6b4bc14e4
NEW: syslog file autoclean
2018-03-09 16:52:06 +01:00
Laurent Destailleur
235db1f405
Enhance OAuth module to store the stripe account in llx_oauth_token
2018-03-08 19:51:18 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
c1c6720edc
Fix look and feel v7
2018-03-07 12:27:31 +01:00
Laurent Destailleur
f597e08d06
Merge branch 'develop' into 8.0-a6_vat
2018-03-07 12:23:43 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
fab007ad83
Remove deprecated option dolibarr_pdf_force_fpdf
...
Fix view of dolibarr setup config file
2018-03-07 09:41:27 +01:00
Laurent Destailleur
1e6a55745c
CSS
2018-03-06 11:54:05 +01:00
Laurent Destailleur
a086bd0137
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Alexandre SPANGARO
4a46ffc5d8
Add information in VAT admin page
2018-03-06 05:02:09 +01:00
Laurent Destailleur
951babae6d
Merge pull request #8272 from aspangaro/7.0
...
Fix : Missing language file
2018-03-05 20:44:34 +01:00
Laurent Destailleur
f35679fb2a
Fix description of field of table
2018-03-05 13:11:07 +01:00
Laurent Destailleur
864edce665
NEW Accept anonmymous events (no user assigned)
...
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Alexandre SPANGARO
c0664474e4
Fix : Missing language file
2018-03-04 06:32:55 +01:00
Laurent Destailleur
eac1b2efe9
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:23:23 +01:00
Laurent Destailleur
f0c9cd3acc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-03 11:22:31 +01:00
Laurent Destailleur
d6b782e5ef
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:22:15 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
...
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Laurent Destailleur
f545d2a134
NEW Can add filter actiontype and notactiontype on event ical export
2018-02-28 20:06:28 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
7e48db2869
Clean code
2018-02-26 15:03:09 +01:00
Regis Houssin
093ea49cc6
Fix: use "multidir_output" instead "dir_output"
2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
029ef534d0
Clean deprecated code (property "special" removed from mod descriptor)
2018-02-25 10:55:02 +01:00
Laurent Destailleur
f7ecac8734
Fix look and feel v7
2018-02-23 11:40:56 +01:00
Laurent Destailleur
b3d968d4a1
Fix look and feel v7
2018-02-23 11:40:20 +01:00
John
d0ef8fe75a
fix travis errors
2018-02-22 09:54:36 +01:00
John
629b8e618e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents
2018-02-21 11:45:23 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
John
46b235c139
add auto select model when select type on create invoice
2018-02-20 15:08:57 +01:00
Laurent Destailleur
1ee128ff13
NEW Add type of website container/page into dictionary
2018-02-19 19:48:53 +01:00
Laurent Destailleur
60fe1fa503
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails.php
2018-02-17 01:19:17 +01:00
Laurent Destailleur
5c5d2cbefa
Fix smtp warning message
2018-02-16 23:49:08 +01:00
Laurent Destailleur
9bed2ce8e2
Fix ignore file integrity check on filefunc.inc.php for deb/rpm package
2018-02-16 22:03:13 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
5eee292663
FIX #8189
2018-02-15 13:40:17 +01:00
Laurent Destailleur
e25bd56e22
Add option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-02-10 12:16:06 +01:00
Laurent Destailleur
ec66bde3c9
Add option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-02-10 12:15:24 +01:00
Rui Strecht
fd594f7e74
Fixed wrong global
2018-02-07 16:57:43 +00:00
Rui Strecht
f52beef3eb
Added translation to company.php if MAIN_SHOW_REGION_IN_STATE_SELECT is activated
2018-02-07 16:54:21 +00:00
Rui Strecht
8c732a1443
Trying to not include sql request into method setMysoc
2018-02-06 12:01:54 +00:00
Rui Strecht
31372f8948
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/core/class/commonobject.class.php
2018-02-06 10:26:38 +00:00
Laurent Destailleur
d24d401f3a
Fix translation
2018-02-04 10:55:09 +01:00
Laurent Destailleur
7c6c893657
Merge pull request #7996 from atm-maxime/new_force_mailto
...
NEW Option to force all emails recipient
2018-02-03 19:15:11 +01:00
Laurent Destailleur
5c6dd0b061
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-03 19:00:04 +01:00
Laurent Destailleur
a41847d084
Fix: date of modificaiton in ledger not visible.
...
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
2018-02-02 14:27:07 +01:00
Rui Strecht
b387c3fdf8
Forgot to update other files to same PR changes
2018-01-31 11:45:30 +00:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2018-01-31 11:19:39 +00:00
Laurent Destailleur
8d983717a3
Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user
...
NEW export filter models can be share or not by user
2018-01-29 21:19:50 +01:00
Laurent Destailleur
a639308601
Fix css
2018-01-27 19:40:16 +01:00
Laurent Destailleur
28417a6c24
Fix css
2018-01-26 23:54:45 +01:00
Frédéric FRANCE
0568461a7b
swiftmailer
2018-01-25 22:03:51 +01:00
Laurent Destailleur
8d7f6843a4
Must be able to export lockedlog for a dedicated year.
...
Fix date are nto humanly readable.
2018-01-25 12:57:36 +01:00
Laurent Destailleur
dfc7d47747
Fix message
2018-01-21 15:32:10 +01:00
atm-quentin
c2ee92d4f1
fix trans
2018-01-18 13:59:05 +01:00
atm-quentin
ce29331c05
NEW Filter export model by user
2018-01-18 12:34:22 +01:00
Laurent Destailleur
cc5dcde9e1
Fix protection to avoid errors
2018-01-14 18:55:55 +01:00
Laurent Destailleur
95d2a9f88d
Responsive and css
2018-01-12 01:10:03 +01:00
Laurent Destailleur
90ddfc3f7f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
2018-01-11 01:14:20 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu
...
fix #7963
2018-01-11 00:44:45 +01:00
florian HENRY
0bd45dc64b
fix: search translation into external module files also
2018-01-10 20:34:32 +01:00
Laurent Destailleur
bc9fc2828a
Fix missing class
2018-01-10 10:42:36 +01:00
florian HENRY
fdedd6f75b
fix 7963
2018-01-08 20:54:40 +01:00
Laurent Destailleur
da4417dfc8
Fix website in multicompany mode
2018-01-07 18:33:20 +01:00
Maxime Kohlhaas
a9c7dc48ab
New option to force e-mail recipient, helpful for test purposes
2017-12-24 17:31:31 +01:00
Laurent Destailleur
e839c72109
Fix css
2017-12-22 14:05:49 +01:00
Laurent Destailleur
d20062df73
Fix jquery css theme
2017-12-20 20:18:41 +01:00
Laurent Destailleur
89a62103ca
Debug module website
2017-12-19 11:40:29 +01:00
Laurent Destailleur
98b82d712a
NEW Revenue stamp can be a percent
...
FIX Revenue stamp not visible on the transfer payment page
2017-12-18 12:43:03 +01:00
Laurent Destailleur
9f2a42b67d
NEW Can filter on user on unalterable log
2017-12-16 21:50:58 +01:00
Laurent Destailleur
2163db446b
NEW Can test signature of a version from API
2017-12-16 17:24:23 +01:00
Laurent Destailleur
1a3fbc092d
Fix method not found
2017-12-15 17:07:32 +01:00
Laurent Destailleur
5af153550d
Debug blockedlog:
...
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
2017-12-15 16:56:08 +01:00
Laurent Destailleur
fb0169cbb8
Back link to module page
2017-12-15 10:46:11 +01:00
Laurent Destailleur
2eea3a1afa
Fix backlink of module setup pages
2017-12-15 10:36:35 +01:00
Laurent Destailleur
dbefb93e0f
Error management
2017-12-11 18:25:23 +01:00
Laurent Destailleur
bb7c03906e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/societe/list.php
2017-12-11 15:25:09 +01:00
Laurent Destailleur
f2e429e28f
Fix file integrity checker (exclude files excluded from package)
2017-12-11 15:03:34 +01:00
Laurent Destailleur
4443c0f0a0
Fix style
2017-12-10 15:24:47 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
alexis Algoud
62cd77d999
NEW automatic activation of external module on country set
2017-12-08 10:13:03 +01:00
alexis Algoud
a2df87ab15
NEW warning on module blocked log reset if country code is FR
...
fix wrong paste click
2017-12-05 11:40:42 +01:00
Laurent Destailleur
081d31a56e
Debug php backup for new mysql version
2017-12-03 11:45:34 +01:00
Laurent Destailleur
0a73daba01
Security: on target=_blank, we must have rel="noopener"
2017-12-02 03:04:52 +01:00
Laurent Destailleur
39fdd1b37d
Use correct link to changelog
2017-11-30 11:16:28 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
...
factorization of extrafields into list
2017-11-28 12:14:47 +01:00
Laurent Destailleur
8954d52e32
Fix edit dictionary
2017-11-27 16:07:48 +01:00
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Scrutinizer Auto-Fixer
aab2799981
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-11-27 13:48:36 +00:00
Laurent Destailleur
69725fe62f
Fix setup of direct print with google docs driver
2017-11-27 13:55:27 +01:00
Laurent Destailleur
a48fe55832
Fix language file of external module not visible in trans tool
2017-11-25 22:53:58 +01:00
Laurent Destailleur
5935ad868a
Fix the from robot must be visible only on test page
2017-11-25 19:23:27 +01:00
Laurent Destailleur
3d48e509bd
Clean code
2017-11-25 19:16:15 +01:00
Laurent Destailleur
2fc5d9fefb
The form to test email can now use all sending profiles.
2017-11-25 18:52:47 +01:00
Laurent Destailleur
a529725c5c
Fix lang code must be null if not defined
2017-11-25 17:42:46 +01:00
Laurent Destailleur
88841ccbae
FIX #7590
2017-11-25 01:58:11 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
657d1137c0
Disable field if overwrite transaction is off
2017-11-23 09:49:15 +01:00
Laurent Destailleur
304819a726
Work on module builder
2017-11-19 16:26:39 +01:00
Laurent Destailleur
4938a0ba2a
Add param forcenowrap on tooltip function
2017-11-19 12:41:37 +01:00
Laurent Destailleur
07c0b5d616
Code comment
2017-11-15 13:15:08 +01:00
Laurent Destailleur
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +01:00
Laurent Destailleur
fa92c53ff6
Fix pb when showing dictionaries
2017-11-14 11:13:24 +01:00
Laurent Destailleur
31e152274c
NEW Add 2 new automatic classification in workflow module
2017-11-14 01:00:57 +01:00
Laurent Destailleur
15fc8ce33b
Fix responsive on agenda setup page
2017-11-12 14:02:27 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
2fe831db63
Merge pull request #7779 from atm-maxime/new_dict_filter_country
...
New dictionnaries are now pre-filtered on company country
2017-11-11 17:30:26 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
9d3cf8f217
Fix can use tooltip with popup even for column titles
2017-11-09 18:50:15 +01:00
Maxime Kohlhaas
82ea46c740
New dictionnaries are now pre-filtered on company country
2017-11-07 10:49:04 +01:00
Philippe GRAND
acc69b1f80
fix : Warning: A non-numeric value encountered
2017-11-03 19:52:02 +01:00
Laurent Destailleur
5f5c7a9126
NEW Show user id of web process in system info - web server
2017-11-03 11:42:24 +01:00
Laurent Destailleur
608f87d03b
Set focus on first field to fill.
2017-11-02 16:14:24 +01:00
Laurent Destailleur
a6879775bb
FIX Search into language is ok for file into external modules two.
2017-11-01 20:05:28 +01:00
Laurent Destailleur
e184cac2c5
FIX Search into language is ok for file into external modules two.
2017-11-01 19:58:46 +01:00
Laurent Destailleur
2094ae1a57
NEW Add filter on event code on automatic filling setup page
2017-10-31 19:28:34 +01:00
Laurent Destailleur
bd94ec0f1d
Use fontawesome for picto for on/off default.
2017-10-31 12:25:06 +01:00
Laurent Destailleur
29bb0b37ef
Translation
2017-10-31 11:50:56 +01:00
Laurent Destailleur
068f5e32cb
NEW Tooltip for substitutions variables on tooltips on admin pages
2017-10-31 11:17:44 +01:00
Laurent Destailleur
007783cf76
FIX Searching translation should not be case sensitive
2017-10-30 01:45:39 +01:00
Laurent Destailleur
9edc8f6eb6
FIX Searching translation should not be case sensitive
2017-10-30 01:32:17 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
1adfc02724
Fix hook not visible when using old syntax
2017-10-27 10:05:21 +02:00
Laurent Destailleur
3accb9d658
Fix warning
2017-10-26 03:35:57 +02:00
Laurent Destailleur
9f0f5eb5e8
Fix translation of extrafields type
2017-10-24 18:05:43 +02:00
Laurent Destailleur
4d4f1ab6ec
Fix html entities
2017-10-24 10:09:20 +02:00
Laurent Destailleur
e257da6b19
Reload of menu auguria done when required
2017-10-24 09:47:18 +02:00
Laurent Destailleur
605c9c45e4
Merge pull request #7656 from atm-maxime/fix_accounting_mode
...
Fix #7584
2017-10-22 02:21:53 +02:00
Laurent Destailleur
4c58e4f98a
Update compta.php
2017-10-22 02:21:34 +02:00
Laurent Destailleur
3bca0ad07d
More modern picto for switch on/off
...
Work on website module
2017-10-20 21:39:19 +02:00
Maxime Kohlhaas
4224ea6c56
Fix use conf instead of global var
2017-10-18 19:09:29 +02:00
Laurent Destailleur
6bcdf2ff75
Test replacement of img switcher with FA css
2017-10-17 14:03:22 +02:00
Laurent Destailleur
3a97a3e2ad
Move key "Translation" into main file.
...
Add direct link to edit on transifex
2017-10-17 13:05:55 +02:00
Laurent Destailleur
5b880cf45f
Merge pull request #7645 from frederic34/transedit
...
enhance admin translation
2017-10-17 11:48:19 +02:00
Frédéric FRANCE
23e2c95af6
enhance admin translation
2017-10-16 21:22:13 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +02:00
Rui Strecht
447cc208fe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/societe/class/societe.class.php
2017-10-16 09:34:24 +01:00
Laurent Destailleur
87814af7b6
Move function colorIsLight into functions.lib.php
...
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
d12019d1b5
Fix from scrutinizer
2017-10-13 13:10:36 +02:00
Laurent Destailleur
8113321062
Start to work on email sender profiles
2017-10-13 12:02:26 +02:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
Laurent Destailleur
56be9e2b60
Introduce table c_email_senderprofile to have several profils
2017-10-11 19:41:45 +02:00
Laurent Destailleur
bcf56e3140
Introduce table c_email_senderprofile to have several profils
2017-10-11 19:41:19 +02:00
Laurent Destailleur
2759e2552e
Merge pull request #7609 from dolibarr95/patch-24
...
Update : Add class in module list table
2017-10-11 11:53:33 +02:00
dolibarr95
220b37133b
Wrong test
...
https://github.com/Dolibarr/dolibarr/issues/7604#issuecomment-335387587
2017-10-11 11:49:46 +02:00
Laurent Destailleur
acc83db220
Merge pull request #7605 from dolibarr95/patch-22
...
Fix : Wrong test in technical services provided
2017-10-11 11:49:18 +02:00
dolibarr95
0abc16b27f
Add class
...
Add oddeven class to tr tag
2017-10-10 14:55:42 +02:00
dolibarr95
7943a14fa2
Wrong test
...
https://github.com/Dolibarr/dolibarr/issues/7604#issuecomment-335387587
2017-10-10 09:43:03 +02:00
Laurent Destailleur
0b7aa20464
Add link to ChangeLog
2017-10-09 22:52:26 +02:00
Rui Strecht
1a5cdf2406
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/admin/company.php
# htdocs/core/class/commonobject.class.php
2017-10-09 11:36:38 +01:00
Laurent Destailleur
14b667c9f1
Merge pull request #7587 from hregis/develop_admin
...
NEW add doActions hook in admin ihm
2017-10-09 10:48:52 +02:00
Laurent Destailleur
33624e1001
NEW Attaching doc automatically in email is now a parameter of template.
2017-10-08 16:34:42 +02:00
Laurent Destailleur
ce7ce82801
Enhance email template editor
2017-10-08 14:51:10 +02:00
Regis Houssin
6401c8a58e
NEW add doActions hook in admin ihm
2017-10-07 20:05:02 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
de71de61af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 18:52:38 +02:00
Laurent Destailleur
df38f60617
Export website into zip
2017-10-06 18:29:18 +02:00
Regis Houssin
4ea3d27ced
Fix: for avoid problem with currentcontext
2017-10-06 15:19:43 +02:00
Laurent Destailleur
4bc7eb0ec1
Merge pull request #7520 from hregis/develop_ldap
...
Fix: Set LDAP password when LDAP key changed
2017-10-06 13:09:28 +02:00
Regis Houssin
e1311340a7
NEW add doActions hook in company admin
2017-10-06 08:45:59 +02:00
Laurent Destailleur
801a5180d6
Fix scrutinizer bug reports
2017-10-06 01:16:19 +02:00
Regis Houssin
8d3ad9ddc8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 08:43:07 +02:00
Laurent Destailleur
5ddd77c950
Fix We must use dol_escape_htmltag for input field not dol_htmlentities
2017-10-03 18:35:35 +02:00
Laurent Destailleur
eeb36464b7
Merge pull request #7524 from hregis/develop_mc
...
Fix: command not found with escapeshellarg !
2017-10-03 18:06:49 +02:00
Laurent Destailleur
386c8215ee
Update security_file.php
2017-10-03 18:06:32 +02:00
Laurent Destailleur
2f02015c30
Update security_file.php
2017-10-03 17:58:50 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
1f11dcb4bd
Fix no loose of configuration of action auto after upgrade Close #7527
2017-10-03 17:21:18 +02:00
Regis Houssin
a88938ace4
Fix: use GETPOST
2017-10-03 17:11:42 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Regis Houssin
475c881e67
Fix: add missing ldap fields
2017-10-02 09:00:07 +02:00
Regis Houssin
c1b6f59c1b
Fix: restore possible ldap keys
2017-10-02 08:43:53 +02:00
Laurent Destailleur
989f285d32
Replace table with div
2017-10-02 01:23:07 +02:00
Laurent Destailleur
3f3a5e0921
Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
...
New custom meteo
2017-10-02 00:48:52 +02:00
Laurent Destailleur
b3939f12b9
Enhance the default value feature
2017-10-01 15:06:43 +02:00
Regis Houssin
cb9d627f02
Fix: Set LDAP password when LDAP key changed
2017-09-30 11:51:22 +02:00
Regis Houssin
660c5dd03d
Fix: avoid ldap error when firstname and lastname is empty
2017-09-28 18:49:33 +02:00
Rui Strecht
4839d0f84d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-28 09:36:52 +01:00
Laurent Destailleur
8242469e40
FIX The unique index on email templates can work now.
2017-09-27 18:16:28 +02:00
Regis Houssin
a38668033d
Fix: missing modification
2017-09-27 17:46:17 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
Rui Strecht
3ebb18ab16
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-26 16:34:59 +01:00
gauthier
79049f55b7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_custom_meteo
2017-09-26 09:56:00 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/modules/modFournisseur.class.php
2017-09-25 19:54:27 +02:00
Laurent Destailleur
4c7b39f49e
FIX #7486 Empty value for multicurrency rate must be forbidden
2017-09-25 19:22:41 +02:00
gauthier
3db52aed78
NEW : calcul percentage ok
2017-09-25 17:13:50 +02:00
gauthier
6fa1929d5c
NEW : change description on click
2017-09-25 12:26:15 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
cef7b9c92d
FIX #7435 Can't add payment term
2017-09-25 00:08:26 +02:00
Regis Houssin
06ee9f4775
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-24 16:10:55 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Regis Houssin
791c385e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/adherents/card.php
2017-09-22 20:26:22 +02:00
Laurent Destailleur
f990667b1a
NEW Can send email from the member card using email templates.
2017-09-22 17:48:38 +02:00
Laurent Destailleur
d4bde2a4ea
Fix date substitution for contracts
2017-09-22 15:12:36 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
Laurent Destailleur
236cf853e5
Sort list of invoice template
2017-09-22 11:47:36 +02:00
Laurent Destailleur
292095f0c6
NEW Can filter on type of email template
2017-09-22 10:11:51 +02:00
gauthier
d51c22a012
NEW : customizable meteo in value or percentage
2017-09-21 17:28:00 +02:00
Rui Strecht
24f8ea003a
Added self to contributors list
2017-09-20 12:30:59 +01:00
Rui Strecht
42a57aab26
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-20 12:16:09 +01:00
Rui Strecht
f1126b65bf
Updated method to fetch state name, code and id to match method used with country
...
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
2017-09-20 12:06:35 +01:00
Regis Houssin
1f59e4f7e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-20 12:47:35 +02:00
Laurent Destailleur
cfd29841e1
NEW Option STOCK_SUPPORTS_SERVICES become visible.
2017-09-19 23:42:20 +02:00
Laurent Destailleur
c38ed54990
Disable old datepicker
2017-09-19 17:31:37 +02:00
Laurent Destailleur
278bcfa8da
FIX #7148
2017-09-18 15:31:22 +02:00
Regis Houssin
f550e27579
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-18 12:15:01 +02:00
Regis Houssin
bb0cb8adf4
Fix: remove unused file
2017-09-18 11:04:55 +02:00
Regis Houssin
8389555882
Fix: wrong image url and file not present
2017-09-18 10:33:54 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
e244ee6715
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-17 21:17:04 +02:00
Laurent Destailleur
2c3428a1bf
Fix css
2017-09-17 20:48:09 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Regis Houssin
1f88e624c2
Fix: add ldap import/export script
2017-09-17 10:42:00 +02:00
Regis Houssin
bdc425c203
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd
NEW add members types ldap group management
2017-09-16 21:41:30 +02:00
Laurent Destailleur
b099e0a135
Fix translation of dolistore interface
2017-09-16 10:42:23 +02:00
Laurent Destailleur
8773a6860f
Fix HTML5 use of <br> is preferred to <br />
2017-09-15 23:49:04 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
c930ba1669
Merge pull request #7403 from hregis/develop_bug
...
Fix: avoid Warning: A non-numeric value encountered
2017-09-15 15:52:25 +02:00
Regis Houssin
25cd1ee27a
Fix: avoid Warning: A non-numeric value encountered
2017-09-15 11:19:19 +02:00
Regis Houssin
a213a5d5fd
Fix: missing empty $object
2017-09-15 11:12:56 +02:00
Regis Houssin
b9e0879847
NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
...
NEW: complete_head_from_modules() in ldap_prepare_head()
2017-09-15 10:57:22 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
3b40c95107
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
2017-09-14 21:57:14 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
205989b64b
Fix phpunit
2017-09-14 09:16:57 +02:00
Laurent Destailleur
51e5959765
Fix travis
2017-09-14 08:26:13 +02:00
Laurent Destailleur
1a056d29d2
Debug search on dolistore
2017-09-12 21:02:18 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
d0a0bf57b6
NEW The "Show detail by account" accepts 3 values: yes, no, if non zero
2017-09-12 12:52:48 +02:00
Laurent Destailleur
31b5ca17f1
Merge pull request #7353 from hregis/6.0_htmlentities
...
Fix: avoid htmlentities
2017-09-11 14:08:37 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
e9e6a8e5ad
Fix center of button
2017-09-11 03:29:36 +02:00
Laurent Destailleur
903df90f8a
NEW Can edit with delete/insert a forced translation
2017-09-10 22:46:08 +02:00
Regis Houssin
7404a6cf98
Fix: avoid htmlentities
2017-09-09 12:15:59 +02:00
Laurent Destailleur
75172966c2
Fix selection of email templates
2017-09-08 14:40:39 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
152416a6d7
Fix bad param
2017-09-08 13:24:10 +02:00
Laurent Destailleur
b7197530c2
NEW Each user can edit its own email template (menu tools)
2017-09-08 12:48:01 +02:00
Laurent Destailleur
835cd43565
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-09-08 10:09:41 +02:00
Laurent Destailleur
7dbd0bd355
FIX Some page of admin were not responsive
2017-09-08 10:09:22 +02:00
Laurent Destailleur
f92eded0a2
Merge pull request #7340 from Oeris/6.0-ficheinter
...
NEW Adds an option to hide duration in the "intervention" module
2017-09-07 18:07:14 +02:00
Laurent Destailleur
b9af2d6b97
Merge pull request #7331 from simnandez/6.0
...
FIX: Bad const name
2017-09-07 17:57:33 +02:00
Neil Orley
e43b13968e
New: Adds an hide hour button in the "intervention" module
...
Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module
2017-09-07 15:31:19 +02:00
Neil Orley
b5c30ea679
New: Adds an hide duration button in intervention module
...
Adds a way to set the visibility of the intervention time field from the administration interface of the "intervention" module
2017-09-07 11:58:22 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
859d0dfe97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
d26b2a694d
FIX Security fixes (filter onload js, less verbose error message in
...
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +02:00
Laurent Destailleur
f29a4c1fb1
Make accountancy pages responsive
2017-09-05 20:42:34 +02:00
Juanjo Menent
53f5513476
FIX: Bad const name
2017-09-05 18:10:19 +02:00
Laurent Destailleur
c3daad7545
Fix not reachable code
2017-09-04 12:55:32 +02:00
Laurent Destailleur
3e9679f273
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-04 10:20:17 +02:00
Laurent Destailleur
58b08c7de8
Clean code
2017-09-01 23:56:59 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Regis Houssin
d9008cd302
Fix: missing $dolibarrdataroot value
2017-09-01 08:20:33 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Juanjo Menent
bfc5f01e1e
NEW Add detail of all tax rates into pdf column tax sale.
...
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
2017-08-30 14:36:00 +02:00
Laurent Destailleur
4d908c2dd0
Merge pull request #7299 from atm-maxime/new_expense_numbering
...
New : add expense report numbering mask
2017-08-29 18:24:17 +02:00
Laurent Destailleur
a60cd49fb0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
2017-08-28 12:53:02 +02:00
Laurent Destailleur
21a7fcb01a
Fix substitution when sending emails
2017-08-28 12:18:18 +02:00
Maxime Kohlhaas
350b24f32b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_expense_numbering
2017-08-27 17:53:19 +02:00
Maxime Kohlhaas
61fadfd0e1
New numbering module for expense report + admin setup
2017-08-27 10:49:51 +02:00
Laurent Destailleur
77af3b96d3
Showempty on language list
2017-08-26 18:45:10 +02:00
Laurent Destailleur
5ed22b64fb
Show if module add objects tables
2017-08-26 16:04:24 +02:00
Laurent Destailleur
632119a5c5
Show if module add dictionary data
2017-08-26 15:46:35 +02:00
Laurent Destailleur
f2a437fa89
Enhance modulebuilder
2017-08-26 15:22:13 +02:00
Laurent Destailleur
7329d21dcd
Fix lang selection
2017-08-25 17:13:33 +02:00
Laurent Destailleur
9d380a8b8a
NEW Can edit the language into the email templates editor.
2017-08-25 16:38:45 +02:00
Laurent Destailleur
17f44ad980
NEW Can make a specific setup for SMTP sending for emailing module
2017-08-24 02:02:00 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Laurent Destailleur
9f5718f00a
Fix php unit
2017-08-23 19:38:06 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
d90a23efb6
Fix for old php
2017-08-23 17:00:50 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Regis Houssin
2492b9968a
Fix: missing scandir
2017-08-23 10:21:10 +02:00
Regis Houssin
6dda2f3670
Fix: "scandir" in url is blocked in some providers
2017-08-23 10:07:00 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
ec56ff59d6
Fix invalid link after renaming a website key.
2017-08-22 15:32:45 +02:00
Laurent Destailleur
109e0f7179
Fix typo
2017-08-22 15:31:37 +02:00
Laurent Destailleur
a5d210195c
Add option MAIN_DISABLE_DOLISTORE_SEARCH
2017-08-22 14:55:01 +02:00
Laurent Destailleur
42666a0146
Fix bad link
2017-08-22 14:51:47 +02:00
Laurent Destailleur
14cd150762
NEW Introduce experimental feature to search dolistore from application
2017-08-22 14:47:01 +02:00
Laurent Destailleur
b3d1cdf84c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-08-22 10:11:32 +02:00
Laurent Destailleur
4a310f36d8
Fix help url
2017-08-22 08:12:30 +02:00
Laurent Destailleur
188653a85d
Work on website module
2017-08-20 18:50:51 +02:00
Laurent Destailleur
5c5c4046a1
Prepare setup for email reminder
2017-08-20 16:07:22 +02:00
Laurent Destailleur
5d76227948
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-18 23:22:36 +02:00
Laurent Destailleur
097b660c41
Mutualize code
2017-08-18 16:25:00 +02:00
Laurent Destailleur
22a7c9bd6b
Merge pull request #7220 from guerrierk/develop
...
NEW|Add possibility to propose last num releve in conciliation
2017-08-17 23:42:07 +02:00
Laurent Destailleur
f058fa1938
Better detection if a module provide triggers
2017-08-03 12:19:31 +02:00
Laurent Destailleur
00a1893d93
Better help
2017-08-03 12:04:13 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
69357dd91c
Merge pull request #7113 from atm-ph/new_develop_expense_report
...
NEW Add expense report rules and ik
2017-07-31 02:33:49 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +02:00
Laurent Destailleur
bb8d458468
Fix menu editor
2017-07-30 19:41:45 +02:00
GUERRIER Kevin
ded6b40489
Add possibility to propose last num releve in conciliation
2017-07-29 14:21:58 +02:00
atm-ph
1f3f9e40b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-27 16:01:53 +02:00
Regis Houssin
2efb86b5d8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-23 10:36:14 +02:00
Laurent Destailleur
854a6ca3d5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-22 16:40:45 +02:00
Laurent Destailleur
5207b84e8b
Fix compatibility with indian IGST/CSGST/SGST
2017-07-22 01:56:38 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
1851080b31
Merge pull request #7152 from dolibarr95/patch-14
...
'int' for $rate variable
2017-07-21 15:07:00 +02:00
Laurent Destailleur
5965bec501
Update multicurrency.php
2017-07-21 15:06:53 +02:00
Laurent Destailleur
168f167934
Tooltip
2017-07-21 12:42:21 +02:00
Laurent Destailleur
df61a5f045
Debug module website
2017-07-20 20:05:49 +02:00
Laurent Destailleur
1e7aa4d9b4
Work on module website
2017-07-19 16:38:00 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
1ef70b387d
Fix bad limit
2017-07-17 16:45:24 +02:00
Laurent Destailleur
7b2a71802b
Do some TODO on modulebuilder module.
2017-07-16 13:00:35 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
15cf15f47f
Look and feel v6
2017-07-14 02:07:01 +02:00
dolibarr95
de24c0e367
Keep alpha for $rate var
2017-07-13 16:21:02 +02:00
dolibarr95
c36c2408c2
'int' for $rate variable
...
see :
https://github.com/Dolibarr/dolibarr/pull/7149#issuecomment-315076031
2017-07-13 15:31:46 +02:00
Laurent Destailleur
743de4e586
FIX Option to classify proposal/order in workflow module must not set
...
source object to billed if amount differs.
2017-07-13 12:42:32 +02:00
Laurent Destailleur
028f1f5133
Fix default currency in creation form.
2017-07-13 10:16:40 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Laurent Destailleur
23fbef3dae
Fix the delete dir functions does not return real nb of deleted files.
2017-07-13 00:26:05 +02:00
Laurent Destailleur
0d4d4516c8
Fix template for css and js
2017-07-12 22:52:56 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
Laurent Destailleur
be09c911ce
Debug module websites
2017-07-10 23:44:46 +02:00
Laurent Destailleur
fd89535037
Debug module website
2017-07-09 22:30:19 +02:00
Laurent Destailleur
3c576dcf21
Fix bad name of tables
2017-07-09 20:57:45 +02:00
Laurent Destailleur
10cb7b2524
Fix remove warnings
2017-07-09 20:31:27 +02:00
Laurent Destailleur
71d360b4a0
Merge pull request #7105 from hregis/develop_bug2
...
Fix: check if action type is different of 'user' (external module)
2017-07-07 19:57:26 +02:00
Laurent Destailleur
2be9f402c6
Fix order of tab
2017-07-07 10:58:18 +02:00
phf
6ab0ec4b1b
Fix travis and rename 2 fields
2017-07-07 10:22:37 +02:00
phf
b8865c425f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-05 10:48:01 +02:00
phf
1beec51928
New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE
2017-07-05 10:44:52 +02:00
Laurent Destailleur
0ee93fb00c
Fix conflict between option login and logina and logint in agenda export
2017-07-04 10:29:38 +02:00
Regis Houssin
d9d9b748ad
Fix: check if action type is different of 'user' (external module)
2017-07-03 19:27:21 +02:00
Laurent Destailleur
9e26e6b0a3
Fix bad value for ref of old contracts
2017-07-03 11:42:17 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
Laurent Destailleur
658fe93d8c
Fix menu editor (data not aligned)
2017-07-01 12:42:49 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
5f00fb5df8
Merge pull request #7059 from jfefe/patch-13
...
Add missing end tag `form` into fichinter setup
2017-06-27 17:36:33 +02:00
Laurent Destailleur
3b7667292b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-27 11:59:40 +02:00
Laurent Destailleur
10eda66735
Fix alignement
2017-06-27 11:32:52 +02:00
jfefe
9b951c5d1b
Add missing end tag form into fichinter setup
...
The setup for option `FICHINTER_PRINT_PRODUCTS` was broken.
2017-06-26 21:37:36 +02:00
Laurent Destailleur
85ce1f3332
Fix missing var init
2017-06-26 09:20:16 +02:00
Laurent Destailleur
e97a4d953d
Merge pull request #7052 from hidupcloud/develop
...
FIX Fixing pages warning when value is null
2017-06-25 03:03:34 +02:00
Laurent Destailleur
778e581aca
Fix: avoid warning on permission if there is only admin users
2017-06-24 22:14:04 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae
Fixing pages warning when value is null
2017-06-24 16:45:45 +02:00
Laurent Destailleur
b0c5616ff0
Fix in the way markdown README and ChangeLog are output on module page.
2017-06-24 16:01:18 +02:00
Laurent Destailleur
014cb4b004
Fix navigation on security event list
2017-06-21 12:03:49 +02:00
Regis Houssin
2fffd2fa6f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-20 23:26:21 +02:00
Laurent Destailleur
ec9bbe2b52
Help/Need debug of some online instances with the log view
2017-06-20 16:54:37 +02:00
Laurent Destailleur
4dda771079
FIX #6973
2017-06-20 12:54:26 +02:00
Laurent Destailleur
f2a2cfd8c8
Look and feel v6
2017-06-20 11:46:30 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Regis Houssin
dcc152d4a4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-18 06:52:20 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Regis Houssin
d1b003f3c4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-17 12:01:14 +02:00
Laurent Destailleur
8a1de52f3c
Fix translation
2017-06-17 12:00:33 +02:00
Laurent Destailleur
7c41c9a3e4
Fix activation of dependency for a dedicated country.
...
BlockedLog depends now on CashDesk only.
2017-06-17 11:43:00 +02:00
Regis Houssin
49e8af7cc9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-17 10:34:50 +02:00
Laurent Destailleur
1d91ce90d3
FIX image from medias directory into PDF free text
2017-06-17 00:16:22 +02:00
Regis Houssin
f0e234eef2
Fix: missing hookmanager init
2017-06-16 17:01:43 +02:00
Laurent Destailleur
b228fe6a2a
Fix auto focus on module page
2017-06-16 16:06:20 +02:00
Regis Houssin
c656856ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi
2017-06-16 10:52:43 +02:00
Laurent Destailleur
8149bf62a8
Fix ajaxcombo broken on accouting account edition on vat dictionary.
2017-06-15 23:47:19 +02:00
Regis Houssin
78d5520741
Fix: missing _cleanObjectDatas function
2017-06-15 21:23:35 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
0b6d7a5b57
Modulebuilder
2017-06-14 12:05:47 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
58c4144123
Fix sort of dictionnary
2017-06-11 19:27:07 +02:00
Regis Houssin
d1233755f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:41:02 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
542a72c684
NEW custom dir is enabled dy default on first install.
...
Fix modulebuilder when custom dir not defined.
2017-06-10 23:50:46 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Laurent Destailleur
58a407d9f1
Fix style and align when no permission on widget
2017-06-10 00:05:47 +02:00
Regis Houssin
460a6f0fb7
Fix: phpunit : Unexpected 'print' (T_PRINT)
2017-06-09 14:15:29 +02:00
Regis Houssin
0e8f36dc92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-09 14:00:48 +02:00
Laurent Destailleur
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
41586b76c0
Fix missing css
2017-06-09 11:40:35 +02:00
Regis Houssin
0546f28823
Fix: Travis error
2017-06-08 18:38:24 +02:00
Regis Houssin
73557151d2
Fix: better test if entity equal 0
2017-06-08 18:27:32 +02:00
Regis Houssin
3bddbd3bdf
Fix: better test
2017-06-08 18:20:27 +02:00
Regis Houssin
ade915af5f
New: add dictionnary sharing (multicompany)
2017-06-08 16:36:42 +02:00
Regis Houssin
4b98a1aefd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-08 15:05:45 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
Laurent Destailleur
57f3d0910e
Merge pull request #6738 from grandoc/new_branch_20_04
...
Update code using new css class
2017-06-08 11:00:49 +02:00
Regis Houssin
1baa620688
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-08 10:33:26 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Regis Houssin
44dba391c1
New: add dictionnary sharing (multicompany)
2017-06-08 10:24:16 +02:00
Regis Houssin
b183c6e7ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_transverse
2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Regis Houssin
03df365eea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 11:01:42 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
7ad92c3a4d
Fix new generic substitution system
2017-06-01 13:32:20 +02:00
Laurent Destailleur
733d1caac6
Correct usage of parameter 'none' in GETPOST
2017-06-01 12:37:16 +02:00
Laurent Destailleur
77df19009d
Removed duplicated code
2017-06-01 12:11:45 +02:00
Laurent Destailleur
c70beaa56b
Complete work for mutualizing generic substitution system.
2017-06-01 01:57:22 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
fa6bc03765
Fix typo
2017-05-30 01:34:20 +02:00
Laurent Destailleur
d56cd44ebc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-29 19:11:41 +02:00
Laurent Destailleur
59ab9a4421
FIX #6850
2017-05-29 15:25:37 +02:00
Laurent Destailleur
3f5cf0ee18
Merge pull request #6897 from hregis/develop_bug4
...
Fix: for view special values
2017-05-29 10:46:03 +02:00
Laurent Destailleur
452579150d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2017-05-29 10:43:26 +02:00
Laurent Destailleur
e667d72547
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
2017-05-29 10:41:51 +02:00
Laurent Destailleur
b22817c237
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2017-05-29 10:25:07 +02:00
Laurent Destailleur
c4f09b8894
Work on modulebuilder
2017-05-28 14:43:17 +02:00
Regis Houssin
95b2b1bd17
Fix: for view special values
2017-05-26 10:28:10 +02:00
Alexandre SPANGARO
1f079fac9d
Move html.formventilation.class.php to html.formaccounting.class.php
2017-05-25 06:57:28 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
a53fb25cfa
Look and feel v6
2017-05-20 18:46:15 +02:00
Laurent Destailleur
80cbc28385
NEW Add REST API to push a file.
2017-05-20 15:52:36 +02:00
Laurent Destailleur
807c77f754
Fix inconsistent options
2017-05-19 18:03:49 +02:00
Laurent Destailleur
d1c4439a0f
Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option
...
NEW Module Agenda: Add option - Show linked object into agenda view
2017-05-19 17:23:54 +02:00
Laurent Destailleur
b35b40e2bf
Align position of right
2017-05-19 17:08:42 +02:00
Laurent Destailleur
f65b29c135
FIX #6867 - Rewrite code to solve regression (not mixing array/string
...
type and solve php warnings). Also restore $langs as a global var.
2017-05-19 16:57:38 +02:00
Laurent Destailleur
2a0a0f12f3
Merge pull request #6867 from OPEN-DSI/core_dict_actioncomm_modify_color_position
...
NEW Core dictionaries: Adds the ability to change the color and position …
2017-05-19 16:33:05 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
KHELIFA
2382a0a4ee
Core dictionaries: Adds the ability to change the color and position of the dictionary 'Types of agenda events'
2017-05-19 10:46:29 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
dff7d00d2b
Look and feel v6
2017-05-18 13:13:18 +02:00
Laurent Destailleur
4a46480ef5
Fix preview of PDF contract
2017-05-18 12:40:20 +02:00
KHELIFA
169859b708
Module Agenda: Add option - Show linked object into agenda view
2017-05-17 17:00:45 +02:00
Sergio Sanchis Climent
1a98886aa3
FIX : #6813
2017-05-17 00:42:29 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
cc16bb0bef
Debug default value feature.
2017-05-16 12:22:55 +02:00
Laurent Destailleur
789fbb6dc3
Enhance tooltips
2017-05-15 12:57:08 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +02:00
Laurent Destailleur
553f5b990c
Fix scrutinizer errors
2017-05-13 18:50:55 +02:00
Laurent Destailleur
b09300ab61
NEW Can edit background color for odd and even lines in tables
2017-05-11 13:02:29 +02:00
Laurent Destailleur
2199c525bc
Merge pull request #6805 from grandoc/new_branch_06_05
...
Update code using new css class
2017-05-10 22:51:31 +02:00
Laurent Destailleur
578eb98b33
Better user interface
2017-05-10 13:13:33 +02:00
Laurent Destailleur
b8b91db007
Use function top_httphead to include headers in pages.
2017-05-09 21:46:57 +02:00
Laurent Destailleur
9fe28c9b2c
NEW Can disable all overwrote translations in one click.
2017-05-09 10:08:04 +02:00
Laurent Destailleur
05d6c2cd75
Fix no more use of constant
2017-05-09 01:36:20 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Laurent Destailleur
d948447600
Add button to disable all personalized default values in one click.
2017-05-06 17:08:38 +02:00
Philippe Grand
fe50dabf42
Merge branch 'develop' into new_branch_20_04
2017-05-06 11:05:33 +02:00
philippe grand
55feea5d98
Update code using new css class
2017-05-06 10:54:28 +02:00
Laurent Destailleur
56140ae572
Work on default focus
2017-05-06 01:09:22 +02:00
Laurent Destailleur
5e6b2897ad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 22:57:52 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Laurent Destailleur
fb58dfa898
Merge pull request #6752 from grandoc/new_branch_24_04
...
Update code using new css class
2017-05-05 19:08:38 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Philippe Grand
b5b79bc36b
Merge branch 'develop' into new_branch_24_04
2017-05-04 21:42:43 +02:00
Philippe Grand
ffe4e48304
Update agenda_other.php
2017-05-04 21:37:27 +02:00
Laurent Destailleur
aa8aa5672b
Merge pull request #6753 from grandoc/new_branch_25_04
...
Update code using new css class
2017-05-04 21:03:11 +02:00
Laurent Destailleur
626c0d6d5e
Add more substitution keys for PDFs.
2017-05-04 20:40:13 +02:00
Laurent Destailleur
768df56c07
Uniformize name of standard PDF template
2017-05-04 20:16:55 +02:00
Laurent Destailleur
c196e79bf4
Merge branch 'develop' into FIX_inventory
2017-05-04 13:50:53 +02:00
Philippe Grand
4c2f3aeeac
Update compta.php
2017-05-04 13:46:25 +02:00
Philippe Grand
a19268c0a3
Merge branch 'develop' into new_branch_20_04
2017-05-04 13:43:37 +02:00
Laurent Destailleur
7ec46b3bd6
Finished work to have substitution keys code mutualized.
2017-05-04 12:35:45 +02:00
alexis portable
428e16341c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into FIX_inventory
2017-05-02 22:46:33 +02:00
alexis Algoud
6138d197e4
FIX major issues for inventory
...
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
2017-05-02 15:19:55 +02:00
Laurent Destailleur
ad095d7fb2
NEW Can set margins of PDFs
2017-05-02 14:26:51 +02:00
Laurent Destailleur
9641a240ea
Complete vat dictionnary
2017-05-02 11:27:35 +02:00
Laurent Destailleur
6e1f825190
Look and feel v6
2017-05-01 13:01:05 +02:00
Laurent Destailleur
a9eeb823bd
Fix browser notif
2017-04-30 05:01:53 +02:00
Laurent Destailleur
60951cf307
Less data example
2017-04-30 04:09:50 +02:00
Laurent Destailleur
f5bdfc426f
Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview
...
New inventory coreobject listview
2017-04-29 21:31:46 +02:00
Laurent Destailleur
a8c775dcbd
Fix compatibility with the removal of "constant".
2017-04-29 18:48:30 +02:00
Laurent Destailleur
2e6d865c7d
NEW Can define default values for create forms.
...
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
2017-04-29 00:44:25 +02:00
phf
8219ff84c8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-04-28 14:45:04 +02:00
Laurent Destailleur
676ff84a4e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-04-28 14:05:42 +02:00
Laurent Destailleur
defce63a24
Work on management of default values
2017-04-28 14:05:28 +02:00
Laurent Destailleur
0ba6433a61
Work on module website
2017-04-28 13:10:08 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
5e856e6923
More complete tooltip help to describe available substitution vars
2017-04-27 17:16:19 +02:00
Laurent Destailleur
1a98c4a3ff
Fix error management in adding translation key
2017-04-27 12:48:13 +02:00
Laurent Destailleur
aa4b967e17
FIX image of rss when link is relative
...
Fix regression after disabling constant init.
2017-04-26 11:46:12 +02:00
philippe grand
e2dbcb2b5a
Update code using new css class
2017-04-25 11:59:18 +02:00
Laurent Destailleur
113d4d1665
FIX spaces not allowed into vat code
2017-04-25 10:29:13 +02:00
philippe grand
0c7cfdb037
Update code using new css class
2017-04-24 16:36:58 +02:00
philippe grand
635894cf10
Update code using new css class
2017-04-20 14:51:36 +02:00
Juanjo Menent
4e2f4fd48b
Merge pull request #6699 from grandoc/new_branch_12_04
...
Update code using new css class
2017-04-19 16:10:02 +02:00
Philippe Grand
88f771a7f1
Merge branch 'develop' into new_branch_12_04
2017-04-19 11:49:26 +02:00
Philippe Grand
a88d6425d7
Merge branch 'develop' into new_branch_13_04
2017-04-19 11:38:28 +02:00
Laurent Destailleur
3da0aea168
Prepare code to use different SMTP servers.
2017-04-18 01:39:06 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Laurent Destailleur
b0442aa56a
Better explanation on label that are translated.
2017-04-14 19:48:01 +02:00
Laurent Destailleur
e2c31b5f23
Fix regression
2017-04-14 18:43:34 +02:00
Laurent Destailleur
db73eeba5c
NEW Can filter on code in dictionnaries
2017-04-14 16:31:16 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
4818b1ba44
Load default values into $user->default_values
2017-04-14 12:39:11 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
philippe grand
1d546462dd
Update code using new css class
2017-04-13 15:59:51 +02:00
philippe grand
edaa3ae672
Update code using new css class
2017-04-12 17:44:01 +02:00
Laurent Destailleur
423ffefbf3
NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN_LINKTO
2017-04-11 18:18:36 +02:00
Laurent Destailleur
2446cb5431
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Laurent Destailleur
d15792bdf4
Minor fix
2017-04-11 00:59:47 +02:00
Laurent Destailleur
9b45776941
Fix responsive
2017-04-10 17:25:53 +02:00
Laurent Destailleur
06f9c1989b
Work on default values
2017-04-10 13:14:31 +02:00
Laurent Destailleur
f1ae0eb7c6
Default value
2017-04-10 12:51:52 +02:00
Marcos García de La Fuente
da0af36086
FIX #6671 Cannot remove thirdparty type with "#" in its name
...
Close #6671
2017-04-09 14:51:15 +02:00
Laurent Destailleur
bb7c164752
Work on page to set/edit default values
2017-04-08 14:18:10 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
a6c60e4a9a
FIX shared bank account with multicompany not visible in invoice setup
2017-04-05 11:14:02 +02:00
Laurent Destailleur
6d81f29835
Merge pull request #6578 from inoveaconseil/patch-1
...
Update pdf.php
2017-03-31 18:07:03 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b
NEW Can add a background image on login page
2017-03-31 11:40:31 +02:00
Laurent Destailleur
18e1e5b780
NEW Add "depends on" and "required by "into module informations
2017-03-30 15:54:48 +02:00
Laurent Destailleur
4df8dcf980
Work on module modBlockedLog and modModuleBuilder
2017-03-29 21:50:15 +02:00
Laurent Destailleur
54b03a3552
Work on 6.0 new look and feel
2017-03-29 11:03:13 +02:00
phf
c3e8a5be62
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-28 17:20:50 +02:00
Laurent Destailleur
219bcb0d54
Work on 6.0 features.
2017-03-27 22:44:50 +02:00
Laurent Destailleur
9f0328ab7f
Hidden for the moment because option specific to one theme only.
2017-03-26 13:11:01 +02:00
Laurent Destailleur
95fbe0147d
Merge pull request #6585 from defrance/patch-99
...
display input border by setting
2017-03-26 13:06:48 +02:00
Laurent Destailleur
9a85e5ef00
Enhance the file checker
2017-03-26 01:45:09 +01:00
Laurent Destailleur
8c2b70c4a7
Fix filechecker
2017-03-25 20:51:02 +01:00
BENKE Charlie
acfdc96121
Border input display is allowed by setting
2017-03-25 19:34:04 +01:00
Inovea Conseil
447607ecd9
Update pdf.php
...
Missing translate #6577
2017-03-25 12:46:32 +01:00
atm-ph
edc2d39702
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-24 17:06:40 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
fec3a89aa5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 11:38:46 +01:00
Laurent Destailleur
0a35d17207
CSS enhancement
2017-03-23 10:59:13 +01:00
Laurent Destailleur
917ef1e01e
Uniformize code
2017-03-22 20:34:01 +01:00
Laurent Destailleur
b5e646daa0
NEW Show by default README.md file found into root dir of ext module.
2017-03-21 16:43:09 +01:00
Laurent Destailleur
a5c11dc840
NEW Add function dolMd2Html
2017-03-21 16:03:13 +01:00
Laurent Destailleur
5b4bb56012
No more need of $bc[$var]
2017-03-21 12:13:02 +01:00
Laurent Destailleur
d9abe553cf
Useless bottom-border
2017-03-21 10:54:47 +01:00
Laurent Destailleur
967f3f579d
Fix translation
2017-03-18 20:07:37 +01:00
Laurent Destailleur
49624c7b68
Useless bottom-border
2017-03-18 19:57:33 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
Laurent Destailleur
4bf0e31299
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-11 02:40:42 +01:00
Laurent Destailleur
c3179963ca
Fix search fails under certain circumstances.
2017-03-10 14:59:57 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
Laurent Destailleur
fda84995e8
If manage zero is set, we must NOT set length. So we can here make a
...
shortcut to avoid useless code.
2017-03-10 11:50:57 +01:00
Laurent Destailleur
c962daabac
NEW add property to show warnings when activating modules
2017-03-09 15:16:16 +01:00
arnaud
4a7e3fb387
NEW odt usergroup
2017-03-08 11:34:21 +01:00
arnaud
abeba95de9
New USER odt
2017-03-02 15:13:42 +01:00
Laurent Destailleur
0f22beb774
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +01:00
Laurent Destailleur
74e8fb9c19
NEW Can set number of dump to keep with job "local database backup"
2017-02-27 02:04:25 +01:00
BENKE Charlie
a2611e31fe
add selectform choice for private mailing
...
better usability than enter 0 ou 1 value
2017-02-24 11:12:14 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
86c399db70
Clean admin menu entries
2017-02-22 02:32:35 +01:00
Laurent Destailleur
d5bb208957
Clean admin menu entries
2017-02-22 02:19:50 +01:00
Laurent Destailleur
eef3824f8c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
Laurent Destailleur
89d10ae5aa
Fix the accounting account groups must be editable by book keeper, not
...
admin user.
2017-02-20 11:21:38 +01:00
arnaud
4ec664029d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
2017-02-17 16:40:14 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
Laurent Destailleur
bde6815e5d
Merge pull request #6425 from GPCsolutions/5.0-multicurrency-error
...
Fix: [Multicurrency] properly display API error
2017-02-17 10:45:45 +01:00
Laurent Destailleur
c3d78bf1b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
2017-02-16 22:09:37 +01:00
Laurent Destailleur
a1ba4aa941
NEW: No external check of version without explicit click in about page.
2017-02-16 02:27:07 +01:00
Laurent Destailleur
ea4a83838c
Missing not visible paramater
2017-02-15 18:30:27 +01:00
Raphaël Doursenaud
d9f32f7ae1
Fix: [Multicurrency] properly display API error
2017-02-15 13:20:38 +01:00
arnaud
977c18513d
FIX pdf supplier payment work
2017-02-14 12:00:56 +01:00
Laurent Destailleur
bcd624e5a5
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-13 01:37:53 +01:00
Laurent Destailleur
25e8caa64e
Fix reversing test for a test
2017-02-13 01:37:12 +01:00
Laurent Destailleur
868f2e5473
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/update.php
htdocs/core/lib/functions.lib.php
2017-02-13 01:36:02 +01:00
Laurent Destailleur
ae740b7c1b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/langs/en_US/errors.lang
2017-02-13 01:19:30 +01:00
Laurent Destailleur
bf32acaadd
Fix control of module format.
2017-02-13 01:13:41 +01:00
Laurent Destailleur
cda301f6b7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-12 20:51:52 +01:00
Laurent Destailleur
d4fd9bd71e
Merge pull request #6414 from laudeco/fix/dictionnary_without_rowid
...
[FIX] Dictionaries without rowid
2017-02-12 20:46:43 +01:00
Laurent Destailleur
a8c5ba2983
Fix php7 error
2017-02-12 20:40:20 +01:00
Laurent Destailleur
5233b8c87f
Fix support for option MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES
2017-02-12 18:38:24 +01:00
Laurent Destailleur
05c9f57fd4
Move edition of emails templates out of dictionaries so we would be able
...
to have templates per user (not reserved to admin).
2017-02-12 18:13:49 +01:00
Laurent Destailleur
f34e0b1bdb
NEW Can deploy an external module from the module setup area.
2017-02-11 15:41:01 +01:00
Laurent Destailleur
4723eac227
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-11 13:56:39 +01:00
Laurent Destailleur
f6a8aacc8d
Fix: deployement of a module
2017-02-10 18:42:59 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Laurent Destailleur
44ab6ad9b7
NEW Can control constants values into file integrity checker
2017-02-10 17:05:45 +01:00
De Coninck Laurent
4fb4bc6f6c
[FIX] Dictionnaries without rowid
...
It's possible to create a dictionnary without the key rowid.
But in that case it's impossible to enable/disable the value because the dictionnary fonctionality uses always rowid even another primary key is defined.
By this fix, the id property uses is the primary key defined on the dictionnary creation.
2017-02-10 10:29:08 +01:00
Laurent Destailleur
488d68113d
Add total in the file integrity checker
2017-02-09 12:56:39 +01:00
Laurent Destailleur
fbe0b13706
Add parameter to set the url to use for the file integrity checker
2017-02-09 01:07:54 +01:00
Laurent Destailleur
b250485efd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-08 11:00:19 +01:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
dc0856413c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-08 10:57:02 +01:00
florian HENRY
7fcf598c78
Fix travis
2017-02-08 08:52:58 +01:00
Laurent Destailleur
d56b5f30c8
FIX #6330
2017-02-07 01:34:21 +01:00
Laurent Destailleur
e58743ea5b
Fix regression: Textarea to enter data was crushed.
2017-02-07 01:13:04 +01:00
Laurent Destailleur
74992ee53f
Merge pull request #6375 from marcosgdf/admin-view
...
Little improvements to admin pages where a FREE_TEXT or a watermark constant was set
2017-02-06 20:11:22 +01:00
Laurent Destailleur
9220a638b5
NEW Filechecker can include custom dir and report added files.
2017-02-06 15:29:07 +01:00
Laurent Destailleur
fea2b081f9
Fix: The long description feature will be available with 6.0. Large
...
content creates problem with tooltip.
2017-02-04 14:17:55 +01:00
Laurent Destailleur
a673afe601
NEW Description of feature of a module into a dedicated popup
2017-02-04 14:16:17 +01:00
Marcos García de La Fuente
a94a951a89
Little improvements to admin pages where a FREE_TEXT or a watermark constant was set
2017-02-03 19:38:33 +01:00
Laurent Destailleur
c48400331f
Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date
...
NEW get multicurrency rate from document date (propal, order)
2017-01-27 01:32:52 +01:00
Laurent Destailleur
29df2c9115
Merge branch 'develop' into mail-lines
2017-01-27 01:29:58 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
809e3ce4d5
Debug browser notification
2017-01-20 20:10:16 +01:00
Juanjo Menent
2374aa351e
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-20 15:55:51 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
bb95f139a8
Fix responsive
2017-01-17 20:04:41 +01:00
BENKE Charlie
e701ea0b2f
Add dictionnary mail for contract
2017-01-16 14:06:34 +01:00
Laurent Destailleur
f5458b4337
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/core/class/html.formfile.class.php
htdocs/product/stats/card.php
2017-01-16 00:48:37 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Regis Houssin
f9ed1592e1
Fix: search problem if name contains accents
2017-01-15 16:07:04 +01:00
Juanjo Menent
3a40d5a4f1
NEW: Events notifications in browser
2017-01-13 16:13:01 +01:00
Juanjo Menent
6cc3ef0c99
NEW: Events notifications in browser
2017-01-13 16:08:49 +01:00
Alexis Algoud
8b4a43ec77
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-09 10:31:05 +01:00
Laurent Destailleur
b21998d506
Fix global checksum not visible on old versions. Link with checksum file
...
to check was hardcoded.
2017-01-07 15:56:04 +01:00
Laurent Destailleur
358616cda2
Fix link should be https
2017-01-07 15:18:57 +01:00
Laurent Destailleur
680c48d90a
Fix error on expired tokens
2017-01-07 14:48:05 +01:00
Laurent Destailleur
9cfc8d4095
Fix several problems into OAuth2 module.
2017-01-06 19:58:46 +01:00
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +01:00
Alexis Algoud
370be70e46
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-03 16:30:50 +01:00
Ion Agorria
522fb4cf7a
Add email template for each line in object
2016-12-31 17:39:01 +01:00
Rabouin Geoffroy
a277a6f190
Typo in SQL request
2016-12-28 10:26:31 +01:00
Laurent Destailleur
c5850d29e7
Fix checksum integrity. Also add a global checksum.
2016-12-26 19:51:24 +01:00
Laurent Destailleur
83a8fcb7f9
Fix filecheck tool.
2016-12-26 19:01:24 +01:00
Laurent Destailleur
374a6d7783
Fix filecheck tool.
2016-12-26 18:50:20 +01:00
Laurent Destailleur
c16489a3c0
Fix add message to explain why some emails fails
2016-12-25 23:14:51 +01:00
Laurent Destailleur
7e2b41402e
Fix bad balance of form
2016-12-23 16:24:07 +01:00
Laurent Destailleur
77c320a092
Fix warning for expense report late
2016-12-22 15:33:43 +01:00
Laurent Destailleur
3c79f3acb5
Minor fixes or code comment
2016-12-20 12:06:26 +01:00
Laurent Destailleur
4d624fd875
Debug feature to choose email "from"
2016-12-20 11:23:44 +01:00
Laurent Destailleur
b3d5f40f37
Merge pull request #6166 from atm-gauthier/3.9_fix_wrong_test
...
FIX : wrong test on dict.php
2016-12-18 10:58:32 +01:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
Laurent Destailleur
c750ba8b99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/conf/conf.php.example
htdocs/langs/en_US/mails.lang
2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282
FIX Security to restrict email sending was not efficient
2016-12-16 13:46:39 +01:00
Alexis Algoud
b7a6a71dff
move file to core
2016-12-15 17:20:46 +01:00
gauthier
4dd740fe2f
FIX : wrong test on dict.php
2016-12-13 11:41:26 +01:00
Laurent Destailleur
5187ffcc9a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-12 13:03:37 +01:00
Laurent Destailleur
4e86e59fb3
Fix responsive
2016-12-12 13:02:54 +01:00
Laurent Destailleur
7077b4931c
Add dump v5
2016-12-12 11:57:50 +01:00
tarrsalah
eb6620f6f6
fix ( #6158 )default localtax1 and localtax2 values.
2016-12-11 17:56:49 +01:00
phf
f5bffeb535
New get multicurrency rate from document date (propal, order)
2016-12-11 16:30:01 +01:00
Maxime Kohlhaas
194639c30e
Missing lang in admin
2016-12-10 22:41:57 +01:00
Maxime Kohlhaas
3ab23ecb7e
Better currency rate setup
2016-12-10 22:40:25 +01:00
BENKE Charlie
b74071dc73
Better display on internal/external module info
2016-12-10 19:35:58 +01:00
Laurent Destailleur
211436b436
Better responsive
2016-12-04 01:14:09 +01:00
Laurent Destailleur
8c428ac5b7
Fix responsive design
2016-12-04 00:51:15 +01:00
Laurent Destailleur
81a3235cf6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
Laurent Destailleur
711961ed18
Fix missing translation
2016-11-29 17:24:40 +01:00
Laurent Destailleur
c33e486828
Fix order of option and picto
2016-11-29 10:42:10 +01:00
Laurent Destailleur
2e5634e60f
Fix responsive design
2016-11-27 14:21:23 +01:00
Laurent Destailleur
60c494fd5f
Missing dolibarr version in dump file
2016-11-26 17:48:06 +01:00
aspangaro
638563dc5d
Fix missing language key in holiday type dictionary
2016-11-22 05:54:44 +01:00
aspangaro
6e66d529f0
Fix missing language key for lead status dictionary
2016-11-22 05:33:33 +01:00
aspangaro
38a31cbd28
Fix missing key language in dictionary email models
2016-11-22 05:25:08 +01:00
aspangaro
213e7d1cd7
Fix Missing language key for dictionary format card
2016-11-21 21:49:08 +01:00
aspangaro
31dd20ec7c
Spaces
2016-11-20 22:59:13 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
bfd1ce0095
Fix translation
2016-11-14 15:25:45 +01:00
Laurent Destailleur
b44c746c2e
Fix table disabled
2016-11-13 18:31:22 +01:00
Laurent Destailleur
6d70d39bbd
NEW Add type "url" as possible extrafield.
2016-11-08 17:21:26 +01:00
Laurent Destailleur
7a94cfc994
NEW Better filtering of automatic/manually inserted events.
2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
bcd3a1a888
NEW Default collation for mysql is now utf8_unicode_ci
2016-11-07 01:53:34 +01:00
Laurent Destailleur
961f7a4e48
Fix label on tab
2016-11-07 00:32:28 +01:00
Laurent Destailleur
4681c84e1d
Better responsive
2016-11-06 12:16:10 +01:00
Laurent Destailleur
a658b7cc3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/card.php
2016-10-31 21:31:57 +01:00
Laurent Destailleur
ffe4ae5915
Fix php7 compatibility
2016-10-31 21:24:23 +01:00
Laurent Destailleur
32b6660f63
Uniformize code
2016-10-29 16:18:39 +02:00
Laurent Destailleur
38e6c9cc57
Fix multientity on overwritting translation not yet supported.
2016-10-28 22:47:37 +02:00
Laurent Destailleur
0847dba26d
Keep option hidden
2016-10-26 12:43:05 +02:00
Laurent Destailleur
d27ffd4194
Merge pull request #5393 from frederic34/patch-10
...
NEW Add admin parameter BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDE for supplier order
2016-10-26 11:48:02 +02:00
Laurent Destailleur
f1421a2ee4
Rename constant with english name
2016-10-24 13:10:35 +02:00
Laurent Destailleur
fdcc858008
Merge branch 'dev_resource_extrafields' of
...
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields
Conflicts:
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-10-24 02:05:34 +02:00
Laurent Destailleur
c8c5ce3760
Merge pull request #5890 from mrsof/patch-4
...
Fix : Custom menu handler is not accessible for editing
2016-10-24 01:09:27 +02:00
Laurent Destailleur
f0365e49e2
Fix book keeper can edit accounting account of taxes
2016-10-21 18:05:26 +02:00
Laurent Destailleur
9eafff4a97
Debug module accounting
2016-10-21 17:41:05 +02:00
Laurent Destailleur
16a3ba148a
Fix edit of vat
2016-10-21 14:47:29 +02:00
florian HENRY
5bf03de3fb
Fix setup page
2016-10-19 22:24:04 +02:00
florian HENRY
54a154fa4f
NEW : Add ressource extrafields
2016-10-19 22:14:51 +02:00
Sof
a30d4a0a38
Fix : Custom menu handler is not accessible for editing
2016-10-18 16:58:50 +02:00
Laurent Destailleur
c1bf7c52f4
Add a line of filter in list of events related to thirdparty or projects
2016-10-18 00:02:18 +02:00
Laurent Destailleur
c689248211
The setup that must be done by the bookkeeper is removed from admin
...
setup and move into setup of accountancy
2016-10-15 14:38:43 +02:00
Laurent Destailleur
48ce299a38
NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities.
2016-10-15 03:45:23 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
78e8ab64aa
Debug multicurrency
2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
Laurent Destailleur
89d08eadce
Better explanation of option
2016-10-09 20:35:24 +02:00
Laurent Destailleur
74f2a4d597
Enable feature to check online signature
2016-10-09 20:20:24 +02:00
Laurent Destailleur
ba52eb870c
Enhancement of Oauth module
2016-10-07 18:43:44 +02:00
Laurent Destailleur
77e87b3c07
NEW Add tooltip in payment term edition in dictionnary
2016-10-07 00:37:06 +02:00
gauthier
b35a4eb1b2
Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month
2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1
NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month
2016-10-04 15:45:23 +02:00
Laurent Destailleur
fc65d5fb79
NEW Start to introduce search filters on dictionnaries for vat list
2016-10-03 13:42:27 +02:00
Laurent Destailleur
6ac39b97e4
Fix restore list of attached files into action report
2016-10-03 00:38:28 +02:00
Laurent Destailleur
a52ad545eb
Enhancement on module Direct Debit SEPA.
2016-10-02 13:03:45 +02:00
Laurent Destailleur
2579cb35dd
Minor fix
2016-10-02 11:03:36 +02:00
Laurent Destailleur
e3aa84ff5a
NEW Add last activation date as info in module list.
2016-10-02 10:41:22 +02:00
Laurent Destailleur
2668cb20cc
Work on SEPA mandate
2016-10-01 20:45:50 +02:00
Laurent Destailleur
c9792ff047
Fix translation
2016-10-01 20:12:00 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
ea0687f613
FIX Vat not visible in dictionnary
2016-10-01 18:22:39 +02:00
Laurent Destailleur
ed56ea4ac0
Style on title
2016-09-30 18:31:04 +02:00
Laurent Destailleur
20ad359c9b
FIX Warning to grant permission must be visible only if one module add
...
some permissions
2016-09-30 18:26:32 +02:00
Laurent Destailleur
287f9972a8
Merge branch 'new_no_default_rights' of
...
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights
Conflicts:
htdocs/langs/en_US/admin.lang
2016-09-30 13:04:14 +02:00
Laurent Destailleur
94dbe3da3f
Fix the info if module are provided by module or not was wrong
2016-09-30 13:02:13 +02:00
Laurent Destailleur
504ee9c73e
NEW Add system tool "Files integrity checker" to detect modified files
...
for packaged versions.
2016-09-30 12:01:06 +02:00
Laurent Destailleur
4b4931f5ea
Add separator in list of dictionaries
2016-09-28 20:01:56 +02:00
Laurent Destailleur
86d86f8442
NEW #5801 More complete change to allow to disable supplier invoice
...
document generation
2016-09-28 18:59:44 +02:00
Laurent Destailleur
586b223221
Work on remote integrity checker
2016-09-26 15:24:43 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
fac946dbb8
FIX The email test sender in email setup was broken
2016-09-26 14:08:14 +02:00
Laurent Destailleur
17f3e09689
Fix link https
2016-09-26 01:04:48 +02:00
gauthier
a0ec91cb94
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse
2016-09-20 12:03:55 +02:00
gauthier
7a0577ccfc
NEW : add limit stock product by warehouse
2016-09-16 17:09:38 +02:00
BENKE Charlie
3d8f756646
prevent space separator in module definition
...
If we type in definition of dictionnary "code,libelle, color" we can't insert/update value...
propose to allow typing space bettween field (better lisibility) and remove space after
2016-09-15 10:51:48 +02:00
Juanjo Menent
6e39d83480
Merge remote-tracking branch 'upstream/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 16:51:41 +02:00
Juanjo Menent
d8f50f9acd
Merge remote-tracking branch 'upstream/3.9' into 4.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 16:34:02 +02:00
Laurent Destailleur
0debcf745a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Juanjo Menent
e3c2299c67
Merge remote-tracking branch 'upstream/3.8' into 3.9
...
Conflicts:
htdocs/admin/dict.php
htdocs/fourn/class/fournisseur.commande.class.php
2016-09-08 18:52:44 +02:00
Laurent Destailleur
2b7ef01e42
FIX SEC for HTB23302
2016-09-08 11:09:38 +02:00
florian HENRY
d6be1cebcb
work on going
2016-09-07 12:41:32 +02:00
Juanjo Menent
3078e6fa4b
FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15)
2016-09-06 13:44:07 +02:00
Laurent Destailleur
898bbd6031
NEW Support extrafields for expense reports
2016-09-06 13:00:32 +02:00
Laurent Destailleur
8419202588
NEW Support free bottom text and watermark on expense report template
2016-09-06 12:47:18 +02:00
Laurent Destailleur
84ec5757a1
Uniformize look and feel
2016-09-04 15:06:34 +02:00
Laurent Destailleur
6da7410c18
Show warning for overwritten translation
2016-09-04 14:58:58 +02:00
Laurent Destailleur
d24045d831
NEW Editing translation GUI become easier with search translation tool.
2016-09-04 14:45:43 +02:00
Laurent Destailleur
cb27b01812
Work on feature to find a translation key
2016-09-03 18:47:04 +02:00
Laurent Destailleur
0e4b4ee321
Merge branch 'develop-external-logging' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging
Conflicts:
composer.json
2016-09-02 21:51:25 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
cd1a12c686
NEW Can edit a label for each price segment when using several segment
...
prices for products.
2016-08-29 16:30:31 +02:00
Laurent Destailleur
330e494eda
NEW Can filter on fields on admin translation page
2016-08-28 22:46:09 +02:00
Laurent Destailleur
4215ec3ca9
FIX usage of sepa generation setup.
2016-08-28 20:12:25 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Laurent Destailleur
0d992b2b99
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/cron/class/cronjob.class.php
htdocs/install/pgsql/functions/functions.sql
2016-08-28 02:17:04 +02:00
philippe grand
919b73b4c4
fix : translation
2016-08-19 16:29:54 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules.
...
Removed Sentry logging.
2016-08-16 03:24:04 +02:00
Laurent Destailleur
6c5849fc87
Fix field too small
2016-08-09 15:56:39 +02:00
Laurent Destailleur
034b08ce56
NEW Add option "Hide images in Top menu".
2016-08-05 23:40:00 +02:00
florian HENRY
0780188f4e
taking account @eldy remarks
2016-08-05 09:46:17 +02:00
florian HENRY
a39290022f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_NEW_ClassOrderDeliverStatusOnStockVentil
Conflicts:
htdocs/langs/en_US/workflow.lang
2016-08-05 09:34:27 +02:00
Laurent Destailleur
544d5af49b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/admin.lang
2016-08-05 01:15:19 +02:00
Laurent Destailleur
c73f962b28
Merge pull request #5585 from atm-florian/dev_NEW_workflow_ClassPropalBillOnBillValidation
...
NEW : Add workflow to classifed propal bill on invoice validation
2016-08-05 00:46:12 +02:00
Laurent Destailleur
5126786d60
NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED
2016-08-04 15:48:34 +02:00
florian HENRY
4001bc474e
NEW : Add workflow to calculated supplier order status on stock dispatch
2016-08-04 11:37:32 +02:00
Laurent Destailleur
af150c35fc
Fix no picto on setup pages
2016-08-04 10:19:30 +02:00
florian HENRY
f0622139ff
NEW : Add workflow to classifed propal bill on invoice validation
2016-08-04 09:55:16 +02:00
Laurent Destailleur
88dcb27981
Fix option not visible when it should
2016-08-02 21:24:14 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
1e037a9b95
Fix pb of responsive design
2016-07-31 18:28:59 +02:00
Laurent Destailleur
5b4c215526
Fix size of field too small and bad translation
2016-07-30 10:31:56 +02:00
Laurent Destailleur
a7b21db210
Fix code is not mandatory on vat table
2016-07-29 17:22:02 +02:00
Laurent Destailleur
f54946bacb
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
2016-07-28 10:10:58 +02:00
Laurent Destailleur
0334b58a4b
Hide feature not yet validated to be ready for a stable 4.0
2016-07-27 20:24:30 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Laurent Destailleur
3b1d6818b8
Update ldap translation
2016-07-27 17:26:04 +02:00
Laurent Destailleur
eddac89bad
FIX Fatal error if curl not installed
2016-07-27 16:45:13 +02:00
Laurent Destailleur
a1c959e9d6
Merge pull request #5536 from defrance/patch-17
...
NEW add edition feature on action/agenda element
2016-07-26 15:29:45 +02:00
Juanjo Menent
0459c6f682
Merge pull request #5545 from GPCsolutions/develop-orderinterfix
...
Fix: Fixed interventions from order.
2016-07-26 12:01:09 +02:00
Laurent Destailleur
3265b7028d
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-25 19:53:28 +02:00
Raphaël Doursenaud
052a11a5c0
Fixed interventions from order.
...
Handling of predefined services was buggy and resulted in an SQL error
because of uninitialized duration.
Generalized services duration handling and exposed it in the module's
admin page.
2016-07-25 17:24:57 +02:00
BENKE Charlie
6acff5dcb5
Update agenda_other.php
2016-07-25 11:31:10 +02:00
BENKE Charlie
cba9bae124
Update agenda_other.php
2016-07-25 11:30:05 +02:00
Laurent Destailleur
59e9d7f397
Fix the repositioning works better with new system class="reposition"
...
compared to old system (#tag)
2016-07-23 13:41:06 +02:00
Laurent Destailleur
343561be7a
Fix colspan
2016-07-23 13:37:17 +02:00
Laurent Destailleur
867a0072e3
Fix forcing on module setup was not working
2016-07-23 13:20:34 +02:00
Laurent Destailleur
a290757d2d
Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany
...
NEW Option to allow payment on bills of different companies (with same parent company)
2016-07-20 19:34:51 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
4b854fb33d
Fix better error message when possible refering objects list is empty.
2016-07-16 14:37:35 +02:00
Laurent Destailleur
28d86bc5a0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-15 19:57:46 +02:00
Laurent Destailleur
97b03e225b
NEW Add option "Stock can be negative". Off by default.
2016-07-15 19:57:35 +02:00
Juanjo Menent
d932bb9532
Merge pull request #5488 from simnandez/develop
...
NEW Do not use Functions Aliases
2016-07-15 18:44:22 +02:00
Laurent Destailleur
7263b29cb4
Merge pull request #5301 from atm-ph/fix_develop_issue_2858
...
NEW issue 2858 - Option to allow negative transfer
2016-07-15 18:15:20 +02:00
Juanjo Menent
62c1302a27
NEW Do not use Functions Aliases
2016-07-15 17:58:14 +02:00
Laurent Destailleur
9ba1ca5acb
Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-07-15 17:05:12 +02:00
appchecker
4b1dfbc2fb
replace intval with GETPOST
2016-07-11 12:56:05 +03:00
appchecker
9895084627
prevent SQLi
2016-07-07 20:23:38 +03:00
Laurent Destailleur
23cac5b157
FIX link to check prof id was hardcoded instead of using dedicated
...
function
2016-07-04 10:28:11 +02:00
Laurent Destailleur
91d2d573c3
Fix NNE has been replaced with ICS
2016-07-02 11:26:55 +02:00
phf
8c133d8546
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858
...
Conflicts:
htdocs/core/class/ldap.class.php
2016-06-30 17:09:22 +02:00
Laurent Destailleur
5f5328c3d8
FIX Link in menu when using left menu editor was wrong.
...
FIX Updating an entry with menu editor did not save fk_leftmenu.
2016-06-29 14:09:18 +02:00
Laurent Destailleur
ab444af8c2
Fix bad css
2016-06-29 13:38:19 +02:00
Laurent Destailleur
266fef40ad
Add a way to enhance security check.
2016-06-25 15:16:32 +02:00
Laurent Destailleur
5222b78e95
FIX property of bank account were lost if an error occured during
...
saving.
2016-06-25 14:20:23 +02:00
Frédéric FRANCE
e7b49a4fca
Update supplier_order.php
2016-06-23 18:20:03 +02:00
philippe grand
cc4fe87e13
internationalization of code comment
2016-06-21 17:00:52 +02:00
philippe grand
0cc990402e
internationalization of code comment
2016-06-19 17:39:40 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
de76f2a9aa
Clean language files
2016-06-18 15:50:37 +02:00
gauthier
427695d869
FIX : New conf must be in payments tab
2016-06-17 17:26:49 +02:00
Laurent Destailleur
e4923fa18a
Merge pull request #5346 from damirugrin/develop
...
Conflict with ModSecurity solved in facture.php.
2016-06-16 20:21:24 +02:00
Laurent Destailleur
3720c95a52
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2016-06-16 09:50:45 +02:00
Laurent Destailleur
2395099d0f
Debug Oauth
2016-06-15 17:20:00 +02:00
gauthier
a0051a856a
NEW : conf to allow payments on different thirdparties bills but same parent company
2016-06-15 17:10:42 +02:00
Laurent Destailleur
5b5b7a2bf9
FIX Bad value used for task warning delay
...
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
damirugrin
ec6dd0c42f
Update facture.php
2016-06-13 18:48:10 +02:00
damirugrin
c5dcebb58e
Conflict with ModSecurity solved.
...
When ModSecurity is enabled on apache server then "scandir" is forbidden word. When changing numbering model then you will find following error in apache log:
ModSecurity: Access denied with code 403 (phase 2). Pattern match "(?i)(?:\\\\b(?:f(?:tp_(?:nb_)?f?(?:ge|pu)t|get(?:s?s|c)|s(?:ession_start|candir)
I have changed "scandir" to "scan_dir".
2016-06-13 18:13:41 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
phf
c62a69ccc8
Merge branch 'fix_3.7_issue_2858' into develop
2016-06-04 18:54:55 +02:00
phf
3cbbdf5e20
Fix #2858
2016-06-04 18:23:22 +02:00
Maxime Kohlhaas
d777fca0b9
Warning messages after module activation and for user with no permission
2016-06-04 13:25:39 +02:00
Juanjo Menent
baa6dd84cf
Fix better perfomance in for
2016-06-04 13:12:05 +02:00
Laurent Destailleur
bfb7923d4c
Merge pull request #5268 from atm-ph/fix_multicurrency_conf
...
Fix conf useful has been commented
2016-06-04 11:37:01 +02:00
phf
b000ccf2e2
Fix traduction for multicurrency module
2016-06-04 01:46:10 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
phf
e3a5af6ad4
Fix clean multicurrency admin
2016-06-04 00:42:01 +02:00
phf
923952fb25
Fix conf useful has been commented
2016-06-03 23:36:58 +02:00
Frédéric FRANCE
19f6aa805b
select engine for code 128 didn't work
2016-06-02 11:41:26 +02:00
Laurent Destailleur
5106f40a56
Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify
Conflicts:
htdocs/expedition/class/expedition.class.php
2016-06-02 11:23:49 +02:00
Laurent Destailleur
c663ca13b8
Fix edit left menu
2016-06-01 21:41:47 +02:00
Laurent Destailleur
bf5fbd3a80
FIX Infinite loop on menu tree output for edition
...
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
2016-06-01 21:14:28 +02:00
Laurent Destailleur
0b6bda910b
Removed scrutinizer warning
2016-05-29 11:23:32 +02:00
Laurent Destailleur
c653acd4ce
Minor fixes
2016-05-27 14:56:59 +02:00
Laurent Destailleur
a587ba496c
NEW Can select fields on supplier orders
2016-05-24 18:43:35 +02:00
Laurent Destailleur
3df464270c
Remove useless code
2016-05-22 16:12:42 +02:00
Laurent Destailleur
b86b464931
Merge pull request #5233 from IonAgorria/email-template-hook
...
NEW Hook for adding new email templates on list
2016-05-22 14:25:06 +02:00
Laurent Destailleur
5fd64c81a6
Missing translation
2016-05-21 12:21:17 +02:00
Ion Agorria
651b1e1d3a
Hook for adding new email templates on list
2016-05-21 03:32:36 +02:00
Laurent Destailleur
92e7177bcb
Fix New into new
2016-05-17 19:58:29 +02:00
Alexis Algoud
8d0e5479a0
Rename var
2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00
Laurent Destailleur
7c3c8f70be
Fix not initialized variables
2016-05-08 12:32:18 +02:00
Laurent Destailleur
aa55cdadac
Merge pull request #4944 from FHenry/develop_advtargetemailiing
...
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
Laurent Destailleur
a41403c594
Merge pull request #5144 from frederic34/patch-7
...
select engine for code 128 didn't work
2016-05-05 22:32:20 +02:00
Laurent Destailleur
7e34581952
Merge pull request #5139 from aspangaro/4.0-p25
...
FIX: Accountancy - Chart of accounts are limited on only one country
2016-05-05 22:27:05 +02:00
Laurent Destailleur
d50e9cde34
Merge pull request #5090 from atm-maxime/fix_pdffoot_details
...
PDF foot details
2016-05-05 21:09:46 +02:00
Laurent Destailleur
5040fe46b0
FIX Missing number total of modules
2016-05-05 11:15:53 +02:00
Florian HENRY
3d57e83094
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
Laurent Destailleur
46e2ed2810
NEW: All variant of ckeditor config can be tested into the setup page of
...
module.
2016-05-01 20:36:42 +02:00
Frédéric FRANCE
ffd80e3f8f
select engine for code 128 didn't work
2016-04-30 18:56:16 +02:00
Laurent Destailleur
97bf91cc5d
Show both currency symbol and code
2016-04-30 14:09:00 +02:00
aspangaro
7041a041ce
FIX: Accountancy - Chart of accounts are limited on only one country
2016-04-30 06:52:21 +02:00
Laurent Destailleur
19162fc8d5
Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into
...
PeartreeG-patch-1
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/resource/element_resource.php
2016-04-29 18:31:11 +02:00
Laurent Destailleur
466404d968
Fix missing dol_fiche_xxx
2016-04-29 17:58:39 +02:00
Laurent Destailleur
26b4a5a1e0
Merge pull request #4267 from bafbes/patch-12
...
allow cherry-pick of a sub-menu by changing its parent identifier
2016-04-29 17:55:29 +02:00
Juanjo Menent
206dee7106
Merge pull request #5086 from aspangaro/4.0-p23
...
NEW: Loan - Add list to select accounting account in admin
2016-04-29 12:01:44 +02:00
Juanjo Menent
d6b1cd8a1c
Merge pull request #5083 from aspangaro/4.0-p22
...
FIX: Accountancy - Work on categories for report - Add french example & other
2016-04-29 11:59:41 +02:00
Florian HENRY
bfbb1c20bc
FIX bug on email template
2016-04-27 09:27:59 +02:00
Alexis Algoud
b46c14812c
Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop
2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db
NEW decrease stock on expedition closing/classifying
2016-04-25 18:33:39 +02:00
Laurent Destailleur
bcb4b2b607
Work on website module
2016-04-23 21:34:10 +02:00
Maxime Kohlhaas
2c6f58e689
Add choices in PDF admin page
2016-04-23 17:37:12 +02:00
aspangaro
c652d5b02d
NEW: Loan - Add list to select accounting account in admin
2016-04-23 16:06:33 +02:00
aspangaro
04fd5a20ef
FIX: Accountancy Work on categories for Report - Add french example
2016-04-23 15:43:28 +02:00
Laurent Destailleur
3278c8245b
Merge pull request #5020 from frederic34/swiftmailer
...
Add Swift Mailer to send mails
2016-04-22 20:12:58 +02:00
Laurent Destailleur
d40e659b30
Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring
...
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
2016-04-19 19:11:54 +02:00
Laurent Destailleur
4619040983
Work on website module
2016-04-19 18:41:05 +02:00
frederic34
1a552cbd16
typo
2016-04-19 18:27:56 +02:00
frederic34
60ebc6fa11
Some correction for testconnect
2016-04-18 00:47:08 +02:00
frederic34
75127638a4
Embed images
2016-04-17 10:28:21 +02:00
frederic34
567dc1734e
Add Swift Mailer to send mails
2016-04-16 18:15:03 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
fedcad31e0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/admin/multicurrency.php
2016-04-12 14:47:16 +02:00
Laurent Destailleur
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
Laurent Destailleur
7ce82aaf16
Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be
...
implemented with pure CSS/Jquery so no more need of not maintained
external library.
2016-04-12 13:38:41 +02:00
Laurent Destailleur
b71c6a8a54
Merge pull request #4800 from atm-ph/new_multicurrency_sync_rates
...
New multicurrency sync rates
2016-04-11 19:20:59 +02:00
Florian HENRY
23bb2eaf8a
remove debug
2016-04-11 14:27:17 +02:00
Florian HENRY
b7275edfb8
FIX #4989
2016-04-11 14:24:31 +02:00
Marcos García de La Fuente
a41a80b8fe
Merge branch 'develop' into oop-refactor-bankaccount-tostring
2016-04-09 23:17:09 +02:00
phf
a33472942d
Fix synchronize rates for multicurrency module
2016-04-09 22:12:33 +02:00
Laurent Destailleur
c2fc9ecf68
Fix scrutinizer warning
2016-04-09 16:12:53 +02:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
1b04eabf1f
Merge log with events tabs
2016-04-08 14:28:49 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
2c829e7cb6
NEW Add picto on module list to show warning and if module is an
...
external module.
2016-04-07 11:50:45 +02:00
Laurent Destailleur
ee53a8b1a8
NEW Can filter modules on publisher
2016-04-06 16:45:22 +02:00
Laurent Destailleur
4e3985fbc5
NEW If option to see non stable modules is on, add a filter into module
...
list to filter on level (deprecated, experimental, development)
2016-04-06 13:27:46 +02:00
Laurent Destailleur
a0a31a3c94
Better responsive design for dictionnaries
2016-04-05 11:24:58 +02:00
Florian HENRY
344a87f970
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/class/html.formaccounting.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
Juanjo Menent
b3a5c8bae2
Merge pull request #4937 from simnandez/dolibarr-3510
...
Close #3510 Add a numbering module for check deposits
2016-04-03 16:22:34 +02:00
Juanjo Menent
8f2fb64efb
Merge pull request #4929 from aspangaro/4.0-p12
...
FIX: Problem with dolibarr installation/migration script. Range is a reserved name...
2016-04-03 16:20:31 +02:00
Juanjo Menent
9d189b3c04
NEW #3510 : Working
2016-04-03 12:14:51 +02:00
Juanjo Menent
d55d12baeb
NEW #3510 : Working
2016-04-03 11:56:31 +02:00
Florian HENRY
0ab40f11be
Merge branch 'develop' into develop_advtargetemailiing
2016-04-03 11:29:17 +02:00
Laurent Destailleur
e954fc07b3
Use natural_search for sql search forging
2016-04-02 16:30:17 +02:00
Laurent Destailleur
127ceeac8c
Uniformize code for list of audit events
2016-04-02 16:12:48 +02:00
Florian HENRY
081c7824d2
FIX : range is MySQL reserved word, cannot be used as column names
2016-04-01 14:00:14 +02:00
Laurent Destailleur
9c394b58b5
Move help text at better place.
2016-04-01 12:40:34 +02:00
aspangaro
e118aad95f
Space
2016-04-01 06:48:17 +02:00
aspangaro
620e03337a
Merging problem
2016-04-01 06:45:46 +02:00
aspangaro
84d326e036
FIX: Problem with dolibarr installation/migration script. Range is a reserved name.
2016-04-01 06:41:49 +02:00
Laurent Destailleur
b367c9daac
Enhance picto for setup
2016-03-30 16:07:48 +02:00
aspangaro
26e017f4ef
Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
...
Conflicts:
htdocs/accountancy/admin/card.php
2016-03-30 06:05:38 +02:00
Laurent Destailleur
32080e99dd
Fix dolistore url
2016-03-29 21:14:12 +02:00
aspangaro
c9271e04a0
Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-29 19:54:41 +02:00
Laurent Destailleur
3142fd3d84
Merge pull request #4899 from aspangaro/4.0-p7
...
Correct problem of merging with my last commits
2016-03-29 19:41:50 +02:00
Laurent Destailleur
718e9a7226
Filter on module origin
2016-03-29 19:18:53 +02:00
Laurent Destailleur
4d37c47990
NEW Can select language from combo list on page to overwrite a
...
translation
2016-03-29 18:05:03 +02:00
Laurent Destailleur
6188c3fced
NEW Introduce a predefined job to run database backup
2016-03-29 14:52:27 +02:00
aspangaro
436fb91901
Uniformize name of table
2016-03-28 14:50:51 +02:00
aspangaro
85d51b0d6f
Correct of problem of merging with my last commits
2016-03-28 07:46:55 +02:00
Laurent Destailleur
22bed60a07
Remove manually other PR that should not be validated (travis errors
...
reported on PR with serious mysql error in migration due to use of
reserved keyword "range" as a name of a field).
2016-03-26 11:19:45 +01:00
Laurent Destailleur
6a58b025f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-25 18:10:50 +01:00
Laurent Destailleur
bc1b2d048b
Uniformise option name
2016-03-25 18:09:42 +01:00
Laurent Destailleur
6aba69c69c
Merge pull request #4885 from aspangaro/4.0-p6
...
NEW: Move HRM dictionary from module to core dictionaries
2016-03-25 18:06:57 +01:00
Laurent Destailleur
46fe16be0b
Merge pull request #4871 from sbechet/develop
...
Postgresql compatibility patch + cosmetic
2016-03-25 17:57:29 +01:00
Laurent Destailleur
85cd0038f5
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-25 16:10:10 +01:00
aspangaro
05df3408f2
Debug works
2016-03-25 15:59:38 +01:00
aspangaro
1d780e7e77
NEW: Accountancy - Add category to manage the display of the income
...
statement and the balance sheet
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-25 15:59:31 +01:00
aspangaro
f8f55e05d0
NEW: Accountancy Add a way to initialize chart of accounts
2016-03-25 15:57:54 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
aspangaro
bec5e5958a
NEW: Move HRM dictionary from module to core dictionaries
2016-03-24 06:28:12 +01:00
aspangaro
1712ad04cc
Debug works
2016-03-23 22:23:59 +01:00
aspangaro
252f37b363
NEW: Accountancy - Add category to manage the display of the income statement and the balance sheet
2016-03-23 21:36:52 +01:00
Regis Houssin
b38e75c404
Merge branch '3.8_fix_merge' into 3.9_fix_merge
2016-03-23 14:03:35 +01:00
fmarcet
b8bc881e5a
FIX: Email templates not compatible with Multicompany
...
Conflicts:
htdocs/admin/dict.php
2016-03-23 13:57:17 +01:00
fmarcet
84e5c8b437
FIX: Email templates not compatible with Multicompany
...
Conflicts:
htdocs/admin/dict.php
2016-03-23 13:56:06 +01:00
fmarcet
e2b4d39292
FIX: Email templates not compatible with Multicompany
...
Conflicts:
htdocs/admin/dict.php
2016-03-23 13:54:39 +01:00
fmarcet
52d88db5c3
FIX: Email templates not compatible with Multicompany
...
Conflicts:
htdocs/admin/dict.php
2016-03-23 13:53:18 +01:00
aspangaro
923b5930ec
NEW: Accountancy Add a way to initialize chart of accounts
2016-03-23 06:05:48 +01:00
Sebastien Bechet
82f74ceb38
Postgresql compatibility patch + cosmetic
2016-03-22 10:09:41 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
phf
600abc9794
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_multicurrency_sync_rates
2016-03-20 15:56:54 +01:00
phf
661ee72d55
UPDATE move ajax request in js file and call a new php file to update all rates
2016-03-20 15:17:30 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Marcos García de La Fuente
eff5e2ebd7
Replaced old AccountNumber key with BankAccountNumber key
2016-03-19 23:02:09 +01:00
Laurent Destailleur
44dc07a61b
Merge pull request #4807 from bafbes/abb-13
...
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-18 02:40:27 +01:00
Laurent Destailleur
c20124e369
Merge pull request #4829 from jtisseau/starttls
...
NEW Sending email can also use the STARTTLS protocol.
2016-03-18 00:48:13 +01:00
Laurent Destailleur
7528af5569
warning moved into info
2016-03-16 11:18:23 +01:00
jtisseau
a98e19a143
Adds a STARTTLS option
...
Adds a STARTTLS authentification option. This is used by Microsoft
Hotmail and Exchange. This commit includes a new constant named
MAIN_MAIL_EMAIL_STARTTLS, a view and edit view for it and the edit
action needed to modify value in DB. It also updates the js function
initFields to make it behave like the standard TLS option and adds two
jQuery function respectively to set TSL off when STARTTLS is selected
and to set STARTTLS off when TLS is selected. Unselecting one of those
won"t select the other.
2016-03-16 02:09:55 +01:00
Laurent Destailleur
12bb3932d0
NEW Add filter on a keyword, status and nature into list of modules
2016-03-14 19:40:52 +01:00
abb
d35f728fad
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-13 19:58:39 +01:00
phf
3134af5013
Fix sync with currencylayer
2016-03-11 23:42:02 +01:00
phf
da17e6e676
New add sync with api to create/update all rates
2016-03-10 23:52:06 +01:00
Laurent Destailleur
d8045e33bb
FIX Option FCKEDITOR_ENABLE_MAIL was no used into dictionnary page to
...
edit email templates
2016-03-05 12:37:09 +01:00
Laurent Destailleur
446a080c75
NEW Mutualize code to manage email substitution variables. Show
...
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
846d78dfba
FIX Edition of delay (nb of days) for payment term "Immediate" was
...
broken.
2016-02-29 15:43:00 +01:00
Juanjo Menent
852f82e55c
Merge pull request #4687 from defrance/patch-106
...
NEW add $scandir GETPOST
2016-02-26 19:52:46 +01:00
Laurent Destailleur
1fa94e4d6a
NEW Introduce position of records into dictionnary of type of contacts
2016-02-26 15:03:07 +01:00
BENKE Charlie
8c85f17379
Update supplier_invoice.php
2016-02-26 12:02:53 +01:00
BENKE Charlie
145a87030c
Update supplier_order.php
2016-02-26 12:01:55 +01:00
Laurent Destailleur
0f49bb8645
Clean code
2016-02-24 17:09:04 +01:00
Sof
e6d06a67b4
FIX : Fatal error: Class 'FormVentilation' not found
2016-02-23 13:00:52 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
a08fa814ec
Better filter to exclude mysqldump warning
2016-02-22 13:32:01 +01:00
Laurent Destailleur
6181ab4149
FIX Avoid to return an error due to mysql warning
2016-02-22 09:32:42 +01:00
Laurent Destailleur
7765e37101
Better support of option SOCIETE_SORT_ON_TYPEENT
2016-02-19 21:09:36 +01:00
Laurent Destailleur
da284cda8c
Add category Supplier Relationship Manager
2016-02-19 19:20:21 +01:00
Laurent Destailleur
dbb8460180
Fix avoid false warning
2016-02-19 19:11:31 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
79bc7cf085
Fix showing description
2016-02-19 04:05:08 +01:00
Laurent Destailleur
761ad0114c
Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order
...
New add multicurrency on supplier proposal/order
2016-02-19 03:36:23 +01:00
phf
e24a35b904
New add multicurrency on supplier proposal/order
2016-02-16 23:58:21 +01:00
phf
6d095fce9f
Fix replace dol_include_once() function by require_once for internal module
2016-02-16 20:44:23 +01:00
Laurent Destailleur
fad09357f4
NEW Show total number of modules into the module list
2016-02-16 12:54:42 +01:00
Laurent Destailleur
36b0cb5b23
NEW Merge all admin tools (system and module admin tools) into same
...
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
2016-02-16 12:50:15 +01:00
Laurent Destailleur
353fa7c2fc
Little cleaning on how options ar shown
2016-02-15 07:12:23 +01:00
Laurent Destailleur
a138c1503a
Little cleaning on how options ar shown
2016-02-15 07:04:07 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
0d5f30f627
Merge pull request #4589 from frederic34/patch-8
...
Update google_oauthcallback.php
2016-02-15 00:34:22 +01:00
Laurent Destailleur
1cb6c7f3e9
Merge pull request #4603 from GPCsolutions/3.9-4597
...
FIX #4597 PHP 7 Uniform Variable Syntax
2016-02-15 00:32:11 +01:00
Laurent Destailleur
71a12824c9
Merge branch 'new_numbering_module_supplier_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:31:33 +01:00
aspangaro
47f60e1f8d
Add function img_weather
2016-02-13 07:53:50 +01:00
Laurent Destailleur
ecc338b1eb
Clean module
2016-02-13 03:25:20 +01:00
Laurent Destailleur
1c6d154a77
Fix: disabling option lead in not working dolibarr
2016-02-12 12:19:11 +01:00
Raphaël Doursenaud
d038ca1875
FIX #4597 PHP 7 Uniform Variable Syntax
...
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
2016-02-11 20:01:51 +01:00
Frédéric FRANCE
ffccd43aab
Update oauth.php
2016-02-09 14:08:50 +01:00
Laurent Destailleur
fcf1e20d5b
Merge pull request #4578 from frederic34/sticker
...
Dictionnary for label sticker and card format
2016-02-08 14:49:31 +01:00
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +01:00
Laurent Destailleur
99c59c8c6b
Missing translation
2016-02-07 23:01:21 +01:00
Laurent Destailleur
c1a6a2880b
Debug numbering module for customer payment
2016-02-07 14:22:52 +01:00
phf
d66bc6f1b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-02-06 12:57:30 +01:00
frederic34
9c74af63af
Dictionnary for label sticker and card format
2016-02-06 12:06:05 +01:00
phf
a8e480e392
FIX #3509 payment ref for suppliers
2016-02-04 23:15:06 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
19300a2d82
Fix warning when javascript disabled
2016-02-03 03:10:58 +01:00
Laurent Destailleur
1fb1da5be4
Work on website module
2016-02-02 16:24:12 +01:00
Laurent Destailleur
928336c835
NEW Clean and enhance code for cron engine
2016-01-31 15:14:50 +01:00
Laurent Destailleur
426e9297ea
Prepare code to match cron rule: 0 if ok, !=0 if error
2016-01-31 14:20:02 +01:00
PeartreeG
581ea0f36b
adding resource in contact type list
2016-01-31 12:17:45 +01:00
Laurent Destailleur
eee0037a5b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-30 14:32:47 +01:00
Laurent Destailleur
c4d8c20abb
Fix missing include
2016-01-30 14:32:20 +01:00
Laurent Destailleur
1854f07e5c
Move code to purge files into a dedicated utils class (cron job need
...
class)
2016-01-30 00:12:58 +01:00
phf
8e933ebb2d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
2016-01-25 19:31:35 +01:00
Laurent Destailleur
ba833dc412
Work on CMS module
2016-01-24 21:35:41 +01:00
Laurent Destailleur
8d46a56dac
Work on CMS module
2016-01-24 21:17:11 +01:00
Laurent Destailleur
097251ec7f
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-23 12:29:22 +01:00
Laurent Destailleur
615ffe5417
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-23 12:28:34 +01:00
Laurent Destailleur
a841db1eeb
FIX Purge of temp files was broken
2016-01-23 12:24:46 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
cbd01bae49
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
2016-01-22 03:18:51 +01:00
Laurent Destailleur
d7847a8ec8
Merge pull request #4256 from GPCsolutions/dolibarr-mysqli
...
[Qual] mysqli code review
2016-01-22 02:22:47 +01:00
Laurent Destailleur
e1ac249d18
Increase size of field
2016-01-21 23:28:14 +01:00
phf
f7afbcff68
NEW integration of multicurrency module (creation fields in database and admin)
...
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
2386b79dfc
FIX Option to disable meteo was not set correctly in edit mode
2016-01-18 14:49:15 +01:00
Laurent Destailleur
4a009d2ad2
NEW On translation admin page, admin can overwrite a translation value.
2016-01-16 00:48:14 +01:00
Raphaël Doursenaud
daa3ce3591
[Qual] Mysqli: set charset with recommended method
2016-01-13 11:55:59 +01:00
Laurent Destailleur
381eea0dbf
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-01-12 23:10:25 +01:00
Regis Houssin
694530bfae
Fix: Gives the possibility to the module, to provide his own family info
...
and position of this family. (canceled $this->family)
2016-01-10 13:00:48 +01:00
Laurent Destailleur
7e9ee6f047
Fix include error
2016-01-10 12:51:42 +01:00
Laurent Destailleur
40f0d0c9f2
Merge pull request #4321 from fmarcet/3.7
...
FIX: Email templates not compatible with Multicompany
2016-01-10 11:49:37 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Juanjo Menent
8cabb87a2b
Merge pull request #4299 from aspangaro/develop-a12
...
Accountancy Add a list to select accounting account on dict
2016-01-09 17:47:33 +01:00
Juanjo Menent
7f6f30e69e
Merge pull request #4298 from aspangaro/develop-a11
...
Accountancy Add a list to select accounting account on tax admin
2016-01-09 17:47:03 +01:00
Juanjo Menent
099ec2b0fb
Merge pull request #4296 from aspangaro/develop-a9
...
Accountancy Add a list to select accounting account on salaries admin
2016-01-09 17:46:24 +01:00
Laurent Destailleur
0d8788e552
FIX It was not possible to define if leave type need to be followed by a
...
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
2016-01-09 01:18:53 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
127354f0af
Minor fixes
2016-01-08 22:41:30 +01:00
Laurent Destailleur
2259cf2340
Merge remote-tracking branch 'origin/3.8' into develop
2016-01-08 14:49:00 +01:00
Laurent Destailleur
8366310f0f
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/admin/agenda_extsites.php
2016-01-08 14:47:46 +01:00
Laurent Destailleur
e008922919
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/admin/agenda_extsites.php
2016-01-08 14:45:53 +01:00
Raphaël Doursenaud
f2178f0369
FIX #4291 Correctly filter external calendar GETPOSTs
2016-01-08 06:42:28 +01:00
fmarcet
d8360a2a01
FIX: Email templates not compatible with Multicompany
2016-01-07 08:18:36 +01:00
fmarcet
cafe148f72
FIX: Email templates not compatible with Multicompany
2016-01-04 09:12:27 +01:00
Laurent Destailleur
1e1d6d4955
Fix to be able to use dolibarr with a smartphone
2016-01-03 19:34:19 +01:00
Laurent Destailleur
b2c41d8565
Fix search forms
2016-01-03 18:46:10 +01:00
Laurent Destailleur
d02c261d2e
Fix perf test was using a not existing js file.
2016-01-02 18:13:41 +01:00
fmarcet
cebb996120
FIX: Email templates not compatible with Multicompany
2015-12-29 11:22:18 +01:00
fmarcet
f8e156ea30
FIX: Email templates not compatible with Multicompany
2015-12-29 10:35:10 +01:00
Bahfir Abbes
61ef9921bd
correction of precedent commit
...
I do not kow how I deleted a line instead of another.
Sorry for it.
Hope it's resolved
2015-12-27 17:50:29 +01:00
Laurent Destailleur
e93ec106bc
Merge pull request #4290 from defrance/patch-92
...
add odt info function call if present in class
2015-12-27 17:26:26 +01:00
aspangaro
d6b96ec03a
Add function length_accountg to dictionary
2015-12-26 08:38:18 +01:00
aspangaro
565040e1bc
Accountancy Add a list to select accounting account on dict
2015-12-26 08:19:43 +01:00
aspangaro
f514c65ff7
Modify a style center
2015-12-26 06:41:03 +01:00
aspangaro
86bb93884a
Accountancy Add a list to select accounting account on tax admin
2015-12-26 06:35:56 +01:00
aspangaro
97e1bb871e
Accountancy Add a list to select accounting account on salaries admin
2015-12-26 06:14:02 +01:00
BENKE Charlie
ed501cec46
add odt info is present in class
2015-12-24 15:44:56 +01:00
