Laurent Destailleur
aa2d581b41
Fix rename of alias
2021-01-26 13:38:41 +01:00
Laurent Destailleur
d7bf173f0d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/lib/functions.lib.php
test/phpunit/SecurityTest.php
2021-01-26 12:12:35 +01:00
Laurent Destailleur
977e4dde86
Fix regression
2021-01-26 12:08:54 +01:00
Laurent Destailleur
8db80ff44d
Fix reponsive
2021-01-26 11:19:13 +01:00
Alexandre SPANGARO
0ef02880eb
Fix: Fa-icon on movement
2021-01-26 08:54:21 +01:00
Laurent Destailleur
13378897a8
FIX Report by Ricardo Matias
...
Conflicts:
test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f
FIX Report by Ricardo Matias
2021-01-25 22:46:09 +01:00
Laurent Destailleur
c5cda97c19
FIX Generation of aliases (main alias and alt alias into subdirs)
2021-01-24 14:34:29 +01:00
Laurent Destailleur
005292054d
FIX Generation of aliases (main alias and alt alias into subdirs)
2021-01-24 14:31:29 +01:00
Laurent Destailleur
d9908efdef
Code comment
2021-01-24 13:29:38 +01:00
Laurent Destailleur
15b818da30
Code comment
2021-01-24 13:27:52 +01:00
Laurent Destailleur
8bd7ddee6b
Clean code
2021-01-23 13:55:56 +01:00
lmarcouiller
cfcd51f291
style errors update
2021-01-22 17:03:39 +01:00
lmarcouiller
7685dee5f6
style changes
2021-01-22 16:59:34 +01:00
lmarcouiller
5a95cc16aa
update clipboardcopypaste with jquery
2021-01-22 16:58:47 +01:00
lmarcouiller
76ce77f7ba
stickler-ci edit
2021-01-22 09:13:04 +01:00
lmarcouiller
64d08544b2
move of function showValueWithCopyPasteButton in function.lib.php
2021-01-22 09:09:46 +01:00
Laurent Destailleur
113ef1a02b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Gauthier PC portable 024
e2abbbcece
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-19 08:57:24 +01:00
Gauthier PC portable 024
2cfaf5fbd6
NEW : add real payments on vat objects
2021-01-18 17:08:17 +01:00
Laurent Destailleur
5a4ab3d00e
Fix look and feel v13
2021-01-18 12:07:40 +01:00
Laurent Destailleur
8b9287055e
Update functions.lib.php
2021-01-16 18:34:25 +01:00
Laurent Destailleur
de6f6c9b5d
Update functions.lib.php
2021-01-16 16:51:47 +01:00
zuiko
32b5aa7790
Update functions.lib.php
...
Fix #15820
function price2num
add underscore and - in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used.
I don't know if other characters have to be added to this pattern.
2021-01-16 16:51:27 +01:00
Laurent Destailleur
d00eb5b533
Merge pull request #15989 from zuiko/patch-3
...
Fix #15820 Bug: Unable to edit the pricing in Sales Order
2021-01-16 16:50:49 +01:00
Laurent Destailleur
e5c932d3f4
Update functions.lib.php
2021-01-16 16:50:34 +01:00
Laurent Destailleur
c7c74e8ed1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2021-01-15 19:53:46 +01:00
Laurent Destailleur
d36c406074
Code comment
2021-01-15 19:24:53 +01:00
Laurent Destailleur
80ed651c5e
Fix GETPOST
2021-01-15 19:23:56 +01:00
Laurent Destailleur
0e636031ba
Add option
...
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:07:00 +01:00
Laurent Destailleur
9350774808
Add option
...
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:06:22 +01:00
zuiko
dd9031432a
Update functions.lib.php
...
Fix #15820
function price2num
add underscore and - in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used.
I don't know if other characters have to be added to this pattern.
2021-01-15 10:29:31 +01:00
zuiko
fd5948f716
Update functions.lib.php
...
Fix #15820
Fix #15820
function price2num
add underscore in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
it seems that some constantes use also "-" so I added it in the pattern.
I don't know if other characters have to be added to this pattern.
2021-01-14 15:00:53 +01:00
zuiko
727751e0c1
Update functions.lib.php
...
Fix #15820
function price2num
add underscore in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
I don't know if other characters have to be added to this pattern.
2021-01-14 14:44:32 +01:00
Laurent Destailleur
aaddda9a6e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/accountancy/class/accountancyexport.class.php
htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
015c5a028b
Doxygen
2021-01-13 12:45:23 +01:00
Laurent Destailleur
958b255822
Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param.
2021-01-12 21:06:02 +01:00
Marc de Lima Lucio
82b0f18378
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-12 15:10:15 +01:00
Laurent Destailleur
f6de607889
Fix warning
2021-01-11 16:07:02 +01:00
Laurent Destailleur
9a5ae77615
Merge pull request #15926 from FHenry/develop
...
fix : remove php warning on install pages
2021-01-11 16:04:04 +01:00
Laurent Destailleur
ed00f6bfb9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:46:50 +01:00
Laurent Destailleur
f9f84f84ba
Fix rounding of foreign amount
2021-01-11 13:46:23 +01:00
Laurent Destailleur
5bd59cd6d1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c
Fix rounding of currency unit prices
2021-01-11 13:36:53 +01:00
Florian HENRY
c7cddb19be
fix stickler
2021-01-10 11:58:22 +01:00
Florian HENRY
7c08e3330c
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-01-07 17:54:49 +01:00
Florian HENRY
04d8a679a7
fix warning message on install
2021-01-07 17:51:45 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product
...
NEW: preload product description on selection for customer propal/order/invoice
2021-01-07 11:19:53 +01:00
Laurent Destailleur
07ca12b26d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 20:48:23 +01:00
Laurent Destailleur
123bd81721
Trim no more required
2021-01-06 20:42:18 +01:00
Laurent Destailleur
ef8021467b
FIX #15892 #15017
2021-01-06 20:41:40 +01:00
Regis Houssin
f80a476bc5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-06 11:37:56 +01:00
ATM john
92a4314779
Fix security mecanism generating data loss
2021-01-06 10:45:54 +01:00
Laurent Destailleur
ba68c958e1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 19:12:57 +01:00
Marc de Lima Lucio
f03f5701f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-05 16:01:31 +01:00
Laurent Destailleur
4b45c5e723
Trans
2021-01-05 12:29:13 +01:00
Laurent Destailleur
ed25b252b9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 11:30:14 +01:00
Regis Houssin
ec6c14beb8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-05 09:41:52 +01:00
Laurent Destailleur
4d09d3a576
Merge pull request #15860 from fappels/13_debug_shipments
...
Some debug on Shipments and reception.
2021-01-04 14:06:52 +01:00
Laurent Destailleur
ef76c067e0
Add limit to 25000
2021-01-04 13:37:21 +01:00
Laurent Destailleur
8baa4c67ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-04 12:34:09 +01:00
Laurent Destailleur
5c104e344c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/ticket/list.php
2021-01-04 12:17:59 +01:00
Laurent Destailleur
bb22f2ccaf
Update admin.lib.php
2021-01-04 12:02:41 +01:00
Laurent Destailleur
b0738643fb
FIX Solve problem with TZ
2021-01-03 18:42:45 +01:00
Maxime Kohlhaas
e190b010d3
Fix dict contact type element list
2021-01-03 16:05:04 +01:00
Laurent Destailleur
645b7694c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/db/DoliDB.class.php
2021-01-03 15:26:31 +01:00
Florian HENRY
dfaf77b03f
merge develop
2021-01-03 15:14:34 +01:00
Francis Appels
ade0e008e9
Some debug on Shipments.
...
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
2021-01-02 17:42:33 +01:00
Regis Houssin
3b7f5a92cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-02 17:20:24 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe
Debug v13
2021-01-02 16:18:16 +01:00
Regis Houssin
e36ae4ac90
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-02 13:14:30 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
...
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1
2021-01-01 20:52:43 +01:00
stickler-ci
327ec211c4
Fixing style errors.
2020-12-31 09:49:27 +00:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Regis Houssin
7c5248d105
FIX and the world turn again
2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc
FIX again and again
2020-12-29 17:48:52 +01:00
Laurent Destailleur
cefd66c18f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-29 16:56:39 +01:00
Laurent Destailleur
af41c06822
Fix warnings
2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f
Fix phpunits
2020-12-29 03:48:11 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
Laurent Destailleur
4b3cd947f2
Fix name of function
2020-12-28 12:33:00 +01:00
Laurent Destailleur
cec96b33ae
Fix warning
2020-12-28 12:30:59 +01:00
Laurent Destailleur
7178918cb4
Merge pull request #15476 from StephaneLesage/fix-edit-category
...
Fix edition of tag/category which used type parameter instead of object's type
2020-12-27 15:08:50 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10
...
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
Florian HENRY
1b6a4fc4ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
2020-12-24 15:00:15 +01:00
Florian HENRY
79fe5ee34c
actioncomm ok
2020-12-24 14:35:40 +01:00
Laurent Destailleur
3586da75a2
Fix warning
2020-12-24 02:52:49 +01:00
Laurent Destailleur
02daf09928
Fix for php8
2020-12-23 23:06:34 +01:00
Laurent Destailleur
1c73d38093
Fix api to download for shipments
2020-12-23 19:16:15 +01:00
Laurent Destailleur
bf606ede12
Enhance remote ip detection
2020-12-23 13:27:30 +01:00
Laurent Destailleur
dfb632f2d5
Fix phpunit
2020-12-21 17:56:31 +01:00
Laurent Destailleur
14223d74bd
Fix css
2020-12-21 15:00:29 +01:00
Laurent Destailleur
0a1387e673
Debug v13
2020-12-20 18:41:54 +01:00
Laurent Destailleur
361f13154b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/fourn/card.php
htdocs/margin/tabs/thirdpartyMargins.php
htdocs/societe/card.php
htdocs/societe/note.php
htdocs/societe/notify/card.php
htdocs/societe/societecontact.php
htdocs/ticket/list.php
2020-12-20 14:31:54 +01:00
Laurent Destailleur
8c87050703
FIX Check of customer/vendor code fails in some cases
2020-12-20 13:54:02 +01:00
Laurent Destailleur
ef4a816c56
CSS
2020-12-19 15:56:21 +01:00
Laurent Destailleur
b6bb08ec2e
Fix management of hreflang
2020-12-19 13:44:15 +01:00
Laurent Destailleur
0eaf924d3b
Add warning on non https website to axplain why features is broken
2020-12-18 15:08:00 +01:00
Laurent Destailleur
832db82fce
Fix warnings
2020-12-18 14:40:45 +01:00
Laurent Destailleur
075181a8d5
Look and feel v13
2020-12-17 12:25:50 +01:00
Laurent Destailleur
d0cc93c608
Fix look and feel v13
2020-12-17 12:09:12 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Laurent Destailleur
36e0f07090
Remove warning
2020-12-17 08:52:39 +01:00
Laurent Destailleur
82710e54a8
Fix get custom odt templates
2020-12-16 18:10:40 +01:00
Laurent Destailleur
2c7d872320
Fix warning
2020-12-16 11:07:34 +01:00
Laurent Destailleur
834058a816
Debug api to create a document
2020-12-16 02:33:21 +01:00
StephaneLesage
49225f3f57
Fix /categories/info.php navigation
2020-12-15 20:17:37 +01:00
Laurent Destailleur
a2bd920371
Fix translation of units
2020-12-15 11:39:18 +01:00
Laurent Destailleur
55deccf364
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-14 23:20:21 +01:00
Laurent Destailleur
5f9b53004b
Fix warning
2020-12-14 17:40:40 +01:00
Laurent Destailleur
e612f53494
Fix warning
2020-12-14 13:01:25 +01:00
Laurent Destailleur
b0e3f1678f
Debug v13
2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b
Fix code
2020-12-14 10:44:51 +01:00
Laurent Destailleur
acb73966f7
Clean code. Removed phpexcel library.
2020-12-13 16:27:44 +01:00
Laurent Destailleur
427fb16256
Fix warning
2020-12-13 13:29:47 +01:00
Laurent Destailleur
16ae3b83f9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-13 13:02:59 +01:00
Laurent Destailleur
8a0d3e3f6f
Fix warning
2020-12-13 12:38:47 +01:00
Frédéric FRANCE
6c3a9cbc40
clean
2020-12-12 21:27:56 +01:00
Laurent Destailleur
75570cc984
Merge pull request #15743 from frederic34/mycompanysocialnetworks
...
Mycompany social networks separate tab
2020-12-12 19:21:29 +01:00
Laurent Destailleur
d19cdae980
Merge pull request #15727 from frederic34/patch-8
...
add option hide topmenu in Config/Display
2020-12-12 18:48:11 +01:00
Frédéric FRANCE
621f246d58
my company social networks in a separate tab
2020-12-12 18:26:54 +01:00
Frédéric FRANCE
643b507a96
ucfirst
2020-12-12 17:31:10 +01:00
Frédéric FRANCE
46bf871127
target
2020-12-12 17:23:42 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links
2020-12-12 17:00:23 +01:00
Laurent Destailleur
7fdae69546
Fix warning
2020-12-12 14:11:50 +01:00
Laurent Destailleur
0968c68cf9
Enhance widget
2020-12-12 12:45:43 +01:00
Frédéric FRANCE
0b3a5dc796
fix style
2020-12-11 18:09:37 +01:00
Laurent Destailleur
8a0c065163
Debug v13
2020-12-11 16:30:45 +01:00
Laurent Destailleur
1f6f434a9c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export_files.php
test/phpunit/SecurityTest.php
2020-12-11 15:56:19 +01:00
Laurent Destailleur
4fcd3fe493
Fix disallow -- string into filename for security purpose. Vulnerability
...
reported by Yılmaz Değirmenci
2020-12-11 15:12:42 +01:00
Laurent Destailleur
df4d2e1b24
Fix path of user photo
2020-12-10 18:13:30 +01:00
Laurent Destailleur
2c37fe13d6
Fix substitution var keys
2020-12-10 12:14:58 +01:00
Laurent Destailleur
155fa43dc6
Fix substitution var __AMOUNT_TEXT__
2020-12-10 12:01:22 +01:00
Laurent Destailleur
10a0c98f94
Debug v13
2020-12-09 19:26:41 +01:00
Laurent Destailleur
a0d9d98402
Fix phpcs
2020-12-09 18:03:02 +01:00
Laurent Destailleur
70b772cf74
Kit must show details on PDF.
2020-12-08 21:56:48 +01:00
Laurent Destailleur
c26efd756f
FIX #15704 #15565 #15694
2020-12-08 20:53:42 +01:00
Laurent Destailleur
0234df6224
Merge pull request #15705 from StephaneLesage/fix-boxes-thirdparty
...
Fix boxes third-parties information
2020-12-08 17:58:09 +01:00
Laurent Destailleur
240648d540
css
2020-12-08 17:09:48 +01:00
Stephane Lesage
376e4d150a
Third-party details in comm action lists
2020-12-08 15:56:42 +01:00
Stephane Lesage
5d8dfadd09
Third-party details in Lists in project index
2020-12-08 15:47:22 +01:00
Laurent Destailleur
64e2ddbd80
Merge pull request #15666 from Zebedeu/develop
...
New #8472 personal and professional titles added
2020-12-07 22:40:01 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template
...
typo ortho
2020-12-07 22:35:45 +01:00
Laurent Destailleur
3fb63e6a4b
Look and feel v13
2020-12-07 15:51:22 +01:00
Laurent Destailleur
e0d656e0c8
Fix phpcs
2020-12-06 18:01:23 +01:00
Laurent Destailleur
a87ef49172
Fix remove warning
2020-12-06 17:59:49 +01:00
Laurent Destailleur
de61a7cfd3
Fix cleaning html tags with trans and with GETPOST.
2020-12-06 17:30:27 +01:00
Zebedeu
dadb257c85
Fix #15675 fixed the error of installation start of version 13.0.0-beta
...
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:58:46 +01:00
Zebedeu
50b80785f5
Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 35ea990cff
2020-12-06 07:56:18 +01:00
Zebedeu
35ea990cff
Fix #15675 fixed the error of installation start of version 13.0.0-beta
...
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:49:22 +01:00
Zebedeu
e38c6e4322
Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 3b7e510e61
2020-12-06 07:42:45 +01:00
Zebedeu
3b7e510e61
Fix #15675 fixed the error of installation start of version 13.0.0-beta
...
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:31:54 +01:00
Zebedeu
2a4fe639ae
Revert "fix | fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 8697fda78b
2020-12-06 07:28:18 +01:00
Zebedeu
8697fda78b
fix | fixed the error of installation start of version 13.0.0-beta
...
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:22:06 +01:00
Zebedeu
f708065445
Revert "Fix | fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 1a1850c6f1
2020-12-06 07:14:11 +01:00
Zebedeu
1a1850c6f1
Fix | fixed the error of installation start of version 13.0.0-beta
2020-12-05 20:28:55 +01:00
Zebedeu
1917d9b508
Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
...
This reverts commit 7a8d031d56
2020-12-05 20:23:31 +01:00
Zebedeu
7a8d031d56
Fix #15675 fixed the error of installation start of version 13.0.0-beta
2020-12-05 20:17:57 +01:00
Laurent Destailleur
6c2d520e21
FIX caluclation of open days must not depends on TZ.
2020-12-05 17:41:05 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho
2020-12-05 15:35:52 +01:00
Laurent Destailleur
cb9d6318e7
Fix warning
2020-12-05 14:09:51 +01:00
Laurent Destailleur
5860bf69ce
fix warning
2020-12-05 13:48:51 +01:00
Laurent Destailleur
3b55eb1d82
FIX master must be after session_start but dol_getprefix must be before
...
and after filefunc.inc.php.
2020-12-05 13:26:58 +01:00
Laurent Destailleur
bb0c33a49e
Merge pull request #15654 from frederic34/commonkanban
...
keep common if wanted
2020-12-04 22:25:51 +01:00
Laurent Destailleur
0536ed87a2
Avoid to process too large user agent
2020-12-04 21:38:33 +01:00
Frédéric FRANCE
a2eab824c1
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-12-04 20:42:22 +01:00
stickler-ci
d89970ddd1
Fixing style errors.
2020-12-04 19:31:53 +00:00
Frédéric FRANCE
c8407b2f91
keep common if wanted
2020-12-04 20:28:05 +01:00
Laurent Destailleur
10bef6eb03
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/opensurvey/class/opensurveysondage.class.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
atm-lena
d22646e6ae
pricetonum() - preg-replace() delete "-" negativ number
2020-12-04 16:06:10 +01:00
Laurent Destailleur
f06d920460
FIX #15583
2020-12-03 16:22:03 +01:00
Laurent Destailleur
5bd6d6f388
Look and feel v13
2020-12-03 14:34:15 +01:00
Laurent Destailleur
1ec3d4cfdf
CSS
2020-12-03 13:19:35 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
99e4aab46e
CSS
2020-11-30 20:31:22 +01:00
Frédéric FRANCE
765df41918
introduce GETPOSTINT
2020-11-30 15:44:29 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
6af9c9f857
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-11-30 07:50:26 +01:00
Laurent Destailleur
b6ccfaf180
css
2020-11-30 07:50:14 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
58eaef37d2
Fix regression
2020-11-29 21:29:22 +01:00
Laurent Destailleur
d3a2aa664f
FIX #15572
2020-11-29 20:27:40 +01:00
Laurent Destailleur
404634919d
Look and feel v13
2020-11-29 15:47:08 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
41984f9934
Clean code
2020-11-28 14:00:35 +01:00
Laurent Destailleur
b1603ed1f5
Fix warning
2020-11-28 12:12:31 +01:00
Laurent Destailleur
7c4599a5c5
Look and feel v13
2020-11-28 01:15:23 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Frédéric FRANCE
1704de39bb
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-27 11:18:04 +01:00
Laurent Destailleur
47a5037155
Fix dolGetFirstLastname() for 4 and 5
2020-11-27 01:18:01 +01:00
Laurent Destailleur
2cf005d22c
Removed warning
2020-11-27 00:39:49 +01:00
Laurent Destailleur
b3b511a6d4
FIX #15546
2020-11-26 22:44:11 +01:00
Laurent Destailleur
e1a6e8f2fc
CSS
...
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
c7e5b0dcc1
Fix warning
2020-11-26 10:12:24 +01:00
Laurent Destailleur
e272130a6a
Fix phpcs
2020-11-26 08:40:08 +01:00
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-25 12:59:32 +01:00
Frédéric FRANCE
66ad0e5b13
add note on ecm files
2020-11-24 18:54:59 +01:00
Laurent Destailleur
47ca74965b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-24 12:26:50 +01:00
Laurent Destailleur
d2f8b65dbf
Prepare use of session in db
2020-11-24 12:26:32 +01:00
Laurent Destailleur
817de18a5d
Fix remove log
2020-11-24 12:25:32 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
53208e620e
Use of . as thousand separator. Can use it for decimal if not 3 digits.
2020-11-24 10:56:05 +01:00
Laurent Destailleur
1e70790cd6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/price.php
2020-11-23 19:55:13 +01:00
Laurent Destailleur
c5278197fb
More phpunit test for price2num
2020-11-23 19:45:11 +01:00
Laurent Destailleur
9b4b11b4bd
Fix var not defined
2020-11-22 14:49:30 +01:00
Laurent Destailleur
e5e320fd90
Fix null
2020-11-22 01:26:58 +01:00
Laurent Destailleur
97e36502f0
Fix warning
2020-11-21 23:37:42 +01:00
Laurent Destailleur
73a3a03398
Fix for smartphone
2020-11-21 23:36:20 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
bf94ce6aad
Fix warnings
2020-11-21 16:49:54 +01:00
Laurent Destailleur
95b79094df
Fix warning.
...
Module cron is more clear.
2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909
Fix setup of scheduled jobs
2020-11-21 14:14:53 +01:00
Laurent Destailleur
aa7383f3d4
Fix warning
2020-11-19 18:15:40 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
0760a268f6
Fix warning
2020-11-18 22:25:03 +01:00
Laurent Destailleur
95460e6372
Merge pull request #15422 from frederic34/patch-10
...
add optional tag which list all other tags in odt substitutions
2020-11-18 12:44:25 +01:00
Laurent Destailleur
2529448f1b
Fix path to files
2020-11-18 12:37:18 +01:00
Laurent Destailleur
3e4c6b9222
Fix warning
2020-11-17 13:13:11 +01:00
Frédéric FRANCE
3b1f50d5fc
Update functions.lib.php
2020-11-17 11:58:11 +01:00
Frédéric FRANCE
fb5385180f
Update functions.lib.php
2020-11-17 11:54:18 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
Laurent Destailleur
ca02ac9e45
Remove warning for php8
2020-11-16 13:00:18 +01:00
Laurent Destailleur
b3e03c6991
Fix css for public pages
2020-11-14 18:11:46 +01:00
Laurent Destailleur
6d4d3c618d
FIX #15369 and standardize permission "readall"
2020-11-13 09:55:53 +01:00
Laurent Destailleur
767f07d02e
Debug function to show list of files in ECM module
2020-11-11 22:47:06 +01:00
Laurent Destailleur
64428f34a0
Fix error message
2020-11-11 05:04:15 +01:00
Laurent Destailleur
617da2ec5f
Fix error message
2020-11-11 04:55:44 +01:00
jcp
50d530733e
NEW: ICS fields moved into bank account table
2020-11-09 14:08:34 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
129c53342a
Fix warning
2020-11-07 20:01:28 +01:00
Laurent Destailleur
d8eb9f8096
Merge pull request #15259 from frederic34/show_ticket_messaging
...
optimize show_ticket_messaging
2020-11-07 19:07:44 +01:00
Laurent Destailleur
b386faebd8
Add noopenenr on links to dolibarr website
2020-11-07 12:49:38 +01:00
Laurent Destailleur
62ba731823
Fix the follow/nofollow was not propagated
2020-11-07 12:47:42 +01:00
Laurent Destailleur
4535d81964
Fix CSS for holiday. Fix #15266
2020-11-05 19:09:58 +01:00
Laurent Destailleur
38f1431534
HOLIDAY_HIDE_FOR_NON_SALARIES replaces !HOLIDAY_FOR_NON_SALARIES_TOO
2020-11-05 19:01:00 +01:00
Laurent Destailleur
a313c35f5b
Fix php8
2020-11-05 11:29:23 +01:00
Laurent Destailleur
9e509a805a
Merge pull request #15289 from frederic34/patch-16
...
can't input two lines address
2020-11-04 18:55:08 +01:00
Laurent Destailleur
32ed5cc07f
Merge pull request #15286 from frederic34/patch-15
...
The function each() has been deprecated: 7.2
2020-11-04 18:36:49 +01:00
Laurent Destailleur
7294a47ef5
Fix generation of user from member, contact, applications for job
2020-11-04 13:33:52 +01:00
Frédéric FRANCE
7c7a1b5512
Update functions.lib.php
2020-11-04 09:45:02 +01:00
Frédéric FRANCE
7caac9ebe7
The function each() has been deprecated: 7.2
2020-11-03 21:35:23 +01:00
Laurent Destailleur
b0e2d40533
Debug and fix v13
2020-11-03 14:19:54 +01:00
Frédéric FRANCE
d84be819da
Merge remote-tracking branch 'upstream/develop' into show_ticket_messaging
2020-11-02 12:50:42 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Frédéric FRANCE
1b992a725f
use assignment
2020-11-02 11:30:07 +01:00
Frédéric FRANCE
3cd11c4e8b
optimize show_ticket_messaging
2020-11-02 00:26:26 +01:00
Laurent Destailleur
41965381fd
Better compatibility with PHP8
2020-11-01 21:27:56 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Laurent Destailleur
e5a5f37b3f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/bills.lang
2020-10-31 15:09:26 +01:00
Laurent Destailleur
41b938047d
Fix doc
2020-10-31 14:51:32 +01:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate
...
# New multi-currency exchange rate editor
2020-10-31 13:55:42 +01:00
Laurent Destailleur
9113ecedfa
code comment
2020-10-31 12:55:26 +01:00
Laurent Destailleur
623cb54480
Prepare a more complete fix for #15016
2020-10-31 12:30:47 +01:00
Laurent Destailleur
a4d2927f82
Fix for #15016
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-10-31 12:18:54 +01:00
Laurent Destailleur
fcb3245295
Fix for #15016
2020-10-31 12:11:41 +01:00
Laurent Destailleur
0a9c7fc577
Look and feel v13
2020-10-31 04:19:22 +01:00
Laurent Destailleur
d4daf8b9ce
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security2.lib.php
2020-10-30 05:59:45 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
Laurent Destailleur
b3333da5c1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/main.inc.php
2020-10-30 04:39:41 +01:00
Laurent Destailleur
1a02504792
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/security2.lib.php
2020-10-30 04:26:09 +01:00
Laurent Destailleur
f51b02026c
Fix regression
2020-10-30 04:24:06 +01:00
Laurent Destailleur
ec0c8e0c79
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/tpl/advtarget.tpl.php
2020-10-30 03:35:40 +01:00
Laurent Destailleur
f22017080d
Fix for php8
2020-10-30 03:25:33 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Florian HENRY
4b7707cc7c
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 17:17:52 +01:00
Laurent Destailleur
4cf32824bf
Merge pull request #15187 from frederic34/patch-6
...
Make MAIN_ALL_TO_UPPER utf8 compliant
2020-10-28 17:17:18 +01:00
Laurent Destailleur
77dfda1a2d
Merge pull request #15194 from ptibogxiv/patch-391
...
FIX display variants card
2020-10-28 17:10:34 +01:00
Laurent Destailleur
e3f848238d
Merge pull request #15195 from frederic34/cachecompanylib
...
add cache
2020-10-28 17:09:27 +01:00
Marc de Lima Lucio
ca2ed2ef74
NEW: ref in product customer price: look for products with customer ref
2020-10-28 11:04:15 +01:00
Florian HENRY
a3073be8e4
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 08:52:29 +01:00
Frédéric FRANCE
0d65ab0c96
add cache
2020-10-28 00:34:59 +01:00
ptibogxiv
6fd996381e
FIX display variant card
2020-10-27 23:07:05 +01:00
Frédéric FRANCE
7a7a6f8018
fix phpcs
2020-10-27 21:28:26 +01:00
Frédéric FRANCE
991273bd10
Update functions.lib.php
2020-10-27 20:44:17 +01:00
Frédéric FRANCE
7d30a11a26
Update functions.lib.php
2020-10-27 20:06:49 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Laurent Destailleur
7d291d075e
Merge pull request #15184 from frederic34/formcolor
...
formcolor parameter is deprecated
2020-10-27 19:03:29 +01:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
...
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36
Fix scrutinizer
2020-10-27 18:55:55 +01:00
Frédéric FRANCE
900452a47d
formcolor parameter is deprecated
2020-10-27 18:46:42 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c
More secured getURLContent method. Add PHPUnit on getURLContent
2020-10-27 18:02:05 +01:00
Laurent Destailleur
d750dc48a1
More secured getURLContent method. Add PHPUnit on getURLContent
2020-10-27 15:06:16 +01:00
Laurent Destailleur
4adaf67d47
Hide setup we don't need if email are disabled globally
...
CSS
2020-10-27 11:40:30 +01:00
Laurent Destailleur
d2a2d74f7e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/langs/am_ET/mrp.lang
htdocs/langs/ar_SA/mrp.lang
htdocs/langs/az_AZ/mrp.lang
htdocs/langs/bg_BG/mrp.lang
htdocs/langs/bn_BD/mrp.lang
htdocs/langs/bn_IN/mrp.lang
htdocs/langs/bs_BA/mrp.lang
htdocs/langs/ca_ES/mrp.lang
htdocs/langs/cs_CZ/mrp.lang
htdocs/langs/da_DK/mrp.lang
htdocs/langs/de_DE/mrp.lang
htdocs/langs/el_GR/mrp.lang
htdocs/langs/en_US/mrp.lang
htdocs/langs/es_ES/mrp.lang
htdocs/langs/et_EE/mrp.lang
htdocs/langs/eu_ES/mrp.lang
htdocs/langs/fa_IR/mrp.lang
htdocs/langs/fi_FI/mrp.lang
htdocs/langs/fr_FR/mrp.lang
htdocs/langs/gl_ES/mrp.lang
htdocs/langs/he_IL/mrp.lang
htdocs/langs/hi_IN/mrp.lang
htdocs/langs/hr_HR/mrp.lang
htdocs/langs/hu_HU/mrp.lang
htdocs/langs/id_ID/mrp.lang
htdocs/langs/is_IS/mrp.lang
htdocs/langs/it_IT/mrp.lang
htdocs/langs/ja_JP/mrp.lang
htdocs/langs/ka_GE/mrp.lang
htdocs/langs/km_KH/mrp.lang
htdocs/langs/kn_IN/mrp.lang
htdocs/langs/ko_KR/mrp.lang
htdocs/langs/lo_LA/mrp.lang
htdocs/langs/lt_LT/mrp.lang
htdocs/langs/lv_LV/mrp.lang
htdocs/langs/mk_MK/mrp.lang
htdocs/langs/mn_MN/mrp.lang
htdocs/langs/nb_NO/mrp.lang
htdocs/langs/ne_NP/mrp.lang
htdocs/langs/nl_NL/mrp.lang
htdocs/langs/pl_PL/mrp.lang
htdocs/langs/pt_PT/mrp.lang
htdocs/langs/ro_RO/mrp.lang
htdocs/langs/ru_RU/mrp.lang
htdocs/langs/sk_SK/mrp.lang
htdocs/langs/sl_SI/mrp.lang
htdocs/langs/sq_AL/mrp.lang
htdocs/langs/sr_RS/mrp.lang
htdocs/langs/sv_SE/mrp.lang
htdocs/langs/sw_SW/mrp.lang
htdocs/langs/th_TH/mrp.lang
htdocs/langs/tr_TR/mrp.lang
htdocs/langs/uk_UA/mrp.lang
htdocs/langs/uz_UZ/mrp.lang
htdocs/langs/vi_VN/mrp.lang
htdocs/langs/zh_CN/mrp.lang
htdocs/langs/zh_HK/mrp.lang
htdocs/langs/zh_TW/mrp.lang
htdocs/mrp/class/mo.class.php
htdocs/mrp/mo_agenda.php
htdocs/mrp/mo_card.php
htdocs/mrp/mo_document.php
htdocs/mrp/mo_movements.php
htdocs/mrp/mo_note.php
htdocs/mrp/mo_production.php
2020-10-27 02:55:22 +01:00
Laurent Destailleur
313273f462
Doc
2020-10-27 02:19:43 +01:00
Alfredo Altamirano
214cd2c99b
Update references of MO translation string
2020-10-26 15:44:26 -06:00
Frédéric FRANCE
4a0dd3b4bc
add small photo in picto link
2020-10-26 22:05:40 +01:00
Laurent Destailleur
a8fccc67ba
Merge pull request #15148 from frederic34/patch-6
...
doxygen
2020-10-26 19:28:11 +01:00
Florian HENRY
9aa3368627
syntax
2020-10-26 16:33:13 +01:00
Florian HENRY
76824c868b
clean get price for fourn and labal for supplier coducment
2020-10-26 16:31:07 +01:00
stickler-ci
541dab5737
Fixing style errors.
2020-10-26 13:40:05 +00:00
Marc de Lima Lucio
bb850ad0d0
NEW: ref in product customer price: add ref in PDFs + hidden conf to choose refs to show
2020-10-26 13:05:07 +01:00
Laurent Destailleur
6c1f60f6c0
Fix regression
2020-10-25 17:19:15 +01:00
Laurent Destailleur
8578a7cd7c
Fix regressions
2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Frédéric FRANCE
1f4bd8476b
doxygen
2020-10-25 15:42:15 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
cc17f08409
Merge pull request #15131 from frederic34/patch-13
...
doxygen
2020-10-25 14:45:24 +01:00
Laurent Destailleur
180d01e76e
Merge pull request #15132 from frederic34/patch-14
...
doxygen
2020-10-25 14:34:04 +01:00
Frédéric FRANCE
000fa91235
fix variable
2020-10-24 13:39:59 +02:00
Frédéric FRANCE
adf1cd1fb7
doxygen
2020-10-24 09:42:52 +02:00
Frédéric FRANCE
e476678a54
doxygen
2020-10-24 09:32:39 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
jpb
63c82b47fe
Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate
2020-10-23 12:27:14 +02:00
jpb
1ecff0a608
add list and crud
2020-10-23 11:58:25 +02:00
Frédéric FRANCE
82c3f63c5c
replace deprecated
2020-10-22 22:54:29 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Laurent Destailleur
9699bdc0fa
Fix phpcs
2020-10-22 21:31:34 +02:00
Laurent Destailleur
8074d2cc1d
NEW Add validation of MX domain for emails
2020-10-22 20:01:59 +02:00
Laurent Destailleur
fb7202b7f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/product/composition/card.php
2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2020-10-22 17:34:48 +02:00
Laurent Destailleur
31f1ab73b1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-10-22 17:31:29 +02:00
Laurent Destailleur
c09e71962e
Merge pull request #15060 from grandoc/new_branch_19_10_2020
...
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/…
2020-10-22 16:11:47 +02:00
Laurent Destailleur
763d0baa14
Merge pull request #15066 from louiscarrese/develop
...
CLOSE #15065 Put the product label in bold in the PDF templates if co…
2020-10-22 15:53:43 +02:00
Laurent Destailleur
2a31d43938
FIX Show errors in session on login page
2020-10-20 18:41:26 +02:00
Florian Mortgat
529dfb8dfb
FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched
2020-10-20 16:37:15 +02:00
Louis Carrese
693e345cab
CLOSE #15065 Fix formatting
...
Had spaces instead of tabs...
2020-10-20 14:34:17 +02:00
Louis Carrese
f377456132
CLOSE #15065 Put the product label in bold in the PDF templates if configured
...
The global configuration variable PDF_BOLD_PRODUCT_LABEL is checked to put the product label in bold in the PDF
templates.
This modification is based on the same behaviour for the product reference, found at line 1373 of the same file.
The products table of the invoices / commercial propositions is produced in the PDF library, hence we have to modify
this library to style the invoices.
Producing a new template would mean duplicating code from the library with the maintenace implications.
2020-10-20 14:19:37 +02:00
Philippe Grand
85513318d0
Update functions.lib.php
2020-10-20 09:30:41 +02:00
Philippe GRAND
5233c6064f
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/.../domains/httpdocs/core/lib/functions.lib.php on line 4379
2020-10-19 16:30:12 +02:00
Laurent Destailleur
4fe857f5d2
Change picto to close a widget
2020-10-17 17:54:09 +02:00
Laurent Destailleur
885e6caaa1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2020-10-16 15:53:31 +02:00
Laurent Destailleur
6bba249935
FIX pdf_getlinetotalwithtax must show total incl tax
2020-10-16 15:50:51 +02:00
Laurent Destailleur
e74b833d7f
Look and feel v13
2020-10-16 15:40:52 +02:00
Laurent Destailleur
4dea8c4bb7
Fix missing token
2020-10-16 13:36:05 +02:00
Laurent Destailleur
5905d3be64
Fix phpcs
2020-10-16 00:06:26 +02:00
Laurent Destailleur
24f7a8aeed
Merge pull request #15028 from FHenry/fix_intracom
...
fix table creation for intracom and change reserved name column name
2020-10-15 20:19:05 +02:00
Laurent Destailleur
14a26c499f
Merge pull request #15027 from ATM-Nicolas/fix_ecm_src_object_type
...
FIX : Use table_element instead of element
2020-10-15 20:14:39 +02:00
Laurent Destailleur
5b37ff0bfd
Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
...
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d
css
2020-10-15 13:16:17 +02:00
Florian HENRY
a0d1e96bfd
fix table creation for intracom and change reserved name column name
2020-10-15 11:37:44 +02:00
ATM-Nicolas
20aee01fd8
FIX : Use table_element instead of element
2020-10-15 11:14:20 +02:00
Laurent Destailleur
20d5098ce2
Fix regression in dol_getdate()
2020-10-14 19:42:17 +02:00
Laurent Destailleur
a0f7aad591
Merge pull request #15019 from ATM-Nicolas/new_ecm_src_object_fields
...
NEW : Fill ECM src object fields in dol_add_file_process
2020-10-14 17:35:29 +02:00
Laurent Destailleur
ba001803ed
Update files.lib.php
2020-10-14 17:35:14 +02:00
Laurent Destailleur
57aabfb3c5
Merge pull request #15013 from FHenry/dev_objectrefferent_for_BOM
...
NEW display stat for BOM on "object referent"/linked Object product tab
2020-10-14 17:14:47 +02:00
Laurent Destailleur
e8ea7125e5
Removed the FIXME. The dol_getdate can now use a timezone.
2020-10-14 17:11:22 +02:00
ATM-Nicolas
98eb11be62
NEW : Fill ECM src object fields in dol_add_file_process
2020-10-14 16:59:05 +02:00
Laurent Destailleur
3cf2b6b5eb
Doc comment.
2020-10-14 15:01:50 +02:00
stickler-ci
8bfb04ea7f
Fixing style errors.
2020-10-14 08:34:30 +00:00
Florian HENRY
ee67d2b1a8
fixnhish bom product stats
2020-10-14 10:30:39 +02:00
Florian HENRY
6ff58aafdc
Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM
2020-10-14 08:43:07 +02:00
Florian HENRY
74155a49be
finish BOM stat referent object
2020-10-14 08:42:57 +02:00
Laurent Destailleur
4a3a3190ea
Standardize pdf templates
2020-10-14 01:46:49 +02:00
Laurent Destailleur
bc6b5d919a
Better responsive
2020-10-13 10:51:51 +02:00
Florian HENRY
4bf428fbf8
Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM
2020-10-13 08:13:54 +02:00
Laurent Destailleur
75997bb8f5
Minor fixes
2020-10-12 14:01:15 +02:00
Florian HENRY
739de365c0
load stat_bom
2020-10-12 13:52:50 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Laurent Destailleur
cc82a15688
css
2020-10-09 18:43:24 +02:00
Laurent Destailleur
b6fc33c454
Fix avoid error when we sumbit form to change page on conciliation
2020-10-09 11:13:02 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Laurent Destailleur
24d35ff9b5
CSS
2020-10-08 11:52:58 +02:00
Laurent Destailleur
70fa262293
CSS
2020-10-08 09:30:15 +02:00
Laurent Destailleur
ff739dcbd2
Increase size of small image (used by PDF)
2020-10-07 19:39:17 +02:00
Laurent Destailleur
561ca757d7
phpcs
2020-10-07 17:17:13 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
96ab66ea5a
Add function
2020-10-07 14:58:54 +02:00
Laurent Destailleur
d1c2772ee7
NEW Add function dolButtonToOpenUrlInDialogPopup() to be able to open
...
any url into a dialog popup.
2020-10-07 12:31:15 +02:00
Laurent Destailleur
47c80f0d14
Merge pull request #14942 from TobiasSekan/ShowProjectOverviewCount
...
Show count on project overview tab
2020-10-06 23:34:43 +02:00
Laurent Destailleur
13ec304b79
Update project.lib.php
2020-10-06 23:30:51 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697
2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697
2020-10-06 15:57:50 +02:00
Laurent Destailleur
95f67309e2
Clean code
2020-10-06 15:11:45 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697
2020-10-06 13:32:02 +02:00
Laurent Destailleur
254d9edbb9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-06 13:18:58 +02:00
Laurent Destailleur
6933b7ec9c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/agenda.lib.php
2020-10-06 13:15:52 +02:00
Laurent Destailleur
989074f13a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-10-06 13:13:31 +02:00
Sekan, Tobias
3ceb5c217f
Show count on project overview tab
2020-10-06 12:56:28 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
Aurélien
140200213e
change table into DB and ref #14697
2020-10-06 11:04:31 +02:00
Alexandre SPANGARO
d83d9895e0
NEW Vat report - Invert constant to show by default zero vat in reports
2020-10-05 20:52:31 +02:00
Aurélien
c1b0c1f6a2
rename folder ref to Module Delivery
2020-10-05 15:32:29 +02:00
Laurent Destailleur
afd6da3b94
Better error management
2020-10-05 14:51:28 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697
2020-10-05 13:59:59 +02:00
Laurent Destailleur
cfc3c01815
Factorize code to know if a parameter is used to store a secret
2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1
NEW Can force the antivirus from conf file or autoprepend ini setup.
2020-10-05 05:00:59 +02:00
ptibogxiv
dd1904c521
Fix multicompany in last action box
2020-10-04 13:58:46 +02:00
Laurent Destailleur
9b3cd421ee
Fix doc
2020-10-03 14:56:04 +02:00
Laurent Destailleur
3b34c496cc
Code
2020-10-03 14:11:47 +02:00
Laurent Destailleur
581a3d8808
FIX Add a better message when file size is too large
2020-10-03 14:02:53 +02:00
Laurent Destailleur
50ca9f4145
Clean code
2020-10-02 19:10:30 +02:00
Laurent Destailleur
00cb3277ec
Merge pull request #14891 from inoveaconseil/Newhidelabelvariant
...
NEW hide label in pdf for variants
2020-10-02 13:45:52 +02:00
Laurent Destailleur
7e414fe9da
Merge pull request #14889 from frederic34/ecm_extrafields
...
NEW Add extrafields support on ECM module
2020-10-02 13:44:45 +02:00
Laurent Destailleur
0893f0250a
Minor bug fixes
2020-10-02 12:54:56 +02:00
Nicolas
9e4e027495
Hide label
2020-10-02 09:39:42 +02:00
Nicolas
85dfb5bf3c
Hide the label into pdf document for variants
2020-10-02 09:27:01 +02:00
Nicolas
e72fbbfe17
Hide the label into pdf document for variants
2020-10-02 09:21:44 +02:00
Laurent Destailleur
813deee4a5
Fix phpcs
2020-10-02 01:14:43 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm
2020-10-02 00:21:13 +02:00
stickler-ci
e14c971b69
Fixing style errors.
2020-09-30 13:29:20 +00:00
ptibogxiv
9624a33e53
FIX date and user cloture / closing display
...
temporary fix while convert french to english term in dolibarr
2020-09-30 15:27:16 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Laurent Destailleur
1e176fad8f
Fix GETPOST on array
2020-09-29 21:28:07 +02:00
Laurent Destailleur
fba8fdae6e
Merge pull request #14856 from bafbes/abb120146
...
new:bankline_prepare_head for bank lines
2020-09-29 16:40:51 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
29414251f5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2020-09-29 13:19:03 +02:00
bahfir abbes
9662c4110a
new:bankline_prepare_head for bank lines
2020-09-29 01:28:39 +01:00
Laurent Destailleur
1a28d7f641
Fix missing token
2020-09-28 16:33:27 +02:00
Laurent Destailleur
2e79064098
Clean code
2020-09-28 11:07:53 +02:00
Laurent Destailleur
1aaf1fe357
Try catch on eval
2020-09-27 21:10:27 +02:00
Laurent Destailleur
5c9ad3ec9b
Update files.lib.php
2020-09-27 18:55:09 +02:00
Florian HENRY
5ff7e37696
review code
2020-09-27 18:05:19 +02:00
Florian HENRY
b6b2553501
Merge branch '11.0' into 11.0_fixmultidiroutput
2020-09-27 18:02:22 +02:00
Laurent Destailleur
68a6239322
Clean code
2020-09-26 04:25:14 +02:00
Laurent Destailleur
611684a9a7
FIX Substitution for member subscription was not done
2020-09-26 02:39:19 +02:00
Laurent Destailleur
d3e9815cfa
Fix phpunit
2020-09-25 17:48:04 +02:00
Laurent Destailleur
48632bbb3f
Clean code
2020-09-25 17:23:42 +02:00
Laurent Destailleur
1b83b55995
Fix to exclude possible sql injection
2020-09-25 17:11:54 +02:00
Laurent Destailleur
0d797a793a
On technical error, return http code 500
2020-09-25 15:01:15 +02:00
Laurent Destailleur
95cf3d2f51
NEW Can use desired stock of a given warehouse for replenishment
2020-09-23 23:02:31 +02:00
Laurent Destailleur
09c6761dae
NEW Include the tag editor of page as a popup into website editor
2020-09-23 16:36:19 +02:00
Laurent Destailleur
5a1c05735f
Fix phpcs
2020-09-22 15:55:30 +02:00
Laurent Destailleur
fea6fca7d1
Fix phpunit
2020-09-22 15:31:09 +02:00
Laurent Destailleur
d21ee07afc
NEW Can define date range of validity of a login during creation
2020-09-22 14:45:19 +02:00
Laurent Destailleur
5f4547bf7c
Prepare table for future features
2020-09-22 10:38:16 +02:00
Laurent Destailleur
438e884c01
Fix phpcs
2020-09-21 14:17:05 +02:00
Laurent Destailleur
3ca379c9e6
FIX Restore multiselect (selection of prospect level)
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc
FIX Restore multiselect (selection of prospect level)
2020-09-21 12:16:22 +02:00
Laurent Destailleur
43376b3abc
Removed warning
2020-09-20 21:27:11 +02:00
Laurent Destailleur
2fcc0791ac
Fix regression on backtopage
2020-09-20 19:55:44 +02:00
Laurent Destailleur
b024ce799c
Merge pull request #14782 from b92/patch-1
...
FIX: Members substitution variable not substituted if empty
2020-09-20 17:13:29 +02:00
Laurent Destailleur
2eb46b4900
Enhance antiXSS by excluding non printable chars used to obfuscate hack
2020-09-20 04:56:45 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
b5703350da
Fix escape
2020-09-19 22:41:05 +02:00
Laurent Destailleur
54c0f742b1
Fix escape
2020-09-19 21:19:04 +02:00
Laurent Destailleur
3bd94d52a1
Fix css
2020-09-19 15:15:49 +02:00
Laurent Destailleur
b1985950a6
Use POST to make the ajax set/del constant
2020-09-19 12:50:47 +02:00
Laurent Destailleur
e142b42f19
Clean code
2020-09-19 04:14:49 +02:00
Laurent Destailleur
93b7956156
Fix sanitizing of backtopage
2020-09-19 02:12:08 +02:00
Laurent Destailleur
a0b230fa46
Fix #yogosha4534
2020-09-19 01:58:46 +02:00
Laurent Destailleur
6a45545ec1
Prepare for fix
2020-09-19 01:53:22 +02:00
Laurent Destailleur
b7a97b2c81
Prepare for fix
2020-09-19 01:45:40 +02:00
Laurent Destailleur
f62d52f89a
Fix tooltip for linkto object.
...
Fix security of ajax selectobject.php
2020-09-19 00:44:47 +02:00
Laurent Destailleur
63bc3aa48a
Better sanitizing
2020-09-19 00:05:29 +02:00
Laurent Destailleur
6d2d5d7cae
Fix #yogosha4529
2020-09-19 00:02:38 +02:00
Bernard Saulme
d86f541b35
FIX|members substitution variable not substituted if empty
...
Members substitution variables not substituted if empty for the __MEMBER_ ... variables, the variable is showed instead.
Change to display '' instead
2020-09-18 18:29:52 +02:00
Laurent Destailleur
4e2aff2cdc
Fix sql injection when forging requests with IN
2020-09-18 17:28:02 +02:00
Laurent Destailleur
72d5850a5f
Fix regression
2020-09-18 15:45:26 +02:00
Laurent Destailleur
cf8e8ee68b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
2020-09-18 14:54:20 +02:00
Laurent Destailleur
f09aea90df
Fix bad test
2020-09-18 14:51:04 +02:00
Laurent Destailleur
56a9f5c48b
Fix
2020-09-18 14:49:20 +02:00
Laurent Destailleur
0b2aa2b01d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
2020-09-18 14:46:23 +02:00
Laurent Destailleur
2fe9514b6b
Doc
2020-09-18 14:01:00 +02:00
Laurent Destailleur
9134892c71
Fix remove useless code
2020-09-18 13:58:09 +02:00
Laurent Destailleur
534846c5c7
NEW Framework is ready for CSRF token protection on explicit GET URLs.
2020-09-18 04:30:24 +02:00
Laurent Destailleur
5744b1e0a3
Fix #yogosha4512
2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8
Fix dol_string_nohtmltag: the decode of entity must be done before split
2020-09-17 21:09:16 +02:00
Laurent Destailleur
0f0e4feeaf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSociete.class.php
2020-09-17 19:33:29 +02:00
Laurent Destailleur
eae5410ced
Protect md file
2020-09-17 16:57:39 +02:00
Laurent Destailleur
7cc75ac873
Fix: removing also " when removing " from a received parameter.
2020-09-17 14:43:58 +02:00
Laurent Destailleur
2f100fdf79
Fix alpha into alphanohtml
2020-09-17 12:53:58 +02:00
Laurent Destailleur
33cefacf91
Fix missing global
2020-09-17 12:17:14 +02:00
Laurent Destailleur
05636c39bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-17 11:39:58 +02:00
Laurent Destailleur
939433706b
FIX #yogosha4465
2020-09-17 11:37:41 +02:00
Laurent Destailleur
5e3f6ce736
Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup
...
Use new table function for comm/propal + cleanup
2020-09-17 11:20:31 +02:00
Laurent Destailleur
d92e482841
FIX #yogosha transversal path when unzipping file
2020-09-17 11:09:43 +02:00
Alexandre SPANGARO
bc457ebb66
Stickler
2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913
FIX Yogosha report 4425 (backport)
2020-09-16 20:55:28 +02:00
Laurent Destailleur
4630887591
Fix css
2020-09-16 20:09:40 +02:00
Laurent Destailleur
47031cb656
Fix phpcs
2020-09-16 18:51:19 +02:00
Laurent Destailleur
d7aa376c3c
FIX Yogosha report 4425
2020-09-16 14:37:05 +02:00
Sekan, Tobias
91641e593f
MAIN_DASHBOARD_USE_TOTAL_HT + more clean
2020-09-16 14:03:41 +02:00
Laurent Destailleur
09558d0ce9
Fix MAIN_OPTIMIZEFORTEXTBROWSER
2020-09-16 13:15:57 +02:00
Sekan, Tobias
ac1fdb4a59
Use new table function for comm/propal + cleanup
2020-09-16 10:51:19 +02:00
Laurent Destailleur
7bcf2c9089
css
2020-09-15 14:45:51 +02:00
Laurent Destailleur
cc24e9b155
Look and feel v13
2020-09-15 13:27:48 +02:00
Laurent Destailleur
3fd041e861
Update functions.lib.php
2020-09-15 11:28:49 +02:00
Alexandre SPANGARO
4137e92430
Time to enable fontawesome icons on weather feature
2020-09-15 03:42:35 +02:00
Laurent Destailleur
b7b1de4580
Fix position of GPAO must be after Product.
...
CSS
2020-09-15 02:41:08 +02:00
Laurent Destailleur
f626bd70d0
Look and feel v13
2020-09-14 20:53:42 +02:00
Laurent Destailleur
8afd448def
Add warning if a hidden option is on to encourage to remove it.
2020-09-14 15:05:35 +02:00
Laurent Destailleur
33d61333b1
Fix picto
2020-09-14 12:50:07 +02:00
Scrutinizer Auto-Fixer
73915d51c8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
4b525f6826
Debug notifications on browser
2020-09-12 04:12:39 +02:00
Laurent Destailleur
9dad8f0fb7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-09-12 03:02:27 +02:00
Laurent Destailleur
f45054df06
Close #14604 Merge manually change to get notification to show
...
Remains: support call of the action=closereminderid done by browser once
notif has be thrown.
2020-09-12 03:02:08 +02:00
Laurent Destailleur
fab3a774d2
Merge pull request #14636 from TobiasSekan/AddTableHelperMethod
...
NEW Add helper function for table headers with numbers
2020-09-12 01:21:24 +02:00
Laurent Destailleur
c4383747a1
Look and feel v13
2020-09-11 13:57:16 +02:00
Laurent Destailleur
64b28020c8
Look and feel v13
2020-09-11 13:14:14 +02:00
Laurent Destailleur
753396ec20
Look and feel v13
2020-09-11 12:19:40 +02:00
Laurent Destailleur
0d124730a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/list.php
2020-09-10 18:05:18 +02:00
Laurent Destailleur
0cccaa7271
FIX look and feel v12
2020-09-10 18:02:49 +02:00
Laurent Destailleur
7e7dec9306
FIX Look and feel v12
2020-09-10 18:02:06 +02:00
Laurent Destailleur
8d93b76258
Clean code
2020-09-10 17:49:05 +02:00
Laurent Destailleur
ed6a16a3c7
FIX look and feel v12
2020-09-10 17:17:31 +02:00
Laurent Destailleur
8c9f2b8458
Fix trans, add log
2020-09-10 17:08:51 +02:00
Laurent Destailleur
bcab13c395
Fix typo
2020-09-10 15:52:47 +02:00
Laurent Destailleur
ed3f1c29ef
more log
2020-09-10 15:52:09 +02:00
Laurent Destailleur
1da99a8fcd
Add log to debug travis error
2020-09-10 15:49:13 +02:00
Sekan, Tobias
747d8c32e2
Fix Sticker CI (again :'-( )
2020-09-10 12:29:01 +02:00
Sekan, Tobias
2292f83258
fix sticker ci
2020-09-10 11:26:17 +02:00
Sekan, Tobias
3f8b2153ea
fix sticker Ci and add missing doc
2020-09-10 11:25:35 +02:00
Sekan, Tobias
d2903c5de6
adress feedback + massive cleanup
2020-09-10 11:04:41 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11
2020-09-09 19:12:08 +02:00
Laurent Destailleur
5c34b26f39
FIX Look and feel v12: First tab must be name of object
2020-09-09 13:57:35 +02:00
Sekan, Tobias
49d009502c
fix sticker CI
2020-09-09 08:16:26 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Laurent Destailleur
86ed4dfa2b
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 11:51:36 +02:00
Sekan, Tobias
bd96e0fe42
finished helper method and usage of it
2020-09-08 11:15:33 +02:00
Alexandre SPANGARO
d1ba6b9476
Merge remote-tracking branch 'upstream/develop' into 13a11
2020-09-08 05:01:36 +02:00
Alexandre SPANGARO
6a04f39fbe
Wrong language key
2020-09-08 04:58:42 +02:00
Alexandre SPANGARO
8c75f0b95b
Code optimize
2020-09-07 21:38:39 +02:00
Laurent Destailleur
c95e54843c
Update lib debugbar
...
Update php-parallel-lint
2020-09-07 21:00:40 +02:00
Laurent Destailleur
b1e45aef46
Debug opensurvey. Look and feel v13. Removed deprecated properties.
2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
d700649fb9
The deprecated subsitution key __SIGNATURE__ has been removed. Replace
...
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
2020-09-06 19:25:25 +02:00
Laurent Destailleur
84efd70dcb
FIX Clean tooltip of help for substition for long notes
2020-09-06 19:19:55 +02:00
Sekan, Tobias
0375f5fd37
Add helper function for table headers with numbers
2020-09-04 15:24:45 +02:00
lvessiller
27c754e6c8
NEW add send context for ticket
2020-09-02 15:33:18 +02:00
atm-lena
f8c79db4a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2
2020-08-31 14:14:27 +02:00
Laurent Destailleur
02f108835d
Fix tooltip
2020-08-30 19:45:46 +02:00
Laurent Destailleur
0d4f7cb485
Fix responsive and title of reports
2020-08-30 17:42:49 +02:00
Laurent Destailleur
e030b2089a
Look and feel v13
2020-08-30 13:14:28 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
723a263cd3
Fix phpcs
2020-08-29 05:07:23 +02:00
Laurent Destailleur
4ecd15b7ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
Laurent Destailleur
b6e9ba8ed6
Merge pull request #14535 from aspangaro/13a6
...
Some fix on assets
2020-08-27 20:01:33 +02:00
atm-lena
e3ce3cbb7c
Function sendEmailsReminder()
2020-08-27 15:49:56 +02:00
atm-lena
69459e3429
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
2020-08-27 11:13:21 +02:00
Laurent Destailleur
180a49601b
Use CSS to define size of logo on public pages.
2020-08-27 11:01:41 +02:00
atm-lena
4ef2644300
Use date.lib.php functions
2020-08-27 10:29:23 +02:00
Alexandre SPANGARO
eebe888377
Some fix on assets
2020-08-24 09:47:37 +02:00
Laurent Destailleur
f010e44a71
WIP
2020-08-23 22:13:06 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
8115acbf82
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-23 19:25:05 +02:00
Laurent Destailleur
f819509442
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a
Fix include regression
2020-08-23 19:22:01 +02:00
Laurent Destailleur
38d53cc03d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2020-08-23 19:20:50 +02:00
Laurent Destailleur
4fa6d86127
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-08-23 19:17:01 +02:00
Laurent Destailleur
7a183ea026
Update pdf.lib.php
2020-08-23 19:13:30 +02:00
Laurent Destailleur
b44d6744f9
Update pdf.lib.php
2020-08-23 19:11:40 +02:00
Laurent Destailleur
7eb003c684
Update pdf.lib.php
2020-08-23 19:11:19 +02:00
Laurent Destailleur
c784c002fd
Merge pull request #14517 from aspangaro/13.0_a5
...
Some fix on complete_head_from_modules
2020-08-23 18:09:15 +02:00
Laurent Destailleur
34d2d9a7c6
Look and feel v13
2020-08-23 15:17:22 +02:00
Laurent Destailleur
ca2a34a4c9
Standardize code: Rename fields date_m into tms. All timestamp fields
...
are now name "tms".
2020-08-23 15:15:47 +02:00
Laurent Destailleur
23cda5f464
Enhance recruitment module
2020-08-22 14:37:09 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Alexandre SPANGARO
f1f579ad67
Some fix on complete_head_from_modules
2020-08-20 22:17:34 +02:00
Laurent Destailleur
afe8f76a4a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/stock.php
2020-08-18 15:41:57 +02:00
Laurent Destailleur
d4a502629e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/stock.php
htdocs/core/lib/ajax.lib.php
2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d
FIX Setup of stock increase/decrease
2020-08-18 15:27:17 +02:00
Laurent Destailleur
58e25768a7
NEW Add PDF document templates for warehouses (list of stock)
2020-08-18 14:02:36 +02:00
Laurent Destailleur
bd65e5612f
Fix duplicate id
2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
2020-08-17 19:54:23 +02:00
John Botella
6e1702c1a5
Fix infinite fetch object linked loop
2020-08-17 15:00:31 +02:00
Laurent Destailleur
86a31d17a5
Better test
2020-08-17 04:34:53 +02:00
Laurent Destailleur
5987504fa5
Better test
2020-08-17 04:34:03 +02:00
asolslk
5a6f459db5
Update accounting.lib.php
2020-08-17 04:09:12 +02:00
Laurent Destailleur
75f8fe8276
Merge pull request #14427 from asolslk/patch-2
...
FIX Visible 0 on accounting account
2020-08-17 01:34:57 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
Bernard Saulme
52b84a3ea2
Update functions.lib.php
2020-08-14 18:08:59 +02:00
Laurent Destailleur
65ceaac42e
Better message
2020-08-14 12:56:17 +02:00
Laurent Destailleur
a916f6af59
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
...
Conflicts:
htdocs/product/composition/card.php
2020-08-14 11:06:39 +02:00
Laurent Destailleur
74da63c0e4
Merge pull request #14448 from 418sec/develop
...
Security Fix for Cross-site Scripting (XSS) - huntr.dev
2020-08-14 03:17:35 +02:00
lvessiller
f385e02c53
FIX title button attribute id empty
2020-08-13 17:43:18 +02:00
Laurent Destailleur
88c07e86ad
Organization of setup for Takepos bar features
2020-08-13 13:46:53 +02:00
florian HENRY
c4d8a25c5a
fix external module multidiroutput
2020-08-10 13:40:55 +02:00
asolslk
ea829913b0
Update accounting.lib.php
2020-08-08 19:07:55 +08:00
Laurent Destailleur
ada7b74ba1
Fix phpcs
2020-08-07 14:56:30 +02:00
Laurent Destailleur
5482a3134a
Merge pull request #14355 from fmarcet/10.0
...
Fix: User can see events that are not assigned to it
2020-08-07 14:54:39 +02:00
Laurent Destailleur
6fd433167f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-08-07 11:59:55 +02:00
Laurent Destailleur
284378232b
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam
...
FIX : JS CRASH - bad usage of moreparam
2020-08-07 10:10:09 +02:00
Laurent Destailleur
16828b8cec
Merge pull request #14403 from FHenry/12.0
...
fix: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method (resolve conflict)
2020-08-07 09:58:49 +02:00
Laurent Destailleur
c2b03e49e1
Fix logo not visible in setup page
2020-08-06 17:28:57 +02:00
Laurent Destailleur
c6ee80eefd
FIX Disable svg as supported image by default. Set
...
MAIN_ALLOW_SVG_FILES_AS_IMAGES to 1 to have svg working.
2020-08-06 17:16:09 +02:00
florian HENRY
46cafcc445
Merge branch '11.0' into 12.0
2020-08-06 16:54:49 +02:00
Laurent Destailleur
43b23994e4
WIP Recruitment module
2020-08-06 15:55:04 +02:00
Laurent Destailleur
37f1b27bd2
Fix phpcs
2020-08-06 03:55:47 +02:00
Laurent Destailleur
cd89538ee9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-06 03:04:46 +02:00
Laurent Destailleur
5b0d04609c
Fix number to string
2020-08-06 03:03:18 +02:00
Laurent Destailleur
b40177a8c8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-06 03:00:16 +02:00
Laurent Destailleur
fbcf95ba02
Fix number to string
2020-08-06 02:59:46 +02:00
Laurent Destailleur
641d9a6565
Fix number to string
2020-08-06 02:58:07 +02:00
Laurent Destailleur
ce960c8d0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-06 02:53:19 +02:00
Laurent Destailleur
0b7aec1fa0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functionsnumtoword.lib.php
2020-08-06 02:52:54 +02:00
Laurent Destailleur
73ea5b0e2d
Fix function to convert price to string
2020-08-06 02:50:24 +02:00
Laurent Destailleur
d2eb1cc47d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:20:49 +02:00
Laurent Destailleur
12b9a73ca5
Fix phpcs
2020-08-06 02:18:34 +02:00
Laurent Destailleur
9d79e984dd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
1cf3422e05
FIX Bad adress of vendor in PDF for PDF of supplier payment
...
FIX dol_convertToWord() Bad conversion of number into a string
2020-08-06 01:56:42 +02:00
spooky360
a94fa93973
Fixed missing quote... => Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr )
2020-08-05 17:11:19 +02:00
spooky360
b9513255fd
Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr ).
2020-08-05 17:02:59 +02:00
stickler-ci
8d88217434
Fixing style errors.
2020-08-04 14:48:15 +00:00
Ferran Marcet
70ad2fcee0
Fix: User can see events that are not assigned to it
2020-08-04 16:45:57 +02:00
Ferran Marcet
7a077a2d99
Fix: User can see events that are not assigned to it
2020-08-04 16:45:04 +02:00
Ferran Marcet
1a62a36b86
Merge remote-tracking branch 'origin/10.0' into 10.0
2020-08-04 16:40:01 +02:00
Ferran Marcet
7b6ef7aca8
Merge branch '10.0up' into 10.0
2020-08-04 16:39:40 +02:00
John Botella
11f14b8fe5
Fix bad usage of moreparam
2020-08-04 14:13:52 +02:00
Laurent Destailleur
c09827248b
Merge pull request #14360 from ATM-Consulting/FIX_12.0_dol_string_onlythesehtmltags_remove_class_by_default
...
FIX 12.0 - dol_string_onlythesehtmltags(): remove class attribute by default
2020-08-04 12:27:31 +02:00
Florian Mortgat
ce18a4f029
FIX 12.0 - in dol_string_onlythesehtmltags, remove the class attribute by default
2020-08-03 12:28:12 +02:00
stickler-ci
9926eac192
Fixing style errors.
2020-08-03 09:26:36 +00:00
quentin
72b2fb442b
fix test libelle
2020-08-03 11:17:39 +02:00
Ferran Marcet
63b15dd1b6
Fix: User can see events that are not assigned to it
2020-08-03 11:17:30 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
04903460b1
Add contact on job page
2020-08-02 18:09:53 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
Laurent Destailleur
367914015c
NEW Add a counter of number of words of pages in website module
2020-08-02 15:53:34 +02:00
Laurent Destailleur
d08c42a205
CSS Better visibility for buttons and status
2020-08-02 00:15:21 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
8b879ee23b
FIX Edit extrafield of type long text loose carriage returns
2020-07-30 14:49:00 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/lib/pdf.lib.php
2020-07-29 13:50:31 +02:00
Laurent Destailleur
566f683c54
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-07-29 13:40:19 +02:00
Laurent Destailleur
f2390e85b9
Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags
...
NEW: additional html tags allowed by dol_string_onlythesehtmltags()
2020-07-29 13:34:45 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d
Fix several trouble with diret debit module and credit transfer module
2020-07-27 19:33:24 +02:00
VERDOL Gauthier
25994e61bc
FIX : We need to see unit line on PDF even though it's an option
2020-07-27 16:04:21 +02:00
Laurent Destailleur
d945ef67e1
FIX Picto of HRM module
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-07-26 20:53:22 +02:00
Laurent Destailleur
5d7a9c9af4
FIX Picto of HRM module
2020-07-26 20:51:49 +02:00
Laurent Destailleur
b63a6bc72a
NEW Can use dynamic code into the 'enabled' property of DAO fields
2020-07-26 20:45:54 +02:00
Laurent Destailleur
dd86c21382
FIX dolGetElementUrl and agenda page for external modules
2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f
FIX locataxes lost on lines when cloning a vendor invoice
2020-07-25 02:59:49 +02:00
FlorianMortgat
c48a294a2b
FIX: allow more harmless html tags
2020-07-25 00:57:40 +02:00
Laurent Destailleur
3ed4773d7f
Fix tab popup when there is 2 head tabs in same page
2020-07-24 18:31:14 +02:00
Laurent Destailleur
93fea8591c
Fix phpcs
2020-07-24 12:17:02 +02:00
Laurent Destailleur
6e36fba4f3
NEW Development of module Recruitment
2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1
FIX dolGetElementUrl and agenda page for external modules
2020-07-24 11:53:44 +02:00
Laurent Destailleur
aefb1483e3
NEW Can change size of logo on PDF documents
2020-07-24 03:36:44 +02:00
Laurent Destailleur
895fe63d3b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-24 01:53:51 +02:00
Laurent Destailleur
34a9eee7a6
Minor fix in translation
2020-07-24 01:50:57 +02:00
Laurent Destailleur
431b207dab
Fix to solve sql error on some databases
2020-07-24 01:02:07 +02:00
Laurent Destailleur
a46f4df147
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/clicktodial.php
2020-07-24 00:15:56 +02:00
Laurent Destailleur
42234ba506
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
Laurent Destailleur
0890b15077
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70
FIX ClickToDial tab of users has disappeared
2020-07-24 00:06:18 +02:00
Laurent Destailleur
f26a64fb88
FIX If using a rounding step, localtax1+2 not included in total
2020-07-19 01:47:17 +02:00
Laurent Destailleur
ac92a9fa40
Doc more complete
2020-07-18 22:59:47 +02:00
Laurent Destailleur
a252c87c82
Fix comment
2020-07-18 19:41:11 +02:00
Laurent Destailleur
8b5f4fe9a6
Fix massaction delete on events
2020-07-11 12:21:53 +02:00
Laurent Destailleur
bd63b84f8e
Fix label of social contribution and button date
2020-07-09 23:18:19 +02:00
Laurent Destailleur
fd95551940
Fix upload of file in import module
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-07-09 21:52:27 +02:00
Laurent Destailleur
e6b241a083
NEW Show tags and status in search list of website pages
2020-07-09 14:07:41 +02:00
Laurent Destailleur
b2bd90ae1a
Fix link to list of event
2020-07-09 12:33:28 +02:00
Laurent Destailleur
9592fdb3fc
CSS
2020-07-09 11:55:16 +02:00
Laurent Destailleur
0a708e46bf
css
2020-07-09 00:46:59 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
96729769f7
Standardize Agenda view
2020-07-08 18:06:14 +02:00
Laurent Destailleur
7d7ef1e72a
FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY
...
Fix setup of product
2020-07-06 15:34:26 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06
Fix trans
2020-07-04 13:04:53 +02:00
Laurent Destailleur
fce81a4bf1
Rename var and fix position of checkbox
2020-07-03 01:30:53 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab
...
NEW multiselect type and date to date filter
2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846
Update company.lib.php
2020-07-03 00:57:15 +02:00
andreubisquerra
9e4d7627f3
Fix travis
2020-07-01 22:55:00 +02:00
jove@bisquerra.com
76f3724191
NEW: Appearance tab in TakePOS with more visual parameters
2020-07-01 22:34:35 +02:00
Laurent Destailleur
e2a9743dd4
Debug module credit transfer
2020-07-01 14:19:47 +02:00
quentin
39651953b3
FIX refacto
2020-07-01 14:04:41 +02:00
quentin
267aa7605b
Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab
2020-07-01 14:00:49 +02:00
Laurent Destailleur
9bb0ef04f5
Fix upload of file in import module
2020-06-29 18:07:51 +02:00
Laurent Destailleur
146c521efd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
2020-06-29 18:06:42 +02:00
Laurent Destailleur
5b3670f300
FIX SQL syntax error when editing extrafields
...
Conflicts:
htdocs/core/lib/security.lib.php
2020-06-29 14:28:53 +02:00
Laurent Destailleur
7c5b0be6a3
FIX SQL syntax error when editing extrafields
2020-06-29 13:48:00 +02:00
Laurent Destailleur
a5893db106
FIX upload documents into manual ECM was reported a permission error
2020-06-28 22:05:55 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
95729e2375
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
lvessiller
c689b91539
FIX upload file in import module
2020-06-25 16:59:48 +02:00
Florian Mortgat
ccfe6f18fe
FIX 10.0 - fatal with postgres
...
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
daba55762f
Fix missing filter on status enabled
2020-06-22 13:07:34 +02:00
Laurent Destailleur
c54294285a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2020-06-20 12:28:14 +02:00
Laurent Destailleur
c919d3d5aa
Merge pull request #14100 from atm-florian/12_fixAdvTargetTplWarning
...
fix: warning and clean old code about multiselect category for advtarget tpl
2020-06-20 12:18:35 +02:00
Laurent Destailleur
989737af6b
Update website templates
2020-06-19 10:36:19 +02:00
florian HENRY
29c049e358
set correct global conf
2020-06-19 09:49:43 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
531bfe217b
Merge fields
2020-06-18 15:11:35 +02:00
Laurent Destailleur
eef07afc90
Try to solve pb with too many columns. Merge 2 columns of amounts in 1
2020-06-18 03:32:13 +02:00
Laurent Destailleur
a5ce3ada0a
Keep feature experimental as it need a lot of change
2020-06-18 02:35:08 +02:00
Laurent Destailleur
c0b269b9ee
Fix Permissions on MO and API for MO
2020-06-18 01:09:30 +02:00
Laurent Destailleur
6c2d70d43b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 19:27:39 +02:00
Laurent Destailleur
2f687a3c40
FIX #14033
2020-06-17 17:57:32 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 13:42:38 +02:00
Laurent Destailleur
6660923e94
FIX Privilege escalation reported by wizlynx WLX-2020-011
2020-06-17 13:29:43 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2
2020-06-16 22:40:45 +02:00
Laurent Destailleur
1736ecfa26
Fix phpcs
2020-06-15 04:32:59 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
2d5c35b12a
Fix debug sepa module
2020-06-14 21:46:32 +02:00
stickler-ci
79a7e4c149
Fixing style errors.
2020-06-13 07:44:48 +00:00
DEMAREST Maxime (Indelog)
9217ec47dc
Fix replace loan_calcmens() by loanCalcMonthlyPayment()
2020-06-13 09:33:02 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2
Fix and improvement on Loan module
...
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
with the new value.
* Can't modify interest in payment if schedule is used (causes the
inconsistency for value in schedule).
* User right verification on schedule page.
2020-06-13 09:32:44 +02:00
Laurent Destailleur
c9cb978c39
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 15:21:06 +02:00
Laurent Destailleur
9bb5135317
Fix We never add .noexe of files into medias dir
2020-06-12 15:20:28 +02:00
Laurent Destailleur
6e81542148
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-12 14:36:11 +02:00
Laurent Destailleur
5d5fb46af6
Fix We never add .noexe of files into medias dir
2020-06-12 14:35:50 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Laurent Destailleur
78204f92e6
Fix tag
2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a
Fix tag at bad place
2020-06-11 16:59:24 +02:00
Laurent Destailleur
503206af88
Fix analytics tag
2020-06-11 16:38:58 +02:00
Laurent Destailleur
6a3547f8af
css
2020-06-11 02:11:17 +02:00
Florian Mortgat
5bc80f8626
FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax
2020-06-10 16:22:48 +02:00
Laurent Destailleur
5794b1abea
Fix for use with text browser
...
Conflicts:
htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
9bbdaffe9d
FIX Sharing buttons
2020-06-10 12:45:02 +02:00
Laurent Destailleur
bd22ad4174
Fix for use with text browser
2020-06-10 12:35:39 +02:00
Laurent Destailleur
764b8a15de
FIX Sharing buttons
2020-06-10 00:01:41 +02:00
Laurent Destailleur
c175fbd697
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/website/class/website.class.php
htdocs/website/index.php
2020-06-09 22:09:57 +02:00
Laurent Destailleur
a9b85222c0
NEW The global header of a website can also have dynamic content
2020-06-09 22:07:06 +02:00
Laurent Destailleur
756ef0b583
Fix disallow < > into meta info
...
Fix message page regenerated
2020-06-09 21:43:42 +02:00
stickler-ci
b4dd11ec98
Fixing style errors.
2020-06-08 14:00:57 +00:00
atm-quentin
3dd7c81f54
FIX stickler
2020-06-08 15:58:20 +02:00
atm-quentin
69db790cf5
NEW multiselect type and date to date filter
2020-06-08 14:43:14 +02:00
Laurent Destailleur
aed5e8a4ce
fix url
2020-06-08 12:25:17 +02:00
Laurent Destailleur
7ce7905d31
Fix check for mrp
2020-06-07 23:03:58 +02:00
Laurent Destailleur
87a60a501f
Security on disabling a web page
2020-06-07 23:00:38 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
2a1d547267
Celan dead code
2020-06-07 18:44:37 +02:00
Laurent Destailleur
88aaec63f7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 18:57:41 +02:00
Laurent Destailleur
e31e889595
Add url in error message
2020-06-06 18:30:04 +02:00
Laurent Destailleur
bd56210e97
doc
2020-06-03 19:24:26 +02:00
Laurent Destailleur
7f1fea1e09
Add json-ld structure 'qa'
2020-06-03 19:23:36 +02:00
Laurent Destailleur
474860d546
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59
Fix webp support
2020-06-03 14:05:18 +02:00
Laurent Destailleur
a37a4031e9
FIX Delete of website page need permission. Conflict with mass action.
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1
FIX Delete of website page need permission. Conflict with mass action.
2020-06-03 00:46:09 +02:00
Laurent Destailleur
838a13cec1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-01 02:41:11 +02:00
Laurent Destailleur
e83b754e6f
Debug modulebuilder
2020-05-31 23:32:36 +02:00
Laurent Destailleur
f63aa7f527
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
2020-05-31 23:27:20 +02:00
Laurent Destailleur
3349144f5e
Fix lose enabled and default when editing field signatures in
...
modulebuilder
2020-05-31 23:23:42 +02:00
Laurent Destailleur
9224061aed
Fix test to upload a file
2020-05-29 03:20:44 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
1838cf92ef
Look and feel v12
2020-05-28 11:51:49 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984
Debug credit transfer
2020-05-27 22:35:55 +02:00
Laurent Destailleur
16625af34e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php
htdocs/core/tpl/filemanager.tpl.php
2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/ecm/class/ecmfiles.class.php
htdocs/ecm/index.php
2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2
FIX XSS using the renaming of .noexe files - reported by Nolan.
2020-05-27 13:12:18 +02:00
Laurent Destailleur
c0ce584487
Look and feel v12
2020-05-27 00:26:04 +02:00
Laurent Destailleur
c607c2daa0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 22:31:47 +02:00
Laurent Destailleur
91ecd3455f
Fix CSS
2020-05-26 22:30:11 +02:00
Laurent Destailleur
05ac3de2f0
Enhance search / filter
2020-05-26 12:46:51 +02:00
Laurent Destailleur
2d30d33303
NEW Can filter on container type, language and tags in the list of pages
...
of website module.
2020-05-26 12:25:41 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
d08fc174c4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:23:51 +02:00
Laurent Destailleur
2fe8e03ed6
Fix missing quote
2020-05-25 22:23:22 +02:00
Laurent Destailleur
41d5d9b6f8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:21:52 +02:00
Laurent Destailleur
ba047428e2
Fix duplicate \n
2020-05-25 22:21:36 +02:00
Laurent Destailleur
17382051c2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-25 22:19:50 +02:00
Laurent Destailleur
19bcdb6418
Fix structured data
2020-05-25 22:19:28 +02:00
Laurent Destailleur
056206098b
CSS
2020-05-25 12:51:17 +02:00
Laurent Destailleur
9e77dc0a26
CSS
2020-05-25 12:50:29 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
8e113888d8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 17:02:27 +02:00
Laurent Destailleur
64f72daa7e
Fix hreflang if canonical page
2020-05-23 17:01:22 +02:00
Laurent Destailleur
aec5200a98
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/variants/class/ProductCombination.class.php
2020-05-23 15:37:00 +02:00
Laurent Destailleur
7c92bb218e
Fix no hreflang if not a canonical page
2020-05-23 15:33:04 +02:00
Laurent Destailleur
acaab1fd45
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:49:15 +02:00
gael.langlais
af5de05a31
Change some curly braces #13929
2020-05-23 13:38:50 +02:00
Laurent Destailleur
d4b1485c97
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 13:11:30 +02:00
Laurent Destailleur
755c47f900
Fix save of wrapper missing
2020-05-23 13:10:33 +02:00
Laurent Destailleur
333ae9d496
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-23 12:58:18 +02:00
Laurent Destailleur
f2c02f5559
FIX Language for RSS
2020-05-23 12:41:06 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-22 08:27:12 +02:00
Laurent Destailleur
5d78f6dac5
NEW Add link to edit property from search result of website pages
2020-05-22 00:38:01 +02:00
Frédéric FRANCE
5940d3705a
add new rule
2020-05-21 16:00:12 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
Frédéric FRANCE
416e6dd90d
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-21 01:11:45 +02:00
Frédéric FRANCE
ccadb1ec7a
add new rule
2020-05-21 00:47:16 +02:00
Laurent Destailleur
64ebc665c7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 23:32:59 +02:00
Laurent Destailleur
de11fb2783
Fix phpcs
2020-05-20 23:32:13 +02:00
Laurent Destailleur
88c939562e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 12:39:01 +02:00
Laurent Destailleur
66df82f9e0
Better management of absolute url for canonical link tag
2020-05-20 12:38:38 +02:00
Laurent Destailleur
2f7786f50f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 10:37:43 +02:00
Laurent Destailleur
c5e341883d
Fix popup of supplier invoice
2020-05-19 23:22:40 +02:00
Laurent Destailleur
346082b153
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 19:59:24 +02:00
Laurent Destailleur
00d7947ee8
Fix link replaced twice
2020-05-19 19:55:28 +02:00
Laurent Destailleur
d89c9abcb6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 00:53:01 +02:00
Laurent Destailleur
7b29ce036a
Fix input of virtual host and canonical url
2020-05-19 00:50:30 +02:00
Laurent Destailleur
9f9dfb94f0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 22:40:52 +02:00
Laurent Destailleur
76663ae3e8
Fix canonical tag
2020-05-18 22:40:32 +02:00
Laurent Destailleur
d60598b848
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 14:53:57 +02:00
Laurent Destailleur
d3ac33ce20
Fix json-ld file
2020-05-18 14:53:35 +02:00
Laurent Destailleur
729cc4fd6f
Fix do not show full path
2020-05-18 13:26:33 +02:00
Laurent Destailleur
02d4ecb21c
Fix url for youtube
2020-05-17 20:08:01 +02:00
Laurent Destailleur
9370f71d01
Fix hardcoded value
2020-05-17 20:03:56 +02:00
Laurent Destailleur
bd564486ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-17 20:03:09 +02:00
Laurent Destailleur
8a6ae84fb0
Fix getStructuredData for organization
2020-05-17 20:02:01 +02:00
Laurent Destailleur
6be60efaba
Fix bad link in json-ld
2020-05-17 19:09:22 +02:00
Laurent Destailleur
af46108cc4
Look and feel v12
2020-05-17 13:34:16 +02:00
Laurent Destailleur
70fc74008a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
2020-05-15 17:19:43 +02:00
Laurent Destailleur
9fb1766266
CSS
2020-05-15 17:14:28 +02:00
Laurent Destailleur
5fe9c45fb2
Fix look and feel v12
2020-05-15 16:07:39 +02:00
Laurent Destailleur
5933aba38c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
Laurent Destailleur
ad906fc508
Fix use SVG logo instead of PNG
2020-05-15 12:43:48 +02:00
Laurent Destailleur
40d30f9a60
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-14 18:37:47 +02:00
Laurent Destailleur
1bf677f537
Can set status of a websitepage
2020-05-14 18:14:55 +02:00
Laurent Destailleur
499c2ea30a
FIX #13855
2020-05-14 16:52:21 +02:00
Laurent Destailleur
3d26351c6b
Fix function if hours.
2020-05-14 16:03:31 +02:00
Laurent Destailleur
ae0e6e4dc8
FIX dol_concatdesc to escape <
...
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Laurent Destailleur
44d36815bd
Look and feel v12
2020-05-11 19:00:27 +02:00
Laurent Destailleur
a2bc46f1c0
CSS
2020-05-11 12:50:24 +02:00
Laurent Destailleur
a8dcd2d09b
Clean code
2020-05-11 11:53:13 +02:00
Laurent Destailleur
c511af69fe
Debug look and feel v12
2020-05-10 21:07:49 +02:00
Laurent Destailleur
501f1ba2c4
Fix look and feel v12
2020-05-10 15:45:07 +02:00
Laurent Destailleur
42ee755ea5
Look and feel v12
2020-05-08 02:52:55 +02:00
Laurent Destailleur
206b16410e
Revert the option to avoid to introduce a feature that is duplicate with
...
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Laurent Destailleur
0cd05887ce
FIX count of open day when date and start are not open should be 0
2020-05-07 17:21:27 +02:00
Frédéric FRANCE
c28e6630bb
Update functions.lib.php
2020-05-07 15:41:21 +02:00
Frédéric FRANCE
dd1d29f983
add some substitutions for date datetime
2020-05-07 15:37:32 +02:00
Laurent Destailleur
b09f179a16
NEW Website logs are now into a separated log file.
2020-05-06 04:32:48 +02:00
Laurent Destailleur
30fede216c
Fix Add '_pw' var as var sensibles.
2020-05-06 04:03:07 +02:00
Laurent Destailleur
247acdd274
Fix position of custom groups of modules
2020-05-06 03:47:28 +02:00
Laurent Destailleur
eacb1b3b2e
Debug modulebuilder
2020-05-05 21:45:10 +02:00
Laurent Destailleur
e354e71425
Fix link to themes on dolistore
2020-05-05 18:19:48 +02:00
Laurent Destailleur
49f9e88cc1
Look and feel v12
2020-05-05 18:16:30 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6
...
links color for table title line is equal to Text color for table title line
2020-05-05 18:12:07 +02:00
Laurent Destailleur
b2a9791dca
Fix pagination on pages "Related items"
2020-05-05 16:33:02 +02:00
Laurent Destailleur
5e4ef9266e
Fix update template to use for notifications
2020-05-04 20:30:02 +02:00
Laurent Destailleur
f0f6d6e314
Merge pull request #13793 from andreubisquerra/master
...
NEW tab for Bar Restaurant parameters and new AUTO ORDER
2020-05-03 21:45:08 +02:00
Laurent Destailleur
da91a857a5
Fix pb of lang subdir in cloning website
2020-05-03 14:49:06 +02:00
stickler-ci
5c1eb08b3f
Fixing style errors.
2020-05-03 08:42:45 +00:00
Anthony Berton
87d86f32ee
Update usergroups.lib.php
2020-05-03 10:40:52 +02:00
andreubisquerra
fe98e430ce
Fix travis
2020-05-03 00:10:12 +02:00
jove@bisquerra.com
81c808692e
NEW Bar Restaurant tab and Auto order
2020-05-02 22:00:04 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
62a2469c71
Fix position of modules
2020-05-02 00:41:27 +02:00
Laurent Destailleur
75dd5f268f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/core/lib/sendings.lib.php
2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
b41b22996f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
5948d385a3
Look and feel v12
2020-04-30 14:46:49 +02:00
Laurent Destailleur
82ace4b4ef
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
2020-04-30 11:52:30 +02:00
Laurent Destailleur
478bd60ad2
Merge pull request #13760 from ptibogxiv/patch-336
...
FIX files download by API/entity
2020-04-28 18:01:42 +02:00
Laurent Destailleur
aa9ee060d5
Look and feel v12
2020-04-28 17:34:11 +02:00
kkhelifa-opendsi
908c653743
Merge branch 'develop' into stcommcontact
2020-04-28 09:03:17 +02:00
ptibogxiv
9764c85ee3
FIX files download by API/entity
...
TODO need more clean of this file with multicompany
2020-04-27 19:15:17 +02:00
Laurent Destailleur
a8613661fc
Fix sql
2020-04-27 19:03:04 +02:00
Laurent Destailleur
12e090eed6
Fix search in correct language
2020-04-27 18:48:35 +02:00
kamel
28d330996c
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:01:07 +02:00
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
5ce3174181
Look and feel v12
2020-04-25 03:31:47 +02:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109
Look and feel v12
2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Frédéric FRANCE
1aafd4667b
fix countable php7 warning
2020-04-24 11:57:23 +02:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
39c454d07b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
7bc8a70b0a
FIX #13670
2020-04-22 18:23:48 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
Laurent Destailleur
9a5986e190
css
2020-04-22 12:40:11 +02:00
Laurent Destailleur
f52408cec1
Look and feel v12
2020-04-22 00:55:38 +02:00
Laurent Destailleur
5c573e197b
Look and feel v12
2020-04-22 00:50:04 +02:00
Laurent Destailleur
cadb52c5b3
Look and feel v12
2020-04-20 19:39:34 +02:00
Laurent Destailleur
230fe26b58
Look and feel v12
2020-04-20 18:38:25 +02:00
Laurent Destailleur
acc7c371cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/vcard.php
htdocs/core/boxes/box_birthdays.php
htdocs/core/boxes/box_birthdays_members.php
htdocs/core/lib/date.lib.php
2020-04-20 16:10:19 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Laurent Destailleur
fe674f08d9
Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER
2020-04-20 03:00:10 +02:00
Laurent Destailleur
8d59ce2e03
Look and feel v12
2020-04-20 02:48:05 +02:00
Laurent Destailleur
fa056e59df
Look and feel v12
2020-04-20 02:14:43 +02:00
Maxime Kohlhaas
817e16d652
Fix birthdays boxes and filter on month
2020-04-18 20:01:18 +02:00
Laurent Destailleur
965bdf733d
FIX Can overwrite file if exists in file manager
2020-04-17 13:10:18 +02:00
Laurent Destailleur
15e3601336
Fix str_replace
2020-04-17 00:49:22 +02:00
Laurent Destailleur
d4c18c79fb
Add option WEBSITE_ADD_CSS_TO_BODY to add a CSS on body tag
2020-04-17 00:42:01 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Scrutinizer Auto-Fixer
d021559b16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-15 22:42:57 +00:00
Laurent Destailleur
86eaa78f1e
FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
...
DOL_DOCUMENT_DIR.
2020-04-15 20:00:27 +02:00
Laurent Destailleur
0d97d88da0
Increase size of small image
2020-04-15 18:12:34 +02:00
Laurent Destailleur
6e9cbe5b70
Fix RSS for blogs
2020-04-15 03:32:49 +02:00
Laurent Destailleur
5772057723
Page to import template easier to understand.
2020-04-13 22:52:34 +02:00
Laurent Destailleur
0878ee3a0f
Look and feel v12
2020-04-13 17:55:25 +02:00
Laurent Destailleur
3740d59848
Look and feel v12
2020-04-13 04:14:28 +02:00
Laurent Destailleur
47b034079a
Look and feel v12
2020-04-13 03:14:01 +02:00
Laurent Destailleur
d0dbf323ed
css
2020-04-13 01:42:10 +02:00
Laurent Destailleur
549b126eff
Look and feel v12
2020-04-12 21:36:57 +02:00
Laurent Destailleur
ed51ce8734
Look and feel v12
2020-04-12 19:56:50 +02:00
Frédéric FRANCE
ea78fc48a8
The variable $rep seems to be never defined.
2020-04-12 18:03:51 +02:00
Laurent Destailleur
38a8cf9bc9
Merge pull request #13575 from frederic34/catmod
...
NEW Show creator, last update user of category/tag in the infoirmation tab
2020-04-12 17:21:04 +02:00
Laurent Destailleur
7d430c08d0
Look and feel v12
2020-04-12 16:36:25 +02:00
Laurent Destailleur
0916017519
Fix addreplace hook
2020-04-12 15:29:13 +02:00
Laurent Destailleur
d7784887d1
More font awesome picto
2020-04-12 14:58:50 +02:00
Frédéric FRANCE
b05ea6573e
info categorie
2020-04-12 00:37:05 +02:00
Laurent Destailleur
ca8e1f3ea5
NEW Can replace a string into all pages in website module
2020-04-11 18:18:53 +02:00
Maxime Kohlhaas
f5ab957faf
FIX #13535 : state in italian address
2020-04-11 17:56:23 +02:00
Laurent Destailleur
33a5288125
Add log
2020-04-11 16:34:59 +02:00
Laurent Destailleur
760121a3d1
Can sort list of answers.
2020-04-11 14:13:16 +02:00
Laurent Destailleur
d8e0036817
css
2020-04-11 12:41:53 +02:00
Laurent Destailleur
069fb27ced
Look and feel v12
2020-04-10 12:27:34 +02:00
Laurent Destailleur
5ff981bf61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/perms.php
2020-04-10 12:04:21 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
5f00f0133e
Merge pull request #13529 from bb2a/patch-4
...
Display Phone link and separ personalise in const
2020-04-09 19:54:48 +02:00
Laurent Destailleur
bc2a1d653d
Merge pull request #13542 from ptibogxiv/patch-325
...
FIX pencil with font awesome 5.13
2020-04-09 19:35:35 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
ptibogxiv
5bba22aeeb
FIX pencil with font awesome 5.13
2020-04-09 14:58:42 +02:00
Laurent Destailleur
5819aadf75
Clean html code (replace table into table with div)
2020-04-09 13:40:26 +02:00
Laurent Destailleur
02436c1e84
NEW The module selection uses a KanBan view by default.
2020-04-08 17:04:23 +02:00
Laurent Destailleur
fe614658c8
Look and feel v12
2020-04-08 16:13:29 +02:00
Anthony Berton
97153fd57d
Update functions.lib.php
2020-04-08 15:13:19 +02:00
Laurent Destailleur
18f2087cc6
Fix look and feel v12
2020-04-08 15:13:01 +02:00
Laurent Destailleur
1adee36314
Upgrade to font awesome 5.13
2020-04-07 21:11:18 +02:00
Laurent Destailleur
9d9364256b
More picto using fontawesome.
2020-04-07 16:45:08 +02:00
Laurent Destailleur
ff1b3db54b
Fix regression on hamburger picto
2020-04-06 23:38:30 +02:00
Laurent Destailleur
0933fefa1d
More fontawesome logo
2020-04-06 18:36:33 +02:00
Laurent Destailleur
665dc6f8d2
More fontawesome logo
2020-04-06 18:16:21 +02:00
Laurent Destailleur
809c741d11
Can use font awesome as picto of object and modules.
2020-04-06 15:34:28 +02:00
Laurent Destailleur
81f289619d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 15:47:46 +02:00
Laurent Destailleur
47987f239d
Fix trans
2020-04-05 15:42:39 +02:00
Laurent Destailleur
03b09f1d28
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:14:03 +02:00
Laurent Destailleur
13b47774e2
FIX #13424
2020-04-05 11:55:43 +02:00
Scrutinizer Auto-Fixer
612bac6598
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-05 00:44:59 +00:00
Laurent Destailleur
28a1b7af35
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-03 18:07:24 +02:00
Laurent Destailleur
a13287e285
Fix: validate of object is ok even if some fields are missing
2020-04-03 14:56:15 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
f6b216eafc
Fix travis
2020-04-01 23:32:44 +02:00
Laurent Destailleur
70706d9ea7
FIX Missing token and take into account max date when it can.
2020-04-01 18:48:45 +02:00
Laurent Destailleur
d2de6a22eb
WIP Can set values in extra languages
2020-04-01 18:11:28 +02:00
Laurent Destailleur
4727800206
Can show technical ID of any object in banner.
2020-04-01 16:51:45 +02:00
Laurent Destailleur
e75e49426f
Look and feel v12
2020-03-31 13:52:02 +02:00
Laurent Destailleur
416d1ce3f0
Fix phpcs
2020-03-31 00:11:31 +02:00
Laurent Destailleur
9fcbec9f02
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-30 19:36:07 +02:00
Laurent Destailleur
d2bfc5f6dc
Merge pull request #13437 from pstructures/develop
...
Add the ability to add tabs from module for company admin setup
2020-03-30 19:25:37 +02:00
Laurent Destailleur
06277ec6e0
Update company.lib.php
2020-03-30 19:24:00 +02:00
Laurent Destailleur
95de8d1992
Update admin.lib.php
2020-03-30 19:23:25 +02:00
Laurent Destailleur
ff549cad18
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields
...
NEW : Project task list, add column selector and extrafields
2020-03-30 18:53:42 +02:00
Francis Appels
3eda785ca5
Add newline end of file
2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab
Add token functions to improve modulebuilder compatiblity with maintained versions.
2020-03-30 10:28:20 +02:00
Laurent Destailleur
d5b107211f
Look and feel v12
2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944
Move more icon definition into CSS
2020-03-28 13:38:25 +01:00
Matt Sidnell
6f07b87cde
Update admin.lib.php
2020-03-27 23:22:02 +00:00
Matt Sidnell
f93bdf6b22
Fix so company_admin tabs do not show in Societe
...
fix
2020-03-27 23:09:40 +00:00
Matt Sidnell
815ae3cb09
Ability to add new tabs on company admin section
...
I have added the option to add a tab from a module to the main company setup section. I need this ability so thought that others might too.
2020-03-27 21:51:34 +00:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
stickler-ci
208049a8f2
Fixing style errors.
2020-03-26 07:27:10 +00:00
florian HENRY
aded72a6fa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-26 08:24:39 +01:00
florian HENRY
21b98a7c4c
set as global
2020-03-26 08:24:20 +01:00
Laurent Destailleur
20fad86520
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
Laurent Destailleur
3855ef6073
Add rounding code 'CR' (currency rate'
2020-03-25 17:41:39 +01:00
Laurent Destailleur
f509c6a266
Add user id into ajaxconst_onoff
2020-03-25 16:00:42 +01:00
florian HENRY
81d86f717d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-25 12:14:54 +01:00
Laurent Destailleur
92db075aa1
Add parameter morecss to img_credit_card()
2020-03-24 21:40:25 +01:00
florian HENRY
6e4038a051
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-24 19:50:19 +01:00
florian HENRY
46a4184f15
NEW : Project task list, add column selector and extrafields
2020-03-24 19:50:01 +01:00
Laurent Destailleur
62fefab5ac
Standardize color of status
2020-03-24 19:06:37 +01:00
gauthier
4c0de74470
FIX : sort by default role makes no sense
2020-03-24 16:27:53 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46
Align color of graph of status on status color
2020-03-24 13:06:59 +01:00
Laurent Destailleur
f56de9f177
Fix autocalculation of timespent in monthy mode
2020-03-23 22:04:40 +01:00
Laurent Destailleur
063cf15bcb
Clean code
2020-03-23 20:16:51 +01:00
Laurent Destailleur
c249a1af14
Merge pull request #13408 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2020-03-23 17:39:09 +01:00
Laurent Destailleur
2a310b09af
Fix phpcs
2020-03-23 17:24:47 +01:00
Laurent Destailleur
b18d3e5588
Fix var not defined
2020-03-23 15:58:47 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
01e60562b9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
24dc202022
Doc
2020-03-23 15:33:52 +01:00
Laurent Destailleur
2177afecd9
Sort order
2020-03-23 14:12:48 +01:00
Alexandre SPANGARO
7d22ccbd12
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
2020-03-23 05:50:07 +01:00
Laurent Destailleur
c80c247a84
Fix phpcs
2020-03-22 20:22:33 +01:00
Laurent Destailleur
3eaed6bfc8
Fix phpcs
2020-03-22 20:22:08 +01:00
Laurent Destailleur
6f3cbe69e8
Fix phpcs
2020-03-22 19:40:58 +01:00
Laurent Destailleur
b0f3fba71a
Fix phpcs
2020-03-22 18:27:56 +01:00
Laurent Destailleur
3d6849dfea
Fix label of tabs
2020-03-22 17:27:08 +01:00
Alexandre SPANGARO
c05ef16e0b
Work on split module fournisseur
2020-03-22 05:51:14 +01:00
Laurent Destailleur
bcf17c79ef
FIX closing tags
2020-03-22 02:44:00 +01:00
Laurent Destailleur
e2acb0c65e
code indent
2020-03-21 19:37:09 +01:00
Laurent Destailleur
792b9228d3
Can search in several different type of containers
2020-03-21 19:09:14 +01:00
Laurent Destailleur
83b8497d28
Rename sample file so we can use color editor
2020-03-21 17:58:03 +01:00
Laurent Destailleur
4ce1665a15
Fix charset in RSS export
2020-03-21 17:36:07 +01:00
Laurent Destailleur
79086011f8
Work on RSS export of blog posts
2020-03-21 17:31:44 +01:00
Laurent Destailleur
666b38b44a
Fix charset in RSS export
2020-03-21 17:31:09 +01:00
Laurent Destailleur
7370268b13
Tool to regenerate files
2020-03-21 11:04:33 +01:00
Laurent Destailleur
27015fc6f6
NEW Add method to add social network sharing buttons on blog posts
2020-03-20 19:34:49 +01:00
Laurent Destailleur
a2f9f72973
Enhance website module
2020-03-20 18:58:45 +01:00
Laurent Destailleur
f904ff5240
Add dol_escape_json method
2020-03-20 17:10:35 +01:00
Laurent Destailleur
aa1f601528
FIX Backto link
2020-03-20 16:30:45 +01:00
Laurent Destailleur
a0086d73a1
Merge pull request #13371 from aspangaro/12.0_a23
...
Work on split module fournisseur
2020-03-20 10:37:54 +01:00
Laurent Destailleur
222556b464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
7eb4522636
FIX missing token and save of survey description
2020-03-19 11:59:57 +01:00
Alexandre SPANGARO
bac099dc60
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
2020-03-19 11:48:21 +01:00
Laurent Destailleur
8e1ffa5144
Fix management of token
2020-03-19 10:52:07 +01:00
Laurent Destailleur
a76392f944
Responsive
2020-03-17 21:26:25 +01:00
Alexandre SPANGARO
033f796398
Work on split module fournisseur
2020-03-17 14:51:48 +01:00
Laurent Destailleur
76fc722638
NEW Can get some variables (not available by default)
2020-03-17 13:33:21 +01:00
Laurent Destailleur
5f255a6c14
A new way to navigate between pages in list is available
2020-03-17 03:24:24 +01:00
Laurent Destailleur
aef827f826
Alias on same line than name
2020-03-14 14:47:01 +01:00
Laurent Destailleur
f92943bee2
css
2020-03-14 03:24:46 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
52290b002a
NEW Another way to navigate between pages for some lists
2020-03-13 12:53:22 +01:00
Laurent Destailleur
d3447bb44b
Fix duplicate /
2020-03-13 10:14:26 +01:00
Laurent Destailleur
4bd1c6c717
Fix hreflink
2020-03-13 09:51:41 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
fc05e8d768
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
2020-03-11 18:03:15 +01:00
Laurent Destailleur
25eae4db9c
Fix missing __USER_EMAIL__ substitution
2020-03-11 16:28:00 +01:00
Laurent Destailleur
26fec2f366
Enhance website
2020-03-11 12:53:41 +01:00
Laurent Destailleur
99b1c773a7
FIX link when using anchor on "/"
2020-03-09 18:56:52 +01:00
Laurent Destailleur
e536ee87b8
FIX link when using anchor on "/"
2020-03-09 18:54:34 +01:00
Laurent Destailleur
fefb3fdde7
Fix permissions on restricArea for external modules
2020-03-08 18:26:41 +01:00
Laurent Destailleur
44a611e006
Move getElementProperties and fetchObjectByElement into functions
2020-03-07 15:06:14 +01:00
Laurent Destailleur
47ebc2bbf2
Hide legend
2020-03-06 09:52:51 +01:00
Laurent Destailleur
52c236570b
Work on the generic Graphic Reporting tool
2020-03-06 01:18:35 +01:00
Laurent Destailleur
a5a2d60755
Fix phpcs
2020-03-05 00:20:39 +01:00
Laurent Destailleur
a6d340a22c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2020-03-04 19:28:15 +01:00
Laurent Destailleur
deda6252f2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/class/expensereport.class.php
2020-03-04 19:22:30 +01:00
atm-arnaud
834873ab15
FIX date order was -1D and desc with label repetition
2020-03-04 11:58:42 +01:00
Laurent Destailleur
537d129627
Merge pull request #13251 from bb2a/patch-20
...
NEW Add subtitution variables for url of document in backoffice
2020-03-03 23:13:53 +01:00
Anthony Berton
2fd7276a30
Update functions.lib.php
2020-03-03 09:53:00 +01:00
Laurent Destailleur
ea7c2aa46b
Update functions.lib.php
2020-03-02 21:47:36 +01:00
Laurent Destailleur
05556a77af
Fix css
2020-03-02 19:37:16 +01:00
Anthony Berton
d9a002a8bd
Update functions.lib.php
2020-03-02 19:27:36 +01:00
Anthony Berton
197f81cb52
Update functions.lib.php
2020-03-02 19:23:45 +01:00
Anthony Berton
12b9897f5c
Update functions.lib.php
2020-03-02 18:53:52 +01:00
Laurent Destailleur
db96634339
Fix trans
2020-03-02 18:50:21 +01:00
Laurent Destailleur
91e8df5c9b
Fix canonical name
2020-03-02 18:43:44 +01:00
Laurent Destailleur
390c0ce4dc
Fix main language is not into subdir
2020-03-02 18:41:30 +01:00
Laurent Destailleur
fab39aef9e
Clean menu bar
2020-03-02 17:35:49 +01:00
Laurent Destailleur
bb79c2cbd9
Fix links
2020-03-02 17:06:22 +01:00
Laurent Destailleur
dea1f1b19f
Fix link
2020-03-02 17:00:51 +01:00
Laurent Destailleur
8928a84c53
Fix link to medias
2020-03-02 16:56:54 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Laurent Destailleur
8879672122
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 12:52:18 +01:00
Laurent Destailleur
0855598c00
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/lib/functions.lib.php
2020-02-29 12:51:33 +01:00
Laurent Destailleur
56704e4029
Add stats of products in MO
2020-02-28 19:26:52 +01:00
Laurent Destailleur
a3e56994b6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
atm-quentin
009eb0d4a4
FIX test on 0 better than isset
2020-02-27 09:34:20 +01:00
Laurent Destailleur
9bc5eb44ca
FIX #13182
2020-02-26 20:25:26 +01:00
atm-quentin
a5baf2bc88
FIX search with '0'
2020-02-26 09:19:39 +01:00
Laurent Destailleur
39624f21e7
Fix var not always defined
2020-02-25 15:36:34 +01:00
Laurent Destailleur
61abfb95a5
Look and feel v12
2020-02-25 13:28:11 +01:00
Laurent Destailleur
16b3e6f7bb
Move external access on dedicated tab
...
Translate field to sort products
2020-02-25 12:44:18 +01:00
Laurent Destailleur
ace5f2844a
Make Setup of TakePOS faster with Ajax ON-Off Button.
2020-02-25 12:37:44 +01:00
Laurent Destailleur
d78221ea08
css
2020-02-24 21:48:46 +01:00
Laurent Destailleur
7cd49f327e
Look and feel v12: CSS for qty in lists
2020-02-24 21:47:48 +01:00
Laurent Destailleur
68526a14cd
NEW Truncate columns names when too long and show full title as popup
2020-02-24 21:33:28 +01:00
Laurent Destailleur
32d74adf20
NEW Truncate columns names when too long and show full title as popup
2020-02-24 21:18:49 +01:00
Laurent Destailleur
9d9429f66b
New: Can limit number of tabs by page.
2020-02-24 20:41:29 +01:00
Laurent Destailleur
32d12468cf
Use SVG logo instead of png
2020-02-24 06:27:03 +01:00
Laurent Destailleur
096a568e83
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-02-23 23:42:23 +01:00
Laurent Destailleur
3075e40f8c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
2020-02-23 23:37:46 +01:00
Laurent Destailleur
189c0d675b
Fix memory report. Xdebug no more required. Try = null instead of unset.
2020-02-23 22:05:59 +01:00
Laurent Destailleur
b4fdd9bc50
Merge pull request #13078 from hregis/10.0_mc
...
FIX #10309
2020-02-21 19:21:54 +01:00
Laurent Destailleur
e4b00c5c20
Merge branch 'develop' into master
2020-02-21 18:20:10 +01:00
Frédéric FRANCE
f6eba36575
fix CATEGORY_ADD_DESC_INTO_DOC
...
$cate->add_category doesn't exists
2020-02-21 18:00:12 +01:00
Laurent Destailleur
9b9f6d5da4
Merge pull request #13151 from frederic34/patch-6
...
fix CATEGORY_ADD_DESC_INTO_DOC
2020-02-21 17:55:19 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
7909055ee8
Enhance multilangue support in website module
2020-02-21 11:36:16 +01:00
Laurent Destailleur
1f4b639ba0
Debug MRP module
2020-02-20 17:44:03 +01:00
javierybar
2942e85e47
More elegant and easy to understand printer setup
2020-02-20 15:16:17 +01:00
Frédéric FRANCE
523e161f33
fix CATEGORY_ADD_DESC_INTO_DOC
...
$cate->add_category doesn't exists
2020-02-20 09:45:17 +01:00
Alexandre SPANGARO
a7ca7dfbb6
FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD
2020-02-20 06:00:17 +01:00
Laurent Destailleur
76f0df138b
Try to fix doc
2020-02-20 01:26:40 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
0c571c0376
Restore common behaviour: Draft object are on left under graph.
...
Open and live objects are on right
2020-02-19 14:20:55 +01:00
Laurent Destailleur
1dd5ba093d
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
2020-02-19 12:11:16 +01:00
Laurent Destailleur
ac16857501
GETPOST(..., 'alpha') remove " if found instead of returning ''
2020-02-19 11:33:45 +01:00
Laurent Destailleur
7c07589850
FIX #13124
2020-02-19 03:07:12 +01:00
Laurent Destailleur
9883c0b688
Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount
...
NEW add weighted amount on project/opportunity
2020-02-19 00:03:03 +01:00
Laurent Destailleur
b618581692
More ajax button in setup. Can reload after on ajaxonoff.
2020-02-18 09:38:34 +01:00
Laurent Destailleur
6555f5d74f
More default hmtl tags in restricthtmlonly
2020-02-17 20:55:17 +01:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
bf281b7dab
Comment
2020-02-17 11:51:49 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Regis Houssin
0ab0bb2e7d
FIX wrong test
2020-02-14 19:26:28 +01:00
Scrutinizer Auto-Fixer
17010478ba
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 09:44:08 +00:00
Regis Houssin
52506ddd05
FIX can be a string or integer
2020-02-13 09:25:36 +01:00
Regis Houssin
f19f706c38
FIX better check
2020-02-13 07:55:52 +01:00
Laurent Destailleur
7931734ecb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Laurent Destailleur
3a9125b097
Merge pull request #13087 from ptibogxiv/patch-304
...
Fix netmeasure update and display
2020-02-12 18:35:44 +01:00
Laurent Destailleur
bd0666bf53
Update product.lib.php
2020-02-12 18:35:15 +01:00
Laurent Destailleur
e74df397eb
FIX #13094
2020-02-12 17:28:18 +01:00
ptibogxiv
f17c7f4cb3
fix for unit with rowid (netmeasure)
2020-02-11 20:21:53 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
05f0242198
NEW The info_admin() can show text after click on other text
2020-02-11 10:38:09 +01:00
Regis Houssin
275b5d1f77
FIX #10309
2020-02-11 07:32:29 +01:00
Laurent Destailleur
8645fd8946
FIX CVE-2019–17223 FIX #13053
2020-02-09 18:28:57 +01:00
Laurent Destailleur
3852ba0655
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-08 17:16:25 +01:00
Laurent Destailleur
aed3ea25cb
Code comment
2020-02-08 17:14:04 +01:00
Laurent Destailleur
3dfe7161cf
Merge pull request #13035 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2020-02-08 17:09:25 +01:00
Laurent Destailleur
716f765ce1
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
2020-02-08 16:00:06 +01:00
Laurent Destailleur
df7cdd1da8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/export_files.php
htdocs/comm/mailing/class/advtargetemailing.class.php
htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
Laurent Destailleur
c3beb854a2
Definition of $fields for member and subscriptions
2020-02-08 13:44:31 +01:00
Laurent Destailleur
54414f7bb0
WIP Generic report
2020-02-07 11:53:09 +01:00
VESSILLER
0be98a4b1b
NEW add opportunity status in project stats
2020-02-07 09:06:07 +01:00
Laurent Destailleur
fe0d1a81eb
Fix filter on current user is stupi on the view "per user".
2020-02-06 21:16:48 +01:00
Laurent Destailleur
5e71366ff2
css
2020-02-06 18:06:36 +01:00
Laurent Destailleur
05e08b3596
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
2020-02-06 12:58:02 +01:00
Scrutinizer Auto-Fixer
59c0631172
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-06 09:49:12 +00:00
Laurent Destailleur
4f3cc87077
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:00 +01:00
Laurent Destailleur
80f4e625be
Fix phpcs
2020-02-05 17:07:42 +01:00
Laurent Destailleur
1875b6a49b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
c015707cbc
Fix Only dolibarr logos are in root of theme
2020-02-05 14:14:59 +01:00
Laurent Destailleur
ddd1ca26b9
CSS
2020-02-05 14:04:19 +01:00
Laurent Destailleur
f8daed7f56
Update company.lib.php
2020-02-05 12:49:56 +01:00
ptibogxiv
94fd2b40c7
new fix Count of Stripe payment mode must take test/live into account
...
fix error message for if no stripe enabled 0b891d5e0c
2020-02-05 12:04:27 +01:00
Laurent Destailleur
0b891d5e0c
FIX Count of Stripe payment mode must take test/live into account
2020-02-04 19:33:47 +01:00
Laurent Destailleur
bc19f72306
FIX Count of Stripe payment mode must take test/live into account
2020-02-04 19:33:20 +01:00
Laurent Destailleur
bb1c9a66dd
Fix code alignement on modulebuilder
2020-02-04 16:37:30 +01:00
Laurent Destailleur
976ce0a954
Fix scrutinizer
2020-02-04 14:33:25 +01:00
Laurent Destailleur
157745a1bb
Fix phpcs
2020-02-04 14:18:37 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
Laurent Destailleur
12b63606df
Fix look and feel of v11
2020-02-02 20:21:16 +01:00
Laurent Destailleur
21e4717721
Merge pull request #12983 from atm-quentin/NEW_monthly_view
...
NEW monthly view to enter time
2020-02-02 20:05:18 +01:00
Laurent Destailleur
86c1777702
Merge pull request #12976 from mapiolca/patch-28
...
Add support of Number2Words module (v2)
2020-02-02 19:54:49 +01:00
Laurent Destailleur
ffa847bc8e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-02 19:32:37 +01:00
Laurent Destailleur
075b1ea744
FIX Log of authentication ko or ko + CVE-2020-7996
2020-02-02 19:05:38 +01:00
Laurent Destailleur
aa54aaeb01
FIX search filter on extrafields were not restored avec "Back to list"
2020-01-31 19:46:03 +01:00
Laurent Destailleur
9372940f17
Fix log through proxy
2020-01-31 17:51:30 +01:00
Laurent Destailleur
8e18a08377
Fix log of proxy forward only if it differs from remote_addr
2020-01-31 16:59:10 +01:00
Laurent Destailleur
0cd8337b7e
NEW Can manage situation invoices
2020-01-31 14:54:42 +01:00
Laurent Destailleur
f752551914
WIP Generic stats page
2020-01-31 14:53:47 +01:00
atm-quentin
78baae1480
Fix stickler v2
2020-01-31 11:51:40 +01:00
atm-quentin
398e83d1cc
FIX for stickler
2020-01-31 11:36:53 +01:00
stickler-ci
fee113bfb5
Fixing style errors.
2020-01-31 10:26:33 +00:00
atm-quentin
a001913751
Debut modification saisie par mois
...
NEW hook and data id
NEW visu FROM day TO day in permonth view
FIX
2020-01-31 11:21:49 +01:00
atm-quentin
ae14814f10
NEW visu FROM day TO day in permonth view
2020-01-31 11:10:40 +01:00
Laurent Destailleur
c58f76b15c
Fix constant name
2020-01-30 17:06:26 +01:00
Pierre Ardoin
05d3c134db
Add support of Number2Words module (v2)
...
if the Number2Words Module is detected, this conversion is selected.
2020-01-30 15:58:21 +01:00
Laurent Destailleur
141664ff10
Fix phpcs
2020-01-30 02:25:26 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
f64ad71924
Missing country code
2020-01-28 02:50:11 +01:00
Laurent Destailleur
c2c80bf40f
Fix Look and feel v11
2020-01-28 02:44:41 +01:00
Laurent Destailleur
fc63d7366d
FIX Mandatory fields must stay mandatory if create/update submit fails
2020-01-27 22:23:40 +01:00
Laurent Destailleur
4fe942985f
FIX Mandatory fields must stay mandatory if create/update submit fails
2020-01-27 22:22:59 +01:00
Laurent Destailleur
29853b5fbd
Fix responsive for public interface of tickets
2020-01-27 14:01:35 +01:00
Laurent Destailleur
50d9ac0b52
Fix else if
2020-01-27 02:13:12 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
8f3f34e1c0
Fix css
2020-01-24 20:11:07 +01:00
Laurent Destailleur
de4183ea65
Update logos
2020-01-24 17:30:46 +01:00
Laurent Destailleur
27a0858050
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
7ad827f212
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/lib/functions2.lib.php
2020-01-23 12:07:17 +01:00
Laurent Destailleur
cbe396b97c
Update functions2.lib.php
2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082
Update functions2.lib.php
2020-01-23 12:02:29 +01:00
Alexandre SPANGARO
7f47b48559
Move function to functions2.lib.php
2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa
FIX: FEC export format
2020-01-23 06:20:31 +01:00
Laurent Destailleur
040f8bef5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-01-22 16:29:04 +01:00
Laurent Destailleur
28d0b85b84
Fix phpcs
2020-01-22 14:56:19 +01:00
Laurent Destailleur
2caa4e9fa6
Merge pull request #12885 from leninrivas/10.0
...
FIX Missing Linked objects Fichinter Ref. in PDF formats
2020-01-22 14:17:25 +01:00
Laurent Destailleur
4922567a27
Add .noexec extension for old php4, php5... files
2020-01-21 15:02:04 +01:00
Laurent Destailleur
4fdfba3867
Add .noexec extension for old php4, php5... files
2020-01-21 15:01:22 +01:00
Laurent Destailleur
ab5940f28c
Fix css lost
2020-01-21 00:56:32 +01:00
Laurent Destailleur
acdb28ba25
Add country id and country code in substitution vars
2020-01-21 00:28:53 +01:00
Laurent Destailleur
5b86851cf3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:46:52 +01:00
Laurent Destailleur
5cac54b2e1
Doc
2020-01-20 18:46:13 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
d465101ae3
Fix We should not be able to choose which permission to use to have
...
access to an object.
2020-01-20 14:29:02 +01:00
Laurent Destailleur
18f2b09fb1
Debug v11
2020-01-20 12:25:25 +01:00
Laurent Destailleur
b8938b8d19
Fix look and feel v11
2020-01-20 02:18:00 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
d9f7c4aec4
FIX #12838
2020-01-18 19:53:48 +01:00
Laurent Destailleur
9c1e409feb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-17 11:35:16 +01:00
Laurent Destailleur
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Anthony Berton
9a6ee89d43
Update functions.lib.php
2020-01-16 15:44:07 +01:00
Anthony Berton
9a6bcaa683
Update functions.lib.php
2020-01-16 15:20:09 +01:00
Laurent Destailleur
849c78f4cd
Doc
2020-01-16 10:12:39 +01:00
atm-ph
3cdb84b192
Fix note started with <s> balise
2020-01-16 09:50:57 +01:00
Laurent Destailleur
5772dce460
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
Laurent Destailleur
07b12e507f
Merge pull request #12841 from bb2a/patch-10
...
Addition of delivery times substitution
2020-01-15 12:08:07 +01:00
Laurent Destailleur
c8ff847480
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/modulebuilder/index.php
2020-01-15 11:56:46 +01:00
Laurent Destailleur
0442105bd4
Fix Generation of zip of module
2020-01-15 11:55:27 +01:00
Anthony Berton
ef5c1e6c8c
Update functions.lib.php
2020-01-13 23:09:08 +00:00
Anthony Berton
1eff733e1c
Update functions.lib.php
2020-01-13 18:23:50 +01:00
Anthony Berton
f3046589e7
Update functions.lib.php
2020-01-13 18:19:51 +01:00
Anthony Berton
226dbceac0
Update functions.lib.php
2020-01-13 17:11:50 +01:00
Laurent Destailleur
9d4e1a3941
FIX #12797
2020-01-13 14:25:48 +01:00
Laurent Destailleur
e88c11c417
Space
2020-01-13 13:20:58 +01:00
Laurent Destailleur
22d4f37e58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
9ebdd82edb
Fix We must refuse to delete a various payment if payment was dispatched
...
in accountancy.
2020-01-10 02:43:24 +01:00
Scrutinizer Auto-Fixer
8691194627
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-09 23:03:10 +00:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896
Fix modulebuilder
2020-01-09 22:27:24 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
622dc7e8d7
Debug v11
2020-01-07 22:01:55 +01:00
Laurent Destailleur
7ef3ee56bd
Fix MRP
2020-01-07 20:28:21 +01:00
Laurent Destailleur
a947215ac1
Fix morecss param was lost
2020-01-07 14:40:59 +01:00
Laurent Destailleur
0e2edde6d3
Look and feel v11
2020-01-07 14:25:58 +01:00
Laurent Destailleur
f4d7958ead
Fix duplicate record in list of events for projects
2020-01-07 14:16:13 +01:00
Laurent Destailleur
f05873201c
Fix duplicate record in list of events for projects
2020-01-07 14:14:47 +01:00
Laurent Destailleur
444e2f1130
Fix length of column
2020-01-07 14:01:45 +01:00
Laurent Destailleur
eea8a4df7b
Fix length of column
2020-01-07 14:01:12 +01:00
Laurent Destailleur
750fa83e96
FIX Bad management of elementtype not llx_actioncomm
2020-01-07 13:49:52 +01:00
Laurent Destailleur
6029e82e90
FIX Bad management of elementtype not llx_actioncomm
2020-01-07 13:48:44 +01:00
Laurent Destailleur
8c67ea14a0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 15:30:22 +01:00
Laurent Destailleur
40ba90d170
css
2020-01-06 15:29:18 +01:00
Laurent Destailleur
afd32135f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
e7ac01e1bd
FIX localtax info were not returned correctly when call done with id.
2020-01-01 22:27:47 +01:00
Laurent Destailleur
2e8fd25299
FIX Local taxes was not correctly supported in TakePOS.
2020-01-01 21:54:47 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
Laurent Destailleur
094b37d79d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-23 19:12:32 +01:00
Laurent Destailleur
8e78dbad69
Fix for php 7.4
2019-12-23 16:41:22 +01:00
Laurent Destailleur
f193d3edd8
Fix for php7.4
2019-12-23 16:38:37 +01:00
Laurent Destailleur
1ebf7e642f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-23 15:49:25 +01:00
Laurent Destailleur
330cca994e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a
FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
2019-12-23 15:45:08 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
2df9df2db0
Debug v11
2019-12-23 12:24:27 +01:00
Laurent Destailleur
693551069b
Fix look and feel v11
2019-12-22 21:32:35 +01:00
Laurent Destailleur
30b8affdb7
Fix look and feel v11
2019-12-22 21:32:19 +01:00
Laurent Destailleur
ad039ff968
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/repair.php
2019-12-21 14:03:45 +01:00
Laurent Destailleur
03649ea2c8
Fix pb with svg images
2019-12-19 19:10:23 +01:00
Laurent Destailleur
43ff015157
Fix pb with svg images
2019-12-19 19:09:56 +01:00
stickler-ci
863fa7360d
Fixing style errors.
2019-12-19 09:57:37 +00:00
Laurent Destailleur
dd0a1b3e10
Merge branch 'develop' into develop_project
2019-12-19 10:56:03 +01:00
Laurent Destailleur
2afaed6981
Fix bad use of MAIN_MAX_DECIMALS_UNIT_ for foreign currencies
2019-12-19 10:50:23 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Laurent Destailleur
138215fc3f
Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
...
european users.
2019-12-16 22:30:16 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
fdf4d86d81
Debug code
2019-12-16 12:38:51 +01:00
Laurent Destailleur
28bcb49957
Fix css
2019-12-16 11:32:27 +01:00
Laurent Destailleur
9e94be8bac
CSS
2019-12-15 20:31:09 +01:00
Laurent Destailleur
7c71f6cae9
Fix message
2019-12-15 17:48:30 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
17b9964678
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2019-12-14 14:43:14 +01:00
Laurent Destailleur
a8de7b850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/admin/system/filecheck.php
2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
d38c73c90a
FIX output of emails from and error on emailing pages.
2019-12-13 15:52:08 +01:00
Laurent Destailleur
a612aefab7
Fix HTML5
2019-12-12 11:11:08 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
12f84d8254
doxygen
2019-12-11 23:04:27 +01:00
Laurent Destailleur
6f4e2e7e61
Fix rounding with multicurrency
2019-12-11 17:58:14 +01:00
VESSILLER
0396b348f7
NEW add weighted amount on project/opportunity
2019-12-10 09:32:37 +01:00
Frédéric FRANCE
f4674a7558
doxygen and $db bot defined
2019-12-10 07:51:39 +01:00
Laurent Destailleur
c8f457f303
Merge pull request #12666 from atm-john/develop_fix_exif_read_data_fatal
...
Fix warning introduce by my #12605 PR #12622
2019-12-09 15:57:24 +01:00
Laurent Destailleur
04a7de14c6
Merge pull request #12660 from Ahuahuachi/develop
...
Bugfix: Module builder missing table prefix
2019-12-09 15:56:01 +01:00
Laurent Destailleur
8c50097012
Update modulebuilder.lib.php
2019-12-09 15:55:25 +01:00
Laurent Destailleur
a12b2fea80
Update modulebuilder.lib.php
2019-12-09 15:54:14 +01:00
John Botella
e1cf93d9a9
Fix exif_read_data fatal error
2019-12-09 14:44:37 +01:00
Laurent Destailleur
63a26ed436
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-09 13:25:49 +01:00
Laurent Destailleur
f2c7d3de2e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-12-09 13:25:23 +01:00
Laurent Destailleur
5dbf060f00
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-12-09 13:24:01 +01:00
Laurent Destailleur
fba274997a
Merge pull request #12647 from atm-john/develop_fix_dolGetBadge
...
Fix dolGetBadge class
2019-12-09 13:05:07 +01:00
Laurent Destailleur
eb0d20b77e
Fix label of country
...
Fix div empty
2019-12-09 09:16:59 +01:00
Alfredo Altamirano
39afe39016
Bugfix: Module builder missing table prefix
...
The function rebuildObjectSql from the module builder module is missing the table prefix when adding a constraint
2019-12-08 19:29:46 -06:00
Laurent Destailleur
2ca5a4378b
Fix empty div when no address
...
Fix deletion of MO
2019-12-09 00:54:42 +01:00
Laurent Destailleur
394104291a
Fix function not found when creating a payment of an expense report
2019-12-08 04:22:09 +01:00
ATM John BOTELLA
4d3ed4ffd3
Fix dolGetBadge class
2019-12-07 17:41:13 +01:00
Laurent Destailleur
d58a6a7d9a
Fix hreflang is more complete
2019-12-07 16:59:35 +01:00
Laurent Destailleur
0e063a3bb3
Fix hreflang tag (must include itself)
2019-12-07 15:46:14 +01:00
Laurent Destailleur
3f0fd9b82a
Fix url
2019-12-07 13:36:37 +01:00
Laurent Destailleur
ff05150f7e
Fix link for alternate language
2019-12-07 13:25:59 +01:00
Laurent Destailleur
7f23c5f74e
Fix link for alternate language
2019-12-07 13:21:11 +01:00
Laurent Destailleur
a2da98c08a
Fix $db not defined
2019-12-07 13:19:12 +01:00
Laurent Destailleur
7be8b14368
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-07 13:10:07 +01:00
Laurent Destailleur
3030a9fa2a
Fix manifest file was saved but not enabled.
2019-12-07 13:09:55 +01:00
Laurent Destailleur
8138fa9780
Missing X-Content-Type-Options: nosniff on header of website pages
2019-12-07 11:51:21 +01:00
Laurent Destailleur
91d83c3d60
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-06 17:40:43 +01:00
Laurent Destailleur
796f34628d
Debug v11
2019-12-06 17:40:22 +01:00
Scrutinizer Auto-Fixer
4debd71281
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Laurent Destailleur
cb497cb08e
Translation
2019-12-06 08:58:16 +01:00
Laurent Destailleur
f74e1f8fa3
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-06 08:11:23 +01:00
Laurent Destailleur
a7571054f0
Fix if exif not available
2019-12-04 22:19:35 +01:00
Laurent Destailleur
553bb728c6
Fix break not necessary
2019-12-04 22:13:50 +01:00
Laurent Destailleur
bde917d7fc
Fix responsive
2019-12-04 15:09:20 +01:00
Laurent Destailleur
9878eddd75
Fix phpcs
2019-12-03 22:52:20 +01:00
Laurent Destailleur
a75915a7a8
Fix regression
2019-12-03 22:37:58 +01:00
Laurent Destailleur
60d3bd0fe9
Fix regression
2019-12-03 22:36:26 +01:00
Laurent Destailleur
558e0cb5f6
Fix regression
2019-12-03 22:34:49 +01:00
Laurent Destailleur
22b17190e8
Update pdf.lib.php
2019-12-03 22:26:33 +01:00
stickler-ci
24b5b9bd72
Fixing style errors.
2019-12-03 18:42:29 +00:00
Philippe GRAND
0ce1e5c007
Fix : Fatal error: Uncaught Error: Class Facture not found
2019-12-03 19:39:32 +01:00
Laurent Destailleur
576006ff6c
Merge pull request #12605 from atm-john/10.0_fix_exif_images
...
Fix Use dynamically exif image information with conf MAIN_USE_EXIF_ROTATION
2019-12-03 17:57:19 +01:00
John Botella
e46f654e9f
Fix deprecated image2wbmp function
2019-12-03 17:27:13 +01:00
Laurent Destailleur
d93cfedcbe
Merge pull request #12602 from TobiasSekan/AddMoreFilesForPreview
...
Add preview button for MD, CSS, XAML files
2019-12-03 13:20:08 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
John Botella
f806c0da78
Fix comment missing
2019-12-03 09:29:04 +01:00
John Botella
2b01576aa9
Fix comment
2019-12-03 09:24:11 +01:00
John Botella
3b72cade4e
Fix exif image with conf MAIN_USE_EXIF_ROTATION
2019-12-02 17:32:06 +01:00
Tobias Sekan
f4e4e1e518
Add preview for MD, CSS, XAML files
2019-12-02 13:53:28 +01:00
Laurent Destailleur
6d81bc77cb
Fix look and feel v11
2019-12-02 11:00:09 +01:00
Laurent Destailleur
af5beade41
Merge pull request #12584 from atm-john/develop_add_link_to_widget
...
NEW link to widget
2019-12-01 19:13:10 +01:00
Laurent Destailleur
f378141fbd
PHPCS
2019-12-01 12:51:01 +01:00
Laurent Destailleur
3eec2430eb
Merge pull request #12585 from atm-john/develop_factoring_token_usage
...
Factoring token usage
2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-01 10:50:56 +01:00
Laurent Destailleur
bf99e8af5d
Fix phpcs
2019-12-01 10:33:55 +01:00
Laurent Destailleur
6bf3af5d83
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748
factoring token usage
2019-12-01 10:20:11 +01:00
ATM John BOTELLA
096e50aaf6
add link to widget
2019-12-01 10:08:43 +01:00
Laurent Destailleur
1d564c2a39
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/core/class/notify.class.php
2019-12-01 00:58:01 +01:00
Laurent Destailleur
bfb8a4e8da
Merge pull request #12578 from Dolibarr/revert-12577-#12482
...
Revert "FIX#12482"
2019-12-01 00:55:13 +01:00
Laurent Destailleur
199b0c11af
Merge pull request #12572 from atm-maxime/fix_deposit
...
Fix deposit line was not translated in deposit invoice
2019-12-01 00:44:17 +01:00
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
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
Maxime Kohlhaas
916954b301
Fix #12371 : access rights on contacts
2019-11-30 14:48:05 +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
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
Frédéric FRANCE
00a80e498e
$head was never initialized
2019-11-28 23:06:04 +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
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
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
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
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
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
b44817f2bf
Merge pull request #12518 from frederic34/patch-17
...
doxygen
2019-11-26 09:10:47 +01:00
Frédéric FRANCE
1ccf0808d0
doxygen
2019-11-26 00:28:26 +01:00
andreubisquerra
6baa1c8d4a
Fix travis
2019-11-25 23:32:40 +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
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
cf0311dd6a
FIX Hook getAccessForbiddenMessage was missing parameters
2019-11-22 16:13:22 +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
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
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
fe3c921152
Merge branch 'develop' into patch-4
2019-11-17 10:17:47 +01:00
Anthony Berton
e1f36ae107
Update functions.lib.php
2019-11-16 17:37:18 +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
Laurent Destailleur
7e52c70321
FIX Advisory ID: usd20190067
2019-11-14 21:16:18 +01:00
Laurent Destailleur
411e9c87e3
Debug feature to set sender profiles
2019-11-14 11:53:28 +01:00
Laurent Destailleur
52787b56b2
Fix when limit = 0
...
Look and feel v11
2019-11-14 11:00:49 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Laurent Destailleur
ede05e03ba
Merge pull request #12417 from frederic34/patch-7
...
doxygen
2019-11-13 18:34:29 +01:00
Laurent Destailleur
7118dbbd1d
Fix var not defined
2019-11-13 18:25:48 +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
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
5eb03cf6ad
Avoid false positive.
2019-11-11 13:26:48 +01:00
Laurent Destailleur
771f304c79
Fix typo
2019-11-09 18:40:08 +01:00
Anthony Berton
4449c6d2a7
Update functions.lib.php
2019-11-08 16:34:20 +01:00
Laurent Destailleur
d1c49c7021
Fix trans
2019-11-08 10:24:03 +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
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
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +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
747113551b
Debug pagination of bookmark list
2019-11-05 09:52:33 +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
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
Laurent Destailleur
6e591d2be0
Fix css
2019-11-04 18:25:32 +01:00
Laurent Destailleur
8aa2fd04ad
NEW The integrity checker now show the expected size of files
2019-11-04 13:23:48 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Laurent Destailleur
99a4781a42
Fix better support for multicurrency for template invoices
2019-11-03 18:58:26 +01:00
Frédéric FRANCE
3e2d89dc02
Update ticket.lib.php
2019-11-02 18:16:09 +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
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
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
d9f333d828
Merge pull request #12289 from frederic34/datetime
...
php is > 5.4
2019-11-02 11:46:34 +01:00
Laurent Destailleur
f9031cdbfd
Clean code
2019-11-02 11:36:48 +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
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
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
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
Laurent Destailleur
5b5a2e9804
Clean code
2019-11-01 03:25:09 +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
John Botella
d0a5e30faa
Change btn name
2019-10-31 08:44:08 +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
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
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
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
e2afcfb999
clean indent
2019-10-27 11:53:20 +01: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
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
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
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
8242281ef8
Close #12096
2019-10-22 14:39:33 +02:00
Laurent Destailleur
b2bbee55f1
Fix phpcs
2019-10-22 12:37:36 +02:00
Anthony Berton
5e7d615250
Update functions.lib.php
2019-10-21 21:06:48 +02: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
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37: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
84f6fd64a9
Merge pull request #12176 from Ahuahuachi/develop
...
Translation of some function documentation
2019-10-20 13:31:25 +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
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
f0a3d1a1c4
Update functions2.lib.php
2019-10-18 23:20:34 +02:00
Alfredo Altamirano
71f9b4f36b
Translation of parameter documentation
2019-10-18 12:55:21 -05:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +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
Gildas
132ea56a59
Fix Stock movement user's right ( Fixes #11967 )
2019-10-17 17:06:38 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
6d05d42c50
Look and feel v11
2019-10-16 11:26:20 +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
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
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
7b1b51e752
Merge pull request #12115 from TobiasSekan/develop
...
Fix MS Outlook import error
2019-10-14 20:54:30 +02:00
Laurent Destailleur
3b84e2bac3
Use img-thumb css
2019-10-14 19:21:13 +02:00
Tobias Sekan
e2ca646b6e
Fix MS Outlook import error
2019-10-14 10:22:47 +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
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
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
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
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
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
Laurent Destailleur
f2d04fe55c
Code comment
2019-10-09 11:51:10 +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
Laurent Destailleur
d55b7689bb
Merge pull request #11920 from ptibogxiv/patch-264
...
NEW translation for member type
2019-10-08 09:00:49 +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
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
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
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
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
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
031c5523d4
NEW Add link to the public interface on the ticket card.
2019-10-05 11:52:30 +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
503973cec9
FIX Edit of ticket module parameters erased others
2019-10-04 14:04:31 +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
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
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 17:21:31 +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
b60ee4c18c
css
2019-10-03 09:58:49 +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
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
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
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 12:25:34 +02:00
Laurent Destailleur
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
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
stickler-ci
5e075d5d30
Fixing style errors.
2019-10-01 06:39:26 +00: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
ATM john
b01bd979b5
Unlock title button feature
2019-09-30 21:10:16 +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
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
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
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-29 11:28:54 +02:00
Laurent Destailleur
6966651d51
Standardize code to use dolSqlDateFilter
2019-09-28 13:22:05 +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
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
66cbb4020b
Merge branch 'develop' into patch-4
2019-09-27 14:46:39 +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
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
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
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Laurent Destailleur
aa5f35f14f
Fix image on ticket
2019-09-26 14:28:34 +02:00
Laurent De Coninck
040e7bdfdf
working solution about filtering the contacs of one company
2019-09-25 18:24:36 +02:00
Alexandre SPANGARO
f4929c5315
NEW Add fa_icon "tools" for load_fiche_titre
2019-09-25 15:24:52 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
19c78d42e9
Fix az09 -> aZ09
2019-09-24 14:20:29 +02:00
Laurent Destailleur
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
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent Destailleur
40f75b16d8
FIX Substitution of __PROJECT_XXX__ not done
2019-09-23 13:04:22 +02:00
Frédéric FRANCE
44ba0deae6
fix badge linked resources on fichinter
2019-09-20 17:58:22 +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
Laurent Destailleur
3f6afa810c
Code comment
2019-09-17 17:55:30 +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
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
John Botella
010e58d957
Add switch view behavior
2019-09-16 13:56:07 +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
Frédéric FRANCE
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 18:42:31 +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
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
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
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
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
florian HENRY
42cd15400d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-09 14:12:34 +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
florian HENRY
63a83a0fa5
resolve conflict
2019-09-09 11:35:37 +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
ATM john
ecddeb2b8b
Add progress to global task list
2019-09-08 21:19:15 +02:00
ATM john
fa5cda2e88
Fix missing total progress column
2019-09-08 18:03:14 +02:00
Laurent Destailleur
f08c07f315
Fix bugs reported by scrutinizer
2019-09-06 10:42:51 +02:00
florian HENRY
dff7be59c8
mostlyDone
2019-09-06 09:22:53 +02:00
Laurent Destailleur
37a32af7b0
NEW Add dictionary to store public holidays.
2019-09-05 20:19:13 +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
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
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
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
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
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
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
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
