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

2527 Commits

Author SHA1 Message Date
Laurent Destailleur
61abfb95a5 Look and feel v12 2020-02-25 13:28:11 +01:00
Frédéric FRANCE
327b827fb4 avoid warning if not an array 
Conflicts:
	htdocs/projet/element.php
 2020-02-21 18:01:04 +01:00
Laurent Destailleur
964b8d74f6
Merge pull request #13160 from frederic34/patch-8 
avoid warning if not an array
 2020-02-21 17:58:50 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Frédéric FRANCE
4801117c37
avoid warning if not an array 2020-02-21 09:24:24 +01:00
Laurent Destailleur
0c571c0376 Restore common behaviour: Draft object are on left under graph. 
Open and live objects are on right
 2020-02-19 14:20:55 +01:00
Laurent Destailleur
9883c0b688
Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount 
NEW add weighted amount on project/opportunity
 2020-02-19 00:03:03 +01:00
Laurent Destailleur
973539db39
Update index.php 2020-02-18 23:59:53 +01:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
 2020-02-18 22:40:43 +01:00
Laurent Destailleur
24bb61b5e4 FIX Usage of project not available in export. 2020-02-18 12:51:53 +01:00
Laurent Destailleur
7b4c674bdc Fix css 2020-02-17 21:43:53 +01:00
Laurent Destailleur
1d760f0e42 Add MO in project overwiew 2020-02-17 21:24:59 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Laurent Destailleur
5d04775164 Fix missing categorie class 2020-02-09 15:14:01 +01:00
Laurent Destailleur
0a912f4e8a Fix missing class 2020-02-08 18:18:22 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Laurent Destailleur
5e4e02337b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-03 02:50:44 +01:00
Laurent Destailleur
90cde17bdb FIX #12986 2020-02-03 02:48:05 +01:00
Laurent Destailleur
fc1d6c1971
Merge pull request #13001 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2020-02-02 20:26:23 +01:00
Laurent Destailleur
12b63606df Fix look and feel of v11 2020-02-02 20:21:16 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-02 18:34:09 +00:00
stickler-ci
01b1667eed Fixing style errors. 2020-02-02 08:13:09 +00:00
ATM john
fe009c3842 Fix project profit for loan part 2020-02-02 09:06:02 +01:00
ATM john
e59d118b8c Fix project loan data 2020-02-02 06:36:06 +01:00
atm-quentin
398e83d1cc FIX for stickler 2020-01-31 11:36:53 +01:00
stickler-ci
fee113bfb5 Fixing style errors. 2020-01-31 10:26:33 +00:00
atm-quentin
a001913751 Debut modification saisie par mois 
NEW hook and data id

NEW visu FROM day TO day in permonth view

FIX
 2020-01-31 11:21:49 +01:00
atm-quentin
ae14814f10 NEW visu FROM day TO day in permonth view 2020-01-31 11:10:40 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
stickler-ci
1de640242f Fixing style errors. 2020-01-28 18:33:01 +00:00
kadogo
9313aabd5c NEW Add duration information for fichinter 2020-01-28 19:28:09 +01:00
Laurent Destailleur
3ece94fb2e Fix class not found 2020-01-27 00:06:10 +01:00
Laurent Destailleur
2177116f83
Merge pull request #12499 from altatof/updtask 
NEW : allow time consumed to be linked to another task
 2020-01-26 23:58:28 +01:00
Norbert Penel
24cb739b7c
FIX : multicompany, impossible to add second task 
due to ref already exists, it was impossible to add a second task on company > 1

this need to be fixed in all Dolibarr versions 

All datas with more than 1 company are corrupted !
 2020-01-20 18:54:35 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
a803feb842
Merge pull request #12474 from openthink-laurent/add-wysiwyg-editor-description-field-projects 
Add WYSIWYG editor to description field of projects
 2020-01-15 14:18:42 +01:00
stickler-ci
eddc38e37f Fixing style errors. 2020-01-15 13:18:25 +00:00
Laurent Destailleur
e15b96c37d
Merge branch 'develop' into updtask 2020-01-15 14:16:43 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2020-01-15 13:38:28 +01:00
Laurent Destailleur
6196f5412b Fix date format 2020-01-15 13:37:04 +01:00
Laurent Destailleur
be9decf06d Fix date format 2020-01-15 13:36:22 +01:00
Laurent Destailleur
0d413c47b1 Fix duplicate info 2020-01-15 13:33:11 +01:00
Laurent Destailleur
43bf0a79e6
Merge pull request #12770 from guillaumematheron/develop 
NEW 2 new options when creating an invoice from time spent on a project : by period or by task
 2020-01-15 13:23:25 +01:00
Scrutinizer Auto-Fixer
8691194627 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-09 23:03:10 +00:00
Laurent Destailleur
14e92bd0be css 2020-01-08 02:39:25 +01:00
Guillaume Matheron
ffa88ad11f Merge remote-tracking branch 'upstream/develop' into develop 2020-01-05 14:51:03 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
stickler-ci
2c68b08e4f Fixing style errors. 2020-01-02 14:27:35 +00:00
Guillaume Matheron
9efdec6c6e Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop 2020-01-02 15:26:28 +01:00
Guillaume Matheron
19e69dc869 Creating invoice from time spent now takes in to account the product duration to compute the quantity to bill 2020-01-02 15:18:18 +01:00
stickler-ci
92f50f6357 Fixing style errors. 2020-01-02 14:00:39 +00:00
Guillaume Matheron
e9e0aae1ce Added option to bill time spent on a task to an existing draft invoice (for instance a recurrent bill) 2020-01-02 14:59:53 +01:00
Laurent Destailleur
31c5f4eb0b
Merge pull request #12748 from OPEN-DSI/v10-fix-projet-element-linkto 
FIX remove backward compatibility projectid and uses object id instead
 2019-12-31 17:40:01 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
stickler-ci
458c1e2174 Fixing style errors. 2019-12-29 19:58:38 +00:00
Guillaume Matheron
84d8ca4b33 Made spaces/tab usage more consistent 2019-12-29 20:47:18 +01:00
Guillaume Matheron
5b1ae96ce9 Added two new options when billing time spent on a project : 
- Create one invoice line per timespent entry

 - Create one invoice line per task
 2019-12-29 20:46:53 +01:00
VESSILLER
811adad8c8 FIX notice var nbfield of array not initialized 2019-12-26 10:34:10 +01:00
VESSILLER
792096ad08 FIX url new for task time spent in project element tab 2019-12-23 16:00:35 +01:00
VESSILLER
99e63ad507 FIX uses GETPOSTISSET instead of GETPOST for projectfield 2019-12-23 15:18:45 +01:00
VESSILLER
e7a5d26355 FIX remove backward compatibility projectid and uses object id instead 2019-12-23 14:25:54 +01:00
Laurent Destailleur
e2451bcd26 Update images 
Fix value of delay for warning on project not closed
 2019-12-21 17:11:21 +01:00
Laurent Destailleur
9f86cd8824 Debug v11 2019-12-20 11:14:16 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
3207add2a6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/fourn/class/fournisseur.product.class.php
 2019-12-17 12:52:12 +01:00
Laurent Destailleur
27b1e71cd2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-17 12:45:00 +01:00
Laurent Destailleur
03bb395ad8
Update document.php 2019-12-17 12:14:30 +01:00
florian HENRY
bb6523b75d fix task document banner without thirdparty FATAL 2019-12-17 10:49:56 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Frédéric FRANCE
7eee26cc0f
Update project.php 2019-12-14 16:18:41 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
VESSILLER
7246b63542 NEW add total weighted amount in project list 2019-12-12 17:34:37 +01:00
VESSILLER
4ea042213e NEW show project label in project index 2019-12-11 10:59:19 +01:00
VESSILLER
0396b348f7 NEW add weighted amount on project/opportunity 2019-12-10 09:32:37 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
f549c4fc9c
Merge pull request #12544 from frederic34/select_produits 
Form select_produits returns void
 2019-12-01 00:47:02 +01:00
Laurent Destailleur
dc77b47d7f
Merge pull request #12564 from atm-john/develop_fix_task_extrafield_fatal_error 
Fix Fatal error : task extrafield error
 2019-12-01 00:45:23 +01:00
ATM John BOTELLA
ff55c9da4a Fix task extrafield error 2019-11-30 00:56:45 +01:00
Frédéric FRANCE
7bbd500e81
The property table_element_date does not exist on Project 
see line 612
 2019-11-28 23:02:14 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void 2019-11-28 21:23:53 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
stickler-ci
7f24d1fe40 Fixing style errors. 2019-11-22 14:18:09 +00:00
altairis
bdb2b730af allow time consumed to be linked to another task 2019-11-22 15:14:55 +01:00
Laurent Destailleur
796c13403d
Merge pull request #12486 from TobiasSekan/FixBoardTaskNumberAlwaysZero 
Fix open tasks number on dashboard was always zero
 2019-11-22 14:37:48 +01:00
Scrutinizer Auto-Fixer
b388c6b7a8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 13:14:59 +00:00
Laurent Destailleur
0fffdd891e Sanitize data 2019-11-21 15:37:59 +01:00
Laurent Destailleur
9a8c5d5c29 Sanitize param 2019-11-21 15:36:30 +01:00
Tobias Sekan
f6c5605fd5
Fix number of tasks on dashboard always zero 2019-11-21 08:29:47 +01:00
Laurent Léonard
dbbcda9e99 Add WYSIWYG editor to description field of projects 2019-11-20 06:38:28 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Frédéric FRANCE
67d05cae1b
doxygen 2019-11-14 19:06:14 +01:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:46 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2019-11-14 08:49:53 +01:00
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00: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
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:34:37 +00:00
Laurent Destailleur
88d2658625
Merge branch 'develop' into scrutinizer-patch-2 2019-11-13 19:14:50 +01:00
Laurent Destailleur
d10be4f169 FIX #12409 FIX #12408 2019-11-13 18:40:24 +01:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
eb378b45a4 Work on BOM - MO module 2019-11-09 20:35:45 +01:00
Laurent Destailleur
4433cff49d
Merge pull request #12346 from frederic34/centpercent 
100% centpercent
 2019-11-07 10:39:09 +01:00
Laurent Destailleur
b3feb6b095 Fix lang not defined 2019-11-06 00:42:29 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
98102e49d2 Fix phpcs 2019-11-05 15:48:41 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
cc51066161
Merge pull request #12273 from frederic34/patch-6 
css
 2019-11-02 13:30:56 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Laurent Destailleur
8608c5db9c Fix color of task progression 2019-11-01 23:16:08 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
c3a9f7ce58
css 2019-10-30 18:49:48 +01:00
Philippe GRAND
e02da55c2d add some comment 2019-10-30 10:08:36 +01:00
Laurent Destailleur
5cbed0a6ed
Merge pull request #12220 from frederic34/patch-8 
css
 2019-10-30 03:13:39 +01:00
VESSILLER
d28242a3c5 FIX remove backward compatibility projectid and uses object id instead 2019-10-29 16:40:47 +01:00
Laurent Destailleur
7fee355fba FIX statistics on MRP page 2019-10-25 10:35:09 +02:00
Frédéric FRANCE
ee21415c6c
Update index.php 2019-10-24 23:12:16 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02: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
Laurent Destailleur
b60ddc255c Removed useless html tags 2019-10-16 14:17:53 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
15d4a18599
Update document.php 2019-10-14 21:21:04 +02:00
iouston
f6aafea33c
Update document.php 
add 2 hidden options for set a default field and a defaut order on document page
 2019-10-14 15:09:59 +02:00
Frédéric FRANCE
fbb44192e0
fix travis 2019-10-08 18:40:39 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus 
Fix : LibStatut missing dolgetstatus usage
 2019-10-07 13:08:33 +02:00
Laurent Destailleur
fb808d830e FIX Look and feel v10 2019-10-06 16:28:14 +02:00
Laurent Destailleur
f6cd3814ac FIX Look and feel v10 2019-10-06 15:08:05 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +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
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
d6198a1e33 Fix billed time is empty 2019-10-01 13:47:29 +02:00
Laurent Destailleur
cd242523a5 Fix billed time is empty 2019-10-01 13:47:12 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00
Laurent Destailleur
48fc165026 Trans 2019-09-30 17:15:05 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +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
412e0f193b
Update element.php 2019-09-27 12:36:53 +02:00
Laurent Destailleur
34aa64bae2
Update element.php 2019-09-27 12:36:15 +02:00
Laurent Destailleur
2eaa910336
Update project.class.php 2019-09-27 12:32:27 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +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
41a2a25729 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/ligne.php
 2019-09-17 12:23:58 +02:00
Laurent Destailleur
ab9dee631b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Laurent Destailleur
36963423c3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-13 11:59:39 +02:00
Laurent Destailleur
7b73e2d57a FIX label of thirdparty is wrong on open project list 2019-09-13 11:05:50 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
ba33369af6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 00:10:08 +02:00
Laurent Destailleur
0466ee1941 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Laurent Destailleur
40890ae345 Fix scrutinizer 2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
Laurent Destailleur
9f775ca480 Fix look and feel v10 2019-08-29 01:37:19 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Laurent Destailleur
cb05380f74 Fix look and feel v10 2019-08-21 04:02:30 +02:00
Laurent Destailleur
cb0bb55b3a Label centered 2019-08-19 10:29:59 +02:00