Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3
2020-12-12 12:23:33 +01:00
Laurent Destailleur
11eb48b60a
Merge pull request #15737 from frederic34/pdfBuildThirdpartyName
...
thirdparty need to be object
2020-12-12 12:16:31 +01:00
Laurent Destailleur
2046b3d042
Merge pull request #15740 from frederic34/pdfproforma
...
fix warning
2020-12-12 12:12:43 +01:00
Frédéric FRANCE
479d709a96
fix warning
2020-12-12 09:39:54 +01:00
Frédéric FRANCE
870f2073ad
fix warning
2020-12-11 22:13:30 +01:00
stickler-ci
87038f953a
Fixing style errors.
2020-12-11 19:58:05 +00:00
Frédéric FRANCE
9b2c989906
thirdparty need to be object
2020-12-11 20:57:02 +01:00
Laurent Destailleur
9100e1410e
Fix translation, add comments and clean code, fix also a small
...
regression on colors for graph with lines
2020-12-11 17:59:18 +01:00
Laurent Destailleur
18efbebd02
css
2020-12-11 17:11:50 +01:00
Laurent Destailleur
4fa1248d15
Fix avoid duplicate rows after double migration
2020-12-11 16:53:03 +01:00
Laurent Destailleur
91ddcf6446
Merge pull request #15724 from Hystepik/develop#1
...
Close #15383 : New format for funnel of prospection
2020-12-11 16:31:46 +01:00
Laurent Destailleur
ab0b508984
Merge pull request #15720 from zuiko/patch-1
...
V13 Update html.form.class.php to complete Fix #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently
2020-12-11 16:31:19 +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
lmarcouiller
dea75e6158
Close #15729 : fix error on box name and format
2020-12-11 15:55:17 +01:00
Laurent Destailleur
b3d49c4dce
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-12-11 15:54:31 +01:00
lmarcouiller
54228ad256
Close #15729 : fix bug with nb jobs
2020-12-11 15:49:47 +01:00
lmarcouiller
a5cf177025
Close #15729 : first push
2020-12-11 15:22:29 +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
6a24da54a1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-11 14:49:02 +01:00
Laurent Destailleur
8151e4430b
Merge pull request #15728 from FHenry/dev_add_ecm_files_info_api_docuements
...
NEW : add ECM files table info into API document entry GET
2020-12-11 14:40:40 +01:00
Laurent Destailleur
aa8a6fde84
Merge pull request #15726 from FHenry/develop
...
fix: manage price min for PRODUIT_CUSTOMER_PRICES
2020-12-11 14:36:32 +01:00
Laurent Destailleur
2353ade957
Merge pull request #15732 from frederic34/patch-14
...
fix phpcs
2020-12-11 14:36:04 +01:00
Laurent Destailleur
f4b299e530
Fix generation of PDF
2020-12-11 14:35:13 +01:00
Laurent Destailleur
2adbd29b49
Debug generation of doc from modulebuilder
2020-12-11 14:22:36 +01:00
Frédéric FRANCE
54d51ec557
Update html.form.class.php
2020-12-11 13:46:47 +01:00
Frédéric FRANCE
eb2d7fa657
fix phpcs
2020-12-11 13:43:03 +01:00
Florian HENRY
dca48e4fb6
NEW : add ECM files table info into API document entry GET
2020-12-11 10:21:10 +01:00
Laurent Destailleur
7ac3bb1b67
Debug v13
2020-12-11 02:40:48 +01:00
Laurent Destailleur
697ca3e4f5
Fix selection of duration type
2020-12-11 02:23:43 +01:00
Laurent Destailleur
4ec598d571
Debug v11
2020-12-11 02:12:39 +01:00
Laurent Destailleur
2f8ee92c51
Fix CSS
2020-12-11 02:02:41 +01:00
Laurent Destailleur
206caec290
Debug v13
2020-12-11 01:20:40 +01:00
Laurent Destailleur
cfa194436f
Debug v13
2020-12-11 00:55:21 +01:00
Laurent Destailleur
1f28590e5e
Fix style
2020-12-10 19:05:54 +01:00
Laurent Destailleur
6b1ce7c050
Fix management of photo of users
2020-12-10 18:58:11 +01:00
Laurent Destailleur
df4d2e1b24
Fix path of user photo
2020-12-10 18:13:30 +01:00
Florian HENRY
2653d173b9
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-12-10 17:16:07 +01:00
Laurent Destailleur
693a7590ef
Fix boxes
2020-12-10 17:09:25 +01:00
Laurent Destailleur
c2124479c7
Fix missing test on IMAP
2020-12-10 16:05:43 +01:00
Laurent Destailleur
c850f4c918
Fix fatal error
2020-12-10 16:01:06 +01:00
lmarcouiller
716bb433e8
ajout pictogramme graph dans info box head
2020-12-10 15:50:18 +01:00
Florian HENRY
3438d080f5
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-12-10 15:09:03 +01:00
Florian HENRY
2a2b372ba9
fix: manage price min for PRICE PER CUSTOMER
2020-12-10 15:08:36 +01:00
Laurent Destailleur
59938147b6
Prepare v13
2020-12-10 13:38:12 +01:00
stickler-ci
0a2f656137
Fixing style errors.
2020-12-10 12:19:43 +00:00
lmarcouiller
4f6923442a
fix merge and sql synthax
2020-12-10 13:19:10 +01:00
Ferran Marcet
7360fcd03e
FIX: Bad rigths to send contract
2020-12-10 13:11:55 +01:00
Laurent Destailleur
d040f53dc2
Update web templates
2020-12-10 13:02:51 +01:00
Laurent Destailleur
be163c684f
Fix phpcs
2020-12-10 12:54:13 +01:00
