lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,477 Commits 43 Branches 150 Tags 886 MiB
6829507372
Commit Graph

104477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fr69400
761ec7b790 Update functions.lib.php 2021-10-26 16:45:40 +02:00
Laurent Destailleur
7cd09eb649 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 16:34:25 +02:00
fr69400
e4b3dda7f0 Update functions.lib.php 
FIX : Duplicate entry in array
FIX : Unasigned variable
FIX : Type mismatch
FIX : Wrong variable
 2021-10-26 15:27:12 +02:00
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
2436f0967b Fix translation of Nature of member in import. 2021-10-26 14:37:15 +02:00
Laurent Destailleur
fcdfd370ba Fix css 2021-10-26 14:31:55 +02:00
Florian HENRY
89ba133c61 fix: categorie display if none 2021-10-26 14:11:51 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:52:00 +02:00
Laurent Destailleur
f592318cba Merge pdf 2021-10-26 13:51:43 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
 2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Laurent Destailleur
181991ee47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-26 13:10:23 +02:00
Laurent Destailleur
d82cbf6636 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-26 13:09:15 +02:00
Laurent Destailleur
e87e354bd5 Fix: can't reset country of origin 2021-10-26 13:08:22 +02:00
Quentin-Seekness
0c915dc052
FIX: Can't create new attendee 
Field date_subscription is mandatory when creating a new attendee.
 2021-10-26 09:54:08 +02:00
Alexandre SPANGARO
a129e91198 Merge branch '14.0' into 14p23 2021-10-26 06:23:31 +02:00
Laurent Destailleur
e5a8e41cd9 Trans 2021-10-26 02:00:11 +02:00
Laurent Destailleur
299376f221 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-26 01:32:37 +02:00
Laurent Destailleur
c376d40346 css 2021-10-26 01:30:00 +02:00
Laurent Destailleur
93e11e07b4
Merge pull request #19207 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2021-10-25 23:35:19 +02:00
Laurent Destailleur
5db80efcec css 2021-10-25 22:39:19 +02:00
Laurent Destailleur
cffee1df4b Fix phpcs 2021-10-25 22:09:21 +02:00
stickler-ci
02b2ed3f05 Fixing style errors. 2021-10-25 20:08:01 +00:00
Laurent Destailleur
64ca5365e7 Fix sql 2021-10-25 22:07:36 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Frédéric FRANCE
5469d49102
fix warning 2021-10-25 22:04:19 +02:00
Frédéric FRANCE
e3f4c70aea
Update list.php 2021-10-25 22:01:36 +02:00
Frédéric FRANCE
7638a2a8a0
fix warnings 2021-10-25 22:00:45 +02:00
Florian HENRY
9a2e1df94a fix scrutinizer error 2021-10-25 21:54:56 +02:00
Florian HENRY
cfd88cb6e5 fix scrutinizer error 2021-10-25 21:50:27 +02:00
Laurent Destailleur
02f8ac4cbc Fix error phpunit 2021-10-25 21:49:25 +02:00
Florian HENRY
fddcaf6945 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_introduced_scrutinizer 2021-10-25 21:45:08 +02:00
Florian HENRY
8803fe64dc fix scrutinizer 2021-10-25 21:45:00 +02:00
Frédéric FRANCE
5694c88b70
fix rights and warnings 2021-10-25 21:33:59 +02:00
Laurent Destailleur
f64cd9d859 Fix bookmarks page 2021-10-25 21:28:52 +02:00
Frédéric FRANCE
1683f46d9b
backport fix 2021-10-25 21:21:48 +02:00
Frédéric FRANCE
8c08786182
Update list.php 2021-10-25 20:51:56 +02:00
Frédéric FRANCE
c4fbf7c422
fix warning 2021-10-25 20:48:45 +02:00
Frédéric FRANCE
02564df769
fix warning 2021-10-25 20:34:19 +02:00
Laurent Destailleur
20c874d441 Fix escape sql params. 2021-10-25 18:48:44 +02:00
Laurent Destailleur
dc1226b116 Fix #yogosha7508 2021-10-25 18:40:19 +02:00
Laurent Destailleur
1aa59a8b73 Fix avoid duplicate fetch_optionnal when updating contract lines 2021-10-25 18:28:04 +02:00
Laurent Destailleur
4869f2ea2d css 2021-10-25 17:58:55 +02:00
Laurent Destailleur
d96de15788 Comment 2021-10-25 17:12:06 +02:00
Florian HENRY
52a4f4869d Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-25 16:54:30 +02:00
Laurent Destailleur
02632e9e88 Fix need write permission on object to link/remove resource 2021-10-25 16:32:37 +02:00
Laurent Destailleur
28926ab174 Fix permission on page to set resource of an object 2021-10-25 16:25:32 +02:00
Laurent Destailleur
7533d4495d Fix bug huntr.dev 2021-10-25 15:39:02 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Gauthier PC portable 024
1e45b9b1cd FIX : We need a default price base type in variant creation case with multiprices when parent has been created with only one level price 2021-10-25 15:25:58 +02:00