lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97,640 Commits 43 Branches 150 Tags 886 MiB
5be6ed3996
Commit Graph

97640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5be6ed3996 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/activity/perweek.php
 2021-04-10 14:02:12 +02:00
Laurent Destailleur
cb57546d99 NEW Can hide columns "time consumed" on timesheet per week. 2021-04-10 13:53:23 +02:00
Laurent Destailleur
95a5296d45 NEW Can hide columns "time consumed" on timesheet per week. 2021-04-10 13:29:24 +02:00
Laurent Destailleur
1444920f57
Merge pull request #17204 from Hystepik/develop#1 
Close #17193 : Move button added with PR 17161
 2021-04-10 13:02:21 +02:00
Laurent Destailleur
5dfebcf351
Merge pull request #17203 from dolibit-ut/patch-256 
Update llx_20_c_departements.sql
 2021-04-10 12:58:31 +02:00
Laurent Destailleur
6241ba559b Trans 2021-04-10 12:44:41 +02:00
Laurent Destailleur
11330fd6c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-10 12:42:55 +02:00
Laurent Destailleur
ce6f8eebf5 Close #17206 Add comment on type of constants 2021-04-10 12:42:43 +02:00
Laurent Destailleur
4e6436c1bb
Merge pull request #17202 from dolibit-ut/patch-255 
Update llx_10_c_regions.sql
 2021-04-10 12:34:51 +02:00
Laurent Destailleur
19b223c484
Merge pull request #17209 from dolibit-ut/patch-258 
Update llx_c_type_contact.sql
 2021-04-10 12:34:37 +02:00
Laurent Destailleur
c86b100477
Update llx_c_type_contact.sql 2021-04-10 12:34:30 +02:00
Laurent Destailleur
af16c9c1e8
Merge pull request #17207 from dolibit-ut/patch-257 
Update llx_c_socialnetworks.sql
 2021-04-10 12:34:01 +02:00
Laurent Destailleur
b6e4bdbc6c
Merge pull request #17210 from Csardelacal/dev/goodfriday 
Good friday is a holiday
 2021-04-10 12:33:26 +02:00
Laurent Destailleur
1b88f05f28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-10 12:06:21 +02:00
Laurent Destailleur
3895142772 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2021-04-10 12:06:11 +02:00
César de la Cal Bretschneider
eadd8defaf Good friday is a holiday 2021-04-10 11:39:48 +02:00
Laurent Destailleur
83e272951f Fix phpcs 2021-04-10 00:31:20 +02:00
Laurent Destailleur
280d534b7a Fix phpcs 2021-04-10 00:29:32 +02:00
Laurent Destailleur
0cf659eb85 Fix syntax error 2021-04-10 00:26:28 +02:00
UT from dolibit
0c343f1f0f
Update llx_c_type_contact.sql 2021-04-09 21:18:42 +02:00
Laurent Destailleur
52213d0ac7 Fix duplicate permissions 2021-04-09 21:15:43 +02:00
UT from dolibit
d269e8da15
Update llx_c_socialnetworks.sql 2021-04-09 20:55:28 +02:00
lmarcouiller
19ee78e123 Close #17193 : Move button convert in webp 2021-04-09 15:44:47 +02:00
UT from dolibit
cf83963e5f
Update llx_20_c_departements.sql 
Netherlands/Nederland
 2021-04-09 15:07:32 +02:00
UT from dolibit
4d243ae072
Update llx_10_c_regions.sql 
Italy
Spain
 2021-04-09 14:56:52 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
7f91713c4a Fix merge not complete 2021-04-09 14:06:30 +02:00
Laurent Destailleur
4b1974080a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Laurent Destailleur
b008cb6b6f
Merge pull request #17147 from glu000/13.0-fix17146 
13.0-fix17146
 2021-04-09 13:57:50 +02:00
Laurent Destailleur
e8bf09862f
Merge pull request #17152 from marc-dll/FIX_12.0_zero_packaging 
FIX: supplier order: error 500 when using packaging with product where it is not defined
 2021-04-09 13:51:16 +02:00
Laurent Destailleur
4016c300d2 Fix missing lin to thirdparty on some actions 2021-04-09 13:38:29 +02:00
Laurent Destailleur
fe7654c067 Complete doc 2021-04-09 13:34:19 +02:00
Laurent Destailleur
4025488e08 css 2021-04-09 13:19:57 +02:00
Laurent Destailleur
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
Laurent Destailleur
06a7b8f5cb
Merge pull request #17159 from Hystepik/develop#1 
Close #17145 : add link to autofill with expected qty
 2021-04-09 12:50:33 +02:00
Laurent Destailleur
592800555f
Merge pull request #17148 from indelog/fix_empty_website_otherlang 
Fix empty string WEBSITE_OTHERLANG (better fix)
 2021-04-09 12:49:01 +02:00
Laurent Destailleur
95d3dabdf6
Update website2.lib.php 2021-04-09 12:48:06 +02:00
Laurent Destailleur
f7bab13c3c
Merge pull request #17187 from glu000/13.0-fix17186 
FIX email is not case sensitive
 2021-04-09 12:36:49 +02:00
Laurent Destailleur
44ec5ad12f
Merge pull request #17194 from daraelmin/daraelmin-amountbymebertype 
NEW option to select membership type on the online payment page for membership subscription or renewal
 2021-04-09 12:35:04 +02:00
Laurent Destailleur
17b446e8f7
Update adherent.class.php 2021-04-09 12:27:10 +02:00
Laurent Destailleur
445309bef2 Clean code 2021-04-09 12:25:45 +02:00
Laurent Destailleur
725c6be7db CSS 2021-04-09 12:13:02 +02:00
Laurent Destailleur
e34335974c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-09 12:09:07 +02:00
Laurent Destailleur
afca96a8ee Enhance barcode scanner tool 2021-04-09 12:08:56 +02:00
Laurent Destailleur
bbb75bd3c3
Merge pull request #17195 from FHenry/fix_dev_right_def_id 
fix: right definition id in modulebuilder
 2021-04-09 11:55:11 +02:00
Laurent Destailleur
5eb9acf3e1
Update modMyModule.class.php 2021-04-09 11:50:34 +02:00
Laurent Destailleur
0864daf2ad
Merge pull request #17189 from altairisfr/wh_project 
add fk_project to warehouse table
 2021-04-09 11:49:08 +02:00
Laurent Destailleur
45f9885978
Merge pull request #17196 from DorianVabre/new_add_config_type_securekey_module_builder 
NEW: add config type securekey module builder
 2021-04-09 11:47:29 +02:00
Laurent Destailleur
c0dc784061
Update eventorganization.php 2021-04-09 11:46:50 +02:00