Commit Graph

99909 Commits

Author SHA1 Message Date
Laurent Destailleur
f2d5221784 Debug ModuleBuilder 2022-03-11 11:26:54 +01:00
BB2A Anthony Berton
80a2499844 Clean 2022-03-11 11:25:49 +01:00
Regis Houssin
193a073b16 FIX missing multientity managed 2022-03-11 11:18:09 +01:00
BB2A Anthony Berton
f2377627ec Add template custom module 2022-03-11 10:50:11 +01:00
Regis Houssin
c9cc067075 FIX missing parenthesis 2022-03-11 10:48:51 +01:00
Regis Houssin
e59befa76b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms 2022-03-11 10:46:14 +01:00
Laurent Destailleur
6100bc86f8 FIX css not saved in modulebuilder 2022-03-11 10:32:06 +01:00
Khang
144a11d15e Merge branch 'Dolibarr:develop' into develop 2022-03-11 13:09:08 +07:00
Laurent Destailleur
bc6249f0eb Better error message 2022-03-10 22:17:04 +01:00
Laurent Destailleur
5516eae056 FIX type smallint in module builder and case in values of a property 2022-03-10 21:31:09 +01:00
Laurent Destailleur
27baeef719 Add sticky left 2022-03-10 20:42:02 +01:00
Laurent Destailleur
5680e7c3d7 FIX Cancel edit on surveyr 2022-03-10 18:26:00 +01:00
Sylvain Legrand
b9a698b3ed DLC and DLUO are reversed in the called function 2022-03-10 17:39:53 +01:00
Laurent Destailleur
994ea81ce0 Fix test send email feature 2022-03-10 17:24:54 +01:00
Steve
b5a5d488f4 Merge branch 'dolibarrdevelop' into WIP_Contrat_dolGetButtonAction 2022-03-10 16:20:45 +01:00
stickler-ci
bf9b6c05a2 Fixing style errors. 2022-03-10 15:20:37 +00:00
steve
f987c30a10 clean comments 2022-03-10 16:19:32 +01:00
kevin
2a09d4821b Resolve merge conflicts 2022-03-10 16:16:42 +01:00
kevin
896c79f27a Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_WYSIWYG_ON_PROJECT_TASKS 2022-03-10 16:13:02 +01:00
kevin
7b3d472fa2 Rework code to best match the standard 2022-03-10 16:10:34 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
2022-03-10 15:59:09 +01:00
steve
fffbc9eac8 wip: Contrat dolGetButtonAction 2022-03-10 15:56:10 +01:00
Laurent Destailleur
0ec5595504 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/admin/tools/export_files.php
2022-03-10 14:12:57 +01:00
Laurent Destailleur
32a68995d6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/class/product.class.php
2022-03-10 14:08:19 +01:00
Laurent Destailleur
f6cfe0557b FIX exclusion of other backup files into backup file
Conflicts:
	htdocs/admin/tools/export_files.php
2022-03-10 14:04:16 +01:00
Frédéric FRANCE
7291bbf710 tooltip order date is date not datetime
from sql table
date_commande date, -- date de la commande
2022-03-10 13:52:05 +01:00
Gauthier PC portable 024
b73e1019ed FIX : cast int sql 2022-03-10 12:02:25 +01:00
Gauthier PC portable 024
732724ea51 FIX : move all sql stock transfer queries into 15 => 16 migration file 2022-03-10 11:37:52 +01:00
Gauthier PC portable 024
db7bd84ec3 FIX : tms without DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP 2022-03-10 11:29:53 +01:00
Gauthier PC portable 024
9e2c8ffe37 FIX : test for stickler feedback 2022-03-10 11:10:38 +01:00
Gauthier PC portable 024
96f78adb92 FIX : travis feedback, tms without "DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" 2022-03-10 11:07:00 +01:00
Gauthier PC portable 024
c103c7d61e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-03-10 10:31:56 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Khang
d7fe48ebc0 Vietnam date format
https://en.wikipedia.org/wiki/Date_and_time_notation_in_Vietnam
2022-03-10 14:14:10 +07:00
Laurent Destailleur
eadd8da3d5 FIX exclusion of other backup files into backup file 2022-03-09 23:32:59 +01:00
Laurent Destailleur
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +01:00
BB2A Anthony Berton
1a5beb0664 Fix style 2022-03-09 19:55:55 +01:00
BB2A Anthony Berton
e1e573c532 Add Hook 2022-03-09 19:55:40 +01:00
BB2A Anthony Berton
032b8692b1 Add hook 2022-03-09 19:42:17 +01:00
BB2A Anthony Berton
3a5a74478f Add auther notif 2022-03-09 18:05:07 +01:00
Gauthier PC portable 024
f2aaa27d7b FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT 2022-03-09 17:41:48 +01:00
steve
c3b22ed26e wip: clean comments 2022-03-09 17:10:53 +01:00
steve
25fcb83b74 wip: reopen button 2022-03-09 16:41:26 +01:00
Laurent Destailleur
2279674f01 Trans 2022-03-09 15:58:23 +01:00
stickler-ci
bb2f57a962 Fixing style errors. 2022-03-09 13:15:30 +00:00
kevin
22249d15c3 Add WYSIWYG Editor on project's tasks description field 2022-03-09 14:09:22 +01:00
javieralapps4up
8ddd37a419 Enabled to add links to local object with local browser in email templates
It is forbidden by default
2022-03-09 13:16:09 +01:00
Steve
dcf5d984b0 Merge branch 'dolibarrdevelop' into WIP_Facture_dolGetButtonAction 2022-03-09 11:49:34 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
kamel
1f00dff4da Correction Stickler CI / stickler-ci 2022-03-09 11:40:26 +01:00