Commit Graph

99280 Commits

Author SHA1 Message Date
Laurent Destailleur
f0eef3a6de
Merge pull request #17375 from indelog/fix_adhpayextid
Fix : missig ext_payment_id on adh public pay
2021-04-26 22:40:15 +02:00
Laurent Destailleur
3d287dcd89
Merge pull request #17376 from indelog/fix_emptymail_adhnewpubform
Fix : empty email on public membership form
2021-04-26 21:22:43 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-26 21:18:48 +02:00
Laurent Destailleur
8e67af8d58
Update api_products.class.php 2021-04-26 21:09:56 +02:00
Laurent Destailleur
fde4beb3b6
Merge pull request #17396 from atm-gauthier/fix_disable_delete_if_payments
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
2021-04-26 21:08:29 +02:00
Laurent Destailleur
a29c26f299 Fix amount chosen lost 2021-04-26 21:07:46 +02:00
Laurent Destailleur
a24da7274b
Merge pull request #17399 from atm-jpb/fix_variant_default_vat_code
fix the productCombination class on updatePrice
2021-04-26 21:01:06 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options
Add parameter "option" to hook formattachOptions
2021-04-26 21:00:12 +02:00
Antonin MARCHAL
a296f81bc6 lint(travis) 2021-04-26 20:30:21 +02:00
Antonin MARCHAL
c0b6dd92d7 lint(stickler)4th 2021-04-26 20:15:32 +02:00
Antonin MARCHAL
57118da206 lint(stickler)3rd 2021-04-26 20:13:55 +02:00
Antonin MARCHAL
285fa4a506 lint(stickler) again 2021-04-26 20:10:57 +02:00
Antonin MARCHAL
1d162cc62c lint(stickler) 2021-04-26 20:06:45 +02:00
Laurent Destailleur
8f7dd6211e fix css 2021-04-26 19:55:46 +02:00
Antonin MARCHAL
14269ab8ee Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-04-26 19:30:00 +02:00
Antonin MARCHAL
9e2ee5bf57 add(pmp) PMP per entity 2021-04-26 19:29:56 +02:00
Laurent Destailleur
c849ce79e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-26 19:21:38 +02:00
Laurent Destailleur
b0fe08e411 Clean code 2021-04-26 19:21:23 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
kamel
9f3bcbc39d Fix Stickler CI 2021-04-26 17:48:42 +02:00
kamel
9c46b234cf FIX Supplier invoices (deposit, multicurency in lines) 2021-04-26 17:43:27 +02:00
stickler-ci
a8136a00b1 Fixing style errors. 2021-04-26 15:07:41 +00:00
jpb
8d07b43ccd space stickler 2021-04-26 17:05:21 +02:00
jpb
09d68dd7a6 fix the productCombination class on updatePrice 2021-04-26 17:00:53 +02:00
lmarcouiller
080bd90c93 Fix #17219 : complement of PR 17161 2021-04-26 16:15:09 +02:00
stickler-ci
1a4e1b1ae9 Fixing style errors. 2021-04-26 13:46:37 +00:00
Laurent Destailleur
14baec95dc Clean code 2021-04-26 15:44:24 +02:00
stickler-ci
6387b929cc Fixing style errors. 2021-04-26 12:30:44 +00:00
Robin-Yann
9fc0416664
Update card.php 2021-04-26 14:28:43 +02:00
Robin-Yann
c1f3626cd7
Update card.php 2021-04-26 14:11:24 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Gauthier PC portable 024
5ef22327a2 FIX : last modif date for salary 2021-04-26 12:29:17 +02:00
Laurent Destailleur
87393cee98 Clean code 2021-04-26 11:59:47 +02:00
Gauthier PC portable 024
3920050186 FIX : useless column 2021-04-26 11:35:33 +02:00
Gauthier PC portable 024
ae1586fcc6 FIX : We must not be able to delete sociale charge, vat or salary if there are payments 2021-04-26 10:48:50 +02:00
Laurent Destailleur
c9d6bc70e8 Clean code 2021-04-26 10:22:28 +02:00
Robin-Yann
676067eafc
Update card.php 2021-04-26 10:21:25 +02:00
stickler-ci
ebd3b00016 Fixing style errors. 2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect 2021-04-26 09:21:32 +02:00
Robin
04c97d2695 FIX combo Prospect / Customers / Supplier in society list 2021-04-26 09:05:47 +02:00
Christian Foellmann
6b4ee56f10 fix missing backets 2021-04-26 08:40:24 +02:00
Laurent Destailleur
c3d3b79315 Fix test on Local url 2021-04-25 22:11:57 +02:00
Laurent Destailleur
bc0f220ee3 Fix web site 2021-04-25 22:02:28 +02:00
Laurent Destailleur
de00603106 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-25 20:28:15 +02:00
Laurent Destailleur
d65554f5ab Fix phpcs 2021-04-25 20:27:53 +02:00
stickler-ci
296d19ac8b Fixing style errors. 2021-04-25 18:25:32 +00:00
Laurent Destailleur
d6ce4e1086 Allow option to restrict API endpoints 2021-04-25 20:23:41 +02:00
Laurent Destailleur
73c482ca64 Fix escape 2021-04-25 19:36:48 +02:00
Laurent Destailleur
a8939377de Escape string 2021-04-25 19:31:19 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00