Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
120,597 Commits 36 Branches 189 Tags
df909b515faec901b0e5be76e53eab1109b49d4f
Commit Graph

461 Commits

Author SHA1 Message Date
Laurent Destailleur
220d404d62 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-04 19:40:05 +02:00
Laurent Destailleur
454372bb4e Fix show description of project 2023-04-04 02:05:05 +02:00
Laurent Destailleur
254e785c47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-04-01 15:06:15 +02:00
Marc de Lima Lucio
96d23fac5f FIX: project referent elements list: conf to hide tasks was flipped 2023-03-31 16:57:19 +02:00
Gauthier PC portable 024
b7e633a00b Merge branch 'NEW/element_time_integration_sql' of github.com:atm-gauthier/dolibarr into NEW/element_time_code_integration 2023-03-09 09:28:00 +01:00
Gauthier PC portable 024
9769fe54a2 NEW : element time integration code 2023-03-08 11:00:58 +01:00
hystepik
f497f4d6e9 Fix : php 8.0 warnings 2023-03-03 16:45:21 +01:00
Laurent Destailleur
c06f0e0b20 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-15 18:23:22 +01:00
Laurent Destailleur
ec1f6de6ac Fix message 2023-02-15 18:23:02 +01:00
Laurent Destailleur
6db1c1cd2f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-15 18:22:06 +01:00
Laurent Destailleur
32d27887b1 Fix message for profit calculation 2023-02-15 18:11:25 +01:00
Laurent Destailleur
d04043f3d8 FIX Profit calculation on project preview tab. 2023-02-15 18:04:23 +01:00
Laurent Destailleur
1b925ec53f FIX Profit calculation on project preview tab. 2023-02-15 17:59:27 +01:00
Laurent Destailleur
6c2d08b9f8 FIX Profit calculation on project preview tab. 2023-02-15 17:57:19 +01:00
Laurent Destailleur
36cf05318b Debug v17 2023-01-31 21:17:06 +01:00
Laurent Destailleur
597c9acb4f Merge branch '17.0' into patch-3 2022-12-27 14:50:09 +01:00
Braito
11bcececf6 update 2022-12-27 10:09:47 +01:00
stickler-ci
f189d71a37 Fixing style errors. 2022-12-26 08:53:27 +00:00
Braito
edf79382bf php 8 warnings test and testnew 2022-12-26 09:47:03 +01:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Laurent Destailleur
1d21d73400 NEW Add date event (!= date project) and location on event organization 2022-10-21 13:19:21 +02:00
Regis Houssin
514cc76fe2 FIX use propal instead propale 2022-10-16 16:44:34 +02:00
Alexandre SPANGARO
a44dcdb562 Use isModEnabled 2022-09-25 22:57:35 +02:00
Alexandre SPANGARO
e707f1c03c Use isModEnabled 2022-09-25 06:18:41 +02:00
Alexandre SPANGARO
5d19588037 Use isModEnabled 2022-09-25 06:13:47 +02:00
Alexandre SPANGARO
3eba955992 Use isModEnabled 2022-09-25 06:05:35 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
04f64dd252 Look and feel v16 2022-05-16 18:54:50 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
8236a8e846 Fix bad test for button to show / hide canceled orders 2022-03-25 15:37:15 +01:00
Laurent Destailleur
4d91e448ce Fix bad test for button to show / hide canceled orders 2022-03-25 15:35:49 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Laurent Destailleur
2afe6ccb4b Debug feature shown/hide canceled orders 2021-11-18 21:26:35 +01:00
Laurent Destailleur
c6463c9a83 Merge pull request #19166 from polkiko/canceled_orders 
NEW Canceled purchase orders do not qualify for total and are hidden
 2021-11-18 20:56:42 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Alexandre SPANGARO
9142599ea5 copyright 2021-10-30 21:18:52 +02:00
Alexandre SPANGARO
b1c799ee08 FIX #19241 Project - Fix display salary in overview 2021-10-30 21:17:15 +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
d240a9f774 fix warnings in ticket list 2021-10-24 09:59:30 +02:00
Jesús Jerez
fc307fb685 Merge branch 'develop' into canceled_orders 2021-10-23 23:24:47 +02:00