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 |
|