Frédéric France
|
e78f9a56be
|
use isModEnabled
|
2022-08-23 20:16:28 +02:00 |
|
Frédéric France
|
86a7a7c8bb
|
use isModEnabled
|
2022-08-23 20:05:09 +02:00 |
|
Frédéric France
|
4bef0f5745
|
use isModEnabled
|
2022-08-23 20:01:34 +02:00 |
|
Laurent Destailleur
|
72c010622b
|
FIX empty with hasRight and add phpunit to avoid this in future
|
2022-08-14 16:38:20 +02:00 |
|
Laurent Destailleur
|
24b1085639
|
Clean code. Prepare for inputing prices with taxes
|
2022-08-13 19:30:26 +02: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 |
|
Regis Houssin
|
b20144c3d0
|
FIX php8 compatibility
|
2022-08-08 11:39:43 +02:00 |
|
Laurent Destailleur
|
654e7bf638
|
Merge branch 'develop' into FIX---php-V8-user-right-order-card
|
2022-07-28 14:21:20 +02:00 |
|
Anthony Berton
|
a778a5ff78
|
and order lib
|
2022-07-28 11:50:42 +02:00 |
|
Anthony Berton
|
03e265b080
|
FIX - php V8 user right order card
|
2022-07-28 11:43:00 +02:00 |
|
Anthony Berton
|
d8ae2361a9
|
NEW - Add user right order generete doc
|
2022-07-28 11:29:36 +02:00 |
|
Laurent Destailleur
|
fb96145b49
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-07-12 02:05:20 +02:00 |
|
Laurent Destailleur
|
204bf2e618
|
Update card.php
|
2022-07-11 10:54:23 +02:00 |
|
This Charlène
|
796f718012
|
Update card.php
|
2022-07-11 07:14:46 +02:00 |
|
This Charlène
|
8be15e8e27
|
php v8 fix warning
missing and bad name variables
|
2022-07-11 07:11:45 +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
|
bc81f372ac
|
Merge pull request #21362 from bb2a/FIX---Cancel-order
FIX - Right close order
|
2022-06-27 11:46:55 +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 |
|
Alexandre SPANGARO
|
11a1273211
|
PHP8 warning & typo on key
|
2022-06-25 07:13:15 +02:00 |
|
Alexandre SPANGARO
|
cadf8ebe29
|
Look & Feel v16 - Align amount to right on card
|
2022-06-25 06:55:10 +02:00 |
|
BB2A Anthony Berton
|
0d00c4b26d
|
FIX
|
2022-06-23 15:34:45 +02:00 |
|
Laurent Destailleur
|
2370ff4dfc
|
Clean code
|
2022-06-14 21:00:05 +02:00 |
|
Laurent Destailleur
|
dd392143e1
|
Fix conf->projet conf->project
|
2022-06-14 17:53:17 +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 |
|
BENKE Charlene
|
2ad50b77b7
|
php V8 warning
|
2022-05-27 16:34:56 +02:00 |
|
Laurent Destailleur
|
259a292704
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-05-24 16:33:24 +02:00 |
|
Laurent Destailleur
|
34199cf0fb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/comm/propal/card.php
htdocs/core/modules/modRecruitment.class.php
|
2022-05-24 16:31:45 +02:00 |
|
Laurent Destailleur
|
324721ac1e
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
htdocs/core/tpl/list_print_total.tpl.php
htdocs/fichinter/list.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2022-05-22 12:54:40 +02:00 |
|
Eric Seigne
|
4a222fe5d5
|
fix potential warning ($conf->ficheinter->enabled)
|
2022-05-22 01:38:32 +02:00 |
|
Frédéric FRANCE
|
243dfacb15
|
Update card.php
|
2022-05-19 12:46:15 +02:00 |
|
Frédéric FRANCE
|
ad3276b579
|
Update card.php
|
2022-05-19 12:42:15 +02:00 |
|
Frédéric FRANCE
|
2114e51b0e
|
Update card.php
|
2022-05-19 12:34:54 +02:00 |
|
Frédéric FRANCE
|
e44e9d812a
|
Update card.php
|
2022-05-19 12:28:50 +02:00 |
|
Laurent Destailleur
|
2e15a14c14
|
css
|
2022-05-18 00:10:44 +02:00 |
|
Laurent Destailleur
|
720a09dacb
|
Fix regression
|
2022-05-09 15:57:10 +02:00 |
|
Laurent Destailleur
|
522c092aeb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-05-09 09:26:10 +02:00 |
|
Laurent Destailleur
|
b3b6337c4c
|
Merge branch 'develop' into NEW_deposit_payment_terms
|
2022-05-08 23:09:06 +02:00 |
|
Laurent Destailleur
|
a99e647348
|
Merge pull request #20658 from Hystepik/develop#1
NEW #20653 edit discount pourcentage for all lines in one shot
|
2022-05-04 01:20:49 +02:00 |
|
Laurent Destailleur
|
708d3610a5
|
Look and feel v16
|
2022-04-29 13:04:29 +02:00 |
|
lmarcouiller
|
1ccf209c47
|
Close #20653 : edit discount pourcentage
|
2022-04-15 14:31:44 +02:00 |
|
BB2A Anthony Berton
|
d154696c32
|
morecss select_compagny
|
2022-04-13 16:15:07 +02:00 |
|
Gauthier PC portable 024
|
83e8e07416
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-04-08 09:25:08 +02:00 |
|
Laurent Destailleur
|
4693ef42bd
|
Enhance responsive
|
2022-04-07 11:18:56 +02:00 |
|
GregM
|
4fb62ee15a
|
replacing to dolGetButtonAction on Commande card
|
2022-03-22 12:04:51 +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 |
|
Marc de Lima Lucio
|
4efcbe8799
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
|
2022-03-08 15:23:52 +01:00 |
|
Marc de Lima Lucio
|
1993a8d7b1
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
|
2022-03-08 15:07:37 +01:00 |
|
Laurent Destailleur
|
54ecf1f98c
|
# WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-03-07 15:24:08 +01:00 |
|
Frédéric FRANCE
|
9d1bcbe55a
|
Fix wrong upload dir
introduced here https://github.com/Dolibarr/dolibarr/pull/19165
|
2022-03-04 18:17:23 +01:00 |
|