Commit Graph

112767 Commits

Author SHA1 Message Date
kevin
19cedae1c1 Add trigger on commonObject setProject 2022-05-06 16:14:38 +02:00
melina
7747489259 add hook for takepos addline 2022-05-06 15:49:44 +02:00
lmarcouiller
81e2383515 import with selectbox 2022-05-06 15:38:47 +02:00
Laurent Destailleur
a57312d09c Look and feel v16 2022-05-06 14:13:04 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2022-05-06 12:46:26 +02:00
Laurent Destailleur
177f3f9ca4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-06 12:43:56 +02:00
Laurent Destailleur
0426be5059 FIX Update of sale price (log not correctly updated)
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/product/price.php
2022-05-06 12:42:45 +02:00
Laurent Destailleur
f222328ff8 FIX Update of sale price (log not correctly updated) 2022-05-06 12:37:18 +02:00
melina
7af2d3a54d fix radio buttons size 2022-05-06 12:04:57 +02:00
melina
a65cb2baff translate radio buttons label 2022-05-06 12:04:12 +02:00
Laurent Destailleur
203c4e8082 Fix bad test 2022-05-06 11:48:15 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
melina
5a76385d91 add hook for cart display 2022-05-06 11:34:05 +02:00
Gauthier PC portable 024
2256f8811d FIX : in salary stats and payment list, we must check right perms as well as salary list 2022-05-06 11:24:53 +02:00
Florian HENRY
477aa4cc09 Merge branch 'dev_new_project_upgrade_external_user_perms_project' of github.com:FHenry/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:19:27 +02:00
Florian HENRY
9192596ec3 merge 2022-05-06 11:17:29 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Laurent Destailleur
e79ab6e991 Prepare the v16 freeze 2022-05-06 11:09:09 +02:00
Laurent Destailleur
7f147a25ea Update doc 2022-05-06 11:07:03 +02:00
melina
bfab24f848 merge develop 2022-05-06 10:32:12 +02:00
UT from dolibit
0483e89c82
Update index.php 2022-05-06 08:19:47 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Laurent Destailleur
583343a171 Clean code 2022-05-06 05:08:54 +02:00
Laurent Destailleur
9dbeccb8d8 Doc 2022-05-06 05:02:29 +02:00
Laurent Destailleur
1942e35459 Fix phpunit 2022-05-06 02:34:23 +02:00
Laurent Destailleur
f9942dfeaa Debug v16 2022-05-05 23:02:23 +02:00
Laurent Destailleur
fea8b263f9 NEW Add a tab with list of application on the jobposition file. 2022-05-05 21:56:59 +02:00
Laurent Destailleur
e0a690bead Clean code 2022-05-05 19:51:19 +02:00
Laurent Destailleur
62dd7244a3 css 2022-05-05 18:29:36 +02:00
Laurent Destailleur
2810623e6e css 2022-05-05 17:47:52 +02:00
stickler-ci
fb97f7db29 Fixing style errors. 2022-05-05 14:59:49 +00:00
Alexandre SPANGARO
7bb5ac4095 FIX Accountancy - Add an option to disable use of sub-account on deposit line 2022-05-05 16:48:01 +02:00
Laurent Destailleur
935b3c300a Debug v16 2022-05-05 16:41:21 +02:00
Laurent Destailleur
93cd0174cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-05 13:16:03 +02:00
Laurent Destailleur
6c624a9a45 Fix name of sql file 2022-05-05 12:26:15 +02:00
Francis Appels
10e13286d3 Add missing reception back to draft error handling 2022-05-05 11:08:17 +02:00
Francis Appels
29d1424413 fix merge conflict
Add missing error translation key
2022-05-05 11:07:39 +02:00
stickler-ci
23ae3af247 Fixing style errors. 2022-05-05 07:38:40 +00:00
Adrien Raze
3681cd7747 Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_move_inventory_column-develop 2022-05-05 09:24:51 +02:00
Regis Houssin
0882c7f5af FIX missing country filter in contract list 2022-05-05 08:43:22 +02:00
Laurent Destailleur
2c8830a798
Merge pull request #20655 from bb2a/Move-checkbox-column-as-first-column-on-modulebuilder
Move checkbox column as first column on modulebuilder
2022-05-04 20:40:29 +02:00
Laurent Destailleur
46254143ef
Merge pull request #20775 from grandoc/new_branch_04_05_2022
fix : do not display html tags into list
2022-05-04 20:40:04 +02:00
Laurent Destailleur
03ffbabb4a
Merge pull request #20778 from FHenry/dev_new_total_list_computed_fields
NEW: extrafields computed numeric and totalizable are correctly calculated in total table row
2022-05-04 20:39:24 +02:00
Laurent Destailleur
82ab41a7f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-04 20:37:13 +02:00
Laurent Destailleur
05e22fb8bc css 2022-05-04 20:36:59 +02:00
GregM
ac1fcf290e update 2022-05-04 17:24:37 +02:00
Laurent Destailleur
e3b777ad5b
Merge pull request #20649 from FHenry/15.0_fix_createtable_without_migration_script
fix: CREATE TABLE llx_element_tag without migration script
2022-05-04 17:15:53 +02:00
GregM
885324629f commit resolve conflict 2022-05-04 17:10:39 +02:00
GregM
d2bf2fdb98 update massaction langs & script 2022-05-04 16:53:57 +02:00
Laurent Destailleur
55e60bf628
Merge pull request #20768 from atm-john/15.0_fix_fatal_error_on_task_list
FIX : fatal error for $db  usage in tpl
2022-05-04 16:46:22 +02:00