lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
112,040 Commits 43 Branches 150 Tags 886 MiB
00a855bc5e
Commit Graph

2532 Commits

Author SHA1 Message Date
Laurent Destailleur
d7209f1818 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-14 21:42:45 +02:00
Laurent Destailleur
ebc8823202 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/ajax/onlineSign.php
 2022-08-14 21:41:25 +02:00
Laurent Destailleur
57fea5151d Fix regression in online signature 
Conflicts:
	htdocs/core/ajax/onlineSign.php
	htdocs/public/onlinesign/newonlinesign.php
 2022-08-14 20:50:28 +02:00
Laurent Destailleur
0abfaf6bd7 Fix regression in online signature 2022-08-14 20:45:04 +02:00
Laurent Destailleur
24b1085639 Clean code. Prepare for inputing prices with taxes 2022-08-13 19:30:26 +02:00
Laurent Destailleur
8c903bf935 Clean deprecated code. Fix go back to mode1 in supplier invoice 2022-08-11 20:23:44 +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
Anthony Berton
31d4d0dcd4 FIX - php V8 user right in propal card and use $user->hasRight 2022-07-27 18:09:11 +02:00
Regis Houssin
7db5f7eb1c FIX regression + add $forceentity parameter 2022-07-18 19:26:13 +02:00
Regis Houssin
ade854a469 FIX security breach if we have same ref number in multiple entities 2022-07-18 16:48:53 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650 
NEW #20650 Checkbox column on left for lists
 2022-07-07 21:48:51 +02:00
Christian Foellmann
1a31704e18 remove old commented code 2022-07-06 19:20:04 +02:00
Laurent Destailleur
daf8c0ff1e Cherry pick 2022-07-06 19:19:47 +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
Laurent Destailleur
a0caf7be71
Merge pull request #21394 from cfoellmann/PR/improve-page-titles 
fix page titles
 2022-07-06 15:55:10 +02:00
Laurent Destailleur
a644504faf
Merge pull request #21429 from OPEN-DSI/develop_new_add_option_keep_old_signature_info_on_propal 
NEW: Add new global variable for keeping the previous signature information on proposale
 2022-07-06 13:33:13 +02:00
Laurent Destailleur
bd28a7e038 Debug v16 2022-07-03 12:54:58 +02:00
kamel
c989ea1ad6 NEW: Add new global variable for keeping the previous signature information on proposale (case of reopen a proposale) 2022-07-01 14:59:11 +02:00
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
Christian Foellmann
4335e67249 remove old commented code 2022-06-27 12:59:06 +02:00
stickler-ci
23d948cec4 Fixing style errors. 2022-06-27 10:56:08 +00:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +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
Faustin
6118cb69e6 NEW #20650 enabled checkcolumn on left for propal list 2022-06-24 15:01:32 +02:00
Laurent Destailleur
53466079af Fix php fatal error 2022-06-19 19:38:40 +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
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
BB2A Anthony Berton
e438bcb70a FIX - php V8 order card 2022-06-09 13:35:50 +02:00
Laurent Destailleur
f5705e89a8
Merge branch 'develop' into patch-195 2022-06-01 22:03:19 +02:00
lmarcouiller
2d13b47441 fix php8.0 warnings 2022-05-31 11:36:54 +02:00
BENKE Charlene
8bc313980a
php V8 warning 2022-05-27 16:32:11 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search 
FIX : regression select extrafield search + fix function name
 2022-05-24 21:55:33 +02:00