Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,322 Commits 35 Branches 179 Tags 1.7 GiB
b5036b7a0d
Commit Graph

495 Commits

Author SHA1 Message Date
TheRealBeef
45bf2cd9a8 Updated to display the Advanced Stock Transfers 
Regular stock transfers can not be associated with projects in normal use, so the previous functionality was depreciated.
 2023-09-27 10:52:39 +02:00
Laurent Destailleur
08ac0e9ee4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-21 12:38:41 +02:00
Laurent Destailleur
11cc0a61da Fix cast of int 2023-09-20 11:59:57 +02:00
Laurent Destailleur
f8e5bcdb62 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-06 15:12:21 +02:00
Laurent Destailleur
b65b8d7bcb FIX Navigation to/from a project from page of projects of a thirdparty 2023-09-06 15:08:54 +02:00
UT from dolibit
60dfe4b60e
Update element.php (#25541) 
sorting of   

if (isModEnabled(' ')) {
	require_once

merged two 'stock' entries
 2023-08-09 13:14:50 +02:00
Laurent Destailleur
2c835002bd Test CI 2023-07-09 13:48:34 +02:00
vmaury
d47f004759 Fix #25302 Sum of tasks time spent on project referrers page (projet/element.php) 2023-07-07 16:16:55 +02:00
Laurent Destailleur
86864b4d53 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-06 22:22:26 +02:00
Frédéric FRANCE
810a2ec650
fix no various payment in project overview 
test was inverted here edf79382bf
 2023-07-05 09:54:45 +02:00
Laurent Destailleur
c2a5e834e1
Merge pull request #25216 from frederic34/20230627 
use isModEnabled
 2023-06-28 16:18:53 +02:00
Laurent Destailleur
693c48460e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-28 15:43:33 +02:00
Frédéric France
81fbdacf8e use isModEnabled 2023-06-27 21:31:36 +02:00
Frédéric FRANCE
3a0bcfa58f
fix tooltip in element project 
if $margin = 0 then $margin == 'add' is true
do not compare int with string
 2023-06-27 11:14:06 +02:00
Laurent Destailleur
88175964f9 Fix regression 2023-06-08 10:35:06 +02:00
Laurent Destailleur
c7e9993733
Merge branch 'develop' into fix_element 2023-06-07 20:53:46 +02:00
Laurent Destailleur
f12327cb0b
Merge pull request #24956 from Hystepik/develop#1 
Fix : php 8.1 warnings
 2023-06-07 20:03:58 +02:00
Frédéric France
fd4c24e000 use user hasRight 2023-06-05 23:49:13 +02:00
hystepik
40fe1a5d90 Fix : php 8.1 warnings 2023-06-05 16:08:59 +02:00
Roger Dueck
31b548291a Fix undefined and invalid access issues 2023-05-29 10:21:40 -06:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
 2023-05-17 00:57:17 +02:00
hystepik
46012a6520 fix : php 8.1 warnings 2023-05-16 15:36:27 +02:00
Laurent Destailleur
607fb89b38 Clean code 2023-05-12 14:52:47 +02:00
Laurent Destailleur
1d22be092d Fix lang trans 2023-05-12 14:51:22 +02:00
Laurent Destailleur
ca21aef394 Fix typo 2023-05-12 14:28:52 +02:00
Laurent Destailleur
c630253fda Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-02 05:28:32 +02:00
Laurent Destailleur
0cf4fca331 Fix look and feel v17 2023-04-27 18:00:53 +02:00
Laurent Destailleur
8a92d7f905 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-27 14:03:59 +02:00
stickler-ci
69f6685971 Fixing style errors. 2023-04-20 18:23:40 +00:00
antonin_tdj
1410565b83
Fix ref_client on Project Overview for propale 
The ref_customer in the propal object is name ref_client. 
I just added another check if nothing is found.
 2023-04-20 19:55:31 +02:00
Frédéric FRANCE
97dcae2339 use isModEnabled 2023-04-20 19:11:45 +02:00
Frédéric FRANCE
057407554a use isModEnabled 2023-04-19 14:06:16 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Laurent Destailleur
9a420b8f41 Clean code 2023-04-18 16:15:27 +02:00
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