Laurent Destailleur
7931bfa766
Merge pull request #12568 from atm-john/develop_fix_divide_by_zero
...
Fix division by zero
2019-11-30 23:29:11 +01:00
Laurent Destailleur
47b35e9011
Merge pull request #12570 from atm-maxime/fix_margin_rights
...
Fix margin rights
2019-11-30 23:28:26 +01:00
Maxime Kohlhaas
edb8bcb598
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
2019-11-30 22:58:32 +01:00
Laurent Destailleur
a352fd5a6e
Revert "FIX#12482"
2019-11-30 21:00:56 +01:00
Nicolas
f2ff443641
FIX #12482
2019-11-30 20:04:27 +01:00
Maxime Kohlhaas
558669dd88
Fix #6497 : deposit lines were not translated
2019-11-30 16:14:16 +01:00
Maxime Kohlhaas
2c165d0a61
Fix deposit date display in PDF
2019-11-30 15:53:50 +01:00
stickler-ci
a13b2267aa
Fixing style errors.
2019-11-30 14:22:25 +00:00
Maxime Kohlhaas
916954b301
Fix #12371 : access rights on contacts
2019-11-30 14:48:05 +01:00
Maxime Kohlhaas
9095482113
Fix margins access + menu display
2019-11-30 14:47:48 +01:00
Nicolas
fd7a18c26f
FIX #12473
2019-11-30 12:49:31 +01:00
ATM John BOTELLA
b7d39b610b
Fix divided by zero
2019-11-30 10:08:55 +01:00
Laurent Destailleur
35b4318cee
Merge pull request #12552 from frederic34/patch-15
...
$head was never initialized
2019-11-30 01:16:40 +01:00
Maxime Kohlhaas
02b5da5db1
Fix #12448 : notifications were sent to disabled user or contacts
2019-11-30 00:57:21 +01:00
Laurent Destailleur
0a3614adbf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-29 11:42:16 +01:00
Laurent Destailleur
3b9d2abcb2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/product.lib.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
3acd0bc2ff
FIX Reduce number of request for list of products
2019-11-29 11:32:09 +01:00
Laurent Destailleur
eed8f242b8
Update demo
2019-11-29 10:23:18 +01:00
Frédéric FRANCE
00a80e498e
$head was never initialized
2019-11-28 23:06:04 +01:00
Laurent Destailleur
1636d341c7
Debug module BOM
...
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Laurent Destailleur
614b82fe88
Fix var not initialized
2019-11-28 14:16:54 +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
552f2088f9
Merge pull request #12532 from frederic34/patch-15
...
The property rowid does not seem to exist on Adherent.
2019-11-28 12:21:35 +01:00
Laurent Destailleur
540f47b998
Merge pull request #12523 from oscim/patch-11
...
Put $object in complete_head_from_modules
2019-11-28 12:20:16 +01: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
874f5b7005
Merge pull request #12528 from frederic34/patch-8
...
image2wbmp() is deprecated as of PHP 7.3.0
2019-11-28 12:19:32 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Laurent Destailleur
20b52db5b8
Merge pull request #12527 from frederic34/patch-7
...
dol_print_error returns void
2019-11-27 20:11:40 +01:00
Laurent Destailleur
c0d349e9f7
Merge pull request #12530 from frederic34/patch-13
...
fix doxygen
2019-11-27 20:11:24 +01:00
Laurent Destailleur
c22fea52e5
Fix do not ping name of server
2019-11-27 11:38:30 +01:00
Laurent Destailleur
9a9a43fc4d
Return OS with ping
2019-11-27 11:34:10 +01:00
altairis
355d7545f6
filter language is an array
2019-11-27 10:23:01 +01:00
Frédéric FRANCE
32aca5f186
Update pdf_standard.class.php
2019-11-26 19:52:10 +01:00
Frédéric FRANCE
757d05e907
fix doxygen
2019-11-26 18:59:26 +01:00
Frédéric FRANCE
a04fa05b6c
image2wbmp() is deprecated as of PHP 7.3.0
...
https://www.php.net/manual/en/function.image2wbmp.php
image2wbmp() is deprecated as of PHP 7.3.0, and will be removed in the next major version. Use imagewbmp() instead.
2019-11-26 18:41:38 +01:00
Frédéric FRANCE
c7e8194df9
dol_print_error returns void
2019-11-26 18:28:44 +01:00
Laurent Destailleur
3a687b1dae
Fix box of task hidden if tasks are not used
2019-11-26 17:44:21 +01:00
oscim
1e6b93500a
Put $object in complete_head_from_modules
...
Add object for correctly usage in function complete_head_from_modules
2019-11-26 16:34:16 +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
4ef6c9cc13
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/ticket.lang
2019-11-26 11:54:42 +01:00
Laurent Destailleur
d1419f81da
Merge pull request #12390 from bb2a/patch-4
...
Use english name of subsitution variables for thirdparties
2019-11-26 10:26:45 +01:00
Laurent Destailleur
b370d70426
Merge pull request #12511 from erpware/develop
...
just fixed two small css issues
2019-11-26 09:20:40 +01:00
Laurent Destailleur
0032b27a8e
Merge pull request #12517 from frederic34/patch-16
...
$out does not seem to be defined for all execution paths
2019-11-26 09:14:55 +01:00
Laurent Destailleur
cee40561df
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-11-26 09:13:52 +01:00
Laurent Destailleur
b0b579bdbf
Fix phpcs
2019-11-26 09:13:35 +01:00
Laurent Destailleur
034267edbf
Merge pull request #12516 from frederic34/patch-15
...
doxygen
2019-11-26 09:11:10 +01:00
Laurent Destailleur
b44817f2bf
Merge pull request #12518 from frederic34/patch-17
...
doxygen
2019-11-26 09:10:47 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Alexandre SPANGARO
6cc61fef9c
Fix Ticket - Deprecated <center>
2019-11-26 04:32:38 +01:00
Frédéric FRANCE
1ccf0808d0
doxygen
2019-11-26 00:28:26 +01:00
Frédéric FRANCE
a142c0050e
$out does not seem to be defined for all execution paths
2019-11-26 00:24:00 +01:00
Frédéric FRANCE
77a300c9ae
doxygen
2019-11-26 00:20:40 +01:00
andreubisquerra
6baa1c8d4a
Fix travis
2019-11-25 23:32:40 +01:00
Daniel Seichter
7a4beb824f
Merge remote-tracking branch 'upstream/develop' into develop
2019-11-25 23:14:19 +01:00
Daniel Seichter
9eafc8f550
fix small css issues
2019-11-25 23:13:31 +01:00
andreubisquerra
b2e995279e
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
2019-11-25 19:29:07 +01:00
Laurent Destailleur
61f414488a
Fix translation
2019-11-24 18:34:07 +01:00
Laurent Destailleur
bc5270ce76
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2019-11-24 18:15:25 +01:00
Laurent Destailleur
712ae48e4e
Fix default setup
2019-11-24 18:07:38 +01:00
Laurent Destailleur
cf0311dd6a
FIX Hook getAccessForbiddenMessage was missing parameters
2019-11-22 16:13:22 +01:00
Laurent Destailleur
32f590f274
Merge pull request #12485 from aspangaro/12.0_a2
...
NEW Add shipment widget
2019-11-22 14:39:56 +01:00
Laurent Destailleur
e2009ceff0
Fix extrafields of line for receptions
2019-11-22 14:22:35 +01:00
Laurent Destailleur
00ad95c01e
Figth against useless dependencies: Remove library the core never use.
2019-11-22 14:06:43 +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
Alexandre SPANGARO
f4e1361d06
NEW small fix
2019-11-22 06:53:05 +01:00
Laurent Destailleur
92a65a8039
Log
2019-11-21 21:36:03 +01:00
Laurent Destailleur
5fdd6f698d
More complete error message
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2019-11-21 20:46:27 +01:00
Laurent Destailleur
b46362dff9
More complete error message
2019-11-21 20:45:19 +01:00
Laurent Destailleur
e8bc8b68c1
Fix missing field in migration
2019-11-21 18:17:40 +01:00
Anthony Berton
496aa0c065
Update functions.lib.php
2019-11-21 10:38:59 +01:00
Alexandre SPANGARO
2f064567ef
NEW Add shipment widget
2019-11-21 07:50:44 +01:00
Laurent Destailleur
58c38912ab
Fix action into actionlogin to avoid conflict
2019-11-20 16:42:18 +01:00
stickler-ci
3209d550c2
Fixing style errors.
2019-11-20 11:45:12 +00:00
ptibogxiv
2c810988a6
Update dolgraph.class.php
2019-11-20 12:43:49 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
2f3b4d239b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-19 18:56:12 +01:00
Laurent Destailleur
6bfb76d40d
Merge pull request #12464 from bb2a/patch-6
...
Update getfullname
2019-11-19 10:55:47 +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
5b6f0cb101
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2019-11-18 21:19:10 +01:00
Laurent Destailleur
918f476c2b
Fix backport fix not checking mandatory extrafields of type select
2019-11-18 19:02:12 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f
Debug email collector. Missing unique key. Fix initial setup.
2019-11-18 11:55:22 +01:00
Laurent Destailleur
b69a7f9709
css
2019-11-17 20:25:39 +01:00
Laurent Destailleur
16d67a1a8e
Fix several trouble with some types in modulebuilder
...
Fix difference between null and 0
2019-11-17 17:36:36 +01:00
Anthony Berton
7a5883588c
Update commonobject.class.php
2019-11-17 14:07:01 +01:00
Anthony Berton
fe3c921152
Merge branch 'develop' into patch-4
2019-11-17 10:17:47 +01:00
Scrutinizer Auto-Fixer
1648fc142e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:24:29 +00:00
Anthony Berton
e1f36ae107
Update functions.lib.php
2019-11-16 17:37:18 +01:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Laurent Destailleur
c5b83ca3d8
Fix link translation of
2019-11-16 12:43:44 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
e5daa73a9e
Merge pull request #12444 from frederic34/doxygen_menubase
...
doxygen menubase class
2019-11-16 00:45:30 +01:00
Laurent Destailleur
3898db3956
FIX #12446
2019-11-16 00:39:23 +01:00
Laurent Destailleur
1f5bea01f5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Frédéric FRANCE
7100328116
doxygen menubase class
2019-11-14 21:25:12 +01:00
Laurent Destailleur
7e52c70321
FIX Advisory ID: usd20190067
2019-11-14 21:16:18 +01:00
Laurent Destailleur
f7ab1498a7
FIX Advisory ID: usd20190053
2019-11-14 17:00:02 +01:00
Laurent Destailleur
80b3e27341
Fix bad name of constant
2019-11-14 14:23:48 +01:00
Laurent Destailleur
7e0ae4bf0e
FIX The pdf templates were using the large logo making PDF too large
2019-11-14 14:17:22 +01:00
Laurent Destailleur
7d997990fa
Fix phpcs
2019-11-14 12:44:15 +01:00
Laurent Destailleur
8db4eff108
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
...
Scrutinizer Auto-Fixes
2019-11-14 12:10:44 +01:00
Scrutinizer Auto-Fixer
f197196719
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:46 +00: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
75667833fe
Fix missing ->msgid
2019-11-14 10:01:05 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
95a6d7f8f5
Doxyen
2019-11-14 09:13:15 +01:00
Laurent Destailleur
56f2463a15
Merge branch 'develop' into patch-6
2019-11-14 08:53:53 +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
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2019-11-14 08:49:53 +01:00
Frédéric FRANCE
6596ffac4f
Update conf.class.php
2019-11-13 20:20:35 +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
Scrutinizer Auto-Fixer
f4aaa8d9bb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Laurent Destailleur
545c2207b2
Fix on exact date when we don't know the second is useless
2019-11-13 19:32:27 +01:00
Laurent Destailleur
b9900c20cc
Merge pull request #11035 from atm-ph/new_search_input_on_type_list
...
NEW show html list instead input text for extrafields typed as list
2019-11-13 19:26:19 +01:00
Laurent Destailleur
88d2658625
Merge branch 'develop' into scrutinizer-patch-2
2019-11-13 19:14:50 +01:00
Laurent Destailleur
65dc46db63
Merge pull request #12424 from Dolibarr/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2019-11-13 19:12:17 +01:00
Frédéric FRANCE
05ab4f79ef
categories for actioncomm
2019-11-13 18:44:11 +01:00
Laurent Destailleur
78b6246e43
Merge pull request #12420 from fappels/debug_11
...
Cleanup interface_90_modSociete_ContactRoles
2019-11-13 18:35:28 +01:00
Laurent Destailleur
ede05e03ba
Merge pull request #12417 from frederic34/patch-7
...
doxygen
2019-11-13 18:34:29 +01:00
Scrutinizer Auto-Fixer
87585c0f2a
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c66bce7ec6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:31:18 +00:00
Laurent Destailleur
7118dbbd1d
Fix var not defined
2019-11-13 18:25:48 +01:00
Laurent Destailleur
bdf0219941
Missing link to create contact
...
Fix css
2019-11-13 18:18:45 +01:00
Laurent Destailleur
74239d48bf
Fix translation of extrafields when $extralabels not loaded
2019-11-13 11:11:08 +01:00
Laurent Destailleur
56c2dc2614
Reduce need of translations
2019-11-12 22:29:36 +01:00
Francis Appels
9efcdc78f9
Cleanup interface_90_modSociete_ContactRoles
2019-11-12 21:56:05 +01:00
Laurent Destailleur
89bf35a8bf
Fix default value show must match the theme selected
2019-11-12 21:54:41 +01:00
Frédéric FRANCE
7ce297c6cc
doxygen
2019-11-12 21:53:17 +01:00
Laurent Destailleur
2c718af26c
Missing container type 'menu'
...
Fix: Add security if container is not a page
2019-11-12 13:55:46 +01:00
Laurent Destailleur
528823140d
Fix phpcs
2019-11-12 12:05:06 +01:00
Laurent Destailleur
6afc84fe72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-12 10:20:55 +01:00
Laurent Destailleur
944a15d06b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-11-12 10:19:01 +01: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
Laurent Destailleur
dc77a58a73
Work on MO
2019-11-12 01:48:12 +01:00
Laurent Destailleur
03e35623c6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-12 00:43:37 +01:00
Laurent Destailleur
8be0a6d470
Fix: Can set savingdocmask by caller. Fix permissions names.
...
Fix: Disable crop on svg images.
2019-11-12 00:43:26 +01:00
Scrutinizer Auto-Fixer
038bda254d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 22:59:36 +00:00
Laurent Destailleur
814dce5b55
Fix var not defined
2019-11-11 19:26:19 +01:00
Laurent Destailleur
2ccef4e469
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2019-11-11 19:10:35 +01:00
Laurent Destailleur
5eb03cf6ad
Avoid false positive.
2019-11-11 13:26:48 +01:00
Laurent Destailleur
6a4ba74ee7
Fix regression introduced by 991e1b2747
2019-11-11 13:17:36 +01:00
Laurent Destailleur
27fb9e0c7f
Merge pull request #12401 from grandoc/new_branch_10_11_2019
...
add some comment
2019-11-10 18:07:13 +01:00
Laurent Destailleur
0a824db6d3
Remove useless call
2019-11-10 17:48:50 +01:00
Laurent Destailleur
6990732c71
Fix missing action in POST
2019-11-10 13:49:04 +01:00
stickler-ci
f8138c22a3
Fixing style errors.
2019-11-10 10:12:10 +00:00
Philippe GRAND
9bf4347371
add some comment
2019-11-10 11:11:43 +01:00
Laurent Destailleur
5b6ace387e
Debug BOM and MO module
2019-11-09 19:47:49 +01:00
Laurent Destailleur
771f304c79
Fix typo
2019-11-09 18:40:08 +01:00
Laurent Destailleur
6233f8e1c5
Fix visibility = 3
2019-11-09 18:19:04 +01:00
Laurent Destailleur
94fce39562
Fix visibility on modulebuilder
2019-11-09 18:13:59 +01:00
BENKE Charlene
53fd8328bc
add certificate if present on document folder
2019-11-09 15:20:36 +01:00
Laurent Destailleur
5ebd5a401c
Fix avoid error on lang not defined when calling trigger
2019-11-09 13:09:05 +01:00
Laurent Destailleur
ab26356e92
Fix avoid error on lang not defined when calling trigger
2019-11-09 13:08:30 +01:00
Laurent Destailleur
fcf983ee23
Fix decimal separator according to lang setup
...
Conflicts:
htdocs/core/actions_addupdatedelete.inc.php
2019-11-09 12:56:34 +01:00
Laurent Destailleur
75e2d412ac
Fix decimal separator according to lang setup
2019-11-09 12:54:11 +01:00
Laurent Destailleur
c0abb725cb
Fix price2num needs lang loaded when it may not exists
2019-11-09 12:46:45 +01:00
Laurent Destailleur
f9869dbfed
Fix price2num need langs when lang is not necessarly loaded.
2019-11-09 12:46:11 +01:00
Laurent Destailleur
917c8df225
Add type of db driver in stats
2019-11-09 12:24:18 +01:00
Laurent Destailleur
dcdcd7c67e
Look and feel v11
2019-11-09 12:03:11 +01:00
Pierre Ardoin
88fb094a78
Fix problem of display photo in the model
...
Fix a problem with photo in the model :
Before : Check in the current entity the product's repertory to find a photo
Now : Check all entities product's repertories to find a photo
2019-11-08 22:02:30 +01:00
Laurent Destailleur
8f35c24b62
Add quick hack by hidden const as solution when numbering is locked.
2019-11-08 16:37:25 +01:00
Anthony Berton
4449c6d2a7
Update functions.lib.php
2019-11-08 16:34:20 +01: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
Laurent Destailleur
83090629fe
Fix join into left join
2019-11-08 13:43:26 +01:00
Laurent Destailleur
e513917d12
Fix phpcs
2019-11-08 11:34:14 +01:00
Laurent Destailleur
d1c49c7021
Fix trans
2019-11-08 10:24:03 +01:00
Laurent Destailleur
f11943126a
Fix scrutinizer
2019-11-08 09:42:39 +01:00
Laurent Destailleur
34beca0758
Fix var not not consistent
2019-11-07 16:33:11 +01:00
Laurent Destailleur
8318db85a3
Fix typo
2019-11-07 16:32:44 +01:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument
...
NEW add upload for account statement
2019-11-07 15:06:47 +01:00
Laurent Destailleur
1f0cee2139
Merge pull request #12376 from TobiasSekan/FixNotDeactivatedCommercialButton
...
Fix not deactivated commercial menu button
2019-11-07 15:05:26 +01:00
Laurent Destailleur
3b44760e65
FIX #12356
2019-11-07 14:10:07 +01:00
Laurent Destailleur
f84087ba70
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-07 14:08:01 +01:00
Laurent Destailleur
1fa61077a0
FIX #12356
2019-11-07 14:07:50 +01:00
Tobias Sekan
7dc94f1761
Fix not deactivated commercial menu button
2019-11-07 13:50:25 +01: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
f1ebfb1ba7
Merge pull request #12369 from TobiasSekan/FixAccessMainMenu
...
Fix main menu access for only shipment rights
2019-11-07 12:55:11 +01:00
Laurent Destailleur
4f219ae0fb
Fix doc
2019-11-07 11:16:59 +01:00
Laurent Destailleur
4433cff49d
Merge pull request #12346 from frederic34/centpercent
...
100% centpercent
2019-11-07 10:39:09 +01:00
Laurent Destailleur
5b13b9f1ff
Merge pull request #12358 from frederic34/patch-20
...
dol_hash may salt so gravatar is not working
2019-11-07 10:37:45 +01:00
Tobias Sekan
5de36b2bab
Fix main menu access for only shipment rights
2019-11-07 09:48:46 +01:00
Nicolas
f18bca7687
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
2019-11-06 20:51:17 +01:00
Inovea Conseil
fed6ed8760
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
2019-11-06 20:48:24 +01:00
Laurent Destailleur
74f2983ee1
Debug modulebuilder
2019-11-06 19:38:51 +01:00
Frédéric FRANCE
a1c8e04646
dol_hash may salt so gravatar is not working
2019-11-06 07:50:21 +01:00
Laurent Destailleur
027d94d41a
Revert change that create not required new lines
2019-11-06 00:51:26 +01:00
Laurent Destailleur
e885345ef7
FIX Check on duplicate profid was not triggered.
2019-11-06 00:27:36 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
7c4942b7be
Fix debug BOM/MO
2019-11-05 20:14:33 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
84a8d4e7cb
Debug BOM/MO
2019-11-05 19:18:12 +01:00
Laurent Destailleur
204475efb9
Removed deprecated file
2019-11-05 19:10:29 +01:00
Laurent Destailleur
4c01f33228
Fix removed a debug die
2019-11-05 15:57:22 +01:00
stickler-ci
f537ae60b6
Fixing style errors.
2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747
NEW Add upload document on account statement
2019-11-05 13:51:52 +01:00
Laurent Destailleur
85ce5176b5
Fix textarea to enter a ticket
2019-11-05 13:41:01 +01:00
Laurent Destailleur
7ab19ef66b
Fix selection not lose if creation of vendor invoice fails
2019-11-05 13:34:25 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
4d84ee2041
Fix var not init
2019-11-05 10:15:00 +01:00
Laurent Destailleur
c0daa1e5d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-05 10:11:49 +01:00
Laurent Destailleur
9499398f86
Code syntax
2019-11-05 10:11:28 +01:00
Laurent Destailleur
57a7370f22
Merge pull request #12327 from frederic34/patch-3
...
config file doesn't exists
2019-11-05 10:04:01 +01:00
Laurent Destailleur
b4d72e3e96
Fix link to setup of social network module
2019-11-05 10:00:46 +01:00
Laurent Destailleur
747113551b
Debug pagination of bookmark list
2019-11-05 09:52:33 +01:00
Frédéric FRANCE
d035aefd40
config file doesn't exists
2019-11-04 21:58:40 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
562e219cc5
Merge pull request #12314 from frederic34/patch-7
...
add thirdparty email in box_propales
2019-11-04 20:51:57 +01:00
Laurent Destailleur
17ea978cea
Merge pull request #12306 from frederic34/escpos
...
Escpos
2019-11-04 20:40:12 +01:00
Laurent Destailleur
c276659acd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/ticket.lib.php
2019-11-04 20:37:49 +01:00
Laurent Destailleur
e60fff39d9
Fix phpcs
2019-11-04 20:36:55 +01:00
Laurent Destailleur
0347d82660
Merge pull request #12303 from frederic34/patch-2
...
css
2019-11-04 20:31:02 +01:00
Laurent Destailleur
ec8bd6327d
Fix css
2019-11-04 18:53:46 +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
6e591d2be0
Fix css
2019-11-04 18:25:32 +01:00
Laurent Destailleur
4ca85eacc1
Debug module BOM
2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Laurent Destailleur
b0ea276233
Debug MO module
2019-11-04 14:13:36 +01:00
Laurent Destailleur
1f6a86e166
Fix look and feel v11
2019-11-04 13:32:34 +01:00
Laurent Destailleur
8aa2fd04ad
NEW The integrity checker now show the expected size of files
2019-11-04 13:23:48 +01:00
Laurent Destailleur
d934f5e920
Fix wrap
2019-11-04 11:44:46 +01:00
Laurent Destailleur
abc6f6ccae
Fix css
2019-11-04 11:43:07 +01:00
Laurent Destailleur
5497e1e103
css
2019-11-04 11:42:27 +01:00
Laurent Destailleur
666e60a883
Responsive
2019-11-04 11:40:54 +01:00
Laurent Destailleur
1053112843
css
2019-11-04 11:07:08 +01:00
Laurent Destailleur
ed3f95b4a6
Responsive
2019-11-04 10:55:08 +01:00
Frédéric FRANCE
60198190fc
Update box_propales.php
2019-11-03 23:55:04 +01:00
Frédéric FRANCE
317ba9c047
Merge remote-tracking branch 'upstream/develop' into escpos
2019-11-03 23:49:36 +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
877f40a1c8
price
2019-11-03 20:07:11 +01:00
Laurent Destailleur
99a4781a42
Fix better support for multicurrency for template invoices
2019-11-03 18:58:26 +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
Frédéric FRANCE
3e2d89dc02
Update ticket.lib.php
2019-11-02 18:16:09 +01:00
Laurent Destailleur
2ee002fc80
Fix trans
2019-11-02 17:44:58 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
89f1904793
Finish removing of ->attribute_label
2019-11-02 17:26:26 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop
...
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
df750b6a9d
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
...
NEW Add attendee to ical export + cleanup
2019-11-02 13:40:27 +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
04a5054e1c
Merge pull request #12279 from atm-john/develop_ticket_file_display
...
New - ticket file download button display
2019-11-02 13:32:33 +01:00
Laurent Destailleur
906f30773d
Merge pull request #12269 from atm-ph/new_edit_comment
...
New update comments is now available
2019-11-02 13:09:21 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019
...
add some comment
2019-11-02 13:00:23 +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
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019
2019-11-02 12:00:04 +01:00
stickler-ci
b43d06db37
Fixing style errors.
2019-11-02 10:55:24 +00:00
Laurent Destailleur
37f4ebb1b2
Update xcal.lib.php
2019-11-02 11:56:01 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
...
add comment
2019-11-02 11:49:28 +01:00
Laurent Destailleur
d9f333d828
Merge pull request #12289 from frederic34/datetime
...
php is > 5.4
2019-11-02 11:46:34 +01:00
Laurent Destailleur
23d238c16d
Merge pull request #12291 from frederic34/patch-15
...
give a value by default
2019-11-02 11:43:02 +01:00
Laurent Destailleur
f9031cdbfd
Clean code
2019-11-02 11:36:48 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Laurent Destailleur
8608c5db9c
Fix color of task progression
2019-11-01 23:16:08 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
f74833cfe1
Make modulebuilder more compatible with multicompany
2019-11-01 18:44:32 +01:00
Laurent Destailleur
012c5ef0c4
Can use substitution variables into filter of fields link
2019-11-01 18:35:48 +01:00
Laurent Destailleur
2af23aa658
Enhance modulebuilder
2019-11-01 17:54:17 +01:00
Laurent Destailleur
a1b2130247
Enhance the progress bar of tasks
2019-11-01 16:09:31 +01:00
Frédéric FRANCE
18b662e430
Update box_graph_orders_permonth.php
2019-11-01 16:01:08 +01:00
Frédéric FRANCE
d14015e3df
Update box_graph_invoices_permonth.php
2019-11-01 15:59:17 +01:00
Frédéric FRANCE
dab8aabb16
Update box_graph_invoices_supplier_permonth.php
2019-11-01 15:58:30 +01:00
Frédéric FRANCE
93b00038f8
Update box_graph_orders_supplier_permonth.php
2019-11-01 15:57:40 +01:00
Frédéric FRANCE
5bdb9da5c5
Update box_graph_invoices_supplier_permonth.php
2019-11-01 15:56:15 +01:00
Laurent Destailleur
135e65c4aa
Look and feel v11
...
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Frédéric FRANCE
931f2b809d
Update box_graph_orders_permonth.php
2019-11-01 15:52:13 +01:00
Frédéric FRANCE
44c8cd9d23
give a value by default
...
The variable $fileurlnb does not seem to be defined for all execution paths
2019-11-01 15:48:55 +01:00
Frédéric FRANCE
da238e94e1
php is > 5.4
2019-11-01 15:21:21 +01:00
Sekan, Tobias
e27f1c623d
Merge branch 'AddAttendeeToIcal' of https://github.com/TobiasSekan/dolibarr into develop
2019-11-01 13:16:54 +01:00
Sekan, Tobias
885c6e6516
Fix wrong newline replacement
2019-11-01 13:16:14 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
stickler-ci
fee0a362ad
Fixing style errors.
2019-11-01 11:11:59 +00:00
Sekan, Tobias
2a983a6a7c
fix link in documentation
2019-11-01 12:09:43 +01:00
Sekan, Tobias
0bfff92032
Add attendee to ical export + cleanup
2019-11-01 11:59:54 +01:00
Philippe Grand
db9c490470
Update emailsenderprofile.class.php
2019-11-01 11:18:54 +01:00
Philippe Grand
74ae90f9da
Update commonobject.class.php
2019-11-01 11:18:12 +01:00
stickler-ci
0c6938aa2a
Fixing style errors.
2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502
add some comment
2019-11-01 10:42:14 +01:00
Laurent Destailleur
5b5a2e9804
Clean code
2019-11-01 03:25:09 +01:00
Laurent Destailleur
aa306bf5d4
Debug widgets
2019-10-31 23:50:36 +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
af09c77a0c
Fix phpcs
2019-10-31 22:15:18 +01:00
Laurent Destailleur
c215d534fc
Fix phpcs
2019-10-31 21:16:41 +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
dcbe7fe8da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-31 14:06:36 +01:00
Laurent Destailleur
360b3a9550
NEW Ask the new label and new dates in confirm popup when cloning tax
2019-10-31 14:06:26 +01:00
stickler-ci
8765e7648e
Fixing style errors.
2019-10-31 11:03:46 +00:00
atm-ph
526aeab9af
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_search_input_on_type_list
2019-10-31 12:02:53 +01:00
John Botella
d0a5e30faa
Change btn name
2019-10-31 08:44:08 +01:00
Laurent Destailleur
b296f62671
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-10-31 02:36: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
John Botella
0cff122ccd
Add file display in ticket
2019-10-30 17:46:18 +01:00
atm-ph
2f68a73a2a
New update comments is now available
2019-10-30 15:45:04 +01:00
Marc de Lima Lucio
85cef09e83
FIX: triggers: directories read with opendir() never closed
2019-10-30 14:46:46 +01:00
stickler-ci
ed9a136211
Fixing style errors.
2019-10-30 08:58:19 +00:00
Philippe GRAND
445d09cf8a
add comment
2019-10-30 09:50:06 +01:00
Philippe GRAND
a80243e528
add comment
2019-10-30 09:48:34 +01:00
Laurent Destailleur
6a01132fdb
Merge pull request #12210 from grandoc/new_branch_24_10_2019
...
add some comment
2019-10-30 03:17:21 +01:00
Laurent Destailleur
2770f79a86
Merge pull request #12216 from frederic34/patch-5
...
css
2019-10-30 03:02:24 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
...
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
05fdddd15e
Merge pull request #12240 from frederic34/patch-19
...
Update html.formmail.class.php
2019-10-30 02:57:27 +01:00
Laurent Destailleur
248016cd5d
Merge pull request #12241 from frederic34/contactphone
...
Contactphone
2019-10-30 02:52:11 +01:00
Laurent Destailleur
bf0400a29b
Merge pull request #12252 from oscim/patch-10
...
Update admin.lib.php
2019-10-30 02:41:59 +01:00
Laurent Destailleur
f03bf149bd
Fix autoselect of field with modulebuilder
2019-10-30 02:09:29 +01:00
Laurent Destailleur
bc3f088f50
Enhance modulebuilder
...
Work on MO
2019-10-30 01:35:41 +01:00
Laurent Destailleur
beb85ee3a8
Work on MO
2019-10-30 00:56:57 +01:00
Laurent Destailleur
66337ec234
NEW Add widgets for BOMs and MOs
2019-10-30 00:36:47 +01:00
Laurent Destailleur
4eedf4a113
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
2019-10-29 11:48:11 +01:00
Laurent Destailleur
e58ecaaa64
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/product/stock/replenishorders.php
2019-10-29 11:43:35 +01:00
stickler-ci
52ef2bb990
Fixing style errors.
2019-10-29 10:16:49 +00:00
oscim
d310ca6e82
Update admin.lib.php
...
add function modulehelp_prepare_head
2019-10-29 11:15:03 +01:00
Laurent Destailleur
5e06fe0712
FIX Avoid fatal error when creating thumb from PDF
2019-10-29 11:11:13 +01:00
Frédéric FRANCE
043a71442f
contact phone
2019-10-27 20:06:16 +01:00
Frédéric FRANCE
a9447bc963
Update html.formmail.class.php
2019-10-27 18:08:21 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-27 17:03:50 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent
2019-10-27 17:01:23 +01:00
Laurent Destailleur
afa3ed499f
Can export BOMs
2019-10-27 15:56:20 +01:00
Frédéric FRANCE
e2afcfb999
clean indent
2019-10-27 11:53:20 +01:00
Frédéric FRANCE
e203f87c84
clean indent
2019-10-27 11:18:36 +01:00
Laurent Destailleur
5cb9434bb4
FIX Stock qty hidden without permission to see stock
2019-10-27 00:55:06 +02:00
Laurent Destailleur
e17cc5b2e5
Debug cloning of BOMs
2019-10-27 00:26:11 +02:00
Laurent Destailleur
f060ef1018
FIX Clean decimal data for module builder
2019-10-27 00:01:16 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Frédéric FRANCE
83ed70f72f
Update agenda.lib.php
2019-10-24 22:44:51 +02:00
Laurent Destailleur
2814a5c07b
Fix phpcs
2019-10-24 21:47:31 +02:00
Laurent Destailleur
b45ee20696
NEW Add a tab to setup "Opening hours" of company (information only)
2019-10-24 21:29:07 +02:00
Laurent Destailleur
8d21144521
Beautify select of products in vendor record
2019-10-24 20:33:16 +02:00
Philippe GRAND
5e44d63ec0
Merge remote-tracking branch 'upstream/develop' into new_branch_24_10_2019
2019-10-24 16:24:17 +02:00
Laurent Destailleur
88e848e346
FIX Extrafields missing in export of expense report
2019-10-24 16:00:10 +02:00
Laurent Destailleur
15609e319f
FIX Extrafields missing in export of expense report
2019-10-24 15:57:34 +02:00
Philippe GRAND
ac839204d7
add some comment
2019-10-24 15:12:20 +02:00
Philippe GRAND
ffa5c8cbc0
add some comment
2019-10-24 15:10:05 +02:00
stickler-ci
3fb0b1ac73
Fixing style errors.
2019-10-24 13:07:19 +00:00
Philippe GRAND
480e21b88a
add some comment
2019-10-24 15:06:56 +02:00
stickler-ci
9eb0385a88
Fixing style errors.
2019-10-24 13:02:34 +00:00
Philippe GRAND
f1db8e6f03
add some comment
2019-10-24 15:02:37 +02:00
stickler-ci
8a7360dd32
Fixing style errors.
2019-10-24 12:59:20 +00:00
Philippe GRAND
96ab43d495
add some comment
2019-10-24 14:58:15 +02:00
Laurent Destailleur
7297514afb
NEW Use the gender of member for picto in member lists.
2019-10-23 21:00:29 +02:00
Laurent Destailleur
fd04729727
Fix tooltip on extrafield title was on wrong line.
2019-10-23 20:35:39 +02:00
Laurent Destailleur
b48f08dd07
Theme v11
2019-10-23 20:12:29 +02:00
Laurent Destailleur
41303006f3
Rename constant
2019-10-23 17:48:55 +02:00
Laurent Destailleur
f4545a2068
Debug method MAIN_STATUS_USES_CSS
2019-10-23 17:31:54 +02:00
Laurent Destailleur
a8ca8c7a1f
Fix edit of extrafields link when empty
2019-10-23 16:38:15 +02:00
Laurent Destailleur
9a386da7f5
NEW Can crop/resize image attached on a bank record
2019-10-23 16:07:09 +02:00
Laurent Destailleur
da00591bba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
2019-10-23 04:04:32 +02:00
Laurent Destailleur
161f2a018f
Fix responsive and bad closing td
2019-10-23 03:50:48 +02:00
Laurent Destailleur
f23804a091
FIX #12152
2019-10-23 03:00:19 +02:00
Laurent Destailleur
fea12076ee
FIX #12152
2019-10-22 20:24:52 +02:00
Laurent Destailleur
c4be61c55c
FIX Better compatible fix for the trouble of weight / size units
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d
FIX Better compatible fix for the trouble of weight / size units
2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Laurent Destailleur
8242281ef8
Close #12096
2019-10-22 14:39:33 +02:00
Laurent Destailleur
5ad7ca5620
Code more generic around setting projet on a card
2019-10-22 13:43:24 +02:00
Laurent Destailleur
b2bbee55f1
Fix phpcs
2019-10-22 12:37:36 +02:00
Laurent Destailleur
2eb5803644
Merge pull request #12196 from bb2a/patch-2
...
Update functions.lib.php
2019-10-22 12:36:47 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop
...
Translate documentation and minor code improvement
2019-10-22 12:32:40 +02:00
Laurent Destailleur
e5ee83ead1
Merge pull request #12194 from grandoc/new_branch_21_10_2019
...
internationalization
2019-10-22 12:31:48 +02:00
Tim Otte
ad51e862e4
Merged
2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204
Requested changes implemented
2019-10-22 11:36:28 +02:00
Laurent Destailleur
aa4afcfe8a
NEW Can set a filter on object linked in modulebuilder.
2019-10-22 03:49:09 +02:00
Laurent Destailleur
6aa2ceac1a
Fix phpcs
2019-10-22 02:53:29 +02:00
Anthony Berton
5e7d615250
Update functions.lib.php
2019-10-21 21:06:48 +02:00
Laurent Destailleur
8e474701c1
Fix missing token
2019-10-21 15:49:08 +02:00
Laurent Destailleur
e261d63295
NEW Can add a button "Create" after combo of object with modulebuilder.
2019-10-21 14:44:39 +02:00
Laurent Destailleur
3024919cd6
fix phpcs
2019-10-21 10:25:23 +02:00
Philippe GRAND
a0303e903a
internationalization
2019-10-21 09:53:42 +02:00
Philippe GRAND
db22cdb8ea
internationalization
2019-10-21 09:43:34 +02:00
Laurent Destailleur
6e9f3c3f9d
Merge pull request #11084 from atm-florian/dev_MassSendEmailInvoiceToBillingContact
...
NEW : mass email action on invoice list use billing contact if exists
2019-10-20 21:45:37 +02:00
Laurent Destailleur
528ded58cf
Merge pull request #12187 from c3do/develop
...
NEW Add API to get Country by code and iso
2019-10-20 21:26:44 +02:00
Alfredo Altamirano
d921b08e5c
Translate documentation of translate class
2019-10-20 11:44:07 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Frédéric FRANCE
0ede817588
do not ignore lines with mix od tabs and spaces
2019-10-20 16:56:47 +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
5a4960f7ae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
2019-10-20 15:30:28 +02:00
c3do
4fb0d03500
NEW Add API to get Country by code and iso
2019-10-20 15:25:18 +02:00
Laurent Destailleur
49c101bb77
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Laurent Destailleur
8ce6197314
Update commondocgenerator.class.php
2019-10-20 14:37:15 +02:00
Laurent Destailleur
1b3d6d749a
Merge pull request #12175 from Shnoulle/develop
...
Close #12098 : allow usage of AUTH LOGIN in smtp
2019-10-20 13:48:24 +02:00
Laurent Destailleur
e95861c361
Update smtps.class.php
2019-10-20 13:48:01 +02:00
Laurent Destailleur
3b5e62947d
Update smtps.class.php
2019-10-20 13:44:28 +02:00
Laurent Destailleur
84f6fd64a9
Merge pull request #12176 from Ahuahuachi/develop
...
Translation of some function documentation
2019-10-20 13:31:25 +02:00
Laurent Destailleur
9e7476cd1f
Merge pull request #12171 from grandoc/new_branch_18_10_2019
...
Standardization
2019-10-20 13:30:40 +02:00
Laurent Destailleur
62a8523ccf
Merge pull request #12178 from frederic34/patch-18
...
Update functions2.lib.php
2019-10-20 12:40:34 +02:00
Laurent Destailleur
ff30274a59
Merge pull request #12177 from frederic34/patch-17
...
Update box_produits.php
2019-10-20 12:40:10 +02:00
stickler-ci
66a2dc4994
Fixing style errors.
2019-10-20 09:18:55 +00:00
Frédéric FRANCE
33c35780e0
wip
2019-10-20 11:17:54 +02:00
Frédéric FRANCE
360bf55f5b
clean indent
2019-10-20 01:09:11 +02:00
Alfredo Altamirano
9d9961e936
Translate documentation
2019-10-19 16:55:27 -05:00
Alfredo Altamirano
1ede09c21a
Fix typo
2019-10-19 11:17:53 -05:00
Frédéric FRANCE
f0a3d1a1c4
Update functions2.lib.php
2019-10-18 23:20:34 +02:00
Frédéric FRANCE
486047c357
Update box_produits.php
2019-10-18 23:14:43 +02:00
Alfredo Altamirano
71f9b4f36b
Translation of parameter documentation
2019-10-18 12:55:21 -05:00
Denis Chenu
88100a53aa
Close #12098 : allow usage of AUTH LOGIN in smtp
...
Global variable MAIL_SMTP_AUTH_TYPE can be used to PLIAN to allow AUTH PLAIN authentification. Default still AUTH LOGIN.
2019-10-18 17:35:52 +02:00
Laurent Destailleur
becd3f7d2f
FIX Missing status and paid flag in export or expense report
2019-10-18 15:35:25 +02:00
Philippe GRAND
a07ab341f8
Standardization
2019-10-18 13:00:31 +02:00
Philippe GRAND
41d2cb2c29
Standardization
2019-10-18 12:56:40 +02:00
Philippe GRAND
f43d51bfec
Standardization
2019-10-18 12:51:49 +02:00
Philippe GRAND
731f4587e2
Merge remote-tracking branch 'origin/new_branch_18_10_2019' into new_branch_18_10_2019
2019-10-18 12:44:40 +02:00
Philippe GRAND
18b183f516
Standardization
2019-10-18 12:43:25 +02:00
stickler-ci
0c61e798a6
Fixing style errors.
2019-10-18 09:42:15 +00:00
Philippe GRAND
3b56d91727
Standardization
2019-10-18 11:41:18 +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
Laurent Destailleur
87ec1de78e
Start to work on solution to sort permissions by module
2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e
Merge branch 'develop' into 10.0_closure2
2019-10-17 18:16:57 +02:00
Laurent Destailleur
4d9c285126
Merge pull request #12163 from sadlig/fix-stock-movement-right
...
Fix Stock movement user's right (Fixes #11967 )
2019-10-17 17:53:17 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
25fe861f9b
Merge pull request #12151 from tuxgasy/10_Product_import_duplicate_volumUnits
...
Fix width unit label in product import
2019-10-17 17:47:31 +02:00
Laurent Destailleur
f71423b3fd
Merge pull request #12160 from grandoc/new_branch_17_10_2019
...
Internationalization
2019-10-17 17:42:44 +02:00
Laurent Destailleur
c64a537bfd
Merge pull request #12155 from frederic34/patch-14
...
Update html.formticket.class.php
2019-10-17 17:42:30 +02:00
Laurent Destailleur
9397407f23
Merge pull request #12149 from grandoc/new_branch_16_10_2019
...
internationalization
2019-10-17 17:41:51 +02:00
Laurent Destailleur
40a9b95696
Merge pull request #12148 from homer8173/patch-7
...
use current local time on Now button
2019-10-17 17:41:16 +02:00
Gildas
132ea56a59
Fix Stock movement user's right ( Fixes #11967 )
2019-10-17 17:06:38 +02:00
Philippe GRAND
2efeeb0ad8
Internationalization
2019-10-17 14:47:03 +02:00
Laurent Destailleur
084ab53b4b
Fix translation
2019-10-17 12:14:38 +02:00
Frédéric FRANCE
46d2bf3317
Update html.formticket.class.php
2019-10-16 23:18:14 +02:00
Frédéric FRANCE
219a4b4374
Update html.formticket.class.php
2019-10-16 23:08:04 +02:00
Frédéric FRANCE
701afc99e9
Update html.formticket.class.php
2019-10-16 23:03:59 +02:00
Frédéric FRANCE
4bc0a6db2d
Update html.formticket.class.php
2019-10-16 22:56:29 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
8a7a0b80e2
Fix remove warnings
2019-10-16 19:08:31 +02:00
Laurent Destailleur
41dd53170e
Code comment
2019-10-16 19:07:17 +02:00
Laurent Destailleur
205967976c
Can set a BOM to draft
2019-10-16 18:35:15 +02:00
TuxGasy
43ce1543d8
Fix width unit label in product import
2019-10-16 17:37:20 +02:00
Laurent Destailleur
7960c91955
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/theme/md/style.css.php
2019-10-16 17:27:41 +02:00
Laurent Destailleur
8152c60878
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2019-10-16 17:13:14 +02:00
Laurent Destailleur
b47ebcca2b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-16 17:10:10 +02:00
Philippe GRAND
10fd472392
internationalization
2019-10-16 15:59:08 +02:00
Philippe GRAND
cd825ba4be
internationalization
2019-10-16 15:46:46 +02:00
stickler-ci
fce1f1991c
Fixing style errors.
2019-10-16 12:34:42 +00:00
Norbert Penel
8d75e83e55
use current local time on Now button
...
use current local time for feed the date according to locale settings
2019-10-16 14:32:17 +02:00
Laurent Destailleur
7a927a22e3
Merge pull request #12137 from frederic34/patch-15
...
Update box_task.php
2019-10-16 14:31:01 +02:00
Laurent Destailleur
2aa594de9d
Merge pull request #12124 from c3do/patch-1
...
New: Set a pricing rule by default for new clean installation
2019-10-16 13:25:44 +02:00
Laurent Destailleur
d7871c4971
Merge pull request #12132 from grandoc/new_branch_15_10_2019
...
Internationalization
2019-10-16 13:24:10 +02:00
Laurent Destailleur
ea2986037f
Merge pull request #12147 from homer8173/patch-5
...
Fix user time instead of server time
2019-10-16 13:12:37 +02:00
Laurent Destailleur
1d7efbdc64
Merge pull request #12138 from frederic34/patch-16
...
FIX datec in box ticket
2019-10-16 13:02:59 +02:00
stickler-ci
bba042c0c3
Fixing style errors.
2019-10-16 10:34:47 +00:00
Norbert Penel
8d49609549
Fix user time instead of server time
...
it seems that we want to use a user time by clicking on now button.
IDEA : may i use client time ??? because if page is old, the now button insert an old time.
2019-10-16 12:28:50 +02:00
Laurent Destailleur
6d05d42c50
Look and feel v11
2019-10-16 11:26:20 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Laurent Destailleur
b0de030f3e
phpcs
2019-10-16 02:05:47 +02:00
Laurent Destailleur
ffc4820970
Fix counter of BOM
2019-10-16 02:05:23 +02:00
Laurent Destailleur
d3df04c5aa
Mutualize code
2019-10-16 01:36:07 +02:00
Laurent Destailleur
b0355dd149
Module BOM have now status DRAFT, VALIDATED, DISABLED
2019-10-16 01:20:58 +02:00
Laurent Destailleur
9ce71c26aa
Use alpha logo by default
2019-10-15 11:41:22 +02:00
Laurent Destailleur
63a60c7811
NEW Add option MAIN_PDF_FORCE_FONT_SIZE
2019-10-15 11:13:14 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-15 09:39:57 +02:00
Laurent Destailleur
fb3d20107c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Laurent Destailleur
2ed96c9e5f
Fix scrutinizer
2019-10-15 02:54:19 +02:00
Laurent Destailleur
a1c93cb2e6
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
...
Look and feel v11
2019-10-15 02:45:12 +02:00
Laurent Destailleur
f50a75194c
Removed warning
2019-10-15 00:44:22 +02:00
Frédéric FRANCE
194072fc60
Update box_last_ticket.php
2019-10-15 00:14:43 +02:00
Frédéric FRANCE
a53c7cfca8
Update box_last_modified_ticket.php
2019-10-15 00:13:52 +02:00
Laurent Destailleur
c869cbe193
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
...
Unlock title button feature
2019-10-14 23:55:10 +02:00
Laurent Destailleur
2d1bc90e57
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-10-14 23:50:06 +02:00
Frédéric FRANCE
b77d2f2ff2
Update box_task.php
2019-10-14 23:27:37 +02:00
stickler-ci
30099a821b
Fixing style errors.
2019-10-14 19:39:00 +00:00
Philippe GRAND
6761e1ef33
Internationalization
2019-10-14 21:38:21 +02:00
Philippe GRAND
7ce5ddbf02
Internationalization
2019-10-14 21:25:43 +02:00
Laurent Destailleur
07bb83a96d
Merge pull request #12113 from aspangaro/10.0_p25
...
Remove a duplicate line
2019-10-14 21:04:22 +02:00
Laurent Destailleur
b8a27a47aa
Merge pull request #12112 from frederic34/patch-17
...
Update box_last_modified_ticket.php
2019-10-14 20:57:18 +02:00
Laurent Destailleur
1fc5afa022
Merge pull request #12111 from frederic34/patch-16
...
Update box_last_ticket.php
2019-10-14 20:56:25 +02:00
Laurent Destailleur
7b1b51e752
Merge pull request #12115 from TobiasSekan/develop
...
Fix MS Outlook import error
2019-10-14 20:54:30 +02:00
Laurent Destailleur
4941a99cc7
Merge pull request #12126 from grandoc/new_branch_14_10_2019
...
add missing translation
2019-10-14 20:53:28 +02:00
Laurent Destailleur
5a55997540
Update pdf_eratosthene.modules.php
2019-10-14 20:53:18 +02:00
Laurent Destailleur
2f0bf491ac
Merge pull request #12130 from frederic34/patch-19
...
Update check_notifications.php
2019-10-14 20:38:40 +02:00
Laurent Destailleur
5c4edad0d4
Merge pull request #12105 from grandoc/new_branch_12_10_2019
...
more internationalization
2019-10-14 20:37:50 +02:00
Frédéric FRANCE
502d154cea
Update check_notifications.php
2019-10-14 20:01:35 +02:00
Laurent Destailleur
3b84e2bac3
Use img-thumb css
2019-10-14 19:21:13 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Philippe GRAND
fd90ebe63b
add missing translation
2019-10-14 15:57:29 +02:00
Philippe GRAND
e326c23245
add missing translation
2019-10-14 15:48:24 +02:00
Cédric
44476afdac
FIX: No pricing rule on new clean installation
...
There is no pricing rule on new fresh installation of Dolibarr.
I think the pricing rule "PRODUCT_PRICE_UNIQ" should be set by default because it is needed to update a product through API REST.
2019-10-14 15:35:04 +02:00
Laurent Destailleur
a33fb47777
Work on MO module
2019-10-14 12:10:14 +02:00
Laurent Destailleur
7973b03201
NEW Add estimated duration on the BOM module
2019-10-14 11:38:36 +02:00
Tobias Sekan
e2ca646b6e
Fix MS Outlook import error
2019-10-14 10:22:47 +02:00
Alexandre SPANGARO
e50d32dc00
Remove a duplicate line
2019-10-13 13:20:45 +02:00
Frédéric FRANCE
92e4b962fa
Update box_last_modified_ticket.php
2019-10-13 10:37:30 +02:00
Frédéric FRANCE
67278e4781
Update box_last_ticket.php
2019-10-13 10:18:41 +02:00
Alexandre SPANGARO
499eb87173
lang file for holidays is holiday
2019-10-13 08:20:37 +02:00
Frédéric FRANCE
c143584af4
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 21:16:54 +02:00
Laurent Destailleur
c338db6c36
Fix unlink picto
2019-10-12 19:16:36 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 19:02:24 +02:00
Laurent Destailleur
9ba992b8b6
Work on inventory module
2019-10-12 12:31:35 +02:00
Philippe GRAND
33efd77fc7
more internationalization
2019-10-12 12:10:33 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc
2019-10-11 23:08:33 +02:00
Laurent Destailleur
2fa3b23cf1
Fix missing price level field
2019-10-11 19:36:36 +02:00
Laurent Destailleur
f334180cb8
Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent
...
NEW add parent category id or label in import category module
2019-10-11 17:33:28 +02:00
Laurent Destailleur
fa928f7dc3
Update modCategorie.class.php
2019-10-11 17:33:13 +02:00
Laurent Destailleur
95305a313d
Fix trans
2019-10-11 17:02:35 +02:00
Laurent Destailleur
60bdb3133e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-11 16:57:56 +02:00
Laurent Destailleur
b58c2c38b2
Fix missing token
2019-10-11 16:57:47 +02:00
Laurent Destailleur
3f62a6d532
Merge pull request #12093 from frederic34/patch-23
...
fix search by roles
2019-10-11 16:57:33 +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
cc73877e03
Merge branch 'develop' into patch-18
2019-10-11 16:32:48 +02:00
Laurent Destailleur
541357027e
Merge pull request #12077 from frederic34/patch-15
...
globe fontawesome
2019-10-11 16:31:37 +02:00
Laurent Destailleur
d6881f9192
Merge pull request #12095 from atm-john/develop_fix_logo_bg
...
Fix logo container css name and add hidden conf to remove background
2019-10-11 16:25:48 +02:00
Laurent Destailleur
a0f918c85a
Merge pull request #12094 from grandoc/new_branch_11_10_2019
...
fix some translations
2019-10-11 16:21:06 +02:00
Laurent Destailleur
dbb06adf98
Merge pull request #12090 from frederic34/patch-19
...
doxygen
2019-10-11 16:15:36 +02:00
Laurent Destailleur
78bfc8997d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:12:01 +02:00
Laurent Destailleur
114e741975
Merge pull request #12079 from frederic34/patch-17
...
Update box_factures_imp.php
2019-10-11 15:54:37 +02:00
Laurent Destailleur
c6a796d270
Try to fix #12097
2019-10-11 15:45:32 +02:00
Laurent Destailleur
868bfb518b
FIX #11702 FIX #12088
2019-10-11 15:08:10 +02:00
Laurent Destailleur
7ce01c5ceb
Look and feel v11
2019-10-11 14:42:55 +02:00
John Botella
1fdc38da2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fix_logo_bg
2019-10-11 14:36:48 +02:00
Laurent Destailleur
c21224ef96
Align code of auguria menu handler with new architecture
2019-10-11 14:24:47 +02:00
Laurent Destailleur
9251f04d63
Update thumbs of themes
2019-10-11 13:26:48 +02:00
Laurent Destailleur
5801d09dbe
NEW Use the squarre logo as favicon of pages
2019-10-11 12:28:13 +02:00
VESSILLER
2fb776ee34
NEW add new rule fetchidfromcodeandlabel for categories import
2019-10-11 11:57:11 +02:00
Philippe GRAND
25b9be9de7
update code
2019-10-11 10:19:58 +02:00
Philippe Grand
bcb7365a5a
Update commondocgenerator.class.php
2019-10-11 10:13:21 +02:00
John Botella
4873cbd071
Fix css name
2019-10-11 10:10:12 +02:00
John Botella
13115a55a2
Fix logo background and hidden conf
2019-10-11 10:02:59 +02:00
Philippe GRAND
af88f44fd9
fix some translations
2019-10-11 09:51:17 +02:00
John Botella
9194eb4bec
Fix block title height if no button
2019-10-11 09:14:10 +02:00
John Botella
724999f1ce
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
2019-10-11 08:40:43 +02:00
Frédéric FRANCE
c80d055af3
fix search by roles
2019-10-10 23:51:54 +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
e7f56b67d8
Look and feel v11
2019-10-10 23:00:33 +02:00
Frédéric FRANCE
9a2fabff6f
doxygen
2019-10-10 18:42:29 +02:00
Laurent Destailleur
a8676e63c8
CSS
2019-10-10 16:46:50 +02:00
Laurent Destailleur
e2113c2f33
Fix sort lost after uploading a file
2019-10-10 16:41:24 +02:00
Laurent Destailleur
b34cbfad74
Rename const
2019-10-10 15:23:45 +02:00
Laurent Destailleur
d9a0dc2986
Fix trans
2019-10-10 15:20:44 +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
Frédéric FRANCE
be00576717
Update functions.lib.php
2019-10-10 08:22:14 +02:00
Frédéric FRANCE
90257dc087
Update box_factures_imp.php
2019-10-10 08:09:39 +02:00
Frédéric FRANCE
d4757a0b5b
globe fontawesome
2019-10-09 23:20:15 +02:00
Laurent Destailleur
072a0a26d6
Use a font awesome icon to show "shippable" flag on orders.
2019-10-09 18:07:00 +02:00
Laurent Destailleur
db651a607d
Use fontawesome for img_warning
2019-10-09 17:33:46 +02:00
VESSILLER
d77f7556d8
NEW add parent category id or label in import category module
2019-10-09 16:00:14 +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
f2d04fe55c
Code comment
2019-10-09 11:51:10 +02:00
Laurent Destailleur
9f4aadae18
Missing Nature, Duration and Type fields in export of products
2019-10-09 02:05:20 +02:00
Frédéric FRANCE
5ac8ba8c65
fix travis
2019-10-08 22:13:19 +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
f55a4d77e4
css
2019-10-08 16:41:03 +02:00
stickler-ci
7e841350db
Fixing style errors.
2019-10-08 13:24:41 +00:00
Laurent Destailleur
138ac0d524
Merge pull request #12063 from laudeco/feature/export_user_bank_account
...
NEW Add bank data of user into the expense report exports
2019-10-08 15:19:46 +02:00
Laurent Destailleur
06eedece26
Merge pull request #11371 from bafbes/abb90058
...
New:Show labels of countries in modulebuilder
2019-10-08 15:17:16 +02:00
Laurent Destailleur
c724eef85c
Update ccountry.class.php
2019-10-08 15:16:56 +02:00
Laurent Destailleur
bd867f5e80
Update ccountry.class.php
2019-10-08 15:16:23 +02:00
Laurent Destailleur
651dec8dc2
Doxygen
2019-10-08 11:27:52 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Laurent Destailleur
d55b7689bb
Merge pull request #11920 from ptibogxiv/patch-264
...
NEW translation for member type
2019-10-08 09:00:49 +02:00
Laurent De Coninck
c8fb1e852c
export some other fields on the expense reports
...
When the user requests the export of the expense reports, some fields
were missing such as the bank account information of the user.
This PR adds the support of all those fields on the expense report
export. Now when you export the expense report you have :
* The bank name
* The bank code
* The IBAN
* The BIC
* The owner
* The owner address
2019-10-08 08:51:09 +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
99da69fb69
NEW Can edit the price of predefined product during adding in documents
2019-10-07 21:01:52 +02:00
Laurent Destailleur
51be0fad99
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-10-07 20:52:39 +02:00
Laurent Destailleur
bb72efefc5
Fix phpcs
2019-10-07 20:52:27 +02:00
Laurent Destailleur
e5026157e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2019-10-07 20:49:30 +02:00
Laurent Destailleur
539f4355c3
Try to fix stickler
2019-10-07 20:48:44 +02:00
Frédéric FRANCE
c68de09ba9
use $this->db in box
2019-10-07 20:27:51 +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
Florian Mortgat
2aee62ea28
FIX: $from and $sendto variables are unescaped in the sending error message
...
This causes addresses like Tom <tom@examp.le> not to be shown in the message.
2019-10-07 17:32:52 +02:00
Laurent Destailleur
297313e7de
CSS
2019-10-07 16:01:36 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault
...
NEW : Address/Contact by default on third parties
2019-10-07 15:27:58 +02:00
Laurent Destailleur
3a15485e99
Update interface_90_modSociete_ContactRoles.class.php
2019-10-07 15:27:23 +02:00
Laurent Destailleur
240785922e
Update interface_90_modSociete_ContactRoles.class.php
2019-10-07 15:23:30 +02:00
Laurent Destailleur
a9c844460b
Debug use of widget on Accounting home page
2019-10-07 14:39:29 +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
ptibogxiv
9aa7226d39
Update member.lib.php
2019-10-07 13:38:05 +02:00
Laurent Destailleur
e02794248e
Merge branch 'develop' into patch-264
2019-10-07 13:25:16 +02:00
Laurent Destailleur
12d243b8d4
FIX #12040
2019-10-07 13:13:46 +02:00
Laurent Destailleur
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
...
Fix : LibStatut missing dolgetstatus usage
2019-10-07 13:08:33 +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
7015e71105
FIX #12041
2019-10-07 12:53:32 +02:00
Laurent Destailleur
e7aa78cb4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 12:37:20 +02:00
Laurent Destailleur
23de8694fa
Fix module files
2019-10-07 12:37:01 +02:00
Laurent Destailleur
f4b752ee81
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/expedition/card.php
2019-10-07 12:33:13 +02:00
VESSILLER
219b0d8925
FIX Import of product using units
2019-10-07 12:26:02 +02:00
atm-lena
8c024b3786
FIX : missing "$this->id" in "fetch" function
2019-10-07 11:26:10 +02:00
Laurent Destailleur
ecd7d1208d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 10:42:49 +02:00
Laurent Destailleur
fc90638b2b
Code comment
2019-10-07 10:42:18 +02:00
Laurent Destailleur
b85c4f0864
Merge branch 'develop' into new-import-product-country-code
2019-10-07 10:41:35 +02:00
Laurent Destailleur
c3ae87816f
Merge pull request #12049 from frederic34/holidayz
...
lang file for holidays is holiday
2019-10-07 10:21:36 +02:00
Frédéric FRANCE
f80fa08a2d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-07 07:57:05 +02:00
Laurent Destailleur
80c1a92872
FIX Load chart of account only if we click or select button "Load chart"
2019-10-06 21:11:29 +02:00
Laurent Destailleur
a3d0b9e374
Fix syntax error
2019-10-06 18:11: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
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Laurent Destailleur
76dad97cb1
Fix syntax error
2019-10-06 14:39:43 +02:00
Laurent Destailleur
6743169faa
Fix js syntax error
2019-10-06 14:34:24 +02:00
Frédéric FRANCE
8a9f08d5a3
lang file for holidays is holiday
2019-10-06 11:29:24 +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
ac8837d01f
Fix url
2019-10-05 19:28:00 +02:00
Laurent Destailleur
7f5ccf4b8e
Remove google+
2019-10-05 19:27:14 +02:00
Laurent Destailleur
e90234c2bc
FIX escape email alias
2019-10-05 14:27:37 +02:00
Laurent Destailleur
c36d49a8c3
FIX escape email alias
2019-10-05 14:15:14 +02:00
Laurent Destailleur
031c5523d4
NEW Add link to the public interface on the ticket card.
2019-10-05 11:52:30 +02:00
Laurent Destailleur
827b1fe5d2
Use small image instead of mini for preview on document list
2019-10-05 11:17:09 +02:00
Laurent Destailleur
8bf9afb7ca
FIX Attachement of linked files on ticket when sending a message
2019-10-04 19:41:35 +02:00
stickler-ci
bc32d684a4
Fixing style errors.
2019-10-04 16:12:33 +00:00
florian HENRY
2d3dd9ed3c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-10-04 18:10:16 +02:00
Laurent Destailleur
ef15bbee4a
Increase delay of hide of popup so we have a chance to click on content
2019-10-04 16:53:58 +02:00
Laurent Destailleur
503973cec9
FIX Edit of ticket module parameters erased others
2019-10-04 14:04:31 +02:00
VESSILLER
0e23fbc6df
NEW add country code in import product model
2019-10-04 10:04:02 +02:00
ATM john
027c8224b0
Fix dolGetStatus unused
2019-10-03 21:34:01 +02:00
Alexandre SPANGARO
ddadff5731
Add globe fa-icon
2019-10-03 21:32:55 +02:00
ATM john
77f666a236
Fix dolGetStatus param
2019-10-03 21:28:11 +02:00
Alexandre SPANGARO
8668e7157a
Add bookmark fa-icon
2019-10-03 21:00:59 +02:00
Alexandre SPANGARO
d0840b038f
Remove constant MAIN_DISABLE_FONT_AWESOME_5
2019-10-03 20:42:02 +02:00
Alexandre SPANGARO
14381927c7
Fix Bank Fa-icon
2019-10-03 20:32:15 +02:00
Laurent Destailleur
aa484d484d
css
2019-10-03 19:02:29 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 18:37:14 +02:00
Laurent Destailleur
c223c5635b
Merge pull request #12010 from laudeco/feature/12006-country-on-pdf-footer
...
[#12006 ] - adds the country in the address of the PDF's footer
2019-10-03 18:15:39 +02:00
Laurent Destailleur
e52b294779
Merge pull request #12012 from frederic34/ficheinter_rec
...
restore unfinished old commit
2019-10-03 18:10:16 +02:00
Laurent Destailleur
e9163015e5
Merge pull request #12029 from altatof/limitlang
...
NEW : add MAIN_LANGUAGES_ALLOWED constant to limit languages displayed
2019-10-03 18:08:35 +02:00
Laurent Destailleur
b787e53020
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-10-03 17:54:58 +02:00
Laurent Destailleur
1a66e0b05e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
d9aa816197
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:50:57 +02:00
Laurent Destailleur
74d3850ec8
Merge pull request #12030 from altatof/fckticket
...
NEW : FCKeditor setup for tickets
2019-10-03 17:49:59 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 17:21:31 +02:00
altairis
699a3391c9
FCKeditor setup for tickets
2019-10-03 16:51:05 +02:00
Laurent Destailleur
e59c70116f
Merge pull request #12021 from frederic34/patch-14
...
fix broken search
2019-10-03 15:57:31 +02:00
Laurent Destailleur
fce33240f3
Merge pull request #12013 from Ahuahuachi/develop
...
Translate french documentation
2019-10-03 15:56:42 +02:00
stickler-ci
3168ad404c
Fixing style errors.
2019-10-03 13:56:33 +00:00
Laurent Destailleur
95c73f7b46
Merge pull request #12025 from seebag/fix/no_sub_members
...
Fix for no subscription members
2019-10-03 15:52:16 +02:00
altairis
153121b95d
add MAIN_LANGUAGES_ALLOWED constant
2019-10-03 15:48:24 +02:00
Laurent Destailleur
b60ee4c18c
css
2019-10-03 09:58:49 +02:00
Sebastien Baguet
9daffcbe07
Fix for no subscription members
2019-10-03 00:29:41 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php
2019-10-03 00:22:14 +02:00
Frédéric FRANCE
feaa5e2bd0
json query path
2019-10-02 22:15:24 +02:00
Frédéric FRANCE
6d117a501a
Update company.lib.php
2019-10-02 22:11:27 +02:00
Frédéric FRANCE
453ae05030
Update company.lib.php
2019-10-02 22:09:50 +02:00
Frédéric FRANCE
9f7f263f79
fix broken search
2019-10-02 21:49:36 +02:00
Frédéric FRANCE
37bb548d21
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 20:56:32 +02:00
Laurent Destailleur
b6a95b4be5
Look and feel v11
2019-10-02 19:04:24 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 18:59:18 +02:00
Laurent Destailleur
f89701b4d4
Fix technical id align on left
2019-10-02 18:55:18 +02:00
Laurent Destailleur
d8a8c4fbe6
Look and feel v11. Picto are fontawesome.
2019-10-02 18:36:36 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Frédéric FRANCE
146275f763
Merge remote-tracking branch 'upstream/develop' into ficheinter_rec
2019-10-02 17:38:18 +02:00
Laurent Destailleur
320e9bbeec
Text on tooltip can also be clickable
2019-10-02 15:54:42 +02:00
Laurent Destailleur
c6d38227b6
NEW Use a dedicated css for the pencil to edit a field
2019-10-02 14:44:38 +02:00
Laurent Destailleur
66829aa615
Use span instead of div by default for the tooltip picto.
2019-10-02 14:33:31 +02:00
florian HENRY
8c9cee1565
resolve conflict
2019-10-02 12:49:38 +02:00
florian HENRY
371ff76f5e
resolve copflict
2019-10-02 12:46:35 +02:00
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency
...
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
2019-10-02 11:12:30 +02:00
Alexandre SPANGARO
94179f712d
Update areacode
2019-10-02 08:58:25 +02:00
Alexandre SPANGARO
848acb6096
Update index
2019-10-02 08:49:33 +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
802236f583
db escape
2019-10-02 08:31:46 +02:00
Alfredo Altamirano
9d75d7ac15
Translate french documentation
2019-10-02 00:55:46 -05:00
Laurent Destailleur
ba7a288abb
Fix colspan and columns of contact of thirdparties
2019-10-01 23:28:13 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
Frédéric FRANCE
26c34198bf
show contact
2019-10-01 21:38:16 +02:00
Laurent De Coninck
3a25beabe6
add the country in the address of the PDF's footer
2019-10-01 21:03:58 +02:00
ATM john
4d5ffbb5c4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
2019-10-01 20:45:04 +02:00
florian HENRY
d48f0fa791
resolve conflixt
2019-10-01 18:07:59 +02:00
Laurent Destailleur
68055e579f
Check array is array
2019-10-01 16:26:55 +02:00
Laurent Destailleur
8ad81a092a
Clean code
2019-10-01 16:19:54 +02:00
Laurent Destailleur
1ff8b879a8
Fix phpcs
2019-10-01 16:10:35 +02:00
Laurent Destailleur
29a2601b9d
Merge pull request #11567 from inoveaconseil/ContextDashboard
...
WIP: Context dashboard
2019-10-01 15:21:35 +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
52b0a0d609
The variable $out seems to be never defined.
2019-10-01 13:45:18 +02:00
Laurent Destailleur
f91242c66c
Fix css
2019-10-01 13:37:08 +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
fa921739ec
Remove duplicate code
2019-10-01 12:03:17 +02:00
Laurent Destailleur
11e01f5c86
Use correct style for table header
2019-10-01 12:02:28 +02:00
Frédéric FRANCE
7872a93605
Update box_commandes.php
2019-10-01 11:36:33 +02:00
Frédéric FRANCE
4ff65ce586
Update box_supplier_orders.php
2019-10-01 11:36:29 +02:00
Frédéric FRANCE
d201515514
Update box_prospect.php
2019-10-01 11:36:24 +02:00
Laurent Destailleur
15e646cc62
Fix bad name of trigger
2019-10-01 11:34:35 +02:00
Laurent Destailleur
c7da05e4a1
Fix bad name of trigger
2019-10-01 11:28:10 +02:00
Laurent Destailleur
6ebd060315
Use php var with same name than html var
2019-10-01 11:23:38 +02:00
Laurent Destailleur
0828000626
Merge pull request #12005 from laudeco/feature/filter_contacts
...
working solution about filtering the contacs of one company
2019-10-01 11:19:29 +02:00
Laurent Destailleur
0f4f5d47f2
Update company.lib.php
2019-10-01 11:18:53 +02:00
Laurent Destailleur
955d9daf38
Update company.lib.php
2019-10-01 11:18:14 +02:00
Laurent Destailleur
76bd09cfb5
Merge pull request #12002 from frederic34/patch-18
...
Update box_supplier_orders.php to show email
2019-10-01 11:16:40 +02:00
Laurent Destailleur
f151dc1951
Merge pull request #12000 from frederic34/zapier2
...
zapier trigger
2019-10-01 11:16:27 +02:00
Laurent Destailleur
2d8e3aad5b
Merge pull request #12001 from frederic34/patch-17
...
Update box_prospect.php to show email
2019-10-01 11:13:01 +02:00
stickler-ci
5e075d5d30
Fixing style errors.
2019-10-01 06:39:26 +00:00
Frédéric FRANCE
c57c8eee88
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 07:41:10 +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
Frédéric FRANCE
f3f2ab8aad
Update box_commandes.php
2019-09-30 22:45:28 +02:00
Frédéric FRANCE
466e48761c
Update box_supplier_orders.php
2019-09-30 22:43:13 +02:00
Frédéric FRANCE
d0e9e9568a
Update box_prospect.php
2019-09-30 22:40:07 +02:00
Frédéric FRANCE
b74a93e194
zapier trigger
2019-09-30 22:03:42 +02:00
Alexandre SPANGARO
8dea427f58
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-30 21:23:27 +02:00
ATM john
b01bd979b5
Unlock title button feature
2019-09-30 21:10:16 +02:00
Laurent Destailleur
0846a081cb
Merge branch 'develop' into new_branch_29_06_2019
2019-09-30 21:06:51 +02:00
Frédéric FRANCE
f32f528bc2
fix merge
2019-09-30 19:36:57 +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
33908afb66
Update zapier logo
2019-09-30 19:30:31 +02:00
Frédéric FRANCE
fec67aade4
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 18:44:34 +02:00
Frédéric FRANCE
a5fce6cca8
Update CMailFile.class.php
2019-09-30 18:25:54 +02:00
Laurent Destailleur
ecc2e8df67
Fix restore lost images
2019-09-30 17:58:31 +02:00
Laurent Destailleur
dc7ad61940
Add class reposition on button that switch the view mode
2019-09-30 17:46:53 +02:00
Laurent Destailleur
b390cff172
Fix css
2019-09-30 17:22:22 +02:00
Laurent Destailleur
ce7e8c83a3
Use a dedicated css imgforviewmode for button used to switch view
2019-09-30 17:08:57 +02:00
Laurent Destailleur
d65af06d20
Merge pull request #11869 from atm-john/new_ticket_messaging_page
...
New ticket messaging page design
2019-09-30 15:34:35 +02:00
Laurent Destailleur
d8de78dca9
Merge pull request #11984 from fuhraih/develop
...
Fix 11554 and 7533
2019-09-30 15:31:41 +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
Laurent Destailleur
bbc98c19bc
Update functions.lib.php
2019-09-30 15:25:55 +02:00
Laurent Destailleur
5b582d1117
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-30 15:18:28 +02:00
Laurent Destailleur
bc1e59ee23
Merge pull request #11982 from frederic34/patch-13
...
Add sendcontext to notification emails
2019-09-30 15:18:12 +02:00
Laurent Destailleur
7dd4a829a5
Comment
2019-09-30 15:18:05 +02:00
Laurent Destailleur
0a75c0645d
Merge branch 'develop' into develop_fix_land_loading
2019-09-30 15:15:12 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 07:49:52 +02:00
Laurent Destailleur
d2881eb85b
FIX CSS
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_input.tpl.php
2019-09-29 19:26:37 +02:00
Laurent Destailleur
64e710fc1b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-29 19:22:22 +02:00
Laurent Destailleur
8acf7298b2
FIX CSS
2019-09-29 19:22:01 +02:00
Laurent Destailleur
a9f88b84d8
Merge pull request #11981 from frederic34/patch-12
...
Update box_supplier_orders_awaiting_reception.php
2019-09-29 16:26:44 +02:00
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-29 11:28:54 +02:00
stickler-ci
103efbbe5b
Fixing style errors.
2019-09-28 20:55:58 +00: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
2b57d486dc
NEW Upgrade ACE editor to v1.4.6
2019-09-28 13:50:32 +02:00
Laurent Destailleur
6966651d51
Standardize code to use dolSqlDateFilter
2019-09-28 13:22:05 +02:00
Laurent Destailleur
db32ca99c6
Fix translation and sql request
2019-09-28 12:36:09 +02:00
Frédéric FRANCE
2eaf3c0dda
Add sendcontext to notification emails
2019-09-28 10:25:00 +02:00
Frédéric FRANCE
710154fb9d
Update box_supplier_orders_awaiting_reception.php
2019-09-28 09:00:52 +02:00
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9
NEW Add fa_icon on load_fiche_titre
2019-09-28 06:02:25 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +02:00
obrunet
3e4e64ab1a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2019-09-27 21:36:35 +02:00
ATM john
d7d5b87cf2
Fix lang loaded
2019-09-27 21:29:55 +02:00
fuhraih
40a8fe3e79
FIX #11554 Extrafields: members autosubscription formular issue
2019-09-27 21:26:06 +02:00
florian HENRY
885d958e63
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-27 20:12:09 +02:00
Laurent Destailleur
fd37a81e19
FIX #11861
2019-09-27 20:02:33 +02:00
Laurent Destailleur
981c5c877a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-27 20:02:08 +02:00
Laurent Destailleur
24ad67e0e1
Fix missing $conf
2019-09-27 20:01:57 +02:00
Laurent Destailleur
d0d884742f
FIX #11861 Not consistent code to manage measuring units
2019-09-27 19:45:33 +02:00
Laurent Destailleur
46e019642f
Code comment
2019-09-27 17:51:22 +02:00
stickler-ci
a8e73533b9
Fixing style errors.
2019-09-27 13:43:11 +00:00
Tim Otte
10f7bd3494
Restricted query of ExtraFields for supplier orders
2019-09-27 15:42:57 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception
...
NEW widget box for supplier orders awaiting reception
2019-09-27 15:32:43 +02:00
Laurent Destailleur
a4d405c6f9
Merge pull request #11906 from OPEN-DSI/new-form-products-select-labels-units
...
NEW Add units in select products lines
2019-09-27 15:30:44 +02:00
Laurent Destailleur
66cbb4020b
Merge branch 'develop' into patch-4
2019-09-27 14:46:39 +02:00
Laurent Destailleur
f5c839217a
Merge pull request #11914 from fmarcet/develop
...
Fix: Load invoices only if showed
2019-09-27 14:34:16 +02:00
Laurent Destailleur
8e08636d36
Merge pull request #11922 from laudeco/feature/11880_add_custom_element_in_project_export
...
[#11880 ] - support the referents also in the beluga export of a project
2019-09-27 14:22:49 +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
fc59193123
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-27 14:11:28 +02:00
Laurent Destailleur
f3bc319a78
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
2019-09-27 14:11:14 +02:00
Laurent Destailleur
6de173494b
Merge pull request #11924 from frederic34/patch-15
...
Update box_fournisseurs.php to see email
2019-09-27 14:01:18 +02:00
Laurent Destailleur
6858dce344
Rename table for categorie of warehouses
2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories
...
NEW Categories/Tags are also available on warehouses
2019-09-27 12:41:28 +02:00
Laurent Destailleur
ed99b71df4
Merge pull request #11915 from frederic34/patch-12
...
Update CMailFile.class.php
2019-09-27 12:26:55 +02:00
Laurent Destailleur
13473be6e9
Merge pull request #11923 from frederic34/patch-14
...
Update box_contacts.php to see email
2019-09-27 12:16:06 +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
0aea902681
Merge pull request #11958 from altatof/clipboard
...
NEW : add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant
2019-09-27 12:14:09 +02:00
Laurent Destailleur
881c90ab74
Merge pull request #11953 from grandoc/new_branch_24_09_2019
...
add missing translation
2019-09-27 11:56:01 +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
Laurent Destailleur
6fbb5c0db7
Merge pull request #11963 from aspangaro/11.0_fa_icon
...
#11931 NEW Add fa_icon "tools" for load_fiche_titre
2019-09-27 11:38:44 +02:00
Laurent Destailleur
e03667dc75
Merge pull request #11939 from frederic34/patch-17
...
fix badge linked resources on fichinter
2019-09-27 11:32:27 +02:00
Alexandre SPANGARO
4610f4391f
Merge branch 'develop' into 11.0_fa_icon
2019-09-27 11:29:39 +02:00
Laurent Destailleur
148afcaca8
Merge pull request #11964 from hregis/8.0_mc2
...
FIX getObjectSid is only for Active Directory
2019-09-27 11:25:14 +02:00
Laurent Destailleur
2b6b1a3e1c
Fix syntax error
2019-09-27 11:12:21 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Frédéric FRANCE
5eb0fb462b
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-27 07:59:02 +02:00
Laurent Destailleur
211d4ec78e
Merge pull request #11949 from frederic34/boxinfos
...
add infos missing in box
2019-09-26 23:43:40 +02:00
Laurent Destailleur
aa5f35f14f
Fix image on ticket
2019-09-26 14:28:34 +02:00
Regis Houssin
ffe866f96f
FIX getObjectSid is only for Active Directory
2019-09-25 19:24:07 +02:00
Laurent De Coninck
040e7bdfdf
working solution about filtering the contacs of one company
2019-09-25 18:24:36 +02:00
Laurent Destailleur
7d91649520
NEW Add extrafields in export of expense report (and holiday)
2019-09-25 15:48:44 +02:00
Alexandre SPANGARO
f4929c5315
NEW Add fa_icon "tools" for load_fiche_titre
2019-09-25 15:24:52 +02:00
altairis
c59e26457d
add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant
2019-09-25 12:18:19 +02:00
Tim Otte
b673c88fab
Fixed sql error
2019-09-25 10:25:00 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-25 08:06:44 +02:00
Ferran Marcet
1c9c72ced7
Qual: Clean code on sellist extrafields. Translate if query has only one field
2019-09-24 17:52:11 +02:00
Laurent Destailleur
b3c49f2ec8
End of dev for extrafields on holiday
2019-09-24 16:26:15 +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
c53be23122
FIX Filtering the HTTP Header "Accept-Language".
2019-09-24 13:54:52 +02:00
Laurent Destailleur
6431e8e16d
FIX SQL injection on qty
2019-09-24 12:43:44 +02:00
Laurent Destailleur
7b3e64d67f
NEW Support of Extrafields on Leave requests.
2019-09-24 12:01:18 +02:00
Philippe GRAND
7ec43e8b59
add missing translation
2019-09-24 09:54:57 +02:00
Alexandre SPANGARO
1b099733f5
Merge remote-tracking branch 'upstream/develop' into 11.0_translation
2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9
Typo abscissa
2019-09-23 21:45:23 +02:00
Alexandre SPANGARO
1b2558bb1f
typo
2019-09-23 21:43:11 +02:00
Alexandre SPANGARO
e5268f98c2
Correct Stickler
2019-09-23 20:48:30 +02:00
Alexandre SPANGARO
6d4c0c34b1
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-23 20:43:06 +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
Laurent Destailleur
1e65a478a8
Fix remove warnings
2019-09-23 19:21:06 +02:00
Frédéric FRANCE
8f41e0f9fe
clean code
2019-09-23 18:39:21 +02:00
Frédéric FRANCE
57509f1312
box ficheinter
2019-09-23 18:13:26 +02:00
Laurent Destailleur
40f75b16d8
FIX Substitution of __PROJECT_XXX__ not done
2019-09-23 13:04:22 +02:00
Laurent Destailleur
8ac0383fa0
FIX Send email from expense report card.
...
FIX Alias name is not into the email recipient label.
2019-09-23 12:36:12 +02:00
Laurent Destailleur
1584a4bf79
Add trigger event USER_SENTBYMAIL in agenda
2019-09-23 12:27:51 +02:00
Frédéric FRANCE
31094936c1
wip
2019-09-23 10:56:11 +02:00
Frédéric FRANCE
44ba0deae6
fix badge linked resources on fichinter
2019-09-20 17:58:22 +02:00
Alexandre SPANGARO
1e49fd0d45
Translate
2019-09-20 15:07:58 +02:00
Alexandre SPANGARO
e32772fdc5
Translate
2019-09-20 09:44:49 +02:00
Alexandre SPANGARO
278312f38f
Translate
2019-09-20 07:02:14 +02:00
atm-quentin
c09f2d8c4e
NEW stock categories
2019-09-19 16:21:03 +02:00
Frédéric FRANCE
61e358bb9d
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-18 21:23:26 +02:00
Laurent Destailleur
345ac28c89
Fix js injection
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/user/group/card.php
2019-09-18 14:21:02 +02:00
John Botella
d72548bd76
add filters
2019-09-18 13:43:34 +02:00
Frédéric FRANCE
c01ab451cc
Update box_fournisseurs.php
2019-09-17 23:04:43 +02:00
Frédéric FRANCE
c38c0bec1c
Update box_fournisseurs.php
2019-09-17 23:03:37 +02:00
Frédéric FRANCE
87d41256d4
Update box_contacts.php
2019-09-17 22:59:23 +02:00
Laurent Destailleur
3f6afa810c
Code comment
2019-09-17 17:55:30 +02:00
Laurent De Coninck
49b75e3f52
support referent in the beluga export.
...
The beluga export of a project, now supports additional referents, coming from the hooks. When the element is present in the view of all elements of the project, the beluga export will also export this element.
[see: X]
2019-09-17 17:40:42 +02:00
ptibogxiv
c8bfd2c7c2
NEW translation for member type
...
usefull for sync with API and multilanguage front end or application
2019-09-17 13:37:34 +02:00
Laurent Destailleur
24cb1390e4
FIX Update of leave request when CSRF with token is on
...
FIX Export of leave request show the number of open days
2019-09-17 13:17:25 +02:00
gauthier
2ac8bd4e16
FIX : If we share invoice, we need to see discount created from a deposit on each entity
2019-09-17 11:59:58 +02:00
Frédéric FRANCE
a44836ae40
Update CMailFile.class.php
2019-09-17 10:15:55 +02:00
VESSILLER
3654a5d01c
FIX selectFields for GROUP BY and show only if units defined
2019-09-17 10:05:35 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-17 08:24:31 +02:00
Frédéric FRANCE
e43f3a0f58
Update functions.lib.php
2019-09-16 18:07:06 +02:00
Frédéric FRANCE
5c00712c0a
Update functions.lib.php
2019-09-16 17:57:40 +02:00
VESSILLER
555ea977c9
NEW Add units in select products lines
2019-09-16 15:32:31 +02:00
Laurent Destailleur
34fc04903a
Introduce a logo squarred into setup (MAIN_INFO_SOCIETE_LOGO_SQUARRED,
...
MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI, ...)
2019-09-16 15:26:13 +02:00
John Botella
010e58d957
Add switch view behavior
2019-09-16 13:56:07 +02:00
Laurent Destailleur
0194f48041
Merge pull request #10795 from altatof/clonecat
...
NEW : copy linked categories on product clone process
2019-09-15 16:34:42 +02:00
Laurent Destailleur
eda17e9c54
Merge pull request #11850 from OPEN-DSI/new-stock-import-warehouse-parent
...
NEW add parent id or ref column in warehouse import
2019-09-15 15:44:33 +02:00
Laurent Destailleur
6bfba0b731
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2019-09-15 15:17:38 +02:00
Laurent Destailleur
76b3668368
FIX regression with option to hide picto on top menu
2019-09-15 15:15:59 +02:00
Laurent Destailleur
755057c99f
FIX regression with option to hide picto on top menu
2019-09-15 15:15:46 +02:00
Laurent Destailleur
544a1237bc
FIX regression with option to hide picto on top menu
2019-09-15 15:11:13 +02:00
Laurent Destailleur
7019e69ee2
FIX regression with option to hide picto on top menu
2019-09-15 15:09:36 +02:00
TuxGasy
e0238705cc
Check if childtablesoncascade is not empty
2019-09-14 19:04:43 +02:00
Frédéric FRANCE
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 18:42:31 +02:00
Frédéric FRANCE
1e652a41af
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 18:41:51 +02:00
Laurent Destailleur
9f6fe0bf5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/orders.lang
2019-09-14 18:27:58 +02:00
Laurent Destailleur
584549df11
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/index.php
2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/accountancy/index.php
2019-09-14 18:23:20 +02:00
Frédéric FRANCE
6444c7378f
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 16:40:23 +02:00
Frédéric FRANCE
e5417cccd8
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 16:40:00 +02:00
Laurent Destailleur
1d865a250e
Merge pull request #11866 from bafbes/abb100076
...
fix: repetition in error message
2019-09-14 16:39:24 +02:00
Laurent Destailleur
c015bbda14
Update ldap.class.php
2019-09-14 16:39:08 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 16:37:10 +02:00
Frédéric FRANCE
08f056a0f4
Delete interface_50_modIFTTT_IFTTT.class.php
...
IFTTT has been removed
2019-09-14 09:09:41 +02:00
Laurent Destailleur
aad6b003fb
Add cache in fetch_optionnals() to avoid duplicate call to
...
fetch_name_optionals_label
2019-09-14 00:02:48 +02:00
florian HENRY
224b4c147a
Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0
2019-09-13 15:25:25 +02:00
florian HENRY
7966bfc2df
fix: fill id for links (document tab)
2019-09-13 15:25:16 +02:00
Laurent Destailleur
166d56f7a3
Removed function dol_micro_time. Use native PHP microtime instead.
2019-09-13 11:15:49 +02:00
Frédéric FRANCE
de3a67f5bd
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-12 21:52:06 +02:00
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project
2019-09-12 21:39:57 +02:00
ATM john
859904587f
add private support and title buttons
2019-09-12 21:17:48 +02:00
Frédéric FRANCE
6f33874d75
add entity
2019-09-12 21:13:00 +02:00
Frédéric FRANCE
cd109d04cd
add function
2019-09-12 20:44:24 +02:00
John Botella
7dcb871048
Fix private message type
2019-09-12 18:39:29 +02:00
Laurent Destailleur
56a99f6e6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-12 11:22:13 +02:00
florian HENRY
d6dcbc714c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-12 09:38:14 +02:00
stickler-ci
b2187c829a
Fixing style errors.
2019-09-11 22:44:17 +00:00
ATM john
bf924f113e
Add more style ans edit button
2019-09-12 00:37:36 +02:00
Laurent Destailleur
84e197e48a
Clean code
2019-09-12 00:09:49 +02:00
Laurent Destailleur
5fd88f438f
Clean code
2019-09-12 00:03:51 +02:00
Laurent Destailleur
d7d764e5f9
Fix var not defined
2019-09-11 23:56:53 +02:00
ATM john
907669bb51
New ticket messaging page
2019-09-11 23:30:09 +02:00
Frédéric FRANCE
e0f17cc71c
add socialnetworks dictionary
2019-09-11 22:47:23 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
Abbes Bahfir
797bab4741
fix: repetition
2019-09-11 18:44:12 +01:00
Laurent Destailleur
3f3282400a
FIX SQL syntax error and CSRF check on vat reports
2019-09-11 13:57:15 +02:00
Laurent Destailleur
5f236fda2e
More complete error message with hour/min/sec
2019-09-11 00:28:09 +02:00
ATM john
9db2e27289
add widget box for supplier orders awaiting reception
2019-09-10 21:47:08 +02:00
stickler-ci
017a0fb70f
Fixing style errors.
2019-09-10 19:42:31 +00:00
Philippe GRAND
6634ef4de5
Merge remote-tracking branch 'origin/develop' into new_branch_29_06_2019
2019-09-10 21:40:04 +02:00
Laurent Destailleur
eb2f48332b
Show first line of code
2019-09-10 15:58:56 +02:00
Laurent Destailleur
48aedcee20
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55
FIX missing include (dol_convert_file not found)
2019-09-10 15:29:33 +02:00
Tim Otte
8f4b2436e4
Ooops
2019-09-10 09:13:42 +02:00
Tim Otte
0c68a7b0e6
Possible solution for the problem "SELECT * is forbidden by SQL rules"
2019-09-10 09:11:31 +02:00
florian HENRY
d081a73dca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-10 08:36:54 +02:00
Laurent Destailleur
61cf47aa16
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-10 00:14:07 +02:00
Laurent Destailleur
08f8ad6f30
FIX javascript error when using dol_use_jmobile=1
2019-09-10 00:09:18 +02:00
VESSILLER
3ea2e0c915
NEW add parent id or ref column in warehouse import
2019-09-09 15:03:20 +02:00
florian HENRY
5961c29d23
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-09 14:53:30 +02:00
florian HENRY
ee931d0f25
fix travis
2019-09-09 14:53:23 +02:00
Laurent Destailleur
66a9fabd06
If you develop your own emailing target selector and used
...
parent::add_to_target(...), you must now use parent::addToTargets(...)
2019-09-09 14:18:25 +02:00
florian HENRY
42cd15400d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-09 14:12:34 +02:00
florian HENRY
42b3640a5a
fix travis
2019-09-09 14:12:28 +02:00
Laurent Destailleur
0466ee1941
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8
Add filter on usage on project list
2019-09-09 14:08:10 +02:00
Laurent Destailleur
28ba5abb89
Clean code
2019-09-09 13:31:14 +02:00
Laurent Destailleur
d3bc05de76
Merge pull request #11848 from atm-john/add_progress_to_global_task_list
...
Add progress to global task list
2019-09-09 13:08:53 +02:00
Laurent Destailleur
235cfa5a5b
Merge pull request #11846 from atm-john/fix_missing_total_progress
...
Fix missing total progress column
2019-09-09 13:07:10 +02:00
Laurent Destailleur
2c0d7ba97d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-09 12:58:42 +02:00
Laurent Destailleur
21d84f63a5
Work on template
2019-09-09 12:58:32 +02:00
Laurent Destailleur
64506a3e00
Merge pull request #11843 from aspangaro/11.0_translation
...
Translation
2019-09-09 12:57:55 +02:00
florian HENRY
617e430998
fix stravis and sticker
2019-09-09 12:31:17 +02:00
florian HENRY
63a83a0fa5
resolve conflict
2019-09-09 11:35:37 +02:00
david
ac539d20b9
FIX #10460 compatibility with MariaDB 10.4
2019-09-09 11:10:08 +02:00
Laurent Destailleur
071dad3233
Merge pull request #11844 from dgfmdrv/develop
...
FIX #10460 compatibility with MariaDB 10.4
2019-09-09 11:09:46 +02:00
Laurent Destailleur
73c3fa40bf
Update phpunit
2019-09-09 10:53:13 +02:00
Laurent Destailleur
15eaa5cbd8
NEW Public holidays are now in a table (no more hard coded per country)
2019-09-09 10:27:56 +02:00
florian HENRY
bdb297a380
resolve conflict
2019-09-09 10:15:44 +02:00
Laurent Destailleur
5cc0b24f6f
Fix param
2019-09-08 21:24:01 +02:00
Laurent Destailleur
1d311b2969
Fix scrutinizer
2019-09-08 21:21:33 +02:00
ATM john
ecddeb2b8b
Add progress to global task list
2019-09-08 21:19:15 +02:00
ATM john
a639724b92
Fix follow tasks and time spent
2019-09-08 18:13:15 +02:00
ATM john
fa5cda2e88
Fix missing total progress column
2019-09-08 18:03:14 +02:00
Alexandre SPANGARO
985cfab8e9
Traduction
2019-09-08 05:22:13 +02:00
Alexandre SPANGARO
3ddd123eb1
Traduction
2019-09-08 05:18:52 +02:00
david
48b2a11da2
FIX #10460 compatibility with MariaDB 10.4
2019-09-08 05:15:26 +02:00
Alexandre SPANGARO
d9fa32b555
Traduction
2019-09-08 05:00:24 +02:00
Alexandre SPANGARO
3a2b3d311a
Traduction
2019-09-08 04:57:09 +02:00
Laurent Destailleur
d6f105c783
Work on MRP module
2019-09-07 15:44:48 +02:00
Frédéric FRANCE
4054ebaf27
wip
2019-09-07 15:12:07 +02:00
Frédéric FRANCE
61d432865b
wip
2019-09-07 14:33:36 +02:00
Frédéric FRANCE
c6a02312a9
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-07 14:19:07 +02:00
Laurent Destailleur
5d6ccfdf00
Fix phpcs
2019-09-07 13:12:39 +02:00
Laurent Destailleur
881b69d117
Merge branch 'develop' into Edit_priceHT_for_predefined_products
2019-09-07 11:29:49 +02:00
Laurent Destailleur
eb7f964268
Update objectline_create.tpl.php
2019-09-07 11:25:11 +02:00
Laurent Destailleur
30d2f84eb7
Remove a label that is no more used
2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus
...
Differentiate supplier orders status
2019-09-07 10:54:03 +02:00
Laurent Destailleur
7386ba61d7
Merge pull request #11673 from ptibogxiv/patch-221
...
NEW display supplier in objectline if defined
2019-09-07 10:50:32 +02:00
Laurent Destailleur
7fe2483a82
Merge branch 'develop' into Hook_on_commonGenerateDocument
2019-09-07 10:26:23 +02:00
Laurent Destailleur
4e5b4964dc
Merge pull request #11827 from aspangaro/10.0_boxes_nowrap
...
FIX Nowrap missing on amount in boxes
2019-09-06 23:37:23 +02:00
Laurent Destailleur
f338a5f9ad
Debug module datapolicy
2019-09-06 19:56:00 +02:00
Laurent Destailleur
89e1cdff61
Debug module datapolicy
2019-09-06 19:41:15 +02:00
Laurent Destailleur
231725e351
Fix scrutinizer
2019-09-06 19:12:43 +02:00
Laurent Destailleur
a5f7211730
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
2019-09-06 16:10:55 +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
165f64463b
Fix look and feel v10
2019-09-06 12:46:54 +02:00
Laurent Destailleur
123eace8c0
Fix look and feel v10
2019-09-06 12:44:23 +02:00
Laurent Destailleur
f08c07f315
Fix bugs reported by scrutinizer
2019-09-06 10:42:51 +02:00
Laurent Destailleur
bb81f66a1a
Add phpunit test for Lessc
2019-09-06 10:36:49 +02:00
florian HENRY
dff7be59c8
mostlyDone
2019-09-06 09:22:53 +02:00
florian HENRY
d50114df64
mostlyDone
2019-09-06 09:20:18 +02:00
Laurent Destailleur
ec1751bae9
Doxygen
2019-09-06 02:47:20 +02:00
Laurent Destailleur
5b1d94a668
Fix translation
2019-09-06 02:27:49 +02:00
Laurent Destailleur
08c16ea2e1
Fix bad dir created
2019-09-06 02:03:26 +02:00
Laurent Destailleur
37a32af7b0
NEW Add dictionary to store public holidays.
2019-09-05 20:19:13 +02:00
stickler-ci
cd96238adc
Fixing style errors.
2019-09-05 14:19:35 +00:00
Christophe Battarel
6902b2cbf2
fix function visibility thanks to stckler
2019-09-05 16:14:15 +02:00
Christophe Battarel
1cfd5615d3
resolv conflict
2019-09-05 16:10:23 +02:00
Laurent Destailleur
87c596a934
Fix responsive
2019-09-05 15:58:54 +02:00
Laurent Destailleur
07e647ca10
Fix sql outside transaction
2019-09-05 14:27:13 +02:00
Laurent Destailleur
f62c79c445
Fix object user must be a param of delete method
2019-09-05 14:26:18 +02:00
Laurent Destailleur
f893854986
Fix remove warnings
2019-09-05 14:24:13 +02:00
Laurent Destailleur
4a19f510fd
Fix scrutinizer reports
2019-09-05 13:58:35 +02:00
Laurent Destailleur
f4a7714f82
Fix bad log
2019-09-05 13:42:58 +02:00
Laurent Destailleur
12868413bd
Doxygen
2019-09-05 13:33:49 +02:00
Alexandre SPANGARO
4fe141c9f1
FIX Nowrap missing on amount in boxes
2019-09-05 12:05:50 +02:00
Laurent Destailleur
9666200d6b
Enhance error management
2019-09-04 19:55:15 +02:00
Tim Otte
54d0b94b6d
Added extrafield support to the product supplier price lines
2019-09-04 15:13:42 +02:00
Laurent Destailleur
1950952b05
Missing label
2019-09-04 15:11:06 +02:00
Laurent Destailleur
7d5877b8b1
Doxygen
2019-09-04 13:50:10 +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
bb7b34816d
Merge pull request #11785 from a-schild/develop
...
Fix for issue #11783
2019-09-03 17:43:49 +02:00
Laurent Destailleur
1a8f271bf4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-03 17:41:56 +02:00
Laurent Destailleur
da3d230182
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
2019-09-03 17:34:49 +02:00
florian HENRY
73c5b9617f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-03 17:07:59 +02:00
florian HENRY
6c20fbafdf
add trigger files
2019-09-03 17:04:42 +02:00
Laurent Destailleur
bd47bd096b
NEW Can defined a position of numbering submodules for thirdparties
2019-09-03 15:58:20 +02:00
Laurent Destailleur
106938168f
Fix phpcs
2019-09-03 15:36:49 +02:00
Laurent Destailleur
2c02e4d118
Merge branch 'develop' into FIX_cron_module_conf_to_display_link_to_cron_task_list
2019-09-03 15:28:52 +02:00
Laurent Destailleur
3c80bc139e
Merge pull request #11794 from atm-florian/10_fixMissingSubstitutionCheckbox
...
FIX bad substitution for extrafields type checkbox
2019-09-03 15:18:17 +02:00
Laurent Destailleur
a9bb891760
Merge pull request #11767 from aspangaro/11.0_digitaria
...
NEW Digitaria model for numbering accountancy thirdparty
2019-09-03 15:01:10 +02:00
Laurent Destailleur
c4a4efe0dc
Merge pull request #11769 from Tim-Otte/develop
...
NEW: Added odt support to supplier orders
2019-09-03 13:04:33 +02:00
Laurent Destailleur
931380c740
Merge pull request #11803 from atm-florian/10_fixavoidDividedBy0
...
fix avoid error message Divided By 0
2019-09-03 12:58:56 +02:00
Tim Otte
0f02a621ba
Seriously? One newline failed the stickler ci test?
2019-09-03 10:39:11 +02:00
Tim Otte
443f16bddf
Removed debug output
2019-09-03 10:36:00 +02:00
Laurent Destailleur
ca7ce63648
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2019-09-02 23:04:15 +02:00
Laurent Destailleur
6c96478040
Removed deprecated code
2019-09-02 22:57:55 +02:00
Laurent Destailleur
a126b1e538
FIX Add char $ and ; in sanitizing of filenames.
2019-09-02 22:25:44 +02:00
florian HENRY
d811de4da2
let only triggers part
2019-09-02 22:01:48 +02:00
Laurent Destailleur
a96742ee9b
Can search into global site files.
...
Support of cancel to previous page
2019-09-02 18:43:22 +02:00
Laurent Destailleur
c068177027
Work on search on global site files
2019-09-02 16:39:56 +02:00
Laurent Destailleur
59fe34752c
Fix error reporting of LDAP errors
2019-09-02 16:02:48 +02:00
Laurent Destailleur
6cf3fd79bb
Fix error reporting of LDAP errors
2019-09-02 15:50:48 +02:00
florian HENRY
405c92640c
on going
2019-09-02 14:47:32 +02:00
florian HENRY
b535bc0cb9
start dev
2019-09-02 11:27:04 +02:00
florian HENRY
cab4b2db5b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact
2019-09-02 09:48:08 +02:00
florian HENRY
c8bfc7441e
fix avoid error message Divided By 0
2019-09-02 09:44:59 +02:00
florian HENRY
7dc3684662
fix bad substitution for extrafields type checkbox
2019-09-02 09:41:30 +02:00
Laurent Destailleur
29d2e7edd0
missing reposition
2019-09-02 04:39:36 +02:00
Laurent Destailleur
ee15ccf82e
missing reposition
2019-09-02 04:28:55 +02:00
Laurent Destailleur
ac7d0b5eb6
Fix scrutinizer
2019-09-02 04:12:48 +02:00
Laurent Destailleur
a4600c9efa
Fix missing class reposition
2019-09-01 23:24:29 +02:00
Laurent Destailleur
aff4118dc9
Fix missing class reposition
2019-09-01 23:24:02 +02:00
Laurent Destailleur
40890ae345
Fix scrutinizer
2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e
Prepare reengeneering of project usage
2019-09-01 02:02:38 +02:00
Laurent Destailleur
7f5728ead9
A better message when database is off.
2019-08-31 19:39:39 +02:00
Laurent Destailleur
0889f2f537
Start to enable MAIN_SECURITY_CSRF_WITH_TOKEN (for develop)
2019-08-31 14:41:54 +02:00
Laurent Destailleur
2f49fc6a7b
Fix scrutinizer
2019-08-31 02:49:54 +02:00
Laurent Destailleur
48db5c2a44
Replace deprecated actioncomm->note into actioncomm->note_private
2019-08-31 02:46:39 +02:00
Laurent Destailleur
cc5dad977c
Fix scrutinizer
2019-08-31 02:17:06 +02:00
Laurent Destailleur
5188f3ed44
Fix doxygen
2019-08-31 02:10:55 +02:00
Laurent Destailleur
517a0091d6
Doxygen
2019-08-31 02:02:19 +02:00
Laurent Destailleur
43e0655dd5
Fix code style and var type
2019-08-31 01:54:21 +02:00
Laurent Destailleur
a3e221468a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-31 01:15:04 +02:00
Laurent Destailleur
7942c5edf7
Fix js injection
2019-08-30 16:22:24 +02:00
Christophe Battarel
8c8844d7ae
Differentiate supplier orders status
2019-08-30 09:33:01 +02:00
Laurent Destailleur
210effc742
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-30 04:18:23 +02:00
Laurent Destailleur
01962cbc67
Clean code
2019-08-29 13:17:14 +02:00
Inovea Conseil
ac7bcbd1b2
Add main feature level
2019-08-29 10:59:36 +02:00
a-schild
ad779bc714
Correctly initialize $addDescription in all cases
2019-08-29 09:46:10 +02:00
a-schild
c38e29185c
Fix for #11783
2019-08-29 09:43:49 +02:00
Laurent Destailleur
77dfc19389
Try to compile css with lessc
2019-08-29 04:38:24 +02:00
Laurent Destailleur
6420a32395
Fix to reduce effect of Deny Of Service attacks
2019-08-29 03:54:31 +02:00
Laurent Destailleur
641a50a58b
Fix to reduce effect of Deny Of Service attacks
2019-08-29 03:52:29 +02:00
Laurent Destailleur
0a1a930bfe
Fix to reduce effect of Deny Of Service attacks
2019-08-29 03:51:58 +02:00
Laurent Destailleur
ff7c122b6d
Add class specific to web page ref
2019-08-29 02:36:32 +02:00
Laurent Destailleur
76ae0cebd6
We don't need anymore code to manage dol_use_jmobile = 3 or 4
2019-08-29 01:32:10 +02:00
Laurent Destailleur
c10f755619
Fix compatibility with old multicompany modules
2019-08-29 00:19:46 +02:00
Laurent Destailleur
76e8384f09
NEW Add option multiselect for developers on the selector of language.
2019-08-28 16:06:19 +02:00
Laurent Destailleur
85016a7a45
Fix bad error when module not enabled
2019-08-28 13:12:43 +02:00
Laurent Destailleur
b05b3e897f
Fix bad error when module not enabled
2019-08-28 13:11:51 +02:00
Laurent Destailleur
c0262f1e19
Fix type integer
2019-08-28 12:24:56 +02:00
Laurent Destailleur
9109eeaa77
Fix type integer
2019-08-28 12:24:35 +02:00
Laurent Destailleur
7236df37d4
FIX error management when adding a property with type real
2019-08-28 12:16:59 +02:00
Laurent Destailleur
ed42f59201
FIX error management when adding a property with type real
2019-08-28 12:10:28 +02:00
Laurent Destailleur
e3a4ad00d7
Code comment
2019-08-28 10:22:40 +02:00
Laurent Destailleur
04e11bcbd1
Doxygen
2019-08-27 20:35:42 +02:00
Laurent Destailleur
4ceb3c2e85
Add context 'ws' for web services authentication.
2019-08-27 20:35:06 +02:00
Laurent Destailleur
bb893fd3a8
FIX Missing the filter fields in export of expense report and leaves
2019-08-27 18:16:34 +02:00
Laurent Destailleur
bbda4269b2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 17:55:21 +02:00
Laurent Destailleur
e09223ed4d
FIX #11702
2019-08-27 17:52:46 +02:00
Tim Otte
5abfc04900
Merge branch 'develop' into develop
2019-08-27 16:37:41 +02:00
Alexandre SPANGARO
47b9af09a5
Fix stickler
2019-08-27 16:37:14 +02:00
Tim Otte
75152cb210
Added odt support to supplier orders
2019-08-27 16:22:16 +02:00
Maxime Kohlhaas
9c09876bd4
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin
2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65
Move $selectedlines to parameter
2019-08-27 14:33:28 +02:00
Alexandre SPANGARO
958361b45e
Merge branch 'develop' into 11.0_digitaria
2019-08-27 14:11:27 +02:00
Alexandre SPANGARO
d7f8df2e45
NEW Digitaria model for numbering accountancy thirdparty
2019-08-27 14:03:33 +02:00
Laurent Destailleur
442793aa65
Merge pull request #11755 from jtraulle/stickler-ci
...
Add .stickler.yml config file
2019-08-27 12:39:50 +02:00
Laurent Destailleur
69688a22e0
Merge
2019-08-27 12:33:42 +02:00
Laurent Destailleur
22719b90b6
Fix remove warning
2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c
Add phpunit testDolStringIsGoodIso
2019-08-27 12:25:24 +02:00
John Botella
c2f570ae60
FIX: remove disabled product type from product list
2019-08-27 11:54:20 +02:00
Laurent Destailleur
20f61fb9be
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 11:43:07 +02:00
Laurent Destailleur
9fb06b1e7e
Fix phpcs
2019-08-27 11:42:18 +02:00
Jean Traullé
dd1e7bbc3d
Merge branch 'develop' into stickler-ci
2019-08-27 08:52:33 +02:00
Jean Traullé
0702ef4e0f
Fix CI (code style)
2019-08-27 08:43:58 +02:00
Laurent Destailleur
b1479e5787
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 03:41:27 +02:00
Laurent Destailleur
63dcef710e
Fix phpcs
2019-08-27 03:41:02 +02:00
Laurent Destailleur
a77c8023dc
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 03:23:59 +02:00
Laurent Destailleur
4fb36ce84d
Fix phpcs
2019-08-27 03:22:58 +02:00
Laurent Destailleur
290766acaa
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-26 23:57:15 +02:00
Laurent Destailleur
783c69c618
Merge pull request #11756 from ptibogxiv/patch-245
...
Fix lang for "nature" in contact
2019-08-26 22:51:23 +02:00
Laurent Destailleur
4b5d9e44b2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/core/class/html.form.class.php
2019-08-26 22:44:49 +02:00
Laurent Destailleur
b6db04a727
Fix add missing filter on entity on stock listing for product combo
2019-08-26 22:42:04 +02:00
Laurent Destailleur
76bd9a09a6
FIX #11570
2019-08-26 22:34:41 +02:00
ptibogxiv
ad38478fc6
Fix lang for "nature" in contact
2019-08-26 20:01:05 +02:00
Laurent Destailleur
999db7ed41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
2019-08-26 16:49:25 +02:00
Laurent Destailleur
7c5fc9f3f8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:41:06 +02:00
Laurent Destailleur
3e4433a6c5
Merge pull request #11731 from ptibogxiv/patch-233
...
NEW birthdays member boxe
2019-08-26 16:36:20 +02:00
Laurent Destailleur
2b8c57b714
Merge pull request #11724 from ptibogxiv/patch-228
...
Fix stripelive_oauthcallback.php
2019-08-26 16:34:40 +02:00
Laurent Destailleur
039a613ea1
Merge pull request #11728 from ptibogxiv/patch-231
...
Fix stripetest_oauthcallback.php
2019-08-26 16:29:00 +02:00
Laurent Destailleur
0c8640bfd9
FIX #11752
2019-08-26 16:09:20 +02:00
Laurent Destailleur
7cb68d6438
NEW Default for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
2019-08-25 18:02:10 +02:00
Laurent Destailleur
60c3cefc53
FIX Api of documents work with value 'thirdparty'
2019-08-25 16:44:39 +02:00
Laurent Destailleur
69b2d03c47
FIX Api of documents work with value 'thirdparty'
2019-08-25 16:41:59 +02:00
Laurent Destailleur
4040693823
FIX Use a SCA ready workflow with Stripe module
2019-08-24 18:12:20 +02:00
Laurent Destailleur
1463302bdd
Add option to disable the anonymous ping
2019-08-23 16:23:31 +02:00
ptibogxiv
c8cf06ed2f
Update box_birthdays_members.php
2019-08-23 14:59:12 +02:00
ptibogxiv
30b929c621
Update modAdherent.class.php
2019-08-23 13:57:22 +02:00
ptibogxiv
73bcf3110d
NEW birthday boxe for member
...
use new function for displays the X next birthday by date ASC
2019-08-23 13:56:04 +02:00
ptibogxiv
839ba76ae4
Update stripetest_oauthcallback.php
2019-08-23 08:58:08 +02:00
ptibogxiv
06fdd5ddbc
Update stripelive_oauthcallback.php
2019-08-22 22:50:41 +02:00
ptibogxiv
0be59646a8
Update stripelive_oauthcallback.php
2019-08-22 22:00:53 +02:00
Laurent Destailleur
3339f89fc5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
cdda08c0d3
FIX #11685
2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card"
2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354
Merge pull request #11685 from ptibogxiv/patch-224
...
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-22 11:25:08 +02:00
Regis Houssin
90f60b0137
FIX add $context parameter in checkLoginPassEntity
2019-08-22 10:56:07 +02:00
Laurent Destailleur
b06dab6930
Fix add option to restore backward compatibility
2019-08-22 00:44:28 +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
689aa4979e
Code comment
2019-08-21 17:28:54 +02:00
Laurent Destailleur
eb0644c6f4
PSR-12
2019-08-21 13:00:22 +02:00
Laurent Destailleur
2c3b2cd1a0
Look and feel
2019-08-21 04:21:43 +02:00
Laurent Destailleur
d2d7fb4b04
Fix management of collapsing of extrafields separators.
2019-08-21 03:38:57 +02:00
Laurent Destailleur
c60fc6c3d4
Add param logcontext on dol_syslog
2019-08-20 13:57:25 +02:00
florian HENRY
4c61e3e381
merge develop
2019-08-19 17:23:47 +02:00
Laurent Destailleur
d304749eca
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-19 10:19:14 +02:00
Laurent Destailleur
cc3fd0f1f6
Merge pull request #11679 from atm-john/develop_new_task_progress_bar
...
FIX/NEW task widget and add task progress bar
2019-08-19 10:05:16 +02:00
Laurent Destailleur
18886c701d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/lib/company.lib.php
2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3
FIX too many record in sql request. Whena criteria is a filter, we must
...
use an inner join.
2019-08-18 23:59:24 +02:00
Laurent Destailleur
c989a63360
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/langs/en_US/cashdesk.lang
2019-08-18 20:54:06 +02:00
Laurent Destailleur
4fd68798a3
Fix phpcs
2019-08-18 20:38:51 +02:00
Laurent Destailleur
d8d927547f
Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU
2019-08-18 19:09:53 +02:00
Laurent Destailleur
2f46b40da2
Prepare feature "Never show this message again"
2019-08-18 18:36:18 +02:00
Laurent Destailleur
7e4cf224ec
Merge branch 'develop' into develop_new_task_progress_bar
2019-08-18 05:38:45 +02:00
Laurent Destailleur
3f105a97bf
Debug the new workboard
2019-08-18 04:56:48 +02:00
Laurent Destailleur
b8e1cc8d16
Enhance #11643
2019-08-18 03:42:38 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard
2019-08-18 01:26:56 +02:00
Laurent Destailleur
18eb2a83fe
FIX #11671 CVE-2019-15062
2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100
FIX #11671 CVE-2019-15062
2019-08-17 22:16:27 +02:00
Laurent Destailleur
ae7ba9ff54
Doc
2019-08-17 15:15:52 +02:00
Laurent Destailleur
467ad3ed22
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/product/stock/card.php
2019-08-16 21:48:46 +02:00
Laurent Destailleur
898996da4a
FIX vulenrability in uploading file found by 美创科技安全实验室
2019-08-16 21:45:13 +02:00
Laurent Destailleur
d51a651ab4
Fix phpcs
2019-08-16 17:35:12 +02:00
Laurent Destailleur
a746075dbe
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2019-08-16 17:04:28 +02:00
Laurent Destailleur
9692ea5faf
FIX #11671 CVE-2019-15062
2019-08-16 16:41:53 +02:00
Laurent Destailleur
1f2eb31e41
Set utf-8 in lowercase
2019-08-16 06:06:36 +02:00
Laurent Destailleur
318b27e084
Fix link
2019-08-16 05:33:45 +02:00
Laurent Destailleur
63520e1d9b
Fix link
2019-08-16 05:32:24 +02:00
Laurent Destailleur
62438b61f0
Better error message
2019-08-16 05:14:20 +02:00
Laurent Destailleur
9a455cf1d6
Fix link
2019-08-16 05:03:48 +02:00
Laurent Destailleur
d5ce7fbaaf
Fix links
2019-08-16 05:01:54 +02:00
Laurent Destailleur
7580efbd4e
Fix link replacement
2019-08-16 04:32:06 +02:00
Laurent Destailleur
2510c1e5e4
Better help text
2019-08-16 03:05:55 +02:00
Laurent Destailleur
08038e5078
FIX save of empty files
2019-08-16 02:31:06 +02:00
Laurent Destailleur
31c26edaf7
Fix link
2019-08-16 00:31:55 +02:00
Laurent Destailleur
0045428c6c
Fix link
2019-08-15 23:45:28 +02:00
Laurent Destailleur
8874a0f3c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/website.lib.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
2019-08-15 23:39:02 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
...
Fix total on list and amount opened on thirdparty card (for supplier)
2019-08-15 21:14:03 +02:00
Laurent Destailleur
6430c74793
Merge pull request #11168 from hregis/develop_menu
...
NEW add new function "setEntity()" and better compatibility with Multicompany
2019-08-15 21:00:05 +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
a8afb4549a
Merge pull request #11634 from fmarcet/9.0
...
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-15 20:22:27 +02:00
Laurent Destailleur
c0ac8daa61
Introduce the color theme "flashy" to use the high contrast color as an
...
option because colors seems too agressive for sensible eyes.
2019-08-15 20:18:12 +02:00
Laurent Destailleur
0cde1b5c93
Merge pull request #11676 from ptibogxiv/patch-222
...
Fix force recalculate price with multicurrency
2019-08-15 19:53:54 +02:00
Laurent Destailleur
9f18b3d690
Update commonobject.class.php
2019-08-15 19:53:38 +02:00
Laurent Destailleur
38fc05866d
Merge pull request #11619 from simnandez/10.0
...
Fix: allow access from any other class that inherits Form class.
2019-08-15 19:48:41 +02:00
Laurent Destailleur
c131af5ae1
FIX #11672
2019-08-15 19:16:52 +02:00
Laurent Destailleur
6b514966b5
Merge pull request #11672 from wdammak/patch-41
...
Update objectline_edit.tpl.php
2019-08-15 19:16:09 +02:00
Laurent Destailleur
76ae2695b2
Merge pull request #11690 from OPEN-DSI/new-expedition-list-massaction
...
NEW add mass actions and FIX type ent array not defined in shipment list
2019-08-15 19:14:34 +02:00
Laurent Destailleur
1c372251de
Merge pull request #11691 from jtraulle/feature-rest-api-supplierinvoices-payments
...
NEW Add GET and POST /supplierinvoices/payments REST API endpoints.
2019-08-15 19:13:32 +02:00
Laurent Destailleur
9cb5ba35dd
Merge pull request #11681 from hregis/10.0_mc
...
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
2019-08-15 19:08:42 +02:00
Laurent Destailleur
4534826583
Merge pull request #11633 from fmarcet/10.0
...
FIX: Make protected all pfd models functions
2019-08-15 19:04:32 +02:00
Laurent Destailleur
59625dceb5
Fix phpcs
2019-08-15 19:03:30 +02:00
Laurent Destailleur
ffece8dd34
Better link for syntax help
2019-08-15 18:46:48 +02:00
Laurent Destailleur
b5d72edebc
Can add more samples of pages. Add an exemple of page with dynamic
...
content.
2019-08-15 18:07:36 +02:00
Laurent Destailleur
c92488986b
NEW Can have a preview of website template when loading a template
2019-08-15 02:32:07 +02:00
Laurent Destailleur
ca256a6635
Add shadow style
2019-08-15 01:58:22 +02:00
Laurent Destailleur
bb35d9be0c
Fix copy of templates during activation of module
2019-08-15 01:50:01 +02:00
Laurent Destailleur
f81463af0c
Update templates
2019-08-15 00:55:47 +02:00
Jean Traullé
4252a2c868
Merge branch 'develop' into feature-rest-api-supplierinvoices-payments
2019-08-14 23:35:35 +02:00
Jean Traullé
c739b95666
Fix codestyle
...
lessc.class.php should be excluded from ruleset as it is an external lib
2019-08-14 23:33:06 +02:00
Laurent Destailleur
f753799810
FIX Support #tag into url of website module
2019-08-14 23:27:34 +02:00
Jean Traullé
6d55af2530
Merge remote-tracking branch 'remotes/upstream/develop' into feature-rest-api-supplierinvoices-payments
2019-08-14 23:24:15 +02:00
Jean Traullé
1d2c2f8551
NEW Add payments GET and POST REST API endpoints for supplierinvoices.
2019-08-14 23:00:40 +02:00
Laurent Destailleur
87b2a01a35
NEW Add less 2 css converter
2019-08-14 19:49:07 +02:00
Laurent Destailleur
0818571827
Work on the edit inline tool.
2019-08-14 19:48:52 +02:00
VESSILLER
b19817194d
NEW add mass actions and FIX type ent array not defined in shipment list
2019-08-14 17:11:59 +02:00
VESSILLER
891cd155ea
NEW add mass actions and FIX type ent array not defined in shipment list
2019-08-14 17:04:13 +02:00
Laurent Destailleur
10a3e773ce
FIX Avoid to add new line in css file at each save
2019-08-14 16:28:41 +02:00
Laurent Destailleur
12bebdefbb
Fix can replace PclZip with ZipArchive
2019-08-14 04:07:25 +02:00
Laurent Destailleur
fbf6cbe091
FIX Option to use ZipArchive instead of PclZip bugged with large files.
2019-08-14 04:07:02 +02:00
Laurent Destailleur
6de2118f11
FIX Bad error management in zip compress and web site export
...
Conflicts:
htdocs/website/index.php
2019-08-14 04:06:29 +02:00
Laurent Destailleur
e1ab5089d7
FIX Missing some replacements in website module
...
Conflicts:
htdocs/website/index.php
2019-08-14 04:02:57 +02:00
Laurent Destailleur
f1c6f1b375
Fix can replace PclZip with ZipArchive
2019-08-14 04:00:08 +02:00
Laurent Destailleur
b0172f136b
FIX Option to use ZipArchive instead of PclZip bugged with large files.
2019-08-14 03:43:15 +02:00
Laurent Destailleur
bc230c2d25
FIX Bad error management in zip compress and web site export
2019-08-14 01:43:06 +02:00
Laurent Destailleur
df53826426
FIX Missing some replacements in website module
2019-08-13 18:22:18 +02:00
ptibogxiv
93d64bb84e
Update functions.lib.php
2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-13 17:47:30 +02:00
Regis Houssin
34579dd4db
FIX phpcs
2019-08-13 07:46:03 +02:00
Regis Houssin
7c8b3c9a38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-08-13 07:34:02 +02:00
Laurent Destailleur
49e61e237c
Better log
2019-08-13 07:08:45 +02:00
Laurent Destailleur
91cdb2a5a8
Add more logs
2019-08-13 07:05:06 +02:00
Laurent Destailleur
7891c8d856
Enhance logs
2019-08-13 06:52:07 +02:00
Laurent Destailleur
99473097a9
FIX Add log and type of content in dolWebsiteOutput and
...
dolWebsiteReplacementOfLinks
Conflicts:
htdocs/website/index.php
2019-08-13 06:43:28 +02:00
Laurent Destailleur
277a693c16
FIX Add log and type of content in dolWebsiteOutput and
...
dolWebsiteReplacementOfLinks
2019-08-13 06:37:06 +02:00
Laurent Destailleur
8e0a023270
FIX Disabling a website does not put it offline
2019-08-13 05:05:19 +02:00
Laurent Destailleur
983dc80d9e
FIX Disabling a website does not put it offline
2019-08-13 05:03:45 +02:00
Laurent Destailleur
ae4bead85c
Fix missing function
2019-08-13 04:43:50 +02:00
Laurent Destailleur
7824731f17
NEW Add feature to search a string into containers
2019-08-13 00:34:42 +02:00
ATM john
b193f1b34e
Fix travis
2019-08-12 23:33:00 +02:00
Lenin Rivas
5c1a84746c
Add Linked objects Fichinter Ref. in PDF formats
2019-08-12 15:21:41 -05:00
Laurent Destailleur
8ad2081555
NEW Can select website templates from available default templates
2019-08-12 22:19:24 +02:00
Laurent Destailleur
c986dbc71f
NEW Add search into template
2019-08-12 20:32:18 +02:00
Laurent Destailleur
de1af78ae6
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 17:38:54 +02:00
Laurent Destailleur
18e4d1b334
Fix to avoid to die page when there is a redirect.
2019-08-12 17:22:46 +02:00
Laurent Destailleur
5346135a0c
Fix removed duplicate load
2019-08-12 17:12:57 +02:00
Laurent Destailleur
4d38e5cdb5
Fix removed duplicate load
2019-08-12 17:12:17 +02:00
ATM john
1ffb013371
add filter
2019-08-12 15:24:07 +02:00
ptibogxiv
a489207122
Fix force recalculate price with multicurrency
2019-08-12 13:56:12 +02:00
Laurent Destailleur
446f0590dc
FIX VAT number for Monaco (it uses FR)
2019-08-12 13:45:04 +02:00
Ferran Marcet
f1c0442a77
FIX: Add comment before protected functions
2019-08-12 10:16:04 +02:00
ATM john
f10f29f632
Add filters
2019-08-12 01:01:16 +02:00
ptibogxiv
b06bfef632
NEW display supplier in objectline if defined
2019-08-11 13:08:17 +02:00
ATM john
22c4a1b49e
Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar
2019-08-11 09:57:13 +02:00
ATM john
53721ae606
move late warning sign
2019-08-10 23:09:27 +02:00
ATM john
89447acaf3
remove tooltip on progress bar
2019-08-10 23:07:12 +02:00
ATM john
eedd065f48
remove useless function usage
2019-08-10 22:59:09 +02:00
ATM john
09c1289802
Fix task widget and improve its display
2019-08-10 22:48:07 +02:00
wdammak
909dbfab96
Update objectline_edit.tpl.php
...
optimization code (double declaration deletion)
2019-08-10 16:35:02 +02:00
ATM john
527e4dcf46
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar
2019-08-10 15:41:49 +02:00
ATM john
3f0f7e2ad5
Add progress bar for task list and visual status badges
2019-08-10 15:41:21 +02:00
Laurent Destailleur
8647a20c18
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
2019-08-10 01:57:43 +02:00
Laurent Destailleur
deb6186338
Merge pull request #11569 from aspangaro/11.0_fiscalyear
...
NEW Box use fiscal year
2019-08-10 01:47:55 +02:00
Laurent Destailleur
96fb4c52ea
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-10 01:43:52 +02:00
Laurent Destailleur
76d721559c
Merge pull request #11630 from hregis/9.0_html
...
FIX adding a "div" for better interaction with login submit button
2019-08-10 01:41:19 +02:00
Laurent Destailleur
31fa26c2be
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-08-10 01:36:50 +02:00
Laurent Destailleur
2824dee11a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
Laurent Destailleur
dd2c35f866
Merge pull request #11648 from atm-john/develop_chart_color
...
NEW more living colors for charts and option for "color bind" people
2019-08-10 00:39:53 +02:00
VESSILLER
ae144a6910
NEW compute column value from others columns in import module
2019-08-08 17:31:16 +02:00
John Botella
401dc12b93
Add color blind option in body for css impact
2019-08-07 12:15:55 +02:00
John Botella
63191dab7d
Add user color blind option
2019-08-07 12:03:19 +02:00
John Botella
4aeaa580ea
Add color blind option
2019-08-07 11:11:47 +02:00
John Botella
cafd4fc599
New living color for chart
2019-08-06 15:24:42 +02:00
John Botella
bc0508164b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-06 09:57:49 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php
2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php
2019-08-05 14:58:50 +02:00
Ferran Marcet
32220dde2e
FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
2019-08-05 14:12:19 +02:00
Ferran Marcet
fd1204bcd2
FIX: Make protected all pfd models functions
2019-08-05 13:41:25 +02:00
Regis Houssin
e81ccf1cff
FIX addinf a "div" for better interaction with login submit button
2019-08-04 17:21:13 +02:00
Laurent Destailleur
d663657f15
FIX format of field with type timestamp
2019-08-04 13:06:48 +02:00
Laurent Destailleur
31648f856c
FIX format of field with type timestamp
2019-08-04 13:04:37 +02:00
Laurent Destailleur
5b2ca3b631
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-08-03 16:37:25 +02:00
Laurent Destailleur
25ee539f92
FIX Missing where on entity
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-08-03 16:35:15 +02:00
Laurent Destailleur
acf8314935
FIX Missing where on entity
2019-08-03 16:32:35 +02:00
Alexandre SPANGARO
7eb48a3f9c
Fix month of the fiscal year start min 1 max 12 / january = 1
2019-08-03 06:04:42 +02:00
Alexandre SPANGARO
552f160235
Merge branch 'develop' into 11.0_fiscalyear
2019-08-03 05:59:57 +02:00
Laurent Destailleur
55e9335cd2
Fix code comment
2019-08-02 19:26:04 +02:00
Laurent Destailleur
c34739ab3f
Fix A file for a hidden feature provides a service without security
...
checks.
2019-08-02 19:25:50 +02:00
Laurent Destailleur
5ee9a88181
NEW Add anonymous telemetry
2019-08-02 19:21:25 +02:00
Laurent Destailleur
4fb8f6663a
Fix code comment
2019-08-02 17:16:13 +02:00
Laurent Destailleur
b9ee95314a
SEC restrictedArea protects also the 'update' action
2019-08-02 17:12:59 +02:00
Laurent Destailleur
89a5a8188f
Fix A file for a hidden feature provides a service without security
...
checks.
2019-08-02 17:12:03 +02:00
Laurent Destailleur
dc79f8d26b
Code comment
2019-08-02 16:52:36 +02:00
John Botella
b4c4e5a662
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-02 14:52:01 +02:00
Juanjo Menent
03a2377abc
Fix: allow access from any other class that inherits Form class.
2019-08-02 12:31:24 +02:00
Laurent Destailleur
0bc90d81c8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-02 12:05:12 +02:00
Laurent Destailleur
c01ac05aec
FIX Content of email for subscription
2019-08-02 12:04:06 +02:00
Laurent Destailleur
ded8a71b9a
Merge pull request #11614 from grandoc/patch_01_08_2019
...
add some translation
2019-08-01 16:39:05 +02:00
Laurent Destailleur
cd0d5c41f5
Update interface_20_modWorkflow_WorkflowManager.class.php
2019-08-01 16:37:40 +02:00
Laurent Destailleur
a03771ce61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:40 +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
5a719769bc
Fix phpcs
2019-08-01 16:29:18 +02:00
Laurent Destailleur
6512435f9f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/modules/cheque/doc/pdf_blochet.class.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-01 16:27:55 +02:00
Laurent Destailleur
bf14b4b3d5
Add Canada Dollar in currency that need symbol before
2019-08-01 16:20:18 +02:00
Laurent Destailleur
24bfd9d98b
Merge pull request #11605 from grandoc/new_branch_01_08_2019
...
add CAN$ within list of currencies before
2019-08-01 16:18:37 +02:00
Laurent Destailleur
73715f00af
Update functions.lib.php
2019-08-01 16:18:26 +02:00
Laurent Destailleur
008a54ea19
Update functions.lib.php
2019-08-01 16:14:53 +02:00
Philippe GRAND
18a56c7ef2
add some translation
2019-08-01 15:59:37 +02:00
dolibarr95
b066431e0e
Add phone format for Jamaica
2019-08-01 15:46:34 +02:00
Philippe GRAND
b32dbbfb74
Merge remote-tracking branch 'upstream/develop' into develop
2019-08-01 15:43:30 +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
90ddc0a214
FIX #10930
2019-08-01 14:27:57 +02:00
Laurent Destailleur
a260e7391f
FIX for #11232
2019-08-01 14:24:54 +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
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +02:00
Laurent Destailleur
12b530c418
FIX Setup of TakePos was not possible after a clean install
2019-08-01 11:27:35 +02:00
atm-arnaud
f64092a1e8
FIX order or proposals billed if both workflow conf activated
2019-08-01 11:00:49 +02:00
Philippe GRAND
4b8963587a
add CAN$ within list of currencies before
2019-08-01 10:02:53 +02:00
Regis Houssin
d9ea61e47c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
2019-07-31 12:49:56 +02:00
Laurent Destailleur
9baf21f492
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-30 22:03:13 +02:00
Laurent Destailleur
754ed1b93b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-07-30 22:03:02 +02:00
Laurent Destailleur
6b789a13a1
Merge pull request #11562 from atm-quentin/FIX_pdf_cheque
...
FIX name was able to be in field but went back to new line
2019-07-30 22:00:58 +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
ed7a57e3ef
Merge pull request #11571 from atm-john/9.0_fix_showOutputField
...
Fix sellist showOuputField
2019-07-30 21:40:37 +02:00
Laurent Destailleur
9a87e27176
Merge pull request #11566 from atm-florianm/FIX_workflow_amount_comparison_fails_due_to_floating_point_val_precision_arithmetic_drift
...
FIX: floating point precision errors in the triggers of the workflow module
2019-07-30 21:23:43 +02:00
Laurent Destailleur
fe8ced58c8
Update interface_20_modWorkflow_WorkflowManager.class.php
2019-07-30 21:19:33 +02:00
Laurent Destailleur
34f78c555d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/bookkeeping/list.php
htdocs/adherents/card.php
htdocs/compta/sociales/list.php
htdocs/compta/sociales/payments.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/holiday/class/holiday.class.php
htdocs/viewimage.php
2019-07-30 20:55:15 +02:00
Laurent Destailleur
5f2439bf0a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-30 20:37:44 +02:00
Vaadasch
23bca6f4cd
Change "DOCUMENT_URI" to "PHP_SELF"
...
DOCUMENT_URI works with Apache. To be compliant with Nginx and probably some others, use PHP_SELF
2019-07-30 19:40:28 +02:00
Vaadasch
1600ecc9ec
Change 0 and 1 to FALSE and TRUE for pgsql
...
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
2019-07-30 19:35:03 +02:00
Laurent Destailleur
e54c6fb5e2
FIX #11460 FIX #11492 FIX #11576 FIX #11590
2019-07-30 19:30:56 +02:00
Laurent Destailleur
a871aa818b
FIX #11460 FIX #11492 FIX #11576 FIX #11590
2019-07-30 18:15:04 +02:00
Marc de Lima Lucio
703506c0e2
FIX: import filter error
2019-07-30 14:11:21 +02:00
Marc de Lima Lucio
449ef92007
FIX: categories import: prevent mismatch between category type and object type
2019-07-30 12:31:03 +02:00
Alexandre SPANGARO
b146004966
Fix travis
2019-07-30 11:06:40 +02:00
Alexandre SPANGARO
8228979e67
Fix travis
2019-07-30 09:18:18 +02:00
Laurent Destailleur
11e3aa5860
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 11:07:11 +02:00
Laurent Destailleur
f825711206
Code comment
2019-07-29 11:01:29 +02:00
Florian Mortgat
858e8a826f
FIX: use rounding to compare the amounts
2019-07-29 09:47:28 +02:00
Laurent Destailleur
ecc0b4ed32
Add prefixsession in event table
2019-07-29 02:16:21 +02:00
Laurent Destailleur
1f3e509603
Show message when a redirect is done.
2019-07-28 21:24:42 +02:00
Alexandre SPANGARO
3e69421ec3
Fix travis
2019-07-28 07:33:57 +02:00
ATM john
581ae226ff
Fix sellist showOuputField
2019-07-27 18:25:25 +02:00
Maxime Kohlhaas
5c2763d0dd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin
2019-07-27 10:53:43 +02:00
Alexandre SPANGARO
83e2f71e07
Fix travis
2019-07-27 07:56:33 +02:00
Alexandre SPANGARO
053ae8224b
NEW Box use fiscal year (Thanks Yves57)
2019-07-27 06:36:39 +02:00
Laurent Destailleur
9f7d118f6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-27 02:40:56 +02:00
Nicolas ZABOURI
3bdbbc7147
NEW list of boxes area
2019-07-26 17:17:59 +02:00
Laurent Destailleur
1ca3c6e3ae
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-26 13:17:47 +02:00
atm-quentin
1f7cd1a3f8
FIX name was able to be in field but went back to new line
2019-07-26 11:05:16 +02:00
Philippe GRAND
0baea71d0f
Merge remote-tracking branch 'upstream/develop' into develop
2019-07-26 07:54:14 +02:00
Laurent Destailleur
0b69bf9957
FIX #11553
2019-07-25 18:17:17 +02:00
Laurent Destailleur
0d79905b0a
Merge pull request #11539 from hregis/9.0_bug2
...
FIX duplicate on the check (TODO field $onetrtd not used ?)
2019-07-25 17:56:42 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
4a8377e4fd
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-25 17:52:40 +02:00
Laurent Destailleur
8241bc414a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2019-07-25 17:52:17 +02:00
Laurent Destailleur
fe9ddd7649
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2019-07-25 17:50:07 +02:00
Laurent Destailleur
111c0dcadd
Comment
2019-07-25 17:46:48 +02:00
Laurent Destailleur
fe22f11f10
More generic code
2019-07-25 15:07:00 +02:00
Laurent Destailleur
351b877c05
Add structured data product
2019-07-25 14:39:22 +02:00
Laurent Destailleur
fb2a9e371c
Fix syntax
2019-07-25 14:27:53 +02:00
Laurent Destailleur
6674b8975b
Fix logo of organization
2019-07-25 14:26:48 +02:00
Laurent Destailleur
1978ffb370
Fix
2019-07-25 14:21:39 +02:00
Laurent Destailleur
e29023f155
Fix
2019-07-25 14:12:22 +02:00
Laurent Destailleur
5fd35c1bc9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/website.lib.php
2019-07-25 13:51:12 +02:00
Laurent Destailleur
d1aa15004e
NEW Add method getStructuredData for website
2019-07-25 13:49:56 +02:00
Laurent Destailleur
0bb92ff10d
NEW Add method getStructuredDataForBlogPost for website
2019-07-25 13:48:13 +02:00
Florian Mortgat
65e9d8f239
FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined)
2019-07-25 11:14:59 +02:00
Laurent Destailleur
151075402f
css
2019-07-24 17:15:25 +02:00
Laurent Destailleur
389976699c
Fix responsive
2019-07-24 16:29:50 +02:00
Laurent Destailleur
9ddb8a5b0b
Fix tooltip to say closed project are not visibles
2019-07-23 14:41:29 +02:00
Laurent Destailleur
c96ad85126
Add hidden option to avoid experimental to use export files feature
2019-07-23 12:34:17 +02:00
atm-josselin
0a1f4b7931
FIX : correct error in files with multiple spaces
2019-07-23 09:45:17 +02:00
Laurent Destailleur
bf55733678
NEW Replace the "info" tab on contract with the more complete "agenda"
...
tag.
2019-07-23 02:45:31 +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
9f95b10d0e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/list.php
htdocs/comm/action/peruser.php
htdocs/compta/prelevement/card.php
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
2019-07-22 19:11:27 +02:00
Laurent Destailleur
5dcf4d6646
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-22 19:06:48 +02:00
Laurent Destailleur
b4e0c5ef6c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-07-22 18:51:32 +02:00
Laurent Destailleur
4833c2bf49
Merge
2019-07-22 18:50:17 +02:00
Laurent Destailleur
f5afc50067
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
2019-07-22 18:47:35 +02:00
Laurent Destailleur
59555d00ff
Merge pull request #11531 from BadPixxel/patch-5
...
FIX: Units Scale Missing in Object CRUD
2019-07-22 18:31:43 +02:00
Regis Houssin
6409cc06ae
FIX duplicate on the check (TODO field $onetrtd not used ?)
2019-07-22 11:44:56 +02:00
Laurent Destailleur
d6d1b29257
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-21 16:15:32 +02:00
Laurent Destailleur
4f34a8b6e8
FIX Position was lost when we edit the line of template invoice
2019-07-21 16:15:13 +02:00
Laurent Destailleur
932530bd37
FIX ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on
2019-07-21 16:00:32 +02:00
Laurent Destailleur
de18d5d187
Enhance phpstan
2019-07-20 16:22:00 +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
Laurent Destailleur
220f8300c1
FIX Responsive of public interface of ticket
2019-07-20 00:14:14 +02:00
Laurent Destailleur
de4142e23e
FIX Add message from public interface
2019-07-19 23:57:35 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries
2019-07-19 23:11:06 +02:00
Laurent Destailleur
ec34ce1e64
Maxi debug of module ticket
2019-07-19 23:11:00 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
48b4aa4c8d
Fix link to ticket
2019-07-19 18:29:33 +02:00
Laurent Destailleur
73af3542d1
FIX the feature to bill time spent was not enabled.
2019-07-19 16:18:14 +02:00
Laurent Destailleur
14751680d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-19 13:38:05 +02:00
Laurent Destailleur
f745d01bf3
Prepare change of properties "titre" into "title"
2019-07-19 13:22:54 +02:00
BadPixxel
b88d19e8e4
FIX: Units Scale Missing in Object CRUD
2019-07-19 12:24:53 +02:00
Florian Mortgat
b100cdb9db
FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set.
2019-07-19 11:58:21 +02:00
Regis Houssin
7ffc46e1da
FIX When we are in update mode, so we use $this->entity
2019-07-19 09:47:05 +02:00
Regis Houssin
cbda42d146
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-07-19 09:37:34 +02:00
Laurent Destailleur
6c3a30e872
Fix log
2019-07-19 03:05:55 +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
738851441f
Revert "Fix phpcs"
...
This reverts commit dfe4debbd2
2019-07-18 18:18:03 +02:00
Laurent Destailleur
3cffd70ed3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
Laurent Destailleur
5e204f0f67
Merge
2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf
Merge
2019-07-18 17:50:15 +02:00
Laurent Destailleur
dfe4debbd2
Fix phpcs
2019-07-18 17:34:38 +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
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
Christophe Battarel
aab23a1531
FIX : do not return formatted prices in json string
2019-07-16 17:50:43 +02:00
Laurent Destailleur
f44182c89f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-16 00:13:52 +02:00
Laurent Destailleur
5d74c81941
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-15 23:48:40 +02:00
Laurent Destailleur
d694360c66
Fix warning
2019-07-15 23:46:54 +02:00
Regis Houssin
294bc5dcb5
FIX avoid conflict with "$classname" in card.php
2019-07-15 10:19:06 +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
Laurent Destailleur
e1d4917704
FIX Missing field "Conciliated" into bank transaction export
2019-07-14 00:39:42 +02:00
Laurent Destailleur
e0095871aa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85
Fix save of doc template for recuring invoices.
2019-07-14 00:10:15 +02:00
Laurent Destailleur
5ccb397af9
Merge pull request #11473 from hregis/9.0_security
...
FIX better compatibility with multicompany transverse mode
2019-07-13 23:42:36 +03:00
Laurent Destailleur
4dabdfa5ac
Merge pull request #11483 from inoveaconseil/FIX_update_price
...
FIX element name in update_price
2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e
Update commonobject.class.php
2019-07-13 22:29:50 +02:00
Laurent Destailleur
b1e21ed5fc
FIX Computed field were not calculated into lists.
2019-07-11 22:18:44 +02:00
Nicolas ZABOURI
abd0abf115
FIX element name in update_price
2019-07-10 18:36:12 +02:00
atm-lena
a3f5397988
FIX help text 2
2019-07-10 15:55:50 +02:00
atm-lena
cebf81a514
FIX helpp text
2019-07-10 15:18:25 +02:00
Regis Houssin
41b004c2b8
FIX better compatibility with multicompany transverse mode
2019-07-10 12:16:32 +02:00
Laurent Destailleur
e5d34de877
FIX compatibility mysql 8. rank is reserved
...
FIX Permission for BOM menu
2019-07-09 00:14:01 +02:00
Maxime Kohlhaas
9c47cb6f91
NEW : can choose lines while creating order from origin
2019-07-08 23:16:32 +02:00
Laurent Destailleur
4387d40b9a
Translation lignes -> lines
2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
Laurent Destailleur
709b738d75
Fix regression
2019-07-05 18:54:51 +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
9b32763919
Fix label for report n ledger for transitionnal bank account on tranfer
2019-07-05 15:25:29 +02:00
Laurent Destailleur
e3359c6f0f
FIX Can't submit a ticket from public interface
2019-07-05 11:21:04 +02:00
Laurent Destailleur
01b1b2e4a7
Fix syntax error
2019-07-04 17:07:26 +02:00
Laurent Destailleur
1c33dd2e75
Merge pull request #11436 from fbosman/fbosman-patch-1
...
Feature request: Extrafields - store computed value #11435
2019-07-04 16:23:08 +02:00
Laurent Destailleur
0d738a04f9
Update admin_extrafields_edit.tpl.php
2019-07-04 16:22:10 +02:00
Laurent Destailleur
f14b0b4fcc
Update admin_extrafields_add.tpl.php
2019-07-04 16:20:01 +02:00
Laurent Destailleur
b691396fce
Update admin_extrafields_add.tpl.php
2019-07-04 16:19:24 +02:00
Laurent Destailleur
4e00cfb455
Clean code
2019-07-04 16:02:04 +02:00
Laurent Destailleur
fb8c93a69d
FIX Bad sql request
2019-07-04 16:00:14 +02:00
Laurent Destailleur
9db86112bb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 15:43:15 +02:00
Laurent Destailleur
f2c1568d09
NEW Extrafields separator can be collapsed or not
2019-07-04 15:43:05 +02:00
Laurent Destailleur
35bce50a1d
Merge pull request #11455 from atm-florianm/FIX_add_hook_to_fileupload_to_enable_modules_to_override_upload_options
...
NEW: Add hook on fileupload.class.php to enable modules to override…
2019-07-04 12:50:21 +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
Laurent Destailleur
8b0b824471
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-04 12:22:48 +02:00
Laurent Destailleur
ee0a65e7fa
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/comm/action/card.php
2019-07-04 12:22:40 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php
2019-07-04 12:20:34 +02:00
atm-florian.m
cf458c77dc
FIX: hook added on fileupload.class.php to enable modules to override upload options
2019-07-04 12:04:39 +02:00
Laurent Destailleur
75aa11e526
Code comment
2019-07-04 02:02:44 +02:00
Laurent Destailleur
27ba3408b4
Fix code comment
2019-07-04 02:01:55 +02:00
Laurent Destailleur
95b6f03bf5
Code comment
2019-07-04 01:58:25 +02:00
atm-greg
2f5b9ccb22
fix case objecttmp is an invoice
2019-07-03 17:00:18 +02:00
Frans Bosman
cd7d4de6ec
Update commonobject.class.php
2019-07-03 16:53:26 +02:00
Frans Bosman
9962243df3
Update admin_extrafields_edit.tpl.php
2019-07-03 16:19:51 +02:00
Frans Bosman
123cf7ce50
Update admin_extrafields_add.tpl.php
2019-07-03 16:16:45 +02:00
Frans Bosman
135e47892b
Update admin_extrafields_add.tpl.php
2019-07-03 16:15:20 +02:00
Frans Bosman
116c6d7a6a
Update commonobject.class.php
2019-07-03 11:09:24 +02:00
Frans Bosman
9064737930
Update commonobject.class.php
2019-07-03 07:08:53 +02:00
Frans Bosman
221c202add
Update commonobject.class.php
2019-07-03 06:59:52 +02:00
Laurent Destailleur
9d50c67208
FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export
2019-07-02 18:06:51 +02:00
Laurent Destailleur
d9560dbb61
Fix var not initialized
2019-07-02 18:02:06 +02:00
Laurent Destailleur
3b0f1c733f
Fix missing token
2019-07-02 15:00:17 +02:00
Laurent Destailleur
c9477f5c4f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2019-07-01 13:29:33 +02:00
fbosman
3e91fdda77
Update commonobject.class.php
2019-07-01 12:34:27 +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
8f5b575b19
Fix missing php-intl is not blocking (not working on windows)
2019-06-30 16:19:26 +02:00
Philippe GRAND
6d625d7d1e
Merge remote-tracking branch 'upstream/develop' into develop
2019-06-30 12:04:55 +02:00
Laurent Destailleur
3461a61cbf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-29 18:35:54 +02:00
Laurent Destailleur
e9c6a10bdd
Fix phpcs
2019-06-29 18:35:36 +02:00
Laurent Destailleur
b177787f0a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
htdocs/product/class/product.class.php
2019-06-29 18:28:51 +02:00
Laurent Destailleur
72084f4684
Fix protected
2019-06-29 16:49:32 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
Laurent Destailleur
b37f55d13a
Add log
2019-06-29 16:06:40 +02:00
Philippe GRAND
bebd219e5a
translations
2019-06-29 10:30:26 +02:00
Philippe GRAND
bd43e90c2b
translations
2019-06-29 10:28:29 +02:00
Philippe GRAND
59424f228e
translations
2019-06-29 10:21:26 +02:00
Philippe GRAND
05e9885ba7
translations
2019-06-29 10:18:45 +02:00
Philippe GRAND
ecc4d4227b
translations
2019-06-29 10:14:46 +02:00
Philippe GRAND
837c1aca35
translation
2019-06-29 09:48:52 +02:00
Laurent Destailleur
d71330c00b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d
NEW Add statistics on product into contracts
2019-06-29 02:03:57 +02:00
Laurent Destailleur
cd024da628
Merge branch 'develop' into new_branch_27_06_2019
2019-06-28 13:39:27 +02:00
Laurent Destailleur
ff7ae5ef20
Update extrafields.class.php
2019-06-28 12:56:31 +02:00
Laurent Destailleur
511be75fca
Update actions_extrafields.inc.php
2019-06-28 12:55:19 +02:00
fbosman
f44203775a
Update extrafields.class.php
2019-06-28 07:10:28 +02:00
fbosman
af83d8836a
Update actions_extrafields.inc.php
2019-06-28 07:06:19 +02:00
Philippe GRAND
2c237b8420
translations
2019-06-27 09:51:48 +02:00
Philippe GRAND
5a4ba837cc
translations
2019-06-27 09:47:00 +02:00
Philippe GRAND
6e8d86fb4a
translations
2019-06-27 09:43:50 +02:00
Philippe GRAND
f1e40b4b22
translations
2019-06-27 09:31:42 +02:00
Philippe GRAND
5a8cc4934b
translations
2019-06-27 09:29:00 +02:00
Philippe GRAND
c20f9a4842
translations
2019-06-27 09:22:44 +02:00
atm-quentin
49db277368
FIX ending slash
2019-06-26 16:42:14 +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
4c4444a53f
fix travis recommendations
2019-06-26 09:36:53 +02:00
Laurent Destailleur
51a1550dbb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2019-06-25 23:14:49 +02:00
Laurent Destailleur
7a0962a393
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/modules/modAccounting.class.php
2019-06-25 23:13:55 +02:00
Laurent Destailleur
d5479cd9ae
Fix import of ledger
2019-06-25 22:37:13 +02:00
Laurent Destailleur
20471c54e1
Fix import code (regex of data imported + import of constant)
...
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
2019-06-25 22:27:00 +02:00
Laurent Destailleur
fc574946b1
Fix import of ledger
2019-06-25 22:23:51 +02:00
Laurent Destailleur
0ae0951d7d
Fix import code (regex of data imported + import of constant)
2019-06-25 22:23:30 +02:00
Laurent Destailleur
70967b4ea1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd
Fix purge of old files
2019-06-25 20:02:14 +02:00
Laurent Destailleur
4696d35bcb
Fix we need to keep temp dir
2019-06-25 19:02:24 +02:00
Laurent Destailleur
1bce2f085e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-25 14:32:03 +02:00
Laurent Destailleur
171a173935
Fix phpcs
2019-06-25 14:30:48 +02:00
Laurent Destailleur
f984a77044
FIX Fallback on main language for alternative languages
2019-06-25 14:05:10 +02:00
Laurent Destailleur
fffdd8797d
FIX Fallback on main language for alternative languages
2019-06-25 14:04:34 +02:00
Laurent Destailleur
700acbeefb
Fix phpcs
2019-06-25 13:26:02 +02:00
Laurent Destailleur
2f7e9aa363
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
2019-06-25 13:24:45 +02:00
Laurent Destailleur
736f918bac
Fix phpcs
2019-06-25 13:14:11 +02:00
Laurent Destailleur
06b3f6a62f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
2019-06-25 13:03:54 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
d85ec982e5
Fix do not output log in arhived log for draft documents
2019-06-24 23:39:44 +02:00
Laurent Destailleur
51506724ef
FIX Do no record log in archived log for draft documents.
2019-06-24 23:36:52 +02:00
Laurent Destailleur
a7bd734ece
Rename ->produit into ->product. Still permissions to rename.
2019-06-24 21:18:49 +02:00
Laurent Destailleur
229dd4d3f5
Merge branch 'develop' into 10.0_accounting6
2019-06-24 19:59:11 +02:00
Laurent Destailleur
f66281d7e5
Update modAccounting.class.php
2019-06-24 19:50:22 +02:00
Laurent Destailleur
2a3b4c3fd7
Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse
...
NEW add extrafield separator collapsing capabilities
2019-06-24 19:04:51 +02:00
Laurent Destailleur
604633afd1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-24 18:45:15 +02:00
Laurent Destailleur
31ffa6bc69
FIX #11218 #11150
2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100
FIX #11218 #11150
2019-06-24 18:40:31 +02:00
Laurent Destailleur
d1dc189a8f
Merge pull request #11383 from atm-maxime/new_task_totaldeclared
...
NEW Add global task declared progression
2019-06-24 18:12:55 +02:00
Laurent Destailleur
609eefaf08
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-24 16:36:08 +02:00
Laurent Destailleur
ae1ad80994
Fix count
2019-06-24 16:32:42 +02:00
Laurent Destailleur
70f19b3a3d
Fix counter of record
2019-06-24 16:31:56 +02:00
Laurent Destailleur
28024d5cd1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-24 16:28:48 +02:00
Laurent Destailleur
b98874848f
Fix backport 9.0
2019-06-24 16:12:54 +02:00
Laurent Destailleur
84575df7e6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 15:44:44 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail
...
FIX mass send mail
2019-06-24 15:34:06 +02:00
Laurent Destailleur
cade08342c
Merge pull request #11390 from grandoc/develop
...
translation
2019-06-24 15:30:30 +02:00
Laurent Destailleur
7e10208619
Merge pull request #11380 from atm-florian/9.0
...
fix depending extrafeilds list
2019-06-24 15:23:48 +02:00
John Botella
ec7446762c
Fix travis
2019-06-24 14:36:06 +02:00
Laurent Destailleur
1daac232b0
Code comment
2019-06-24 14:31:58 +02:00
Laurent Destailleur
01b8522216
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-24 13:56:39 +02:00
Laurent Destailleur
76d49229cd
Fix log
2019-06-24 13:42:46 +02:00
Laurent Destailleur
1c86294f83
Enhance pdf_getFormat
2019-06-24 13:39:32 +02:00
Laurent Destailleur
1699413a4c
Add log
2019-06-24 12:59:16 +02:00
John Botella
9c414a7a57
Change function to camel case
2019-06-24 12:22:33 +02:00
John Botella
a83e7f3665
Add retained warranty to PDF
2019-06-24 12:00:55 +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
43fc0466e5
Fix position of modules
2019-06-23 20:05:15 +02:00
Laurent Destailleur
9c54de57ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-23 18:12:56 +02:00
Laurent Destailleur
1c48b8be32
Fix code comment
2019-06-23 17:23:41 +02:00
Laurent Destailleur
efa09301b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 20:19:14 +02:00
Laurent Destailleur
8a9c858609
Code comment
2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0
Fix confusion between ->childs and ->childsoncascade
2019-06-22 20:17:40 +02:00
Laurent Destailleur
2854e0dae6
Code comment
2019-06-22 19:15:15 +02:00
Laurent Destailleur
5c3d3cec9e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 18:44:12 +02:00
Laurent Destailleur
662afe8a36
Fix missing global
2019-06-22 18:24:29 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Laurent Destailleur
eb20df8e64
Fix debug save of state into setup
2019-06-22 14:47:46 +02:00
Philippe GRAND
e877f108ac
translation
2019-06-22 12:18:56 +02:00
Laurent Destailleur
6cab4f03ba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 12:10:50 +02:00
Philippe GRAND
9d698c257c
translation
2019-06-22 12:10:32 +02:00
Philippe GRAND
8de36dc7c1
translation
2019-06-22 12:10:09 +02:00
Philippe GRAND
2d3b0b8f9e
translation
2019-06-22 12:09:50 +02:00
Philippe GRAND
26af2d8fe3
translation
2019-06-22 12:09:28 +02:00
Philippe GRAND
5379d4085f
translation
2019-06-22 12:08:57 +02:00
Philippe GRAND
a8d50228db
translation
2019-06-22 12:08:36 +02:00
Philippe GRAND
4d4b5abb7e
translation
2019-06-22 12:08:08 +02:00
Philippe GRAND
d75f4eb1c8
translation
2019-06-22 12:07:46 +02:00
Philippe GRAND
3cc97ec351
translation
2019-06-22 12:07:02 +02:00
Philippe GRAND
592591ff69
translation
2019-06-22 12:06:37 +02:00
Philippe GRAND
053b129f52
translation
2019-06-22 12:06:01 +02:00
Philippe GRAND
a9222c602f
translation
2019-06-22 12:04:26 +02:00
Laurent Destailleur
a4cd7772ef
Fix title
2019-06-22 12:02:41 +02:00
Laurent Destailleur
403d41ec30
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 11:55:33 +02:00
Laurent Destailleur
a7d7d44f87
FIX Management of vat info in stripe
2019-06-21 19:59:16 +02:00
Laurent Destailleur
681dbc3eac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-21 19:58:43 +02:00
Laurent Destailleur
b6266953e9
FIX Management of vat info in stripe
2019-06-21 19:58:28 +02:00
John Botella
ec7ebe9f39
redo backported fix and update adherent substitution methode
2019-06-21 15:32:38 +02:00
John Botella
200b66d11f
Remove a backported fix because failling at init test
2019-06-21 14:52:12 +02:00
Laurent Destailleur
c63b465d48
Fix doxygen
2019-06-21 14:34:04 +02:00
Laurent Destailleur
4499447a89
Fix sort order of import profiles
...
Fix picto in import profile for accounting
2019-06-21 14:27:38 +02:00
Laurent Destailleur
bbbd066ac9
Merge pull request #11119 from openthink-laurent/add-customer-code-customer-orders-documents
...
Add customer code in customer orders documents
2019-06-21 13:33:57 +02:00
Laurent Destailleur
7ffcd3603b
Add option DOC_SHOW_CUSTOMER_CODE
...
Because we have a lot of information and the REF is better to retrieve/search an order and know the customer code, i added a hidden option to show this field.
2019-06-21 13:33:24 +02:00
Laurent Destailleur
f9095408b6
Fix sort order of export profiles
...
Add missing pos information into export of invoice
Add missing label of project in export of invoice
2019-06-21 13:25:40 +02:00
Laurent Destailleur
ad4bd05efb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/modules/modAdherent.class.php
2019-06-21 11:29:06 +02:00
Laurent Destailleur
c725db166d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-21 11:26:44 +02:00
Laurent Destailleur
70c950bd7c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/modAdherent.class.php
2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a
FIX Add missing end date of subscription in export
2019-06-21 11:23:49 +02:00
Bahfir Abbes
7f34a03034
It's just a mistake. In order to declare a getnomUrl method, Ccountry does not need to extend Commonobject
2019-06-20 20:55:48 +01:00
Laurent Destailleur
8da5794777
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Maxime Kohlhaas
b0229d1b9a
Global task declared progression on project task tab
2019-06-20 14:07:44 +02:00
Laurent Destailleur
ff0f6295d8
Fix phpcs
2019-06-20 13:59:53 +02:00
Laurent Destailleur
6975e18233
Fix phpcs
2019-06-20 13:59:04 +02:00
Laurent Destailleur
bb9b0d401e
Fix phpcs
2019-06-20 13:56:20 +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
29e3199639
Fix phpcs
2019-06-20 13:39:29 +02:00
Laurent Destailleur
e9da44e023
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 12:33:02 +02:00
Laurent Destailleur
cb057e9c6d
NEW Add hidden option to be ready for BREXIT
2019-06-20 12:32:14 +02:00
florian HENRY
0865bdb60f
fix depending extrafeilds list
2019-06-20 12:16:48 +02:00
John Botella
b21006614c
Fix substitutions null
2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99
Fix display option email per participient
2019-06-20 11:09:37 +02:00
John Botella
9305403bea
Fix duplicate pdf in mass sendmail
2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba
FIX condition
2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c
Fix replacement and vars names
2019-06-20 09:21:35 +02:00
Laurent Destailleur
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
Laurent Destailleur
ee8e7d66f8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-06-20 03:43:27 +02:00
Laurent Destailleur
078324811b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
2019-06-20 03:43:16 +02:00
Laurent Destailleur
4574ad2eeb
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-20 03:39:48 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other
...
Translate rights
2019-06-20 03:36:16 +02:00
Laurent Destailleur
2c0d43a27a
Merge pull request #11372 from bafbes/abb90059
...
New:Show c_country elements in modulebuilder
2019-06-20 03:32:53 +02:00
Laurent Destailleur
2b0b7b0dab
Update ccountry.class.php
2019-06-20 03:32:28 +02:00
Laurent Destailleur
13200a4d51
Merge pull request #11350 from frederic34/patch-7
...
NEW can specify hour start end for selectDate and step for minutes
2019-06-20 03:24:23 +02:00
Laurent Destailleur
03178bc481
Merge pull request #11293 from hregis/develop_pdf
...
FIX better method to check if pdf is protected/encrypted
2019-06-20 03:22:51 +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
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
...
Allow zero as account number
2019-06-20 03:09:37 +02:00
Laurent Destailleur
daab58974e
Merge pull request #11366 from aspangaro/10.0_other2
...
Missing language key
2019-06-20 03:02:13 +02:00
Laurent Destailleur
925314c710
Merge pull request #11367 from aspangaro/10.0_other3
...
Nowrap on amount
2019-06-20 02:51:14 +02:00
Laurent Destailleur
d6b6f77e74
Fix support domains with 3 levels
2019-06-19 22:06:12 +02:00
Laurent Destailleur
68e9712f0c
Fix support domains with 3 levels
2019-06-19 22:05:38 +02:00
John Botella
31a53b72ae
FIX var name
2019-06-19 16:55:45 +02:00
Laurent Destailleur
04f2fb604f
Fix duplicate 'option_' in prefix
2019-06-19 15:48:37 +02:00
Laurent Destailleur
2034faf280
Fix duplicate 'option_' in prefix
2019-06-19 15:48:04 +02:00
Abbes Bahfir
c109eebe38
New:Show c_country elements in modulebuilder
2019-06-19 14:43:18 +01:00
Abbes Bahfir
695a00f21c
New:Show labels of countries in modulebuilder
2019-06-19 14:04:18 +01:00
Laurent Destailleur
f9cc120d75
Debug module ticket
2019-06-19 12:53:28 +02:00
Alexandre SPANGARO
9bde7c5229
Nowrap on amount
2019-06-19 09:21:18 +02:00
Alexandre SPANGARO
13836d3e21
Missing language ley
2019-06-19 06:21:53 +02:00
Alexandre SPANGARO
c59de49894
Translate rights
2019-06-18 22:38:52 +02:00
Laurent Destailleur
53923a8581
Fix scrutinizer warnings
2019-06-18 20:21:22 +02:00
Laurent Destailleur
20e00ca290
FIX if last char of customercode is accent making the truncate of first
...
chars wrong.
2019-06-18 19:41:16 +02:00
Laurent Destailleur
0123a18ff8
Look and feel v10
2019-06-17 18:44:08 +02:00
Laurent Destailleur
42e58d9ea5
Fix preview of interventions
2019-06-17 18:38:14 +02:00
Eric Seigne
0b3bc5a172
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber
2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d
allow zero as accountancy code nomber (replace all empty tests by != '')
2019-06-17 18:28:11 +02:00
Laurent Destailleur
08d5ca4ddb
Debug page to export accounting documents
2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287
Debug page to export file
2019-06-17 17:20:22 +02:00
Laurent Destailleur
a74eaaff4d
Fix sort of linked elements
2019-06-17 15:54:54 +02:00
Laurent Destailleur
cf82587504
Fix menu entry
2019-06-17 15:02:44 +02:00
Frédéric FRANCE
1a1f3493c9
NEW can specify hour start end for selectDate and step for minutes
2019-06-17 14:03:57 +02:00
Laurent Destailleur
8330078de1
Fix default value
2019-06-17 12:33:09 +02:00
Regis Houssin
3afd4e15ad
FIX try to remove ob_* functions
2019-06-17 07:09:19 +02:00
Regis Houssin
908b5fff00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf
2019-06-17 07:08:35 +02:00
Regis Houssin
6597c9f60d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-17 06:45:08 +02:00
Laurent Destailleur
48b2cb83af
Close #11152 by a manual merge to keep only required things
2019-06-16 17:08:23 +02:00
Laurent Destailleur
122c4eb8bd
Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction
...
FIX empty test
2019-06-14 13:51:34 +02:00
Laurent Destailleur
5cada6ee0b
Merge pull request #11336 from ptibogxiv/patch-186
...
Fix measuring_units_string display function
2019-06-14 13:48:31 +02:00
Laurent Destailleur
1fa1b91916
Update product.lib.php
2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db
Update product.lib.php
2019-06-14 13:38:52 +02:00
Laurent Destailleur
e8b139d1c6
Fix repeated logs and fetch
2019-06-13 22:48:31 +02:00
ATM john
e7d81a68f0
Fix Override Attribute
2019-06-13 22:11:47 +02:00
ATM john
0ef9a8843a
Fix empty test
2019-06-13 21:57:30 +02:00
ptibogxiv
a30f029bbf
Update product.lib.php
2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58
Fix measuring_units_string display function
2019-06-13 20:52:52 +02:00
Laurent Destailleur
7e1eacb7d5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-13 13:26:54 +02:00
Laurent Destailleur
357c5244f7
Fix phpcs
2019-06-13 13:26:35 +02:00
Laurent Destailleur
f00c9a10db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2019-06-13 12:15:51 +02:00
Laurent Destailleur
52159dcb69
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.formother.class.php
2019-06-13 12:14:19 +02:00
Laurent Destailleur
3e6b7208cc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a
Fix syntax error
2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/html.formother.class.php
2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-13 12:07:24 +02:00
Laurent Destailleur
4b26702516
code comment
2019-06-13 11:07:38 +02:00
Laurent Destailleur
60e1e89981
Merge pull request #11328 from fappels/clean_10_beta
...
Fix scrutinizer bugs
2019-06-13 10:18:59 +02:00
Laurent Destailleur
ab9742f4df
Try to keep proportion of logo
2019-06-13 10:09:20 +02:00
Laurent Destailleur
2bc821d900
Try to keep proportions of logo
2019-06-13 10:08:35 +02:00
Laurent Destailleur
1318e26cda
Merge pull request #11298 from hregis/7.0_price
...
FIX missing compatibility with multicompany transverse mode
2019-06-13 10:01:05 +02:00
Laurent Destailleur
4cbfb67d63
Update html.formother.class.php
2019-06-13 09:59:10 +02:00
Francis Appels
3f63be6045
fix typo
2019-06-12 22:10:40 +02:00
Francis Appels
a26c868783
Fix scrutinizer bugs
2019-06-12 22:05:10 +02:00
Laurent Destailleur
900e860f6d
Fix list of events for BOM module
2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d
Fix look and field v10
2019-06-12 19:03:22 +02:00
Laurent Destailleur
e81663ec34
Fix cropping of image files for BOM module was ko
2019-06-12 19:00:34 +02:00
Laurent Destailleur
c57013f293
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-12 13:59:14 +02:00
Laurent Destailleur
4f5f03b893
Merge pull request #11326 from atm-greg/FIX_massaction_presend
...
Fix massaction presend
2019-06-12 12:37:03 +02:00
Laurent Destailleur
0bf7512f28
Update actions_massactions.inc.php
2019-06-12 12:33:31 +02:00
atm-greg
47746fd17d
fix template type
2019-06-12 12:30:49 +02:00
Laurent Destailleur
91a4e8bc0a
Merge
2019-06-12 12:09:56 +02:00
atm-greg
9ba102b6b9
bad object used
2019-06-12 12:08:16 +02:00
atm-greg
25031e534d
fix massaction presend
2019-06-12 12:05:02 +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
afe1ec633b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-12 10:07:21 +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
Laurent Destailleur
8447259f25
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab
FIX #11316
2019-06-12 10:05:53 +02:00
Laurent Destailleur
2ac8723ce9
Code comment
2019-06-11 21:02:41 +02:00
Maxime Kohlhaas
0ce2c2aab5
Fix missing massaction hook params
2019-06-10 10:11:26 +02:00
Laurent Destailleur
f6d8b46b40
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
2019-06-07 22:58:58 +02:00
Laurent Destailleur
0a903da5dc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
2019-06-07 22:53:30 +02:00
Laurent Destailleur
b36f80ab2e
Merge pull request #11306 from frederic34/patch-6
...
Parameter must be array or object that implements Countable
2019-06-07 18:10:03 +02:00
Laurent Destailleur
b73d287953
Update agenda.lib.php
2019-06-07 18:09:43 +02:00
Laurent Destailleur
4c44378049
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-07 16:56:39 +02:00
Laurent Destailleur
0edd94c4f8
Merge pull request #11303 from atm-florian/10.0
...
fix various little stuff from scrutinizer (undeclared vriable, misspelling variable, mistype declaration)
2019-06-07 15:21:30 +02:00
Laurent Destailleur
4ed7e281c5
Merge pull request #11301 from frederic34/patch-5
...
avoid warning with php 7.2
2019-06-07 15:08:49 +02:00
Laurent Destailleur
a0a0c2207b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-07 01:29:55 +02:00
Laurent Destailleur
3d8910d327
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
2019-06-06 19:19:05 +02:00
Laurent Destailleur
3ff154c1d0
Fix sql error
2019-06-06 19:05:47 +02:00
Frédéric FRANCE
f11db8396a
Parameter must be array or object that implements Countable
...
warning with php 7.2
2019-06-06 09:49:32 +02:00
florian HENRY
f2171d466b
fix variable name
2019-06-05 17:05:26 +02:00
florian HENRY
acad2e633b
fix scrutinzer
2019-06-05 16:34:32 +02:00
florian HENRY
3927a74d6b
fix scrunitizer
2019-06-05 16:30:22 +02:00
florian HENRY
e1392466cf
Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0
2019-06-05 16:10:20 +02:00
florian HENRY
1cf38fa635
fix scrutinizer
2019-06-05 16:08:04 +02:00
Frédéric FRANCE
ca6a624112
avoid warning with php 7.2
2019-06-05 13:55:47 +02:00
Laurent Destailleur
d3d0ce4649
Better error message when missing grant privileges
2019-06-05 10:42:59 +02:00
Laurent Destailleur
a08dcec7fc
Fix doc
2019-06-04 20:02:29 +02:00
Laurent Destailleur
9c4f9c91df
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-04 19:18:43 +02:00
Laurent Destailleur
210b2f37dc
Fix error message
2019-06-04 19:18:20 +02:00
Laurent Destailleur
1229f64632
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-04 19:04:33 +02:00
Laurent Destailleur
21a1e0d7b3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
2019-06-04 19: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
79a3e41418
Hook 'getAccessForbiddenMessage'
2019-06-04 12:48:06 +02:00
Laurent Destailleur
29d9983669
Fix look and feel v10
2019-06-04 01:22:26 +02:00
Laurent Destailleur
664e0b81d8
Debug module BOM
2019-06-03 22:07:34 +02:00
Laurent Destailleur
b526f7da43
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-03 20:47:12 +02:00
Laurent Destailleur
a143dba9f8
Work on incomplete code on BOM module
2019-06-03 20:46:11 +02:00
Laurent Destailleur
7d2cedfdcf
Debug bom module
2019-06-03 19:29:49 +02:00
Laurent Destailleur
72f55e1d81
Debug modulebuilder
2019-06-03 18:11:53 +02:00
Regis Houssin
5726b40a10
FIX try to use WHERE EXISTS instead DISTINCT
2019-06-03 17:26:03 +02:00
Regis Houssin
7fd1051efc
FIX missing compatibility with multicompany transverse mode
...
Conflicts:
htdocs/core/class/html.formother.class.php
2019-06-03 17:22:15 +02:00
Laurent Destailleur
65b702d854
responsive
2019-06-03 16:37:31 +02:00
Lionel VESSILLER
490e85f494
Fix PSR2
2019-06-03 16:34:49 +02:00
Laurent Destailleur
8ef209bc04
Fix responsive
2019-06-03 16:30:49 +02:00
Laurent Destailleur
213936aac1
Fix combo
2019-06-03 16:20:04 +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
Regis Houssin
e5e6111544
FIX wrong function name
2019-06-03 12:05:58 +02:00
Regis Houssin
b0042995ac
FIX add docs
2019-06-03 12:04:17 +02:00
florian HENRY
71550b95e5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact
2019-06-03 11:23:52 +02:00
Regis Houssin
38246b4088
NEW add new function "setEntity()"
2019-06-03 11:13:26 +02:00
Regis Houssin
7b8b1a9052
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-03 11:04:28 +02:00
Regis Houssin
43ada3fcd4
FIX better method to check if pdf is protected/encrypted
2019-06-03 09:36:00 +02:00
Laurent Destailleur
5530e003ba
Fix title
2019-06-02 19:47:19 +02:00
Laurent Destailleur
e6100310af
Fix missing title
2019-06-02 19:47:01 +02:00
Laurent Destailleur
fc37c393ce
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-06-02 12:36:48 +02:00
Laurent Destailleur
57cfb4b007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-06-02 12:30:25 +02:00
Laurent Destailleur
d8adda82f9
Merge pull request #11291 from AXeL-dev/patch-9
...
Fix #11256
2019-06-02 12:23:27 +02:00
Laurent Destailleur
ea58f8a617
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-02 11:49:49 +02:00
Laurent Destailleur
5f0fbcea9a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/contact/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
2019-06-02 11:49:33 +02:00
AXeL-dev
82b37a514c
Fixed empty verification (0 might be considered as empty also, so its better to compare string value with '')
2019-06-01 16:27:06 +00:00
AXeL-dev
d2c853c47b
Fix #11256
2019-06-01 15:00:15 +00:00
Maxime Kohlhaas
d47913ed19
Fix : add refclient on bulk invoicing
2019-05-31 16:33:32 +02:00
Maxime Kohlhaas
15fd24a511
Fix : remove hardcoded llx_ prefix
2019-05-31 12:14:51 +02:00
Laurent Destailleur
f2088a084f
Fix error management
2019-05-31 11:53:30 +02:00
Laurent Destailleur
cd75794aaa
FIX #11169 #11202
2019-05-31 11:38:54 +02:00
ptibogxiv
5b6821c191
FIX display job/fucnction in contact list
...
Display job/function is usefull for correct choice of additionnal contact in a object (PR from returns of severals professionnal dolibarr's user)
2019-05-29 16:55:44 +02:00
Laurent Destailleur
ab73d8a6fc
Merge pull request #11258 from hregis/develop_security
...
FIX add Windows and Mac executable
2019-05-29 13:52:19 +02:00
Laurent Destailleur
05063016e8
FIX #11244 Enhance repair tool
2019-05-29 12:21:51 +02:00
Laurent Destailleur
912e29a746
FIX #11244
2019-05-29 11:06:01 +02:00
Laurent Destailleur
3c05cfe690
Fix useless test
2019-05-29 10:50:33 +02:00
Laurent Destailleur
b46b675b7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-29 10:36:00 +02:00
Laurent Destailleur
a491de01b3
Merge pull request #11244 from altatof/8.0
...
FIX : do not include tpl from disabled modules
2019-05-29 10:35:39 +02:00
Laurent Destailleur
a524fd17ce
Fix phpcs
2019-05-29 10:03:05 +02:00
Laurent Destailleur
fd0eb47b35
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/card.php
2019-05-29 09:57:48 +02:00
Laurent Destailleur
6e9cd819c1
Fix phpcs
2019-05-29 09:55:09 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
3841fb5a85
Fix doxygen
2019-05-28 22:18:46 +02:00
Laurent Destailleur
454316a5fa
Fix getDomainFromURL
2019-05-28 22:18:22 +02:00
Laurent Destailleur
1c3f519b1a
Remove warnings
2019-05-28 12:54:35 +02:00
Laurent Destailleur
2404e6a521
Fix cast to int
2019-05-28 12:38:21 +02:00
Laurent Destailleur
15de8a9497
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/card.php
2019-05-27 19:25:53 +02:00
Laurent Destailleur
1c6ddd25c4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-27 19:23:54 +02:00
Laurent Destailleur
7db643fff0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-05-27 19:23:09 +02:00
Laurent Destailleur
93c395fe10
FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL
2019-05-27 19:22:51 +02:00
Laurent Destailleur
a138c05457
Fix colspan
2019-05-27 13:28:10 +02:00
Regis Houssin
3df6f0f6c3
FIX wrong extension
2019-05-27 11:43:06 +02:00
Regis Houssin
c1242f409b
FIX add Windows and Mac executable
2019-05-27 11:32:46 +02:00
atm-ph
c79b9b9704
Fix create bills on mass action does not retrieve the original currency code
2019-05-27 11:18:29 +02:00
Laurent Destailleur
b81c3a6d2b
Fix look and feel v10
2019-05-26 18:23:30 +02:00
Laurent Destailleur
19ff0120ff
# WARNING: head commit changed in the meantime
...
Removed uselesss files (replaced by DebugBar)
2019-05-26 11:42:00 +02:00
Laurent Destailleur
f2e03b3909
Removed useless files (replaced with DebugBar)
2019-05-26 11:24:57 +02:00
Laurent Destailleur
a5865d3e4a
Debug BOM
2019-05-25 19:29:33 +02:00
Laurent Destailleur
b67363d769
Fix rename export php lib to avoi duplicate with old library.
2019-05-25 18:54:43 +02:00
Laurent Destailleur
c04d082ad1
FIX Import of chart of account
2019-05-24 18:14:15 +02:00
Laurent Destailleur
49991eabf8
Fix import of accounting account from ref in import profiles
2019-05-24 17:09:18 +02:00
Laurent Destailleur
63824861a6
Fix import of chart of account. The account parent was not managed.
2019-05-24 16:58:06 +02:00
Christophe Battarel
83d883c36a
finally eldy is always right
2019-05-24 15:14:34 +02:00
Christophe Battarel
4863ddcb00
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0
2019-05-24 15:13:23 +02:00
Laurent Destailleur
ccfb4f575b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2019-05-24 14:58:21 +02:00
Christophe Battarel
545cdd0762
test include return on FALSE
2019-05-24 12:54:24 +02:00
Christophe Battarel
abc7c2f0f8
test include return on TRUE
2019-05-24 12:33:40 +02:00
Christophe Battarel
aaaad71347
FIX : do not include disabled modules tpl
2019-05-24 12:10:58 +02:00
Marc de Lima Lucio
49385fcab3
FIX: situation invoices: bad detailed VAT in situations following the first one
2019-05-23 14:37:40 +02:00
Laurent Destailleur
43e098caae
Fix phpcs
2019-05-23 12:35:53 +02:00
Alexandre SPANGARO
582b4b906e
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
2019-05-23 11:32:13 +02:00
Laurent Destailleur
111239094a
Work to finish module BOM for v10
2019-05-22 20:28:24 +02:00
Alexandre SPANGARO
65070afce4
WIP
2019-05-22 17:22:49 +02:00
Laurent Destailleur
c8970c0283
Fix vat validator
2019-05-22 16:50:53 +02:00
Laurent Destailleur
fb95fe0606
Check vat is not case sensitive
2019-05-22 16:15:26 +02:00
Laurent Destailleur
2b90df6f80
Fix responsive
2019-05-22 16:08:21 +02:00
Laurent Destailleur
65acd6ef60
Fix function to check vat syntax
2019-05-22 15:48:07 +02:00
Laurent Destailleur
11bcfb4f5e
Fix check on VAT syntax not visible on list
2019-05-22 15:37:59 +02:00
Alexandre SPANGARO
a182b89bb0
Merge branch 'develop' into 10.0_closure2
2019-05-22 13:52:13 +02:00
Regis Houssin
4f2f23f522
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-22 08:45:31 +02:00
Laurent Destailleur
f99f1d83c2
Merge pull request #11229 from frederic34/patch-7
...
target _blank depend of mime
2019-05-21 22:42:36 +02:00
Laurent Destailleur
16f7d96ed1
Merge pull request #11231 from ATM-Marc/FIX_8.0_extrafields_search
...
FIX: extrafield list search: SQL error when field is multiselect
2019-05-21 22:38:14 +02:00
Laurent Destailleur
5707aff7c4
Look and feel v10
2019-05-21 21:52:04 +02:00
Laurent Destailleur
fdeb12a909
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/card.php
2019-05-21 21:18:40 +02:00
Laurent Destailleur
a7f5f3fb94
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-21 21:16:54 +02:00
Laurent Destailleur
dcf77520ea
FIX Error management when MAILING_NO_USING_PHPMAIL is set
2019-05-21 21:16:06 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Laurent Destailleur
657bd5c2fe
Move module from develop to experimental
2019-05-21 15:50:16 +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
Marc de Lima Lucio
18a6ed17cf
FIX: extrafield list search: SQL error when field is multiselect
2019-05-21 14:49:23 +02:00
Laurent Destailleur
bea4647107
Fix auto swith on utf8 when using utf8mb4
2019-05-21 14:36:16 +02:00
Laurent Destailleur
f283e24b48
Fix the noexe must be added for dangerous extension like js and shells
2019-05-21 13:53:12 +02:00
Laurent Destailleur
eafc35b00f
Look and feel v10
2019-05-21 13:27:45 +02:00
Frédéric FRANCE
84781cabac
target _blank depend of mime
...
target _blank is added in the previous line depending on mimtype
2019-05-21 13:11:17 +02:00
Regis Houssin
2cf630c213
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-05-20 16:10:47 +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
ebf252f8a3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-20 15:40:50 +02:00
Laurent Destailleur
ec922d3d17
Add CONTRACT_HIDE_PLANNED_DATE_ON_PDF and CONTRACT_HIDE_REAL_DATE_ON_PDF
2019-05-20 14:54:09 +02:00
Laurent Destailleur
c3732f2b7a
Fix edition of margins in recurring invoices
2019-05-20 14:41:47 +02:00
Laurent Destailleur
3c1b860da4
Fix css
2019-05-20 12:16:39 +02:00
Frédéric FRANCE
aef850f6d3
zapier for dolibarr
2019-05-19 21:12:22 +02:00
Laurent Destailleur
27ed095181
Debug BOM module
2019-05-19 16:40:25 +02:00
Laurent Destailleur
d86fc28aba
Fix CSS
2019-05-19 13:01:11 +02:00
Laurent Destailleur
ea5ffbb0bf
Merge pull request #11216 from atm-florian/8.0
...
fix: #11187
2019-05-19 02:19:12 +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
Laurent Destailleur
71ef8c881b
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:06:20 +02:00
florian HENRY
e4d87ab2e7
fix : #11189
2019-05-19 02:05:13 +02:00
Laurent Destailleur
7738787729
Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2019-05-19 02:03:16 +02:00
Maxime Kohlhaas
1d980342ec
Fix #8344
2019-05-19 00:05:23 +02:00
Laurent Destailleur
41cb13b1cc
Fix warning
2019-05-18 19:28:14 +02:00
Laurent Destailleur
4517d84e3a
FIX Disable a module
2019-05-18 19:22:17 +02:00
Maxime Kohlhaas
4f64250ad6
Fix menu links for holidays
2019-05-18 17:12:25 +02:00
Maxime Kohlhaas
6c195d7bdf
Add warning delay for holidays
2019-05-18 17:07:29 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser
...
FIX: scrutinizer feedback
2019-05-18 16:05:24 +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
ATM John BOTELLA
f714b45efb
FIX scrutinizer feedback
2019-05-18 15:53:07 +02:00
florian HENRY
9ef5767fd5
phpcs
2019-05-18 12:28:39 +02:00
florian HENRY
730820bb26
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-05-18 12:11:48 +02:00
florian HENRY
02af7ca25e
fix pb with multicompny payment dictionnary on faxcture card
2019-05-18 12:11:28 +02:00
Alexandre SPANGARO
876e1147d1
WIP Correct right on fiscal year
2019-05-18 09:41:29 +02:00
Laurent Destailleur
26d4875f8f
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-18 02:26:40 +02:00
Maxime Kohlhaas
095fd2769a
Fix project beluga order status
2019-05-18 01:11:34 +02:00
Laurent Destailleur
c50a3c4a78
Merge pull request #11190 from atm-florian/develop
...
add info into change log
2019-05-18 00:47:24 +02:00
Laurent Destailleur
051308c679
Update eldy_menu.php
2019-05-18 00:46:32 +02:00
florian HENRY
0c3500fc5d
fix : #10562
2019-05-18 00:45:41 +02:00
ATM-Marc
b85ed3e0b7
FIX: mail presend: can overwrite a file previously uploaded
2019-05-18 00:11:15 +02:00
florian HENRY
fcfabd40af
fix missing cell into perms screen
2019-05-17 18:10:40 +02:00
Maxime Kohlhaas
2a2f0557cf
Fix : display hr tab on user if rights to read all
2019-05-17 17:07:38 +02:00
florian HENRY
8b1c91912b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact
2019-05-17 16:40:48 +02:00
Nicolas ZABOURI
1f789fa266
FIX syntax
2019-05-17 11:24:24 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta
2019-05-16 21:21:51 +02:00
Laurent Destailleur
53b7f3fe92
Merge pull request #11173 from aspangaro/10.0_accountancy_cat
...
NEW Add accoutancy sell intra and export in product import
2019-05-16 21:14:46 +02:00
Laurent Destailleur
c24c81692d
Update modAccounting.class.php
2019-05-16 21:13:57 +02:00
Laurent Destailleur
d1e5c525aa
Fix warning
2019-05-16 14:47:42 +02:00
Laurent Destailleur
2d0b3b7b23
Fix dol_sort_array for objects
2019-05-16 12:25:14 +02:00
Laurent Destailleur
4a69541419
Several bug fixes using phpstan
2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213
Fix doc
2019-05-15 17:50:35 +02:00
Marc de Lima Lucio
d428f79d46
NEW: new line template: hidden conf to fill service dates from the last service line
2019-05-15 12:26:39 +02:00
Alexandre SPANGARO
6f9010c362
NEW add category in export of chart of accounts
2019-05-13 22:02:43 +02:00
Francis Appels
6e5d826d65
Clean PHPCS for commonobject.class
2019-05-13 22:02:33 +02:00
Alexandre SPANGARO
d99424cdf0
NEW Add accoutancy sell intra and export in product import
2019-05-13 21:19:18 +02:00
Laurent Destailleur
e2408fb54d
Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display
...
fix useless calculation
2019-05-13 20:20:01 +02:00
Laurent Destailleur
94387cd0e1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-13 12:28:25 +02:00
Laurent Destailleur
75646e365d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/contrat/services_list.php
htdocs/expensereport/list.php
htdocs/product/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
ChangeLog
htdocs/contrat/services_list.php
htdocs/core/lib/files.lib.php
htdocs/filefunc.inc.php
htdocs/product/list.php
2019-05-13 12:22:14 +02:00
atm-greg
644f247910
fix useless calculation
2019-05-13 12:02:46 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php
2019-05-13 12:00:13 +02:00
Laurent Destailleur
30e08d8f9c
Merge pull request #11167 from andreubisquerra/master
...
TakePOS as stable
2019-05-13 11:43:17 +02:00
Laurent Destailleur
f0cdaff936
Fix status of crons
2019-05-13 10:26:30 +02:00
Laurent Destailleur
e84003d4ff
Escape param
2019-05-13 09:29:34 +02:00
Regis Houssin
156b25a702
FIX use "multidir_output" instead "dir_output"
2019-05-12 16:36:29 +02:00
Laurent Destailleur
7a75567ad9
FIX Debug ticket module
2019-05-12 16:34:49 +02:00
Regis Houssin
3cb6ca34e9
FIX multicompany compatibility
2019-05-12 16:06:16 +02:00
Regis Houssin
b73df2698d
FIX better compatibility with Multicompany
2019-05-12 14:25:41 +02:00
andreubisquerra
166ac1b8c2
TakePOS as stable as indicated in the Changelog
2019-05-11 21:33:26 +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
cc64e3e5c0
Fix responsive
2019-05-10 19:38:08 +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
eed2b97913
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-10 17:40:53 +02:00
Laurent Destailleur
069df82380
FIX javascript error when ckeditor module not enabled
2019-05-10 17:40:34 +02:00
Laurent Destailleur
7712c54eb9
Merge pull request #11162 from hregis/develop_menu
...
FIX wrong permissions in products/services menu
2019-05-10 16:31:20 +02:00
Laurent Destailleur
1c3bcea1f9
Merge pull request #11157 from ptibogxiv/patch-180
...
Fix img_credit_card with payment methods
2019-05-10 16:28:52 +02:00
Laurent Destailleur
02b8e77df2
Fix responsive
2019-05-10 16:14:05 +02:00
Regis Houssin
449117ba52
FIX missing service
2019-05-10 15:53:49 +02:00
Regis Houssin
97de84d1e7
FIX wrong permissions in products/services menu
2019-05-10 15:48:48 +02:00
Laurent Destailleur
71ba368d57
Fix phpdoc
2019-05-10 14:02:45 +02:00
Laurent Destailleur
cd8f601cdc
Fix length of vat number
2019-05-10 14:01:11 +02:00
Laurent Destailleur
00f6265870
Fix responsive
2019-05-10 09:33:21 +02:00
ptibogxiv
f50280f13b
Fix img_credit_card with payment methods
2019-05-10 01:16:58 +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
bc49f47718
Fix phpcs
2019-05-09 19:48:13 +02:00
Laurent Destailleur
314dc26b87
Look and feel v10
2019-05-09 19:32:19 +02:00
Laurent Destailleur
a5b1de4f6a
Fix tab that should not be visible
2019-05-09 17:52:55 +02:00
Laurent Destailleur
1e970fa8d7
Merge pull request #11151 from atm-arnaud/FIX_linkedfiles_in_attached_files_was_broked
...
FIX attached files list with link file was broked
2019-05-09 15:05:51 +02:00
Laurent Destailleur
84714f39e2
Fix setup of terminal
2019-05-09 13:37:20 +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
677b333d0a
FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick
...
hack to fix output pb).
2019-05-09 12:38:00 +02:00
Laurent Destailleur
6e69db8a1a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
htdocs/filefunc.inc.php
2019-05-09 12:27:14 +02:00
Laurent Destailleur
f1fd4108ae
Debug/Clean code
2019-05-09 12:17:20 +02:00
Laurent Destailleur
d3bbb93ada
Fix template for situation
...
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2019-05-09 12:16:43 +02:00
atm-arnaud
4c90ba1a64
FIX attached files list with link file was broked
2019-05-09 12:11:18 +02:00
Laurent Destailleur
725de78d29
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-09 10:16:01 +02:00
Laurent Destailleur
ed98817f0d
Fix template for situation
2019-05-09 10:15:38 +02:00
Laurent Destailleur
e5b613562a
Merge pull request #11148 from andreubisquerra/master
...
TakePOS Terminals
2019-05-09 09:18:41 +02:00
Laurent Destailleur
c2abedeb24
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0
2019-05-08 21:43:57 +02:00
Laurent Destailleur
74875690a0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-05-08 19:14:31 +02:00
Laurent Destailleur
96c021773e
Update takepos.lib.php
2019-05-08 19:11:17 +02:00
Laurent Destailleur
c3693cb007
Fix phpcs
2019-05-08 19:10:12 +02:00
Laurent Destailleur
f6de2d091d
FIX Sending email to mass actions send same email on same customer
2019-05-08 19:07:12 +02:00
andreubisquerra
84cfa00bf1
Terminals
2019-05-08 18:29:00 +02:00
Laurent Destailleur
590b1d1e90
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Laurent Destailleur
f2e24ed96e
Fix bad contact used
2019-05-08 18:20:28 +02:00
Laurent Destailleur
3a3b04f31b
Fix showdocument for external modules
2019-05-08 17:31:50 +02:00
Laurent Destailleur
8812b95ce0
Merge pull request #11144 from aspangaro/develop
...
Fix Eldy menu
2019-05-08 02:09:35 +02:00
Laurent Destailleur
eb9b9e44d8
Merge pull request #11137 from OPEN-DSI/fix-card-presend-shipment
...
Fix contact address substitution before sending by mail in shipment card
2019-05-08 02:06:36 +02:00
Laurent Destailleur
b58a73cfaf
Merge pull request #11139 from code-chicken/patch-1
...
FIX Add support for units
2019-05-08 02:02:22 +02:00
Laurent Destailleur
2ee72e2fdf
Update html.form.class.php
2019-05-08 02:02:07 +02:00
Laurent Destailleur
1e036f3513
Correct support for type price on module builder
...
Fix link of ref in cash fence list
2019-05-08 01:09:38 +02:00
Laurent Destailleur
dc1ee29fef
Fix default permission of new users
2019-05-07 23:03:45 +02:00
gauthier
f661b926fa
FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf
...
Example : if you upload a file like "my file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space
2019-05-07 14:33:17 +02:00
Alexandre SPANGARO
a386f0e9ea
Fix Eldy menu
2019-05-07 09:18:27 +02:00
Laurent Destailleur
c4798c34b0
Fix autocompletion of product on stock correction
2019-05-07 00:26:31 +02:00
Rüdiger Hahn
4008e26328
Add support for units
...
Fetch units from db when they've been enabled in configuration
2019-05-06 13:12:41 +02:00
Lionel VESSILLER
8bb4b3f339
Fix contact address substitution before sending by mail in shipment card
2019-05-06 11:12:56 +02:00
florian HENRY
0ffc2b733d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact
2019-05-06 08:42:13 +02:00
Alexandre SPANGARO
4baffae297
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
2019-05-05 22:43:02 +02:00
Alexandre SPANGARO
4e16992796
WIP
2019-05-05 14:07:42 +02:00
Alexandre SPANGARO
be1eb7829e
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
2019-05-04 07:41:23 +02:00
Laurent Léonard
8d659d8078
Fix date format in customer orders documents
2019-05-04 07:12:13 +02:00
Laurent Léonard
a7a8eb3648
Add customer code in customer orders documents
2019-05-04 06:33:23 +02:00
florian HENRY
7af203e519
modifié : ../core/actions_massactions.inc.php
2019-05-03 16:28:44 +02:00
florian HENRY
8dc494890a
modifié : ../core/actions_massactions.inc.php
2019-05-03 16:24:25 +02:00
florian HENRY
1f8eafa1ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact
2019-05-03 16:23:23 +02:00
Lionel VESSILLER
87e83a7967
New add extrafield separator collapse with theses specific values
...
- empty for a simple separator
- 1 to extend by default all extrafields after the separator position
- 2 to collapse by default all extrafields after the separator position
2019-05-03 16:14:44 +02:00
Laurent Destailleur
9115df7439
Debug v10
2019-05-03 11:25:53 +02:00
florian HENRY
f2d275614c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_MassSendEmailInvoiceToBillingContact
2019-05-03 09:48:07 +02:00
Laurent Destailleur
eab49d4300
NEW Update Stripe library to 6.34.3
2019-05-03 02:22:27 +02:00
Laurent Destailleur
8442c86436
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9
FIX Default value on form to send email
2019-05-02 15:34:29 +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
1378d5e89b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-02 14:03:47 +02:00
Laurent Destailleur
263b6cafbc
Fix var
2019-05-02 14:03:35 +02:00
Laurent Destailleur
8c76c404bd
Merge pull request #11088 from defrance/patch-141
...
planned_timespent not present on task
2019-05-02 14:01:19 +02:00
Laurent Destailleur
e81f10c790
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
2019-05-02 13:45:49 +02:00
Laurent Destailleur
425dd6faf7
Merge branch 'develop' into patch-2
2019-05-02 12:38:38 +02:00
Laurent Destailleur
86f5889a72
Merge pull request #11078 from Supermanu/help_extrafields
...
Show help text for extrafields in forms
2019-05-02 12:36:15 +02:00
Laurent Destailleur
ceeb9752ce
Fix PHPCS
2019-05-02 12:28:40 +02:00
Laurent Destailleur
0f8c7df6fe
Debug api of module BOM
2019-05-02 12:19:43 +02:00
Laurent Destailleur
90a1181dc5
Debug module Ticket
2019-05-01 20:41:03 +02:00
Laurent Destailleur
9955af5194
Debug ticket module
2019-05-01 17:53:41 +02:00
Laurent Destailleur
a75c6a81d1
FIX Follow rule to create a new page
2019-05-01 17:15:42 +02:00
Frédéric FRANCE
ac304f58b0
clean new commits
2019-04-30 20:37:59 +02:00
Frédéric FRANCE
5766bb0b8a
Merge remote-tracking branch 'upstream/develop' into patch-2
2019-04-30 20:16:43 +02:00
Laurent Destailleur
61bf731d17
FIX Balance of td
2019-04-30 18:11:35 +02:00
Laurent Destailleur
9c45b781af
Fix balance of colspan
2019-04-30 16:44:11 +02:00
Laurent Destailleur
b13bc0e698
Fix loading of website page object not done for home page
2019-04-30 13:51:31 +02:00
Laurent Destailleur
203998a2c7
Fix loading of website page object not done for home page
2019-04-30 13:51:04 +02:00
Laurent Destailleur
feb0800208
Fix loading of website page object not done for home page
2019-04-30 13:50:31 +02:00
Laurent Destailleur
0cd1fc79f2
NEW Add a security permission to edit php dynamic content on website.
2019-04-30 13:05:13 +02:00
BENKE Charlene
f8f40a9239
planned_timespent not present on task
...
duration is the good one
2019-04-30 11:27:33 +02:00
Laurent Destailleur
3007905508
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modProduct.class.php
htdocs/core/modules/modService.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/stripe/class/stripe.class.php
2019-04-30 03:30:40 +02:00
Laurent Destailleur
d55c440740
Fix some product and services export profiles
2019-04-29 21:23:01 +02:00
Laurent Destailleur
ef8bb1f5ca
Add MAIN_DOLEDITOR_HEIGHT as quick hack to fix pb of too small area
2019-04-29 20:55:45 +02:00
Laurent Destailleur
101f6a5af3
FIX Several fixes on import of services/products
2019-04-29 20:41:36 +02:00
Supermanu
bbc6c0fe0c
Show help text for extrafields in forms
2019-04-29 20:18:47 +02:00
Laurent Destailleur
5d40124b22
Fix import of product price with multilevel prices
2019-04-29 20:15:03 +02:00
Laurent Destailleur
627ef14454
FIX The autocopy feature was ko for suppliers
2019-04-29 18:51:15 +02:00
florian HENRY
d7abad4566
NEW : mass email action on invoice list use billing contact if exists
2019-04-29 17:40:59 +02:00
Laurent Destailleur
5253c759af
Fix overwrite feature
2019-04-27 21:42:52 +02:00
Laurent Destailleur
410a3801da
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2019-04-27 13:27:52 +02:00
Frédéric FRANCE
3e99a40b9e
Update website.lib.php
2019-04-26 17:47:47 +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
63c0ab93fb
FIX CVE-2019-11201
2019-04-25 23:21:25 +02:00
Laurent Destailleur
01075081cb
FIX CVE-2019-11200
2019-04-25 22:25:19 +02:00
Laurent Destailleur
b2614259e7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-25 19:32:58 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +02:00
Laurent Destailleur
68926e3b6f
Merge pull request #11066 from aspangaro/10.0_accountancy7
...
FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries)
2019-04-25 18:59:17 +02:00
gauthier
31897f54ac
Fix prev situation invoice selection (backport fix 8.0)
2019-04-25 12:37:05 +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
6fe84a7962
Fix phpcs
2019-04-25 11:18:25 +02:00
Alexandre SPANGARO
2c411310bc
FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries)
2019-04-25 08:29:43 +02:00
Laurent Destailleur
68d438b697
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/user/class/user.class.php
2019-04-25 01:50:48 +02:00
Laurent Destailleur
82093f5891
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-04-25 01:27:02 +02:00
Laurent Destailleur
560b026d68
Fix CSS
2019-04-25 01:26:29 +02:00
Laurent Destailleur
e5c2027dbb
NEW Add accounting code for eec sales and export sales on products
2019-04-25 01:16:29 +02:00
Alexandre SPANGARO
6f9e71dae3
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
2019-04-24 21:15:54 +02:00
Laurent Destailleur
ab1f371ea5
Fix encoding on expense report PDF
2019-04-24 20:58:27 +02:00
Laurent Destailleur
79c37f2226
Fix link for endpoint
2019-04-24 18:47:11 +02:00
Laurent Destailleur
fe3fe60efc
Cleaner setup page
2019-04-24 18:31:11 +02:00
Laurent Destailleur
287b8ebe53
Merge pull request #11060 from hregis/9.0_mc
...
FIX missing compatibility with multicompany
2019-04-24 11:33:16 +02:00
Laurent Destailleur
8aa8efcb14
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-24 11:25:23 +02:00
Laurent Destailleur
99639ef429
FIX #11013
2019-04-24 11:25:14 +02:00
Laurent Destailleur
f0bb9288bf
FIX #11013
2019-04-24 11:23:49 +02:00
Laurent Destailleur
4421dedbd2
Merge pull request #11008 from aspangaro/10.0_closure
...
FIX: Update blocked by datec on fiscal year
2019-04-24 10:28:23 +02:00
Laurent Destailleur
691159c56b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-24 10:24:55 +02:00
Laurent Destailleur
1264857211
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/js/timesheet.js
2019-04-24 10:24:32 +02:00
Laurent Destailleur
0090b26946
Merge pull request #11049 from frederic34/patch-5
...
Update mod_expedition_ribera.php
2019-04-24 10:10:11 +02:00
Laurent Destailleur
ad9dfc826a
Merge pull request #11051 from frederic34/patch-7
...
Update mod_commande_saphir.php
2019-04-24 10:09:58 +02:00
Laurent Destailleur
7ad214b2f1
Merge pull request #11052 from frederic34/patch-8
...
Update mod_chequereceipt_thyme.php
2019-04-24 10:09:38 +02:00
Laurent Destailleur
49c7d07e8c
Merge pull request #11050 from frederic34/patch-6
...
Update mod_contract_magre.php
2019-04-24 10:09:28 +02:00
Laurent Destailleur
a1bff2ca36
Merge pull request #11048 from frederic34/patch-2
...
Update mod_bom_advanced.php
2019-04-24 10:09:07 +02:00
Laurent Destailleur
6d397316d6
Merge pull request #11053 from frederic34/patch-9
...
In export modules, id is string
2019-04-24 10:08:30 +02:00
Regis Houssin
41a82023e3
FIX missing compatibility with multicompany
2019-04-24 08:17:10 +02:00
Laurent Destailleur
684e09fdcd
NEW Add function isValidVATID()
2019-04-23 22:49:33 +02:00
Laurent Destailleur
742de5c777
Fix pdf of expense report
2019-04-23 16:04:53 +02:00
Laurent Destailleur
633eb1d6c6
Remove warning
2019-04-23 13:28:42 +02:00
Laurent Destailleur
4d92d7731c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
8d0825910a
Fix warnings
2019-04-23 10:38:20 +02:00
Laurent Destailleur
7c7c4f0d93
Removed warnings
2019-04-23 10:24:16 +02:00
Laurent Destailleur
f19d96bf8d
NEW Show enabled modules in dol_print_error
2019-04-23 10:24:05 +02:00
Laurent Destailleur
a50fc9189b
Fix phpcs
2019-04-22 15:45:44 +02:00
Laurent Destailleur
9e91826dea
Can set length of random password
2019-04-22 14:12:58 +02:00
Laurent Destailleur
be726c2376
Code comment
2019-04-22 12:44:25 +02:00
Laurent Destailleur
24572e2f82
Remove warnings
2019-04-22 12:42:46 +02:00
Laurent Destailleur
6da42941a8
NEW Add attached document on bank account visible in automatic ECM.
2019-04-21 19:54:30 +02:00
Frédéric FRANCE
53c851de7b
Update export_csv.modules.php
2019-04-20 11:42:25 +02:00
Frédéric FRANCE
a0ce52bb23
Update export_excel.modules.php
2019-04-20 11:41:37 +02:00
Frédéric FRANCE
73b32f0679
Update export_excel2007.modules.php
2019-04-20 11:41:19 +02:00
Frédéric FRANCE
06a8513575
Update export_excel2007new.modules.php
2019-04-20 11:40:59 +02:00
Frédéric FRANCE
b05a5e49ff
Update export_tsv.modules.php
2019-04-20 11:39:38 +02:00
Frédéric FRANCE
e5559ac2f9
Update mod_chequereceipt_thyme.php
...
The property db does not exist on mod_chequereceipt_thyme.
2019-04-20 09:36:47 +02:00
Frédéric FRANCE
fbf718f330
Update mod_commande_saphir.php
2019-04-20 09:34:23 +02:00
Frédéric FRANCE
bed3ed705c
Update mod_contract_magre.php
...
The property db does not exist on mod_contract_magre.
2019-04-20 09:31:53 +02:00
Frédéric FRANCE
9b9d4ddc45
Update mod_expedition_ribera.php
...
The property db does not exist on mod_bom_advanced.
2019-04-20 09:29:24 +02:00
Frédéric FRANCE
e9b13baac2
Update mod_bom_advanced.php
...
The property db does not exist on mod_bom_advanced.
2019-04-20 09:27:15 +02:00
Laurent Destailleur
734b1ca7c1
Fix phpcs
2019-04-19 22:18:08 +02:00
Laurent Destailleur
a0cd053206
Merge branch 'develop' into patch-2
2019-04-19 13:04:52 +02:00
Laurent Destailleur
6ed616a969
Merge pull request #11042 from aspangaro/10.0_assets
...
Assets - Debug - Look & field v10
2019-04-19 13:02:50 +02:00
Laurent Destailleur
31167857b5
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-04-19 13:01:14 +02:00
Laurent Destailleur
a438f688fb
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-04-19 13:00:37 +02:00
Laurent Destailleur
99f5bf2a6c
Merge pull request #11027 from AXeL-dev/patch-8
...
Fix debugbar module class
2019-04-19 13:00:37 +02:00
Laurent Destailleur
ecf3bc6402
Fix phpcs
2019-04-19 13:00:10 +02:00
florian HENRY
83cf08f2eb
fix php warning
2019-04-18 20:37:27 +02:00
Frédéric FRANCE
315349a681
replace @public by @var
2019-04-18 18:41:02 +02:00
Alexandre SPANGARO
3729e32368
Assets - Debug - Look & field v10
2019-04-18 14:13:48 +02:00
Frédéric FRANCE
4912c69d8a
Update functions2.lib.php
2019-04-18 10:12:00 +02:00
florian HENRY
2b6cdd2e33
Fix workfolow module launch trigger on order close
2019-04-18 10:01:05 +02:00
Christophe Battarel
0b5cb9770f
use dol_escapa_js
2019-04-18 09:59:39 +02:00
atm-ph
1e087b68e1
New show html list instead input text for extrafields typed as list
2019-04-17 16:29:48 +02:00
Christophe Battarel
79fc351cbd
credentials
2019-04-17 09:26:45 +02:00
Alexandre SPANGARO
3091288ed7
Revert "Move to Warning an alert on hook when method return a string than a int"
...
This reverts commit cc5727bc7b
2019-04-17 07:27:38 +02:00
Alexandre SPANGARO
660a1cea1d
NEW Accounting - Add rights on export, delete operations in ledger
2019-04-17 07:26:39 +02:00
AXeL-dev
bef38c9abe
debugbar module class: remove unreached part of code (may generate errors on call)
2019-04-17 00:33:49 +01:00
Laurent Destailleur
b5bf6830e9
Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
...
media added from filemanager in notes are visible by PDFs builder.
2019-04-17 01:13:59 +02:00
ATM john
945e3db952
remove text
2019-04-16 22:03:11 +02:00
ATM john
965c973bda
Change class name
2019-04-16 22:02:23 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
Christophe Battarel
20953d3522
fix javascript
2019-04-16 17:36:42 +02:00
Christophe Battarel
62f59a13af
fix javascript
2019-04-16 17:30:57 +02:00
Christophe Battarel
f4cc1695f4
fix when ckeditor is not enabled
2019-04-16 17:22:33 +02:00
Christophe Battarel
ce4b67ecaa
fix pagefoot
2019-04-16 16:45:43 +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
John BOTELLA
a60d4b3b52
Appli btn apply to links
2019-04-16 09:09:25 +02:00
ATM john
07e6ce5460
Appli function to links
2019-04-15 21:33:31 +02:00
ATM-Nicolas
93365addd1
FIX : Total per day shows 00:00 if the total time spent is equal to 12:00
2019-04-15 11:40:58 +02:00
Alexandre SPANGARO
cc5727bc7b
Move to Warning an alert on hook when method return a string than a int
2019-04-15 09:15:42 +02:00
Alexandre SPANGARO
9957b8aed5
WIP - FEC - Validate
2019-04-15 09:07:36 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Alexandre SPANGARO
c1ecfae6f2
FIX: Update on fiscal year
2019-04-13 22:46:40 +02:00
Laurent Destailleur
00eb0511f6
Make code simpler to sort list of files.
2019-04-13 12:41:50 +02:00
Laurent Destailleur
8e9a4e1877
Fix output of fields with type "real"
2019-04-13 10:42:43 +02:00
Laurent Destailleur
ebe8f27c16
Fix on smartphone
2019-04-13 10:29:09 +02:00
Laurent Destailleur
cf058e7d3b
NEW Ask date of invoice when using the Clone feature.
2019-04-12 12:12:08 +02:00
atm-quentin
6deba39c6a
FIX credit note can be split
2019-04-12 10:16:13 +02:00
Lionel VESSILLER
09ce5bd977
Fix dropdown menu in pages with several lists
2019-04-11 17:59:11 +02:00
Laurent Destailleur
7db0c0c705
Merge pull request #10993 from altatof/presend
...
NEW : use outputlangs in fullname construction for emails
2019-04-11 16:33:07 +02:00
Laurent Destailleur
3d5a1a5550
Merge pull request #10988 from OPEN-DSI/new-societe-export-fields
...
New company fields in contact export
2019-04-11 16:29:01 +02:00
Laurent Destailleur
2b2838058c
Merge pull request #10986 from grandoc/new_branch_09_04_2019
...
New branch 09 04 2019
2019-04-11 16:28:18 +02:00
Laurent Destailleur
862917edff
NEW Tooltip with vat amount and price incl tax on lines of objects.
2019-04-10 21:24:23 +02:00
Laurent Destailleur
cfa414b2de
Better log
2019-04-10 16:42:45 +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
1f6f6f6edb
Track action close for ticket
2019-04-10 13:21:06 +02:00
Laurent Destailleur
ac25003d33
Dolibarize module ticket
2019-04-10 11:39:54 +02:00
Christophe Battarel
79beb59385
use outputlangs in fullname construction for emails
2019-04-10 11:11:41 +02:00
Laurent Destailleur
861c1b412c
CSS
2019-04-09 19:23:34 +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
7790140f22
CSS
2019-04-09 14:13:34 +02:00
Laurent Destailleur
f9860e1425
Work on email collector
2019-04-09 13:23:30 +02:00
Lionel VESSILLER
86d4f5d213
New company fields in contact export
2019-04-09 10:13:26 +02:00
Philippe GRAND
bb5e60ad54
update code
2019-04-09 09:39:38 +02:00
Philippe GRAND
9b8297ee15
update code
2019-04-09 09:39:00 +02:00
Philippe GRAND
2e7256a094
update code
2019-04-09 09:38:35 +02:00
Philippe GRAND
1b2aa27c2f
update code
2019-04-09 09:37:21 +02:00
Philippe GRAND
3ff5c6b42b
update code
2019-04-09 09:36:51 +02:00
Philippe GRAND
144ebb2f89
update code
2019-04-09 09:35:39 +02:00
Philippe GRAND
1d84dcbe17
update code
2019-04-09 09:34:26 +02:00
Philippe GRAND
c26afe15ff
update code
2019-04-09 09:33:20 +02:00
Philippe GRAND
350a04108f
update code
2019-04-09 09:32:18 +02:00
Philippe GRAND
edd5661f1a
update code
2019-04-09 09:31:33 +02:00
Philippe GRAND
3a209d2454
update code
2019-04-09 09:30:32 +02:00
Philippe GRAND
42df91e4e2
update code
2019-04-09 09:29:01 +02:00
Philippe GRAND
30e2d8fa6b
update code
2019-04-09 09:28:01 +02:00
Philippe GRAND
327ac2973e
update code
2019-04-09 09:27:25 +02:00
Philippe GRAND
2ed71b0039
update code
2019-04-09 09:26:39 +02:00
Philippe GRAND
baecb20562
update code
2019-04-09 09:24:41 +02:00
Philippe GRAND
0de76fc128
update code
2019-04-09 09:23:50 +02:00
Philippe GRAND
f833bbcb32
update code
2019-04-09 09:21:34 +02:00
Philippe GRAND
68c1332244
update code
2019-04-09 09:19:16 +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
a19cedfc13
Fix phpcs
2019-04-09 00:48:12 +02:00
Laurent Destailleur
c0b3ee23e5
Fix phpcs
2019-04-08 23:50:18 +02:00
Laurent Destailleur
d01b54ca5b
Fix phpcs
2019-04-08 18:02:27 +02:00
Laurent Destailleur
1274d71a10
Fix phpcs
2019-04-08 16:00:01 +02:00
Laurent Destailleur
917b9d69fa
Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
...
not recommanded to use in Dolibarr.
2019-04-08 14:55:31 +02:00
Laurent Destailleur
1b415a6aed
Fix translation of help tooltip on fields for modulebuilder.
2019-04-08 14:42:46 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1
...
NEW improve Expensereport, Inverse Receiver
2019-04-08 14:04:08 +02:00
Laurent Destailleur
2b5e25188c
Merge pull request #10977 from IonAgorria/resources-product
...
NEW: Resources tab possible in products/services
2019-04-08 13:57:30 +02:00
Laurent Destailleur
faf8803329
Merge pull request #10966 from atm-ph/fix_default_filter
...
Fix default filter
2019-04-08 13:48:31 +02:00
Laurent Destailleur
a7ced8ab5d
Merge pull request #10963 from aspangaro/v10_p3
...
NEW: Accounting - Invert module name
2019-04-08 13:39:51 +02:00
Laurent Destailleur
2606de2119
Update modAccounting.class.php
2019-04-08 13:35:06 +02:00
Laurent Destailleur
7c91c1b9f1
Merge pull request #10962 from aspangaro/v10_p2
...
FIX: Problem with badge in tab in expedition card
2019-04-08 13:33:59 +02:00
Laurent Destailleur
976ef92df6
Merge pull request #10958 from atm-john/new_look_and_feel_pdf
...
New pdf document column system : supplier order and expedition
2019-04-08 13:31:47 +02:00
Laurent Destailleur
da6c5b552f
Merge pull request #10950 from OPEN-DSI/new-extrafield-sellist-chkbxlst-options
...
New categories options in sellist and chbxlist extrafields
2019-04-08 13:28:51 +02:00
Laurent Destailleur
7b85a7977b
Update html.form.class.php
2019-04-08 13:28:32 +02:00
Ion
b64cb4129f
Add resources tab for products/services
2019-04-07 23:52:49 +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
Ion
71f30266dc
Add service to getElementProperties
2019-04-07 12:53:52 +02:00
Laurent Destailleur
54714bc755
Deprecated property ->fk_departement is now ->state_id everywhere.
2019-04-05 20:06:13 +02:00
Laurent Destailleur
67760d6f41
Fix phpcs
2019-04-05 19:53:45 +02:00
Laurent Destailleur
997d6cca0a
Fix $db not defined
2019-04-05 19:49:47 +02:00
Laurent Destailleur
b6c19e0f35
Fix var not defined
2019-04-05 19:48:32 +02:00
Laurent Destailleur
becefeebff
Fix upload of files without extension
2019-04-05 19:39:49 +02:00
Laurent Destailleur
734b97e255
Fix upload of files without extension
2019-04-05 19:39:04 +02:00
Laurent Destailleur
1ffb5a72d5
Replace image with font awesome
2019-04-05 14:45:54 +02:00
Christophe Battarel
f167ad910e
camelCase and generic cloneCategories function
2019-04-05 11:30:51 +02:00
Laurent Destailleur
00cdf13a15
Revert "Do not close php tags"
...
This reverts commit 1db134c2a0
2019-04-05 11:09:39 +02:00
atm-ph
285e60e9f1
Fix default filter
2019-04-05 10:57:50 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
Alexandre SPANGARO
4335ea9064
NEW: Accounting - Invert module name
2019-04-04 17:13:20 +02:00
Alexandre SPANGARO
b64ee3af70
FIX: Problem with badge in tab in expedition card
2019-04-04 17:02:18 +02:00
John BOTELLA
3299b765f1
New pdf models
2019-04-04 10:16:20 +02:00
Laurent Destailleur
1f00e24abc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-03 18:52:47 +02:00
Laurent Destailleur
9e5d87e821
Fix warning
2019-04-03 18:39:27 +02:00
Laurent Destailleur
82c19a6372
FIX Avoid error 500 when extension php-intl not loaded
2019-04-03 18:38:27 +02:00
Laurent Destailleur
1db134c2a0
Do not close php tags
2019-04-03 18:13:39 +02:00
John BOTELLA
a668cc28b1
Add table title auto height
2019-04-03 16:19:49 +02:00
Laurent Destailleur
eb6bd20132
Fix error message
2019-04-03 16:16:51 +02:00
Laurent Destailleur
76bf412f95
Fix phpcs
2019-04-03 14:40:15 +02:00
Laurent Destailleur
c5f5abc67d
Fix css for MD theme
2019-04-03 14:37:38 +02:00
Laurent Destailleur
bfed3685a5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-03 13:27:13 +02:00
Laurent Destailleur
7120078b0f
NEW Simplification of styles architcture: Showing or not the menuhider
...
is completely decided by CSS and screen size instead of PHP+CSS.
2019-04-03 13:26:50 +02:00
Laurent Destailleur
64889f4639
Merge pull request #10947 from grandoc/new_branch_01_04_2019
...
update comments
2019-04-03 11:05:05 +02:00
Laurent Destailleur
80be77d95d
Merge pull request #10948 from ptibogxiv/patch-148
...
fix term autoOrManual
2019-04-03 11:03:44 +02:00
Laurent Destailleur
bb9cd05ea8
Fix phpcs
2019-04-02 20:02:43 +02:00
Philippe Grand
ebe50a4efe
Update pdf_sponge.modules.php
2019-04-02 15:33:10 +02:00
Philippe Grand
b978014fb9
Update pdf_eratosthene.modules.php
2019-04-02 15:32:01 +02:00
Lionel VESSILLER
8a220b9da1
New categories options in sellist and chbxlist extrafields
2019-04-02 11:01:46 +02:00
Laurent Destailleur
8a6e28860b
A better transition with deprecation
2019-04-01 22:09:24 +02:00
Laurent Destailleur
7db443e8ab
Better compatibility
2019-04-01 21:14:15 +02:00
ptibogxiv
5d25c33ff5
fix term
2019-04-01 20:49:41 +02:00
markus
c08b69d00b
Rely on MAIN_INVERT_SENDER_RECIPIENT
2019-04-01 19:59:58 +02:00
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
fc983fa65c
Move a function into functions2.lib.php
2019-04-01 18:46:13 +02:00
Laurent Destailleur
0c051e0cf0
Merge pull request #10923 from ptibogxiv/patch-145
...
NEW automatic / manual selector form
2019-04-01 18:44:05 +02:00
Laurent Destailleur
5d9a7e0d80
Fix phpcs
2019-04-01 18:21:59 +02:00
Laurent Destailleur
0091b65a83
Fix phpcs
2019-04-01 18:10:14 +02:00
Philippe GRAND
b154ae752a
update comments
2019-04-01 09:43:07 +02:00
Philippe GRAND
e8e5e5cfb9
update comments
2019-04-01 09:42:01 +02:00
Philippe GRAND
e2c5c49c52
update comments
2019-04-01 09:40:50 +02:00
Philippe GRAND
2b41e9166d
update comments
2019-04-01 09:39:22 +02:00
Philippe GRAND
eb901e7c4e
update comments
2019-04-01 09:38:23 +02:00
Philippe GRAND
46488f6a0c
update comments
2019-04-01 09:36:52 +02:00
Philippe GRAND
2c41610ac8
update comments
2019-04-01 09:21:08 +02:00
Philippe GRAND
ae681eaf06
update comments
2019-04-01 09:18:56 +02:00
Philippe GRAND
f828e6ee90
update comments
2019-04-01 09:15:48 +02:00
Laurent Destailleur
c07159fee9
Fix regression in timesheet. Keep extrafield of task for the moment.
2019-03-31 22:06:41 +02:00
ptibogxiv
69b04e2189
Update html.formother.class.php
2019-03-31 19:28:45 +02:00
ptibogxiv
13c93ba1c2
transfert from html.form.class.php
2019-03-31 19:26:40 +02:00
ptibogxiv
1a228ed95c
transfert to html.otherform.class.php
2019-03-31 19:25:45 +02:00
Laurent Destailleur
d572a9258c
Merge branch 'develop' into new_evol_time_spent_views
2019-03-31 19:12:27 +02:00
Laurent Destailleur
ce62e7f7ec
Merge pull request #10939 from OPEN-DSI/new-exports-fields
...
New add fields in contact export
2019-03-31 19:00:16 +02:00
Laurent Destailleur
29e0c98185
Merge pull request #10934 from aspangaro/10.0_product_account
...
NEW: Add import of accounting account for intra/export selling on product card
2019-03-31 18:50:15 +02:00
Laurent Destailleur
039e6034d1
Merge pull request #10936 from aspangaro/10.0_WARNING
...
LOG_WARNING on function dol_print_date with deprecated value
2019-03-31 18:45:01 +02:00
Laurent Destailleur
4233307384
Merge pull request #10946 from frederic34/patch-4
...
phpcs fix
2019-03-31 18:41:22 +02:00
Laurent Destailleur
0d564cdd6c
Merge pull request #10919 from grandoc/new_branch_26_03_2019
...
New branch 26 03 2019
2019-03-31 18:23:05 +02:00
Laurent Destailleur
ecd049b4e6
Debug dolistore
2019-03-31 13:39:51 +02:00
Frédéric FRANCE
ddd1c04eae
phpcs fix
2019-03-31 09:27:11 +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
be21755378
Add page id to help debug in header
2019-03-29 23:04:09 +01:00
Laurent Destailleur
26e3f41f73
Translation
2019-03-29 16:18:47 +01:00
Laurent Destailleur
697a2e5576
Show time to bill and billed in list of tasks
2019-03-29 14:34:55 +01:00
Lionel VESSILLER
a52935f6e4
New add fields in contact export
...
- thirdparty fields (address, phone, email, typent)
- contact field (status)
2019-03-28 18:29:36 +01:00
Alexandre SPANGARO
8163739a68
LOG_WARNING on function dol_print_date with deprecated value
2019-03-28 12:03:04 +01:00
Alexandre SPANGARO
9f9dd2cd30
NEW: Add import of accounting account for intra/export selling on product card
2019-03-28 11:41:59 +01:00
Laurent Destailleur
3930464b84
Clean code and debug TakePOS module
2019-03-27 17:50:23 +01:00
Laurent Destailleur
11e4411400
TakePOS Can enter payment in several times and with different modes
2019-03-27 15:42:53 +01:00
Laurent Destailleur
ec0733d202
Use color on the amount of the payment page of TakePOS module
...
FIX Use pricejs instead of toFixed to be compatible with all currencies
WIP Prepare to be able to enter different payment modes on same invoice
2019-03-27 12:40:32 +01:00
ptibogxiv
2cc9b61a9f
Update html.form.class.php
2019-03-27 11:10:30 +01:00
ptibogxiv
2c71b98d0d
NEW automatic / manual selector form
2019-03-27 11:05:43 +01:00
Laurent Destailleur
d8212d84df
Debug emailcollector
2019-03-26 19:15:18 +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
Philippe GRAND
2dd4ac54a3
fix : typo
2019-03-26 12:30:17 +01:00
Laurent Destailleur
524f171168
FIX old export models was not visible
2019-03-26 12:12:16 +01:00
Laurent Destailleur
513ef1e727
Fix label short
2019-03-25 16:16:08 +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
a950d8389e
WIP Attach document to expense report lines
2019-03-24 20:22:05 +01:00
markus
f942917f53
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-24 17:42:49 +01:00
Laurent Destailleur
b2eee520df
Fix phpcs
2019-03-24 16:11:12 +01:00
Laurent Destailleur
152c27139f
Doc
2019-03-24 14:54:04 +01:00
Laurent Destailleur
614b4afeb0
NEW The preview of PDF files generates 1 png file even if several pages.
2019-03-24 14:53:26 +01:00
Laurent Destailleur
949ef79227
Better error message
2019-03-24 14:26:16 +01:00
Laurent Destailleur
fad6efd86c
WIP file attachment on expense report lines
2019-03-24 13:27:26 +01:00
Laurent Destailleur
5ff76e2c13
WIP file attachment on expense report lines
2019-03-24 12:15:19 +01:00
Laurent Destailleur
20f3af066c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/clients.php
2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-03-23 22:36:04 +01:00
Laurent Destailleur
3ede626932
FIX If we build one invoice for several orders, we must put the ref of
...
order on the line to not lose information.
Conflicts:
htdocs/commande/list.php
htdocs/core/actions_massactions.inc.php
2019-03-23 22:34:10 +01:00
Laurent Destailleur
5666fbedac
FIX If we build one invoice for several orders, we must put the ref of
...
order on the line to not lose information.
2019-03-23 22:30:52 +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
05c2ae6778
Remove warnings
2019-03-23 12:36:05 +01:00
Laurent Destailleur
ea010b9e01
Fix reduce side effects of debugbar
2019-03-23 12:15:42 +01:00
Laurent Destailleur
c569e71bc8
Fix remove warnings
2019-03-23 12:04:50 +01:00
Laurent Destailleur
cd6a0bacdd
Look and feel v10
2019-03-22 14:32:15 +01:00
Laurent Destailleur
d79d5d5a23
Fix var name not defined
2019-03-22 13:20:37 +01:00
Laurent Destailleur
28fede950f
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
...
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
1b558d70c1
Fix menu translation
2019-03-22 12:42:23 +01:00
Laurent Destailleur
52d3e89276
FIX function not found
2019-03-22 12:21:31 +01:00
Laurent Destailleur
a92ff42be8
FIX function not found
2019-03-22 12:12:42 +01:00
Laurent Destailleur
ee4150665e
Fix phpcs
2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97
Merge pull request #10898 from grandoc/new_branch_21_03_2019
...
add some comments
2019-03-21 18:29:11 +01:00
Laurent Destailleur
aa33e4fd2a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-21 18:26:29 +01:00
Laurent Destailleur
55d64d441f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-21 18:26:02 +01:00
atm-ph
b202169e9a
New evol "Input per day" display
2019-03-21 15:20:59 +01:00
Philippe GRAND
7988481688
add some comments
2019-03-21 15:06:14 +01:00
Philippe GRAND
96893315b5
add some comments
2019-03-21 15:03:01 +01:00
atm-ph
fa41eeec7f
New evol "Input per week" display
2019-03-21 14:21:29 +01:00
Frédéric FRANCE
d10b94e72b
Update extrafields.class.php
2019-03-21 14:08:49 +01:00
Laurent Destailleur
a1fe1bb58c
FIX when 2 extra fields are mandatory in 2 different entities
2019-03-21 12:33:39 +01:00
Laurent Destailleur
5d21547854
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Laurent Destailleur
a7fdd34973
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-21 12:17:50 +01:00
Laurent Destailleur
032aa869e4
FIX Can't insert if there is extrafields mandatory on another entity.
...
FIX Can't set default value of extrafield of type varchar
2019-03-21 12:14:15 +01:00
Laurent Destailleur
4c85068a85
FIX Can't insert if there is extrafields mandatory on another entity.
2019-03-21 11:53:04 +01:00
markus
b0e12deb25
Fix travis
2019-03-20 09:36:23 +01:00
atm-greg
a8cdb63a25
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Hook_on_commonGenerateDocument
2019-03-20 06:49:36 +01:00
Laurent Destailleur
51eab7e2f8
Fix rename tag
2019-03-19 15:21:07 +01:00
Laurent Destailleur
9745bd1f16
NEW Add tag for ODT generation for localtax rates
2019-03-19 15:18:43 +01:00
Laurent Destailleur
70c2ffc816
FIX toggle of login_block was ko with eldy theme
2019-03-19 14:22:57 +01:00
Laurent Destailleur
eab11ce743
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2019-03-19 13:14:44 +01:00
Laurent Destailleur
dbe15d3685
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-19 13:10:17 +01:00
Laurent Destailleur
1a8902f23e
Fix migration for compatibility
2019-03-19 12:03:02 +01:00
Laurent Destailleur
2a8056b075
Merge pull request #10881 from frederic34/patch-5
...
phpcs fix
2019-03-19 11:15:16 +01:00
Frédéric FRANCE
03cd321aeb
phpcs fix
2019-03-18 20:18:38 +01:00
Frédéric FRANCE
135df4b3ce
Usage of ELSE IF is discouraged; use ELSEIF instead
2019-03-18 11:24:56 +01:00
Regis Houssin
57091f08b0
FIX missing entity filter and wrong var name
2019-03-18 10:53:43 +01:00
markus
8c010c2580
fix travis
2019-03-18 10:24:21 +01:00
Laurent Destailleur
bb8845ac41
Merge pull request #10865 from atm-maxime/new_box_birthdays
...
NEW Widget birthdays of the month
2019-03-18 08:56:58 +01:00
Laurent Destailleur
b3dc6d7d1d
NEW Generation of doc by modulebuilder can include README and CHANGELOG
2019-03-17 19:33:25 +01:00
markus
b4807e7972
remove unneeded class
2019-03-17 18:38:26 +01:00
Maxime Kohlhaas
e090cd6f87
New box birthdays of the month
2019-03-17 16:55:26 +01:00
Laurent Destailleur
39b9ca2397
Work on documentation generation by modulebuilder
2019-03-17 15:45:50 +01:00
Laurent Destailleur
d44be341a5
NEW Add property 'noteditable' in modulebuilder
2019-03-17 01:45:46 +01:00
Laurent Destailleur
1abfd1f58e
Add page to setup module debugbar
...
Fix CSS
2019-03-17 00:32:39 +01:00
Laurent Destailleur
5f9fa817fb
Fix bad log
2019-03-16 23:41:06 +01:00
Laurent Destailleur
95c1275efc
Fix phpcs
2019-03-16 20:10:22 +01:00
Laurent Destailleur
c2badb57d7
NEW: Add module debugbar
2019-03-16 16:27:14 +01:00
Laurent Destailleur
e5567c7ee4
Fix typo
2019-03-16 14:48:41 +01:00
markus
a45fbfae76
fix travis
2019-03-16 14:37:07 +01:00
Laurent Destailleur
40c2ca4310
Fix label of status of third party record when using smartphone
2019-03-15 23:08:00 +01:00
Laurent Destailleur
7a5a561170
Fix label of status of invoice record when using smartphone
2019-03-15 23:00:50 +01:00
Laurent Destailleur
91f80934f3
Fix: On smartphone, hide label of status only on lists.
2019-03-15 20:39:55 +01:00
Laurent Destailleur
b6cacf3a20
Fix label of status for members on smartphone
2019-03-15 20:18:35 +01:00
Laurent Destailleur
d512e54407
Restore toggle of login_block because it was no more visible
2019-03-15 20:10:39 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
...
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
a1adcc785c
Clean code
2019-03-15 19:11:24 +01:00
Laurent Destailleur
6f0fbc42c1
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
...
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/members/new.php
htdocs/public/opensurvey/studs.php
2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
2019-03-15 15:13:28 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
d31b632d96
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
2019-03-15 11:06:49 +01:00
Laurent Destailleur
074ba0729a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-15 11:00:52 +01:00
Laurent Destailleur
84bff41543
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-15 11:00:24 +01:00
Laurent Destailleur
6c2cad3d48
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/security.lib.php
2019-03-15 11:00:00 +01:00
Laurent Destailleur
e326c4d579
Look and feel v10
2019-03-15 10:48:10 +01:00
gauthier
8375b47e74
FIX : in fact expensereport must be in $check array
2019-03-15 10:21:50 +01:00
Laurent Destailleur
86c5dc20e3
NEW Can choose the root category to show for TakePOS module
2019-03-15 02:12:40 +01:00
Laurent Destailleur
ca31f654e7
Reduce text for graph title
2019-03-14 23:42:22 +01:00
Laurent Destailleur
0afbd70c2c
Merge pull request #10833 from grandoc/new_branch_14_03_2019
...
update with html5 compliant code
2019-03-14 18:04:06 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
2019-03-14 17:48:44 +01:00
Laurent Destailleur
f50638b7d8
Update html.form.class.php
2019-03-14 17:44:54 +01:00
gauthier
3fb6978bc8
FIX : no need to test anything to display documents tabs on expense report
2019-03-14 17:36:49 +01:00
Laurent Destailleur
69bfac7eef
Update html.form.class.php
2019-03-14 17:36:35 +01:00
Laurent Destailleur
c6b3d81d61
Update html.form.class.php
2019-03-14 17:35:44 +01:00
Laurent Destailleur
d4f2a16abf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
2019-03-14 17:10:58 +01:00
Laurent Destailleur
8a752ae657
Merge pull request #10744 from OPEN-DSI/fix-show-action-done-sortfield
...
Fix sort by field in all events (action and emailing type)
2019-03-14 17:00:12 +01:00
Laurent Destailleur
be0535d11f
Merge pull request #10805 from frederic34/patch-2
...
update doc
2019-03-14 16:55:29 +01:00
Frédéric FRANCE
b67429218d
Update html.formmail.class.php
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2019-03-14 16:52:16 +01:00
Laurent Destailleur
965f4702b0
Merge pull request #10830 from frederic34/patch-4
...
Update html.formmail.class.php
2019-03-14 16:49:34 +01:00
Philippe GRAND
3d65b887a7
update with html5 compliant code
2019-03-14 14:34:33 +01:00
Philippe GRAND
719ecde6e9
update with html5 compliant code
2019-03-14 14:34:04 +01:00
Philippe GRAND
756bdfc6a8
update with html5 compliant code
2019-03-14 14:33:36 +01:00
Philippe GRAND
9ee27936f7
update with html5 compliant code
2019-03-14 14:33:00 +01:00
Philippe GRAND
ad9f75d3e9
update with html5 compliant code
2019-03-14 14:32:26 +01:00
Philippe GRAND
80858b39d9
update with html5 compliant code
2019-03-14 14:31:40 +01:00
Philippe GRAND
f71769e0e6
update with html5 compliant code
2019-03-14 14:31:08 +01:00
Philippe GRAND
f13d520830
update with html5 compliant code
2019-03-14 14:30:41 +01:00
Philippe GRAND
b4a9b3aa20
update with html5 compliant code
2019-03-14 14:30:08 +01:00
Philippe GRAND
5977cdad26
update with html5 compliant code
2019-03-14 14:29:16 +01:00
Laurent Destailleur
7f23a396a9
Merge pull request #10794 from aspangaro/10.0_AccountancyMenuV2
...
NEW: Accounting - More comprehensive menu
2019-03-14 14:29:01 +01:00
Philippe GRAND
6c4070eb87
update with html5 compliant code
2019-03-14 14:28:36 +01:00
Philippe GRAND
310670b3f6
update with html5 compliant code
2019-03-14 14:27:54 +01:00
Philippe GRAND
f082bd3e96
update with html5 compliant code
2019-03-14 14:27:16 +01:00
Philippe GRAND
af4edbba2b
update with html5 compliant code
2019-03-14 14:26:43 +01:00
Philippe GRAND
d21dbe915b
update with html5 compliant code
2019-03-14 14:26:08 +01:00
Philippe GRAND
6b878a2c64
update with html5 compliant code
2019-03-14 14:25:21 +01:00
Philippe GRAND
27b7ec8202
update with html5 compliant code
2019-03-14 14:24:17 +01:00
Philippe GRAND
d506cf7700
update with html5 compliant code
2019-03-14 14:21:54 +01:00
Philippe GRAND
68c6c0513d
update with html5 compliant code
2019-03-14 14:20:32 +01:00
Philippe GRAND
38822a9bb1
update with html5 compliant code
2019-03-14 14:18:44 +01:00
Philippe GRAND
6984cd25d8
update with html5 compliant code
2019-03-14 14:11:43 +01:00
Philippe GRAND
0832e9873c
update with html5 compliant code
2019-03-14 14:10:41 +01:00
Philippe GRAND
63b1a1459b
update with html5 compliant code
2019-03-14 14:09:54 +01:00
Laurent Destailleur
9f6610a421
Merge pull request #10831 from frederic34/patch-5
...
phpcs fix
2019-03-14 14:04:44 +01:00
Laurent Destailleur
f8a4d9075b
Fix css for fontawesome 5
2019-03-14 11:48:25 +01:00
Frédéric FRANCE
965f5861b3
Update commoninvoice.class.php
2019-03-14 09:10:26 +01:00
Frédéric FRANCE
d8599b52d9
Update html.formmail.class.php
2019-03-14 08:19:22 +01:00
Laurent Destailleur
7e31e6b4f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
fcbd39fda9
Fix typo
2019-03-13 19:07:19 +01:00
Laurent Destailleur
e7cd8d690c
Remove warnings
2019-03-13 19:06:45 +01:00
Laurent Destailleur
e0208cb3d6
Generation of PDF doc
2019-03-13 18:11:15 +01:00
Laurent Destailleur
1bd9d6a8e5
Fix font awesome 5 picto for notes
2019-03-13 15:02:43 +01:00
Laurent Destailleur
9da84f68c7
Bad language file for civility order
2019-03-13 14:23:27 +01:00
Laurent Destailleur
6ae36ce6a7
Work on BOM
2019-03-12 19:20:01 +01:00
Laurent Destailleur
fe6b682ec0
NEW Add visibility with value 4 in framework to define fields to show on
...
forms and list but not on creation forms.
2019-03-12 17:45:19 +01:00
Laurent Destailleur
7d82073eab
Use fontawesome for icon "setup".
2019-03-12 11:57:55 +01:00
Rafael Ingenleuf
f19574f27f
changed UserBankAccount fetch
2019-03-12 11:57:50 +01:00
Laurent Destailleur
da2aba96eb
Can setup tool to build html or pdf for module builder documentation
2019-03-12 11:51:20 +01:00
Laurent Destailleur
d762766a56
Font awesome 5 by default
2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle
2019-03-12 09:24:42 +01:00
Frédéric FRANCE
40a1562077
update doc
2019-03-12 09:09:26 +01:00
Laurent Destailleur
abdc2aa21a
Fix phpcs
2019-03-11 21:03:23 +01:00
Laurent Destailleur
e5f0c8e0e7
Look and feel
2019-03-11 20:54:25 +01:00
Laurent Destailleur
3559d600e2
Merge pull request #10770 from atm-john/theme_badge_status
...
Add badge status css part1
2019-03-11 20:49:31 +01:00
Laurent Destailleur
6daa262779
Files for variables of themes were renamed from graph-color.php into
...
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
2019-03-11 20:32:25 +01:00
Laurent Destailleur
c6a269e4c4
Fix select of menu entry
2019-03-11 19:53:27 +01:00
Laurent Destailleur
3cb5b6f49c
Merge pull request #10647 from atm-john/theme_top_menu
...
Factor css and allow use vars
2019-03-11 18:08:46 +01:00
Laurent Destailleur
540a1026f6
Merge pull request #10786 from frederic34/patch-4
...
update doc in commonobject class
2019-03-11 16:47:40 +01:00
Laurent Destailleur
7cede22b7b
Merge pull request #10790 from frederic34/don-html5
...
Don html5
2019-03-11 16:47:17 +01:00
markus
e1f9e845cc
remove empty line
2019-03-11 16:44:15 +01:00
markus
bdb03bd454
add class
2019-03-11 16:41:01 +01:00
John BOTELLA
57c6c60118
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-11 14:44:35 +01:00
John BOTELLA
5d7118340b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-11 14:40:19 +01:00
markus
63a3e3df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-11 12:38:49 +01:00
Laurent Destailleur
7e547f3f16
Fix type of parameter
2019-03-11 12:07:28 +01:00
Laurent Destailleur
fac329e637
Clean code
2019-03-11 01:01:15 +01:00
Alexandre SPANGARO
4de4f2ec6f
Correct language
2019-03-10 21:03:51 +01:00
Laurent Destailleur
935fe7c22a
Debug and enhance modulebuilder.
2019-03-10 19:33:28 +01:00
markus
d7ca08afb0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-10 15:26:35 +01:00
markus
47fce826fe
changes
2019-03-10 14:15:06 +01:00
markus
1737229eab
update hints
2019-03-10 13:59:32 +01:00
markus
47f15897aa
remove double line
2019-03-10 13:49:01 +01:00
markus
6a8d76ea39
honor MAIN_INVERT_SENDER_RECIPIENT
2019-03-10 13:44:50 +01:00
markus
6f05d6ea36
changes
2019-03-10 13:41:18 +01:00
markus
dcaed95bfe
changes
2019-03-10 13:31:51 +01:00
markus
6ef6248d58
use fk_user_author
2019-03-10 13:27:22 +01:00
markus
b4c8977a44
next step
2019-03-10 13:22:21 +01:00
markus
b302f569a9
make public
2019-03-10 13:14:17 +01:00
markus
5b0ed63f6d
use global $user
2019-03-10 13:11:43 +01:00
Frédéric FRANCE
b69f63e7d7
replace html by html5
2019-03-10 09:32:19 +01:00
Laurent Destailleur
d659543ac0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-09 19:00:57 +01:00
Laurent Destailleur
fa4467fb5f
FIX Tooltip on click was ko on smartphone
2019-03-09 18:37:07 +01:00
markus
1ac54853d9
improve
2019-03-09 18:34:57 +01:00
markus
a789cfe576
fix typo
2019-03-09 18:32:44 +01:00
markus
b8ec0b20b0
#3700 New Switch EXPENSEREPORT_INVERT_SENDER_RECIPIENT
2019-03-09 18:22:37 +01:00
Frédéric FRANCE
b47a54c652
update doc in commonobject class
2019-03-09 18:05:48 +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
c6d7987b57
FIX method db->active does not exists
2019-03-09 01:06:07 +01:00
Laurent Destailleur
73b359c124
Fix class visibility
2019-03-09 00:54:10 +01:00
Laurent Destailleur
e38427a41f
Fix var not initialized
2019-03-08 19:56:21 +01:00
Laurent Destailleur
fb5757a633
Merge pull request #10775 from frederic34/fourn-html5
...
replace html by html5 in fourn
2019-03-08 19:36:11 +01:00
Laurent Destailleur
86f4e81a6e
Merge pull request #10773 from frederic34/patch-2
...
Update stats.class.php
2019-03-08 19:33:40 +01:00
Laurent Destailleur
9c97b2af30
Merge pull request #10769 from altatof/expe
...
NEW : add product extrafields to shipping export
2019-03-08 19:33:09 +01:00
markus
e452a2e31d
add bank lib
2019-03-08 18:14:22 +01:00
markus
41c21b88c1
More output
2019-03-08 16:46:08 +01:00
markus
1bf99b81f1
Display more
2019-03-08 16:44:35 +01:00
Markus Welters
fac99ccd98
Merge pull request #2 from countiy/patch-1
...
expensereport changed IBAN
2019-03-08 16:37:04 +01:00
markus
c595dca5e7
fix typo
2019-03-08 16:35:11 +01:00
Rafael Ingenleuf
a505323fe7
expensereport changed IBAN
2019-03-08 16:27:08 +01:00
Rafael Ingenleuf
bcd3921561
expensereport layout changed and IBAN added
2019-03-08 15:36:09 +01:00
John BOTELLA
ccebb8d1a7
Fix travis errors
2019-03-08 14:40:22 +01:00
John BOTELLA
37cd62b564
Add user friendly behavior
2019-03-08 14:26:06 +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
Alexandre SPANGARO
5d06e53f1b
NEW: Accounting - More comprehensive menu
2019-03-08 09:11:56 +01:00
Laurent Destailleur
ebc2289292
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-07 20:53:16 +01:00
Laurent Destailleur
0798f7b719
NEW Can upload files from the edit page of expense report
2019-03-07 20:53:03 +01:00
Frédéric FRANCE
d96cc53f97
replace html by html5 in fourn
2019-03-07 20:46:38 +01:00
Frédéric FRANCE
1917adb980
Update stats.class.php
...
The property _lastfetchdate is declared private in Stats and cannot be accessed from this context.
2019-03-07 17:35:02 +01:00
Laurent Destailleur
4ecc1dac56
Merge pull request #10756 from altatof/fp2
...
NEW : add constant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
2019-03-07 17:29:10 +01:00
John BOTELLA
218690db00
add css behavior
2019-03-07 17:05:27 +01:00
John BOTELLA
a0b14b9105
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092
fix travis
2019-03-07 15:49:16 +01:00
John BOTELLA
97544e0aea
add new dolGetStatus to LibStatut in common invoice class
2019-03-07 15:24:11 +01:00
Christophe Battarel
d414e3eb48
add product extrafields
2019-03-07 15:00:48 +01:00
Laurent Destailleur
8d0a8d8263
Merge pull request #10758 from altatof/lf
...
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
2019-03-07 14:18:26 +01:00
Laurent Destailleur
975afd014d
Merge pull request #10763 from frederic34/patch-6
...
Update eldy.lib.php
2019-03-07 14:15:53 +01:00
Laurent Destailleur
ddc52b7199
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/exports/export.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2019-03-07 14:13:38 +01:00
Laurent Destailleur
02b8bc94e7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-07 14:06:31 +01:00
Laurent Destailleur
e96f84a3d6
Merge pull request #10765 from altatof/sd8
...
FIX : supplier discount was not retrieved when choosing a product
2019-03-07 13:26:44 +01:00
Laurent Destailleur
0349f9bfaa
Update objectline_create.tpl.php
2019-03-07 13:26:25 +01:00
Laurent Destailleur
3757fa83fd
Merge pull request #10760 from altatof/db
...
Avoid doing empty queries
2019-03-07 13:04:46 +01:00
Laurent Destailleur
daaa4ca0c2
Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed
...
PSR2.Classes.PropertyDeclaration.VarUsed
2019-03-07 12:49:13 +01:00
Laurent Destailleur
8ffab05f67
Merge pull request #10759 from altatof/ml
...
NEW : sort list of models alphabetically
2019-03-07 12:47:50 +01:00
Laurent Destailleur
b4bdbda9f5
Update mysqli.class.php
2019-03-07 12:36:57 +01:00
Laurent Destailleur
fc87090669
Merge pull request #10764 from frederic34/patch-7
...
New format type 5 for email
2019-03-07 12:33:24 +01:00
Laurent Destailleur
d6cf493880
Merge pull request #10768 from altatof/export
...
FIX avoid timeout for big export
2019-03-07 12:31:51 +01:00
Christophe Battarel
a6bb1cf5f6
avoid timeout
2019-03-07 11:27:06 +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
John BOTELLA
5ea5d51247
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-07 09:41:03 +01:00
John BOTELLA
89157234b7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-07 09:33:11 +01:00
Christophe Battarel
96b8da0d62
fix supllier discount
2019-03-06 22:04:01 +01:00
Frédéric FRANCE
d39b600ff4
Update CMailFile.class.php
2019-03-06 20:29:58 +01:00
Frédéric FRANCE
9e6a5a0b81
Update eldy.lib.php
2019-03-06 18:49:03 +01:00
Christophe Battarel
414bac6fb4
avoid logging empty query
2019-03-06 17:56:43 +01:00
Christophe Battarel
8f8fe0648e
fix bad copy paste
2019-03-06 17:24:50 +01:00
Christophe Battarel
4382a26c87
sort list of models alphabetically
2019-03-06 17:21:44 +01:00
Christophe Battarel
ceab55f26b
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
2019-03-06 17:07:51 +01:00
Frédéric FRANCE
c2070190f2
phpcs fix
2019-03-06 16:51:35 +01:00
Christophe Battarel
4e533b2a91
better constant test
2019-03-06 16:41:28 +01:00
Christophe Battarel
d3bb9d2cc2
add contant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
2019-03-06 16:37:02 +01:00
Laurent Destailleur
0c2a0c643b
NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__
2019-03-06 14:33:05 +01:00
Laurent Destailleur
d4409ffb08
Restore menu MRP on new eldy code
2019-03-06 14:18:58 +01:00
Laurent Destailleur
df180a7682
Merge pull request #10451 from wdammak/patch-25
...
Update eldy.lib.php
2019-03-06 13:59:16 +01:00
Laurent Destailleur
1ab3949e9c
Optimize js code
2019-03-06 13:01:01 +01:00
Lionel VESSILLER
bf5b482f3d
Fix replace TRUE and FALSE for php checkstyle and aliasing label instead of note in SQL request
2019-03-06 09:05:07 +01:00
Frédéric FRANCE
2745f98644
PSR2.Classes.PropertyDeclaration.VarUsed
2019-03-05 22:10:46 +01:00
Laurent Destailleur
cfd39a1483
Merge pull request #10742 from OPEN-DSI/fix-pdf-beluga-orientation
...
Fix authorize long references in Beluga PDF model (uses Landscape mode)
2019-03-05 18:45:02 +01:00
John BOTELLA
e382f13637
remove test
2019-03-05 17:16:38 +01:00
John BOTELLA
ef9ad4d109
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-05 17:14:59 +01:00
John BOTELLA
600f0c9fa6
Fix condition
2019-03-05 17:14:29 +01:00
John BOTELLA
72d96d2ac3
prepare badges
2019-03-05 17:13:20 +01:00
John BOTELLA
6b98eecd32
fix compatibility status
2019-03-05 16:58:05 +01:00
gauthier
598d1fc914
FIX : extrafields always visible on view mode
2019-03-05 16:53:36 +01:00
Laurent Destailleur
bbbffae72b
Fix phpcs
2019-03-05 16:27:19 +01:00
Laurent Destailleur
16e90ffae4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/langs/en_US/website.lang
2019-03-05 15:59:42 +01:00
Laurent Destailleur
d18a5853df
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
2019-03-05 15:57:31 +01:00
Laurent Destailleur
98f5bb2ed3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-05 15:55:08 +01:00
John BOTELLA
7a4540088a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-05 15:37:17 +01:00
John BOTELLA
95981ca14c
PR feedback
2019-03-05 15:26:19 +01:00
Lionel VESSILLER
9b797eb980
Fix sort by field in all events (action and emailing type) and fix multiple contacts in one event
2019-03-05 14:55:04 +01:00
Laurent Destailleur
7d37b4c46d
CSS
2019-03-05 13:04:54 +01:00
Laurent Destailleur
b851911708
Dolibarize module ticket
2019-03-05 12:18:46 +01:00
Lionel VESSILLER
ef10a32069
Fix authorize long references in Beluga PDF model (uses Landscape mode)
2019-03-05 11:18:44 +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
c95c8b4dcb
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/login/functions_dolibarr.php
2019-03-04 20:17:16 +01:00
Laurent Destailleur
54b9681257
More log to help debug
2019-03-04 20:15:31 +01:00
Laurent Destailleur
4a582485b9
Debug module ticket
2019-03-04 19:19:09 +01:00
Laurent Destailleur
0d49f27831
Code style
2019-03-04 17:36:45 +01:00
Laurent Destailleur
68bb95079a
Ignore 2 rules
2019-03-04 17:36:03 +01:00
Laurent Destailleur
69794f5293
Fix phpcs
2019-03-04 17:31:50 +01:00
Laurent Destailleur
99e79d1750
Fix regression with private property
2019-03-04 14:11:07 +01:00
Laurent Destailleur
ca9449c70e
Work on BOM
2019-03-04 14:01:30 +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
1c775b7b68
Work of BOM module
2019-03-04 12:46:07 +01:00
John BOTELLA
7cadaca8fc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-04 11:37:16 +01:00
John BOTELLA
74caaca827
fix travis errors
2019-03-04 11:15:01 +01:00
John BOTELLA
c420cab500
fix travis errors
2019-03-04 11:11:15 +01:00
Laurent Destailleur
15a6da1a8c
Fix alignement css
2019-03-03 17:03:09 +01:00
Laurent Destailleur
481d0de010
FIX Import of service was not available in update mode
2019-03-03 13:02:20 +01:00
Laurent Destailleur
1931f43ce7
Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into
...
MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE
2019-03-03 00:05:07 +01:00
Frédéric FRANCE
3037e4a157
Update DolibarrModules.class.php
2019-03-02 20:49:53 +01:00
Laurent Destailleur
e91a933635
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-02 19:13:48 +01:00
Laurent Destailleur
8fce6e5e31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/modAgenda.class.php
2019-03-02 19:07:14 +01:00
Laurent Destailleur
8f8aaf1e8c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-02 19:05:51 +01:00
Laurent Destailleur
a2eefab696
Merge pull request #10714 from ATM-Marc/FIX_7.0_export_actioncomm
...
FIX: actioncomm export: ORDER BY clause / event type filter
2019-03-02 18:44:34 +01:00
Laurent Destailleur
f7daa53a2c
Merge pull request #10724 from frederic34/patch-4
...
Update admin_extrafields_view.tpl.php
2019-03-02 18:42:28 +01:00
Laurent Destailleur
a5711a51ab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
e215bfdb66
Merge pull request #10721 from frederic34/bad-exclude-pattern
...
fix exclude from phpcs
2019-03-02 18:23:02 +01:00
Laurent Destailleur
4288a09101
Merge pull request #10723 from frederic34/swiftmailer-autoloader
...
autoloader for egulias lib needed by swiftmailer
2019-03-02 18:21:31 +01:00
Laurent Destailleur
03237d1730
NEW Look and feel v10 - Add CSS tabBarNoTop
2019-03-02 18:20:13 +01:00
Frédéric FRANCE
b5def5fd59
Update admin_extrafields_view.tpl.php
2019-03-02 18:11:47 +01:00
Frédéric FRANCE
8c23b41f9a
autoloader for egulias lib needed by swiftmailer
2019-03-02 14:32:52 +01:00
Laurent Destailleur
5f6ca1119a
Replace arrow picto with fontawesome
2019-03-02 14:07:13 +01:00
Frédéric FRANCE
65551864d5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-03-02 12:24:15 +01:00
Laurent Destailleur
359f2c6e81
NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE
...
Removed migration files
2019-03-02 12:16:37 +01:00
Frédéric FRANCE
d04716c018
wip
2019-03-02 10:16:13 +01:00
Frédéric FRANCE
40d34940f1
fix exclude from phpcs
2019-03-02 10:00:51 +01:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
c5c27fdb77
add visibility
2019-03-01 19:24:06 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility
2019-03-01 18:28:51 +01:00
John BOTELLA
421c009e58
Standardise new function name
2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-01 13:49:42 +01:00
John BOTELLA
b222c44bb9
Add helper functions and little review size of badges
2019-03-01 12:01:25 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Frédéric FRANCE
0022c4fe72
add visibility
2019-02-28 22:44:12 +01:00
Frédéric FRANCE
7e31ca48d8
add visibility
2019-02-28 22:07:48 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-28 20:48:23 +01:00
Frédéric FRANCE
92c5c15033
add visibility
2019-02-28 20:48:07 +01:00
Marc de Lima Lucio
b96ac794e9
FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work
2019-02-28 16:15:32 +01:00
Laurent Destailleur
429da47d68
Fix default language of reminders
2019-02-28 13:11:14 +01:00
Laurent Destailleur
9b58ca8227
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-28 11:28:20 +01:00
Laurent Destailleur
488004026f
Fix syntax error
2019-02-28 11:28:10 +01:00
Laurent Destailleur
cefaeb583f
Update xinputfile.modules.php
2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270
Update xinputfile.modules.php
2019-02-28 11:24:07 +01:00
Laurent Destailleur
7606c73fd5
Merge pull request #10704 from iouston/patch-1
...
NEW add hidden option MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT
2019-02-28 11:18:12 +01:00
Laurent Destailleur
c240c66789
Update html.formfile.class.php
2019-02-28 11:17:43 +01:00
Laurent Destailleur
4ca6b248c3
Merge pull request #10708 from wdammak/patch-33
...
phpcs simplification
2019-02-28 11:06:33 +01:00
Laurent Destailleur
c444521abc
IFTTT
2019-02-28 11:00:40 +01:00
Laurent Destailleur
b8b55fb748
WIP Add IFTTT module
2019-02-28 10:30:27 +01:00
Frédéric FRANCE
ba4ca5d7c2
add visibility
2019-02-28 00:15:32 +01:00
Frédéric FRANCE
cc1ee2d883
add visibility
2019-02-27 23:55:18 +01:00
wdammak
8e8c68345a
phpcs simplification
2019-02-27 21:41:55 +01:00
Frédéric FRANCE
9b165f6b3f
add visibility
2019-02-27 20:45:07 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 15:48:31 +01:00
Laurent Destailleur
3bffa69f1d
Remove deprecated code
2019-02-27 15:23:56 +01:00
gauthier
1237a6d3e9
FIX : same thing here
2019-02-27 14:58:10 +01:00
gauthier
49e03b009f
FIX : if empty error message, we just see "error" displayed
2019-02-27 14:50:01 +01:00
Laurent Destailleur
29cfa03fa4
Fix font awesome 5 regressions
2019-02-27 13:54:39 +01:00
Laurent Destailleur
836eff1233
Merge pull request #10698 from wdammak/patch-32
...
Add parent establishment
2019-02-27 13:34:50 +01:00
Laurent Destailleur
f2dc687202
Update html.formfile.class.php
2019-02-27 13:26:37 +01:00
iouston
d1716babef
disable the auto renaming on upload
...
add a global variable for disable the auto renaming on upload file
corresponds to the request of this post : https://www.dolibarr.fr/forum/12-howto--aide/55094-fichiers-joints-decocher-la-case-sauver-sous#107392
2019-02-27 11:17:33 +01:00
atm-quentin
e39f85ac4d
FIX js focusing
2019-02-27 09:23:39 +01:00
atm-quentin
72dc25552a
FIX better placement
2019-02-27 09:23:31 +01:00
atm-quentin
7f68750ec9
FIX blank space travis
2019-02-27 09:23:15 +01:00
atm-quentin
f51b89def3
NEW supplier buyprice barcode
2019-02-27 09:22:34 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 08:23:29 +01:00
wdammak
64bd995978
Fix camelCase syntax and remove disabling of phpcs
2019-02-27 04:02:11 +01:00
Laurent Destailleur
401f587868
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_project.php
2019-02-27 02:27:33 +01:00
Laurent Destailleur
cbaa57b1e2
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-27 02:25:42 +01:00
Laurent Destailleur
86e2ffe323
Merge pull request #10390 from glu000/8.0
...
Fix #10278
2019-02-27 02:24:55 +01:00
Laurent Destailleur
238894a7e4
Merge pull request #10624 from frederic34/patch-2
...
selectMulticurrency avoid malformed empty value
2019-02-27 02:06:24 +01:00
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2
2019-02-27 01:51:01 +01:00
bomuux
9c5a4e303c
SQL error in box_project.php
...
Corrected a bug : for an internal user with no rights to see all
projects, the project box on home cause an error in log.
Finally a lot of simplification because
Project::getProjectsAuthorizedForUser do most of the filtering.
Conflicts:
htdocs/core/boxes/box_project.php
2019-02-27 01:44:15 +01:00
Laurent Destailleur
64f81e8f65
Merge pull request #10628 from bomuux/patch-4
...
FIX: sql error in box_project.php
2019-02-27 01:38:03 +01:00
Laurent Destailleur
d6651f3998
Update box_project.php
2019-02-27 01:37:20 +01:00
Laurent Destailleur
014c199173
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2019-02-27 01:28:12 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin
2019-02-27 01:16:21 +01:00
Laurent Destailleur
94166c505b
Merge pull request #10690 from frederic34/patch-3
...
Update extrafields.class.php
2019-02-27 01:15:13 +01:00
Laurent Destailleur
49c4e5b694
Merge pull request #10700 from frederic34/patch-4
...
Update html.formticket.class.php
2019-02-27 01:14:34 +01:00
Laurent Destailleur
fb2b7a6c09
Merge pull request #10693 from atm-quentin/NEW_field_tasklist
...
add data elem on task list
2019-02-27 01:14:07 +01:00
Laurent Destailleur
58e2901d14
Fix phpcs
2019-02-27 00:54:07 +01:00
Frédéric FRANCE
d608921f1e
add visibility
2019-02-26 23:15:28 +01:00
Frédéric FRANCE
242bf0ba49
Update html.formticket.class.php
2019-02-26 22:56:50 +01:00
Frédéric FRANCE
8b4e920d5e
add visibility
2019-02-26 22:42:19 +01:00
Frédéric FRANCE
5016bc7188
wip
2019-02-26 21:48:21 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-26 21:16:01 +01:00
Frédéric FRANCE
e6c3eb0ba1
wip
2019-02-26 21:13:07 +01:00
Laurent Destailleur
9e82c37963
WIP Start module BOM
2019-02-26 19:27:04 +01:00
wdammak
99fb702833
Add Select Establishment
2019-02-26 18:42:05 +01:00
John BOTELLA
9f0a93f68f
Add color lib for color automation
2019-02-26 17:44:16 +01:00
Laurent Destailleur
3a2a1b4a56
Debug module ticket
2019-02-26 13:43:09 +01:00
Laurent Destailleur
5bcce53e40
Fix preselection when key is '0'
2019-02-26 12:20:22 +01:00
Laurent Destailleur
e0c7c32fae
Fix preselection when key is '0'
2019-02-26 11:44:44 +01:00
Laurent Destailleur
528bfca690
Fix preselection when key is '0'
2019-02-26 11:44:16 +01:00
atm-quentin
35762c0d4e
add data elem on task list
2019-02-26 11:25:40 +01:00
Frédéric FRANCE
675a17a74c
wip
2019-02-26 00:34:43 +01:00
Frédéric FRANCE
346d1f410c
wip
2019-02-25 23:15:48 +01:00
Frédéric FRANCE
915841eeb9
wip
2019-02-25 22:50:19 +01:00
Frédéric FRANCE
c89e4d79b8
wip
2019-02-25 22:27:04 +01:00
Frédéric FRANCE
1e6ed94c5e
Update extrafields.class.php
...
The property $errno was declared of type integer, but $this->db->lasterrno() is of type string
2019-02-25 21:39:45 +01:00
Frédéric FRANCE
1c07006015
wip
2019-02-25 21:36:27 +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
Cristian Torres
c781eeb17d
[FIX] ORDER BY before custom filters for where
...
When filtering data "and cac.libelle" would be appended after ORDER BY
2019-02-24 20:55:27 +01:00
Laurent Destailleur
dfd6a0feaa
Merge pull request #10643 from tony13tv/patch-3
...
[FIX] ORDER BY before custom filters for where
2019-02-24 20:55:01 +01:00
