Commit Graph

96128 Commits

Author SHA1 Message Date
Laurent Destailleur
fa010f401a Merge pull request #20639 from FHenry/dev_new_date_sign_in_propal_list
NEW: Add column date Signature on propal list
2022-04-14 21:03:43 +02:00
Laurent Destailleur
6075b627a3 Merge pull request #20633 from Easya-Solutions/fix-stockcorrection-include-tpl-path
FIX include tpl path in product stock
2022-04-14 21:03:15 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/index.php
2022-04-14 16:10:23 +02:00
Laurent Destailleur
909766828e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 15:28:25 +02:00
Laurent Destailleur
ae412d37ed Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 15:28:16 +02:00
Laurent Destailleur
3d21023110 Label of option 2022-04-14 14:11:40 +02:00
Florian HENRY
f15438dd03 NEW: data sign on propal list 2022-04-14 12:28:51 +02:00
atm-arnaud
0fcfb7c5fd FIX intervention entity missing 2022-04-14 12:08:06 +02:00
lmarcouiller
c90d758b0f New : add of unique(entity,label) 2022-04-14 11:06:54 +02:00
lvessiller
5f7f9a7515 FIX include tpl path in product stock 2022-04-14 09:48:06 +02:00
Laurent Destailleur
90366b1b81 Revert "NEW : Import with select boxes" 2022-04-13 16:21:25 +02:00
BB2A Anthony Berton
d154696c32 morecss select_compagny 2022-04-13 16:15:07 +02:00
Laurent Destailleur
c968b872e4 Merge pull request #20619 from fmarcet/15.0
Fix: The resource dropdown does not show the values
2022-04-13 12:14:56 +02:00
Laurent Destailleur
29242a23c3 Update product.class.php 2022-04-13 12:11:35 +02:00
Norbert Penel
e9e10e84b2 ensure priority in this usage
ensure priority in this usage
2022-04-13 10:47:33 +02:00
Laurent Destailleur
914b037a9a Fix regression: bad cache management of linked object loading. 2022-04-12 22:35:12 +02:00
Laurent Destailleur
6a7212a48d Fix sql error 2022-04-12 22:02:46 +02:00
Laurent Destailleur
5e76c1a45d Fix doc 2022-04-12 21:59:34 +02:00
Ferran Marcet
ed172421f0 Fix: The resource dropdown does not show the values 2022-04-12 19:20:45 +02:00
Ferran Marcet
6cbcc54bd9 Fix: The resource dropdown does not show the values 2022-04-12 19:19:41 +02:00
Laurent Destailleur
1bfd9c695f Update tva.class.php 2022-04-12 16:29:25 +02:00
Laurent Destailleur
04ad919a2c Debug modulebuilder for v16. 2022-04-12 15:51:46 +02:00
Laurent Destailleur
386b8bee5e Fix deletion/creation of extrafields. 2022-04-12 15:26:21 +02:00
Laurent Destailleur
599c90ae6b FIX dol_string_onlythesehtmltags can keep html comments 2022-04-12 14:57:12 +02:00
stickler-ci
adda436dab Fixing style errors. 2022-04-12 12:45:05 +00:00
kevin
c51aff99af Add missing entity on adding new VAT 2022-04-12 14:38:17 +02:00
Laurent Destailleur
b1cc271ad5 Fix trans 2022-04-12 14:23:39 +02:00
Aloïs Micard
36372b250c Merge branch 'develop' into add_tabs_in_module_builder 2022-04-12 14:12:41 +02:00
lmarcouiller
d41676cf8b Close #20609 : new massaction asign sale representative 2022-04-12 13:57:00 +02:00
Laurent Destailleur
a006eaecde Fix trans 2022-04-12 13:02:33 +02:00
Aloïs Micard
752cc6f4a7 Lint source code 2022-04-12 11:17:24 +02:00
Aloïs Micard
a747f574b3 Improve comment 2022-04-12 11:15:40 +02:00
Aloïs Micard
25a851ac70 Fix translation 2022-04-12 11:12:43 +02:00
Aloïs Micard
a6407257dd Allow to view tabs in module builder 2022-04-12 11:11:26 +02:00
kevin
f4023b4e44 Add missing entity on salary's payment 2022-04-12 11:08:50 +02:00
Laurent Destailleur
98c7139859 Fix regression on fetchObjectLinked when used in loop on a static object 2022-04-12 10:34:50 +02:00
Laurent Destailleur
4da7883a9a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-12 10:05:27 +02:00
Laurent Destailleur
cfe554b04c Fix var not defined 2022-04-12 03:08:31 +02:00
Laurent Destailleur
cb367f7787 Merge pull request #20606 from vold-lu/translate_permission_label
NEW: ModuileBuilder - Translate permissions label
2022-04-12 03:02:24 +02:00
Laurent Destailleur
356ef3373f Merge pull request #20607 from fmarcet/15.0
Fix: Online signature of proposals does not work well with multicompany
2022-04-12 02:57:26 +02:00
Laurent Destailleur
f679392d26 FIX missing picto in combo of mass actions of thirdparties. 2022-04-12 02:26:37 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
2022-04-11 21:22:27 +02:00
Laurent Destailleur
8f3335f75d CSS 2022-04-11 21:17:35 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 21:14:51 +02:00
Laurent Destailleur
6005f0e08b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-11 20:57:27 +02:00
Laurent Destailleur
b8d1acaff7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 20:57:16 +02:00
Laurent Destailleur
155dfbda94 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-11 20:43:50 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/user/card.php
2022-04-11 20:43:20 +02:00
Laurent Destailleur
c035ee6f2a Look and feel v16 2022-04-11 19:21:04 +02:00
Ferran Marcet
b8bccd62ef Update newonlinesign.php 2022-04-11 18:41:36 +02:00