Frédéric FRANCE
|
38d3b9ca71
|
fix regex
|
2021-11-11 16:54:20 +01:00 |
|
Laurent Destailleur
|
06f378db18
|
FIX Bad use of dol_concatdesc()
|
2021-11-11 15:31:19 +01:00 |
|
Laurent Destailleur
|
c5f3f42867
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-11-11 15:13:39 +01:00 |
|
Laurent Destailleur
|
66f1dd8545
|
Fix avoid too large PDF
|
2021-11-11 15:12:31 +01:00 |
|
Laurent Destailleur
|
e46e622049
|
Merge pull request #19349 from BitKFu/total_discount
Added -Propal- as a missing class name to the commondocgenerator.class.php
|
2021-11-11 15:03:02 +01:00 |
|
Laurent Destailleur
|
c6ecf87a8a
|
Update commondocgenerator.class.php
|
2021-11-11 15:02:51 +01:00 |
|
Laurent Destailleur
|
da2f3e7b40
|
Code comment
|
2021-11-11 14:55:59 +01:00 |
|
Laurent Destailleur
|
0665dac594
|
Merge pull request #19348 from ptibogxiv/patch-449
FIX bug if multicompany disabled
|
2021-11-11 14:38:28 +01:00 |
|
Laurent Destailleur
|
9cb094b466
|
Fix error method not defined
|
2021-11-11 14:37:25 +01:00 |
|
Laurent Destailleur
|
a3d2dcb97f
|
Merge pull request #19351 from cfoellmann/PR/block-massaction-delete
block deletion of items not free to delete (is_deletable)
|
2021-11-11 14:33:23 +01:00 |
|
Laurent Destailleur
|
28aa17e4fd
|
FIX calculation of balance in conciliation page on desc sorting.
|
2021-11-11 14:27:17 +01:00 |
|
Laurent Destailleur
|
0443302c3d
|
FIX calculation of balance in conciliation page on desc sorting.
|
2021-11-11 13:49:21 +01:00 |
|
Laurent Destailleur
|
bbd97c6e16
|
Code comment
|
2021-11-11 13:36:04 +01:00 |
|
Christian Foellmann
|
6a216e520f
|
block deletion of items not free to delete (is_deletable)
|
2021-11-11 11:06:05 +01:00 |
|
Laurent Destailleur
|
47dd7335a9
|
Debug v15
|
2021-11-10 21:34:41 +01:00 |
|
stickler-ci
|
7c5810dee6
|
Fixing style errors.
|
2021-11-10 14:19:14 +00:00 |
|
Gerhard Stephan
|
285bd67d90
|
Added -Propal- as a missing class name to the commondocgenerator.class.php
|
2021-11-10 15:16:36 +01:00 |
|
ptibogxiv
|
0afaf080ee
|
FIX bug if multicompany disabled
avoid bad constantes
|
2021-11-10 14:53:17 +01:00 |
|
Giovanni Vella
|
78df3f54c4
|
Merge branch 'Dolibarr:develop' into develop
|
2021-11-10 13:55:18 +01:00 |
|
Laurent Destailleur
|
13e8e3d33c
|
Look and feel v15
|
2021-11-08 19:15:02 +01:00 |
|
Laurent Destailleur
|
8636527125
|
Clean code
|
2021-11-08 17:53:18 +01:00 |
|
Laurent Destailleur
|
f4b2a6ec92
|
Fix negative colors for bars
|
2021-11-08 14:51:14 +01:00 |
|
Laurent Destailleur
|
c464a1cfd2
|
Fix colors
|
2021-11-08 14:37:21 +01:00 |
|
Gerhard Stephan
|
b34fb95f4f
|
Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
|
2021-11-08 10:59:04 +01:00 |
|
Laurent Destailleur
|
e8e0768eec
|
Fix phpcs
|
2021-11-08 03:47:16 +01:00 |
|
Laurent Destailleur
|
28dcdb0708
|
Merge pull request #19283 from bb2a/NEW_SUBSTITUTION_ONLINE_SIGN_PROPAL
NEW - Substitution proposal online sign
|
2021-11-08 03:46:09 +01:00 |
|
Laurent Destailleur
|
43406e7d61
|
Merge pull request #19321 from nicolas-eoxia/new_redirect_after_login
NEW : redirect after connection in login page #19320
|
2021-11-08 03:27:48 +01:00 |
|
Laurent Destailleur
|
d026c721cf
|
Update security2.lib.php
|
2021-11-08 03:27:27 +01:00 |
|
Laurent Destailleur
|
a94b2b4f7e
|
Clean code
|
2021-11-08 03:22:49 +01:00 |
|
Laurent Destailleur
|
be1ca6ebab
|
Clean code
|
2021-11-08 03:21:15 +01:00 |
|
Giovanni Vella
|
e36d2b5398
|
Merge branch 'Dolibarr:develop' into develop
|
2021-11-07 21:53:52 +01:00 |
|
Laurent Destailleur
|
eaf2c6e89c
|
Fix $action not defined
|
2021-11-07 17:49:31 +01:00 |
|
Laurent Destailleur
|
2e499c2d17
|
Fix unknown property
|
2021-11-07 17:46:08 +01:00 |
|
Laurent Destailleur
|
6829507372
|
Fix missing $db
|
2021-11-07 17:44:34 +01:00 |
|
Laurent Destailleur
|
66f85d674d
|
Fix warning scrutinizer
|
2021-11-07 17:43:17 +01:00 |
|
Laurent Destailleur
|
1934a37676
|
Escape to avoid false positive, even if it should be useless.
|
2021-11-07 17:35:43 +01:00 |
|
Laurent Destailleur
|
969fe16442
|
Debug mass actions of partnership module
|
2021-11-07 16:51:18 +01:00 |
|
Laurent Destailleur
|
552d32ccd6
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-11-07 13:54:07 +01:00 |
|
Laurent Destailleur
|
3b7c385c6c
|
Fix syntax error
|
2021-11-07 13:53:30 +01:00 |
|
Laurent Destailleur
|
2234522519
|
Debug module parnership. Add the type of partnership.
|
2021-11-07 13:51:31 +01:00 |
|
Laurent Destailleur
|
713db0e613
|
Removed function pdf_getTotalQty (duplicate with pdf_getlineqty)
|
2021-11-07 12:26:44 +01:00 |
|
Laurent Destailleur
|
ccc1d4d1fa
|
Fix warning
|
2021-11-07 12:24:25 +01:00 |
|
Laurent Destailleur
|
dd2207d6c5
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/db/DoliDB.class.php
htdocs/resource/list.php
|
2021-11-06 21:11:05 +01:00 |
|
Laurent Destailleur
|
7e68f9e013
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/core/db/DoliDB.class.php
htdocs/resource/list.php
|
2021-11-06 21:04:17 +01:00 |
|
Laurent Destailleur
|
edbcf78495
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-11-06 20:39:05 +01:00 |
|
Laurent Destailleur
|
0bc5ec8c78
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2021-11-06 20:38:29 +01:00 |
|
Laurent Destailleur
|
65105a3e05
|
Better log
|
2021-11-06 19:27:50 +01:00 |
|
Laurent Destailleur
|
77864f2c2c
|
NEW Can set value for EHLO smtp command in MAIL_SMTP_USE_FROM_FOR_HELO
|
2021-11-06 19:11:47 +01:00 |
|
Alexandre SPANGARO
|
1cd864e395
|
Merge remote-tracking branch 'upstream/develop' into 15a29
|
2021-11-06 05:06:21 +01:00 |
|
Nicolas Domenech
|
61d97ccd22
|
NEW : redirect after connection in login page
|
2021-11-05 16:02:24 +01:00 |
|