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
121,782 Commits 35 Branches 179 Tags 1.7 GiB
9861b50ede
Commit Graph

8381 Commits

Author SHA1 Message Date
Laurent Destailleur
7f5a4a2229 Debug v18 2023-05-22 21:23:21 +02:00
hystepik
1aae4f1cce Fix : thirdparty global discount page 2023-05-22 16:02:19 +02: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
Laurent Destailleur
9743bbde60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:46:09 +02:00
Laurent Destailleur
584131140d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:47 +02:00
Laurent Destailleur
7e6666038c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-16 19:43:23 +02:00
stickler-ci
2c97b66c24 Fixing style errors. 2023-05-16 14:57:46 +00:00
avolani
79cacf58c2
Update propal.class.php 
Fix IDs on created proposal lines when cloning so the hook createFrom has all the clone infos
 2023-05-16 16:53:58 +02:00
Laurent Destailleur
b72cba5c14
Merge pull request #24775 from Hystepik/develop#3 
fix : php 8.1 warnings
 2023-05-15 23:21:24 +02:00
Laurent Destailleur
9972ab2f44 CSS 2023-05-15 20:53:31 +02:00
hystepik
979359526e fix : php 8.1 warnings 2023-05-15 16:05:04 +02:00
Laurent Destailleur
3992e12143 Fix responsiv 2023-05-13 17:43:27 +02:00
Laurent Destailleur
685995cf01 Debug v17 2023-05-12 13:06:36 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
stickler-ci
d25b226796 Fixing style errors. 2023-05-11 09:50:17 +00:00
Noé Courtier
4ad585facc FIX: Add Missing rights check on holiday calendar 2023-05-11 11:41:58 +02:00
Laurent Destailleur
9674d234ba FIX On company change, we must reuse the company parameters 2023-05-10 22:05:43 +02:00
Laurent Destailleur
a3a9d1ac9f Fix SQL error 2023-05-10 18:56:17 +02:00
Laurent Destailleur
2d784f3008 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-10 05:01:15 +02:00
Florian HENRY
77e52007e4 fix: add field in sql the is use in line 1463 and remove undeclare varible 2023-05-05 19:09:28 +02:00
stickler-ci
13348ede59 Fixing style errors. 2023-05-05 16:22:49 +00:00
NextGestion
e8acd50626 Object line : Prevent adding Free line when the option "MAIN_DISABLE_FREE_LINES" is activated (Proposal, invoice, order, contract) 2023-05-05 17:15:49 +01:00
Laurent Destailleur
91f5971b01 Fix alignment 2023-05-01 18:46:22 +02:00
Laurent Destailleur
72f96cc16c
Merge pull request #24437 from FliyFly/editpropalattributes 
Edit attributes on propal card
 2023-05-01 18:15:06 +02:00
Laurent Destailleur
cfff62c2fa Clean code 2023-04-29 15:46:44 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
be835d63ed
Merge pull request #24635 from VMR-Global-Solutions/develop 
API add / fix filter on extrafields in index()
 2023-04-28 20:02:09 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
VMR Global Solutions
926aa6fec7
API add / fix filter on extrafields in index() 
Add / change in api_xxx.class.php files the ability to filter on extrafields when missing in the public functions index()
by changing the SQL query with the pattern 
" FROM ".MAIN_DB_PREFIX"xxxx AS t LEFT JOIN ".MAIN_DB_PREFIX."xxxx_extrafields AS ef ON (ef.fk_object = t.rowid)
 2023-04-28 09:31:33 +02:00
Laurent Destailleur
f44c97d3c6 Code is using the Universal Filter Syntax 2023-04-27 22:12:23 +02:00
Laurent Destailleur
3065b9ca6a Clean code 2023-04-27 21:15:27 +02:00
Laurent Destailleur
2f3cefcc09 Clean code 2023-04-26 11:41:02 +02:00
Laurent Destailleur
586d9f5ba7 Look and feel v18 2023-04-24 01:59:39 +02:00
Laurent Destailleur
a03358fa46 Debug v18 2023-04-24 01:03:43 +02:00
Laurent Destailleur
8a400f0e6f Trans 2023-04-23 21:45:47 +02:00
Laurent Destailleur
73539162ff Show sending mode on emailing file 2023-04-23 21:42:05 +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
16809e557f Fix column balance 2023-04-13 22:31:38 +02:00
FLIO
cbff9a6642 Merge branch 'develop' into editpropalattributes 2023-04-12 15:43:53 +02:00
FLIO
74c1bcf4e8 Fix to correspond to the requested table 2023-04-11 12:58:00 +02:00
FLIO
5e34099363 Fix to correspond to the requested table 2023-04-11 12:48:44 +02:00
Laurent Destailleur
3d11afc4e5 Look and feel v18 2023-04-09 14:52:36 +02:00
Laurent Destailleur
4c9e6e1997 Fix opt-out email 2023-04-09 14:33:23 +02:00
Laurent Destailleur
b9e08dafab css 2023-04-09 13:09:39 +02:00
Laurent Destailleur
8f3bd5ab07 Add info for opt out email 2023-04-09 13:00:34 +02:00
Laurent Destailleur
516232a190 Add info for opt out email 2023-04-08 19:17:14 +02:00
Laurent Destailleur
038fcd69a0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-08 15:13:44 +02:00