Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,559 Commits 36 Branches 189 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

12820 Commits

Author SHA1 Message Date
Laurent Destailleur
ab2afd772b Merge pull request #21600 from ymollard/eventorg-fixes 
FIX: EventOrganization Missing databases entries and labels
 2022-07-29 15:40:21 +02:00
Laurent Destailleur
9796ec22bf Merge pull request #21615 from bb2a/NEW---FTP-lib-and-lang-file 
NEW - FTP lib
 2022-07-29 15:05:52 +02:00
Laurent Destailleur
f0c8523713 Debug v16 2022-07-29 14:57:11 +02:00
Laurent Destailleur
7404e8fb75 Debug v16 2022-07-29 14:50:21 +02:00
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Anthony Berton
8e7fa102b8 Clean 2022-07-29 11:14:28 +02:00
Anthony Berton
f10dd33440 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---FTP-lib 2022-07-29 09:40:18 +02:00
Anthony Berton
77b3e511be Del file lang 2022-07-29 08:51:57 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-07-28 18:52:44 +02:00
Anthony Berton
ce87eea3ec ErrorFTPNodisconnect 2022-07-28 18:18:04 +02:00
Laurent Destailleur
0800dc1d8a Merge pull request #21602 from bb2a/NEW---Add-user-right-order-generete-doc 
NEW - Add user right order generete doc
 2022-07-28 14:03:43 +02:00
Anthony Berton
d8ae2361a9 NEW - Add user right order generete doc 2022-07-28 11:29:36 +02:00
Laurent Destailleur
1a61209c0d Fix fatal error in Stripe setup page 
Conflicts:
	htdocs/stripe/admin/stripe.php
 2022-07-28 10:55:38 +02:00
Laurent Destailleur
2020a58ebd Fix fatal error in Stripe setup page 2022-07-28 10:47:36 +02:00
Laurent Destailleur
37c725fc6c NEW Can delete a website even if not empty 2022-07-27 23:01:33 +02:00
Yoan Mollard
e9528443b2 Insert speaker contact type into db 2022-07-27 22:12:36 +02:00
Yoan Mollard
5600fd63df Retrieve category and insert default const at init of eventorganization module 2022-07-27 21:36:57 +02:00
Laurent Destailleur
c5e5f2915e Look and feel v17 2022-07-27 19:01:26 +02:00
Anthony Berton
c2715d1469 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEX---List-product-in-orders 2022-07-27 15:35:58 +02:00
BB2A Anthony Berton
da7f267df3 [200~Merge branch NEX---List-product-in-orders of https://github.com/bb2a/dolibarr into NEX---List-product-in- 2022-07-27 15:02:37 +02:00
BB2A Anthony Berton
7a8006c0a0 init 2022-07-27 14:40:45 +02:00
Christophe Battarel
daa106113d fix translation string 2022-07-27 11:11:26 +02:00
Christophe Battarel
fd6838776f NEW : TAKEPOS - setup terminal name 2022-07-27 11:09:02 +02:00
Laurent Destailleur
78ee02408e Merge pull request #21431 from fboitel/NEW-recursive-envents 
NEW : Recurrent events on agenda v1
 2022-07-27 11:01:26 +02:00
Laurent Destailleur
a04bef1909 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-27 02:48:56 +02:00
Laurent Destailleur
f4b7b0d060 Trans 2022-07-27 02:41:55 +02:00
Laurent Destailleur
8439ed24b1 Trans 2022-07-27 01:58:29 +02:00
lvessiller
bae3583fe3 FIX resolve conflicts 2022-07-26 16:49:35 +02:00
Laurent Destailleur
3f04a91b07 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 14:16:44 +02:00
Laurent Destailleur
138e93402d Fix language font for PDF 2022-07-26 14:15:38 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
64fd91c319 Trans 2022-07-26 11:58:47 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Laurent Destailleur
4d58058697 Fix separator 2022-07-26 10:01:08 +02:00
Yoan Mollard
ae70dc11c6 Fixed labels 2022-07-25 22:28:07 +02:00
Laurent Destailleur
122c27885f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-25 10:29:11 +02:00
Laurent Destailleur
3262426b84 Trans 2022-07-25 08:59:01 +02:00
Laurent Destailleur
8fb7d129c9 Trans 2022-07-25 00:36:38 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
da8a9e6082 Merge pull request #20625 from Easya-Solutions/new-inventory-category-field 
NEW Can use products categories to make inventory
 2022-07-24 22:06:55 +02:00
Laurent Destailleur
89999d0138 Fix update description of skills 2022-07-24 17:31:30 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
c7fd9f5a3a Trans 2022-07-24 10:57:46 +02:00
Laurent Destailleur
7275ac1511 Trans 2022-07-22 20:14:25 +02:00
Laurent Destailleur
56a8912c9b Fix do not erase global option when configuring ticket 2022-07-22 19:47:59 +02:00
Laurent Destailleur
ca323f99ba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 19:37:55 +02:00
Laurent Destailleur
8c8db25dd9 Fix trans 2022-07-22 19:37:27 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Yoan Mollard
edb2e95aaf Fixed labels for permission errors 2022-07-22 17:33:04 +02:00
lvessiller
1f28734a83 FIX resolve conflicts 2022-07-22 08:50:50 +02:00