Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
81,180 Commits 36 Branches 189 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

380 Commits

Author SHA1 Message Date
Frédéric FRANCE
67d05cae1b doxygen 2019-11-14 19:06:14 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Laurent Destailleur
eb378b45a4 Work on BOM - MO module 2019-11-09 20:35:45 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Philippe GRAND
e02da55c2d add some comment 2019-10-30 10:08:36 +01:00
Frédéric FRANCE
7581275316 wip 2019-10-20 11:59:21 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
stickler-ci
cb34c7e299 Fixing style errors. 2019-10-03 20:08:42 +00:00
ATM john
13e456d992 Fix Project LibStatus langs 2019-10-03 22:05:48 +02:00
ATM john
edc4dc3727 Fix project libStatus to use new dolGetStatus 2019-10-03 21:20:07 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
2eaa910336 Update project.class.php 2019-09-27 12:32:27 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent De Coninck
b4f31d61fa allow to remove one custom referent in the project. 
Allow to remove one custom referent from the project.

When we develop one module that supports the custom referent in a
project and if you don't follow the same naming convention as in the
other table (in french). You cannot remove the element.

This fix support now the property 'project_field'. And thus set this
column to null.

[see: #11881]
 2019-09-23 17:46:54 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
559a902405 FIX summary of time spent in preview tab of projects 2019-07-23 03:39:35 +02:00
Laurent Destailleur
f745d01bf3 Prepare change of properties "titre" into "title" 2019-07-19 13:22:54 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
ddc01b4c27 Removed the method liste_array() of project class. It was not used by 
core code.
 2019-07-18 14:22:05 +02:00
Laurent Destailleur
3b393e818a Fix missing entity property into fetch 2019-07-18 14:17:29 +02:00
Laurent Destailleur
6966a854b0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2019-06-17 15:59:52 +02:00
Laurent Destailleur
dac99c878c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/projet/tasks/time.php
 2019-06-17 15:57:06 +02:00
Juanjo Menent
a73ae49c4d FIX: #11296 2019-06-14 18:56:30 +02:00
Laurent Destailleur
ed2d9435db Update project.class.php 2019-06-07 15:21:15 +02:00
florian HENRY
c5afc3131f fix variable name 2019-06-05 15:59:35 +02:00
florian HENRY
1d4962cf81 fix scrutinizer 2019-06-05 15:57:16 +02:00
Laurent Destailleur
ae3605d82d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/core/class/extrafields.class.php
 2019-05-20 15:47:06 +02:00
Laurent Destailleur
ebf252f8a3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-20 15:40:50 +02:00
florian HENRY
4311a1ece8 fix: #11187 2019-05-19 01:58:20 +02:00
Supermanu
9aed9359ad FIX: Remove link between categories and project when deleting 2019-05-04 12:22:45 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
621709ed42 FIX check thirdparty defined when PROJECT_THIRDPARTY_REQUIRED is set 2019-04-10 16:54:20 +02:00
Laurent Destailleur
321ffb859b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
 2019-04-08 14:09:18 +02:00
Laurent Destailleur
b23f74eab1 FIX Status of opportunity should never be -1 2019-04-08 12:17:57 +02:00
Laurent Destailleur
9eaef2ce7a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/export.php
	htdocs/langs/en_US/admin.lang
 2019-03-26 12:40:36 +01:00
Laurent Destailleur
29fe65ed75 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-26 12:37:21 +01:00
Laurent Destailleur
e5f54bd14c FIX Remane of project 2019-03-26 12:35:44 +01:00
Laurent Destailleur
f2de44ce51 Clean code 2019-03-11 01:11:39 +01:00
Frédéric FRANCE
27218b7087 wip 2019-02-24 23:32:09 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091 psr2 2019-02-02 18:25:01 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00