Commit Graph

100110 Commits

Author SHA1 Message Date
Laurent Destailleur
5a927702c0
Merge pull request #17500 from fmarcet/develop
NEW: Add import on BOM
2021-05-06 16:21:09 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership
Dolibarr partnership
2021-05-06 16:11:13 +02:00
Laurent Destailleur
4c20aa6a60
Merge pull request #17485 from kastoras/add_pagination_to_get_products
Close #17484 Add pagination to get products
2021-05-06 16:05:06 +02:00
UT from dolibit
9cd78e6ecf
Update modules_member.class.php 2021-05-06 16:00:49 +02:00
Laurent Destailleur
a0f85044fc
Merge pull request #17510 from Hystepik/develo#2
Fix #17501 : Undownloable attached file
2021-05-06 16:00:20 +02:00
Laurent Destailleur
a4d93424dc
Merge pull request #17498 from marc-dll/FIX_11.0_pgsql_where_boolean
FIX: pgsql: prevent 'WHERE 1'
2021-05-06 15:58:41 +02:00
Laurent Destailleur
21ce99338b
Merge pull request #17504 from FHenry/13.0
fix missing token
2021-05-06 15:57:45 +02:00
Laurent Destailleur
04ac12b477
Merge pull request #17508 from dolibit-ut/patch-319
Update llx_00_c_country.sql
2021-05-06 15:57:17 +02:00
Laurent Destailleur
7bd6cdbf59
Merge pull request #17505 from FHenry/13_fix_webdavlink
fix: allow webdavs link type
2021-05-06 15:56:55 +02:00
Anthony Berton
2615a1f152 Update list.php 2021-05-06 15:34:45 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 15:21:48 +02:00
altairis-noe
c1b5d26ca0 reconcile before PR - second take 2021-05-06 15:20:49 +02:00
altairis-noe
b979fad859 reconcile before PR 2021-05-06 15:19:29 +02:00
altairis-noe
3311a0b00e Merge branch 'productcard_traceability_fields' of github.com:altairisfr/dolibarr into productcard_traceability_fields 2021-05-06 14:56:04 +02:00
Dorian Vabre
2f7dd4e807 wip vote page 2021-05-06 14:53:23 +02:00
altairis-noe
2bdea3732d days in lifetime trans 2021-05-06 14:52:48 +02:00
Noé Cendrier
57985e866a
Merge pull request #10 from altairis-noe/productcard_traceability_fields
Productcard traceability fields
2021-05-06 14:36:15 +02:00
Dorian Vabre
a00c9c44c3 now adding contact to conforbooth, not only to thirdparty 2021-05-06 14:26:41 +02:00
Dorian Vabre
9c20e92e17 country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change 2021-05-06 14:06:53 +02:00
Dorian Vabre
abeb1c644c country now only required when paying a booth, dates of start and end required 2021-05-06 13:50:13 +02:00
Dorian Vabre
4d8d94bfbf fixes: show only correspond button on specific page, id no longer encoded in hidden parameter 2021-05-06 12:13:49 +02:00
Dorian Vabre
c56c7afa89 update on specifications on suggesting a booth/conf since its now two separated pages 2021-05-06 11:59:24 +02:00
Dorian Vabre
df78aaff88 now 2 distinct pages to suggest a conf or a booth 2021-05-06 11:49:00 +02:00
Dorian Vabre
099ad77d44 encryption change for url 2021-05-06 11:32:07 +02:00
Dorian Vabre
10c9e9b77c wip 2021-05-06 11:31:23 +02:00
Dorian Vabre
a68a7c1f67 wip 2021-05-06 11:27:48 +02:00
Dorian Vabre
4c50d210dd creation of the 3 main pages 2021-05-06 11:26:42 +02:00
Laurent Destailleur
6f4e151b91 Fix permissions 2021-05-06 11:25:46 +02:00
Laurent Destailleur
644079ff00 Fix sql 2021-05-06 11:18:35 +02:00
altairis-noe
7c53e2bb18 too much td 2021-05-06 11:16:22 +02:00
altairis-noe
cce132b8da one more space 2021-05-06 10:04:54 +02:00
altairis-noe
435cbcd16c spaces after ! 2021-05-06 10:01:53 +02:00
altairis-noe
8a108ae5e8 qcstatus out of formproduct and corrections in syntax 2021-05-06 09:59:33 +02:00
lmarcouiller
d55309c847 fix rename file 2021-05-06 09:46:54 +02:00
UT from dolibit
6b89b99dfd
Update llx_00_c_country.sql 2021-05-05 23:07:52 +02:00
Laurent Destailleur
19f78b2e8f More compact gui 2021-05-05 19:13:40 +02:00
ATM john
63292255cc Fix search accented words in product description 2021-05-05 18:45:23 +02:00
altairis-noe
5be2bdd123 qcstatus is not for this branch 2021-05-05 18:01:47 +02:00
altairis-noe
b1a4031bde no qcstatus in productlot class 2021-05-05 17:47:01 +02:00
Gauthier PC portable 024
9108651a7a FIX : if dom is added with ajax, selector need to keep working 2021-05-05 17:25:12 +02:00
Florian HENRY
adc8620506 fix: allow webdavs link type 2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00
altairis-noe
94e485aa06 qc_frequency in days and qcstatus elsewhere 2021-05-05 16:56:25 +02:00
lmarcouiller
020ad5aebe Add endofline in errors.lang 2021-05-05 16:49:51 +02:00
lmarcouiller
6589bab20a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f Fix #17501 : Undownloable attached file 2021-05-05 16:48:04 +02:00
Ferran Marcet
6f66efacb8 New: Add import on BOM 2021-05-05 13:47:43 +02:00
Anthony Berton
ed26e75c0b init 2021-05-05 11:54:16 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00