Commit Graph

7718 Commits

Author SHA1 Message Date
Laurent Destailleur
73946fc6cb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-06-29 16:52:07 +02:00
Laurent Destailleur
71bf338127 Fix regression 2022-06-29 16:50:17 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
941245c5e2 Debug v16 2022-06-28 12:26:49 +02:00
Laurent Destailleur
1d354aa844
Merge pull request #21380 from cfoellmann/PR/fix-fetch-propal-conds
fix fetching mode_reglement default from soc/comm on propal creation
2022-06-27 17:34:54 +02:00
Laurent Destailleur
3e0bc05edd
Update card.php 2022-06-27 17:34:25 +02:00
Christian Foellmann
236f6ad23b fix fetching mode_reglement default from soc/comm on propal creation 2022-06-27 13:11:31 +02:00
Laurent Destailleur
11e11c99b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-27 12:12:07 +02:00
Laurent Destailleur
bbd2f05e3a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-06-27 12:11:40 +02:00
Laurent Destailleur
a1f974f356
Merge pull request #21374 from aspangaro/17p2
Look & Feel v16 - Align amount to right on card
2022-06-27 11:39:31 +02:00
Christian Foellmann
55d90ec560 set the target for SOC links on proposals and invoices to the customer tab 2022-06-25 16:24:55 +02:00
Alexandre SPANGARO
f2e1a8de8b Look & Feel v16 - Align amount to right on card 2022-06-25 06:51:48 +02:00
Laurent Destailleur
e6cb8b6d0e Fix sql error 2022-06-24 18:22:47 +02:00
Laurent Destailleur
4b79d91437 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 12:35:24 +02:00
Laurent Destailleur
264f8ab4ce
Merge pull request #21342 from frederic34/useismodenabled
Use getDolGlobalString
2022-06-23 09:55:31 +02:00
Laurent Destailleur
55326331b9 Fix reposition 2022-06-22 22:14:08 +02:00
stickler-ci
df585c21ee Fixing style errors. 2022-06-22 11:31:47 +00:00
Florian HENRY
156ddb9896 FIX: fiche inter url link into Commerce index 2022-06-22 13:24:15 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
Alexandre SPANGARO
c5967623a9 Merge remote-tracking branch 'upstream/develop' into 16b2 2022-06-21 06:16:24 +02:00
Alexandre SPANGARO
9103f62d8b Fix PHP8 2022-06-20 04:37:35 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
53466079af Fix php fatal error 2022-06-19 19:38:40 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Supermanu
f39c8e46d8 Fix timezone issue in event list 2022-06-15 10:26:44 +02:00
Laurent Destailleur
25ecbe3401 Debug v16 2022-06-15 03:26:27 +02:00
Laurent Destailleur
2de5a9f31b
Merge pull request #21253 from badre-agtaib/scru2
fix bug: The property thirdparty_id does not exist on ActionComm
2022-06-14 19:29:32 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
f8b04140e3
Merge pull request #21182 from bb2a/FIX---php-V8-order-card
FIX - php V8 order card
2022-06-14 15:41:39 +02:00
BB2A Anthony Berton
a757940f17 FIX - Right 2022-06-14 09:14:30 +02:00
bagtaib
8c8ae82700 removed deprecated code 2022-06-13 17:22:00 +02:00
Laurent Destailleur
a48b032dd8
Merge pull request #21200 from leninrivas/patch-5
Save usermodid to updatePercent
2022-06-12 19:09:45 +02:00
Lenin Rivas
503a5cdc82
Add user who modified the percent 2022-06-12 06:33:42 -05:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Lenin Rivas
b57a9d5896
Save usermodid to updatePercent 2022-06-10 05:58:01 -05:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
BB2A Anthony Berton
e438bcb70a FIX - php V8 order card 2022-06-09 13:35:50 +02:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Laurent Destailleur
32c6daee2f CSS 2022-06-07 18:18:01 +02:00
Florian HENRY
70892c18c5 fix: filter status do not work on peruser action comm 2022-06-07 18:14:15 +02:00
Florian HENRY
0146be0d15 fix: filter status do not work on peruser action comm 2022-06-07 18:13:21 +02:00
Laurent Destailleur
87230795cc Fix warning 2022-06-03 14:23:37 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
stickler-ci
e48ce5b159 Fixing style errors. 2022-06-02 19:34:39 +00:00
Florian HENRY
b482a78d31 better fix 2022-06-02 21:29:27 +02:00
Florian HENRY
7f38d55648 better fix 2022-06-02 21:28:17 +02:00
Laurent Destailleur
a579859ab5
Merge pull request #21044 from defrance/patch-195
php V8 warning ($conf->c part 1
2022-06-02 15:44:04 +02:00
stickler-ci
19dc0f124c Fixing style errors. 2022-06-02 13:37:55 +00:00
Florian HENRY
d5c4cac64b Merge branch '15_fix_actioncomm_code_not_updated' of github.com:FHenry/dolibarr into 15_fix_actioncomm_code_not_updated 2022-06-02 15:32:37 +02:00