Frédéric FRANCE
|
7f60a34799
|
use isModEnabled
|
2022-08-19 18:07:21 +02:00 |
|
stickler-ci
|
6c1289382c
|
Fixing style errors.
|
2022-08-14 13:49:28 +00:00 |
|
Vincent de Grandpré
|
7a22e6f339
|
commentaires du code en anglais
|
2022-08-14 09:48:49 -04:00 |
|
stickler-ci
|
142f242267
|
Fixing style errors.
|
2022-08-13 22:35:53 +00:00 |
|
Vincent de Grandpré
|
fd64b3baec
|
CLOSE 21748 Maillage sur ErrorProductAlreadyExists en créant produit
|
2022-08-13 18:32:30 -04:00 |
|
Laurent Destailleur
|
95b1b3f990
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/emailcollector/class/emailcollector.class.php
htdocs/index.php
htdocs/website/index.php
|
2022-08-10 13:16:02 +02:00 |
|
Laurent Destailleur
|
9e55377f0a
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
|
2022-08-10 13:10:52 +02:00 |
|
Laurent Destailleur
|
643f4c8bdc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-08-10 13:08:03 +02:00 |
|
Frédéric FRANCE
|
5ef9d2d40d
|
keep url
|
2022-08-08 11:11:17 +02:00 |
|
Frédéric FRANCE
|
96c17b485c
|
do not loose decription
when changing country, reload cause description lost
|
2022-08-08 11:07:38 +02:00 |
|
Laurent Destailleur
|
ab81492fa4
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formwebsite.class.php
htdocs/core/lib/cron.lib.php
|
2022-07-24 22:17:25 +02:00 |
|
Laurent Destailleur
|
e465c0f34b
|
Debug v16
|
2022-07-24 19:05:55 +02:00 |
|
Christian Foellmann
|
4c5e05e411
|
fix page titles
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/contact/list.php
htdocs/product/stock/movement_list.php
htdocs/user/list.php
|
2022-07-06 19:19:08 +02:00 |
|
Laurent Destailleur
|
76e3c10c06
|
Revert "fix page titles"
|
2022-07-06 15:56:04 +02:00 |
|
Christian Foellmann
|
89d1389e2d
|
fix page titles
|
2022-06-27 12:48:04 +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 |
|
Christian Foellmann
|
b65c9f4ead
|
fix PRODUCT_DISABLE_ACCOUNTING - hide fields on product/card view
|
2022-06-25 15:04:28 +02:00 |
|
Laurent Destailleur
|
540cd43596
|
Merge branch 'develop' into patch-210
|
2022-06-23 12:37:47 +02:00 |
|
Frédéric France
|
287f868fbb
|
use getDolGlobalString
|
2022-06-22 08:36:24 +02:00 |
|
Frédéric France
|
62c171c26d
|
isModEnabled
|
2022-06-21 20:54:28 +02:00 |
|
BENKE Charlene
|
67021bfd31
|
php V8 warning
|
2022-06-20 15:32:04 +02:00 |
|
Frédéric France
|
3fdbce7a31
|
use isModEnabled function
|
2022-06-11 09:46:28 +02:00 |
|
Frédéric France
|
5dcfc28913
|
use isModEnabled function
|
2022-06-09 22:41:59 +02:00 |
|
Laurent Destailleur
|
e1c2968ae7
|
Look and feel v16
|
2022-05-18 23:11:59 +02:00 |
|
Laurent Destailleur
|
177e8c17fb
|
Fix scrutinizer
|
2022-05-18 11:23:21 +02:00 |
|
lmarcouiller
|
207ebc9266
|
fix php 8.0 warnings
|
2022-05-11 15:06:11 +02:00 |
|
Laurent Destailleur
|
fdfde165a9
|
FIX #20702 #20699 #20700
|
2022-04-29 17:48:40 +02:00 |
|
Laurent Destailleur
|
40d0c3b996
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/tva/card.php
htdocs/langs/en_US/admin.lang
|
2022-04-28 19:23:13 +02:00 |
|
Florian HENRY
|
b4fb6cf527
|
fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL
|
2022-04-15 09:13:41 +02:00 |
|
Laurent Destailleur
|
26c3e235cf
|
Merge pull request #19459 from frederic34/productmerge
can merge products
|
2022-04-07 15:02:03 +02:00 |
|
Laurent Destailleur
|
f141eee005
|
Update card.php
|
2022-04-02 18:08:52 +02:00 |
|
GregM
|
79a0aa816f
|
DolGetButtonAction add $usercancreate
|
2022-02-25 16:42:25 +01:00 |
|
GregM
|
22aae26f71
|
update product card
|
2022-02-25 10:27:26 +01:00 |
|
GregM
|
a761afe5ed
|
FIX add dolGetButtonAction on Product
|
2022-02-25 10:14:39 +01:00 |
|
GregM
|
c65680dbcf
|
WIP dolGetButtonAction on Product
|
2022-02-24 11:48:10 +01:00 |
|
Frédéric FRANCE
|
eb77f10d7b
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-15 19:11:24 +01:00 |
|
Laurent Destailleur
|
37fb02ee76
|
Fix #huntr76f3b405-9f5d-44b1-8434-b52b56ee395f
|
2022-01-29 15:50:59 +01:00 |
|
Frédéric FRANCE
|
38f2a2ca43
|
move actioncomm
|
2021-11-24 18:19:59 +01:00 |
|
Frédéric FRANCE
|
ebc54f82e6
|
move actioncomm
|
2021-11-24 18:16:48 +01:00 |
|
Frédéric FRANCE
|
21a3a6cc7a
|
clean code
|
2021-11-23 23:55:01 +01:00 |
|
Frédéric FRANCE
|
6cbc3c6033
|
clean code
|
2021-11-23 22:55:35 +01:00 |
|
Frédéric FRANCE
|
99cddfa235
|
can merge products but experimental
|
2021-11-23 22:36:14 +01:00 |
|
Frédéric FRANCE
|
429e5cf517
|
can merge products but experimental
|
2021-11-23 22:02:55 +01:00 |
|
Frédéric FRANCE
|
c56f180515
|
can merge products but experimental
|
2021-11-23 21:52:40 +01:00 |
|
Frédéric FRANCE
|
d601f62194
|
can merge products but experimental
|
2021-11-23 21:38:29 +01:00 |
|
Laurent Destailleur
|
e113fe468f
|
Clean code
|
2021-11-12 14:57:36 +01:00 |
|
Laurent Destailleur
|
d21278b0ef
|
Merge branch 'develop' into fix_php8
|
2021-10-31 17:54:32 +01:00 |
|
Laurent Destailleur
|
e9ba9fc103
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
|
2021-10-26 13:52:00 +02:00 |
|
Laurent Destailleur
|
da2ce063b3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/product/card.php
htdocs/public/emailing/mailing-unsubscribe.php
|
2021-10-26 13:42:30 +02:00 |
|
Laurent Destailleur
|
fde44f2792
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
|
2021-10-26 13:29:47 +02:00 |
|