Laurent Destailleur
bfb01ae928
Clean code
2022-08-26 18:24:42 +02:00
Laurent Destailleur
af69270a0e
NEW Can enter the unit price including the vat
2022-08-26 17:39:41 +02:00
Regis Houssin
68994752cd
FIX multiple php8 compatibility
2022-08-26 11:08:39 +02:00
Laurent Destailleur
2e905b127a
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/index.php
htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Laurent Destailleur
0d693d723a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/comm/propal/class/api_proposals.class.php
2022-08-25 14:31:47 +02:00
Laurent Destailleur
a4c0177db0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/user/bank.php
2022-08-25 14:29:09 +02:00
Laurent Destailleur
72a0725fec
Fix phpcs
2022-08-25 13:52:30 +02:00
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
582f6b196e
use isModEnabled
2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745
use isModEnabled
2022-08-23 20:01:34 +02:00
Anthony Berton
5a4d5d7f97
set_echeance no in set_date
2022-08-23 08:56:00 +02:00
Anthony Berton
8328923e09
update date
2022-08-22 17:18:31 +02:00
Christian Humpel
0bf814d558
Fix #21816 : correct Agenda filter (if no filter is selected)
2022-08-20 18:00:43 +02:00
stickler-ci
c4e88b739f
Fixing style errors.
2022-08-19 13:46:44 +00:00
atm-greg
ccbae64324
fix put line errase desc and label of line
2022-08-19 15:36:57 +02:00
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
2d8b544ace
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2022-08-12 12:19:20 +02:00
Laurent Destailleur
110f7a4736
Debug v16
2022-08-12 12:17:49 +02:00
Laurent Destailleur
9bc6c41ca7
Clean code: No more fetch to clone
2022-08-11 23:59:25 +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
4fb3a2e296
Fix scrutinizer
2022-08-11 00:52:08 +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
Laurent Destailleur
f95b70eb9b
Merge pull request #21686 from hregis/fix_php8_compatibility
...
FIX php8 compatibility
2022-08-10 04:18:14 +02:00
Anthony Berton
0764a9c123
FIX - php V8 multiprice thirdpaty card
2022-08-09 16:45:04 +02:00
Regis Houssin
b20144c3d0
FIX php8 compatibility
2022-08-08 11:39:43 +02:00
Laurent Destailleur
528d54ba79
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-08-02 20:28:07 +02:00
Laurent Destailleur
ed907fa972
Merge pull request #21599 from bb2a/FIX---php-V8-user-right-in-propal-card-and-use-$user->hasRight
...
FIX - php V8 user right in propal card and use $user->hasRight
2022-08-02 19:43:58 +02:00
Laurent Destailleur
ab2afd772b
Merge pull request #21600 from ymollard/eventorg-fixes
...
FIX: EventOrganization Missing databases entries and labels
2022-07-29 15:40:21 +02:00
Laurent Destailleur
2cbb71f523
Merge pull request #21604 from bb2a/FIX---php-V8-user-right-actioncomm-class
...
FIX - php V8 user right actioncomm class
2022-07-28 19:01:56 +02:00
Laurent Destailleur
b6a6dd91d8
# WARNING: head commit changed in the meantime
...
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-28 18:52:44 +02:00
Laurent Destailleur
5c3139974c
css
2022-07-28 14:55:47 +02:00
Anthony Berton
9c0cf32ef7
FIX - php V8 user right actioncomm class
2022-07-28 11:56:07 +02:00
Laurent Destailleur
6ce2b02207
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-28 02:39:27 +02:00
Laurent Destailleur
f6d54ca101
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
ChangeLog
build/exe/doliwamp/doliwamp.iss
htdocs/comm/action/index.php
htdocs/comm/action/peruser.php
2022-07-28 02:36:57 +02:00
Yoan Mollard
244f3913b0
Qualify cactionevents for eventorganization
2022-07-27 21:35:52 +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
Laurent Destailleur
78ee02408e
Merge pull request #21431 from fboitel/NEW-recursive-envents
...
NEW : Recurrent events on agenda v1
2022-07-27 11:01:26 +02:00
Laurent Destailleur
5903a9f87f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-07-26 12:24:24 +02:00
Laurent Destailleur
aaee8ff0ca
Debug v16
2022-07-25 18:03:07 +02:00
Florian HENRY
266b0213a5
fix: filter Status Not applicable into is not correctly manage on Agenda list
2022-07-25 13:18:03 +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
25d01b2be5
Merge pull request #21502 from Easya-Solutions/new-comm-action-card-hook-formconfirm
...
NEW hook formConfirm on action comm card
2022-07-24 20:23:40 +02:00
Laurent Destailleur
dd29018987
Fix bad table name
2022-07-24 18:27:15 +02:00
lmarcouiller
bac8efd4c8
Fix : PHP 8.1 warnings
2022-07-22 17:32:18 +02:00
lmarcouiller
eb38875119
Fix : PHP 8.1 warnings
2022-07-20 16:35:51 +02:00
Faustin
1f9afaadb1
Removing daily event for the moment
2022-07-20 13:08:28 +02:00
Faustin
87b80912df
merge
2022-07-19 20:42:53 +02:00
Laurent Destailleur
75b8246578
Merge branch 'develop' into NEW-recursive-envents
2022-07-19 19:40:48 +02:00
comaiteseb
877ed17d4c
Merge branch 'Dolibarr:15.0' into 15.0
2022-07-19 15:35:21 +02:00
comaiteseb
888328b03b
FIX issue Dolibarr#21495 for v15
...
FIX #21495
Error when calculate the date when AGENDA_EXPORT_FIX_TZ is set.
The resulting date is 1969-12-31
2022-07-19 15:31:29 +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
4f54fb4f00
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-14 11:54:30 +02:00
Laurent Destailleur
71045cbe83
Fix popup message
2022-07-13 14:00:19 +02:00
Laurent Destailleur
97acf949fc
Clean message on email limit
2022-07-13 13:39:16 +02:00
lvessiller
6aade2e506
NEW hook formConfirm on action comm card
2022-07-13 11:19:07 +02:00
comaiteseb
f2a294965a
Update actioncomm.class.php
...
FIX issue #21495
2022-07-12 18:44:21 +02:00
Laurent Destailleur
5ac0cfb39d
Merge pull request #21496 from comaiteseb/develop
...
Update actioncomm.class.php
2022-07-12 18:42:28 +02:00
Laurent Destailleur
eeb967b540
Fix missing link to invoice
2022-07-12 11:59:33 +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
comaiteseb
4b5b0bd163
Update actioncomm.class.php
...
FIX issue #21495
2022-07-11 21:25:49 +02:00
Laurent Destailleur
1cbeaf6ac0
Fix php8
2022-07-11 20:05:49 +02:00
Francis Appels
490944baac
Fix php 8 warning
2022-07-11 17:29:26 +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
Laurent Destailleur
c0977e5ee8
Merge pull request #21469 from cfoellmann/PR/card-empty-action
...
FIX default to create on card.php if $action is empty
2022-07-10 18:50:48 +02:00
Laurent Destailleur
ca3cf1de9f
NEW Add " as enclusore by default for CSV export. Keep removing CR/LF.
...
Fix export of invoice.
2022-07-10 02:25:46 +02:00
Laurent Destailleur
547a7cdea2
Fix trans
2022-07-10 01:18:06 +02:00
Laurent Destailleur
5e54639749
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-08 10:23:47 +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
8360ea9711
Fix hide link to doc if doc never generated
2022-07-08 00:20:33 +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
Faustin
572f1f0fee
NEW : Recurrent events on agenda v2
2022-07-07 00:07:15 +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
b4c2a5a6f4
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-06 15:48:35 +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
f6b0710baf
FIX Can convert a partially closed down payment when close for
...
bankcharge
2022-07-05 21:04:24 +02:00
Laurent Destailleur
5e451e1155
FIX Can convert a partially closed down payment when close for
...
bankcharge
2022-07-05 20:59:42 +02:00
Laurent Destailleur
bd28a7e038
Debug v16
2022-07-03 12:54:58 +02:00
Faustin
259224c3be
NEW : Recurrent events on agenda v1
2022-07-02 18:48:35 +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
Laurent Destailleur
e6cb8b6d0e
Fix sql error
2022-06-24 18:22:47 +02:00
Faustin
6118cb69e6
NEW #20650 enabled checkcolumn on left for propal list
2022-06-24 15:01:32 +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
Florian HENRY
43207429ae
fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create) until we decide to remove this column
2022-06-02 15:32:16 +02:00
stickler-ci
d73982d1eb
Fixing style errors.
2022-06-02 13:26:06 +00:00
Florian HENRY
f6e53b40da
fix: actioncomm.code have to be updated with correct c_actioncomm code (like in create) until we decide to remove this column
2022-06-02 15:20:00 +02:00
Laurent Destailleur
bc79f041dc
Debug v16
2022-06-02 11:11:28 +02:00
Laurent Destailleur
9f59eaa752
Debug v16
2022-06-02 10:39:04 +02:00
Laurent Destailleur
f5705e89a8
Merge branch 'develop' into patch-195
2022-06-01 22:03:19 +02:00
Laurent Destailleur
31c94dde3b
Merge pull request #21066 from Hystepik/develop#1
...
fix php8.0 warnings
2022-06-01 21:00:55 +02:00
Laurent Destailleur
3751fc92ca
Clean code
2022-06-01 20:47:14 +02:00
Laurent Destailleur
37ea95eb3a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-01 16:04:25 +02:00
Laurent Destailleur
65913cdd15
Fix list of event empty.
2022-06-01 13:11:36 +02:00
lmarcouiller
2d13b47441
fix php8.0 warnings
2022-05-31 11:36:54 +02:00
Laurent Destailleur
480452e291
FIX missing filters
2022-05-29 10:35:49 +02:00
Laurent Destailleur
f6ad688ddd
FIX module for emailing target selection must use a condition on module
2022-05-28 20:50:24 +02:00
BENKE Charlene
8bc313980a
php V8 warning
2022-05-27 16:32:11 +02:00
BENKE Charlene
35a1f9ac4b
php V8 warning
2022-05-27 16:30:26 +02:00
BENKE Charlene
959278e315
php V8 warning
2022-05-24 22:36:16 +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
Laurent Destailleur
00e65eb106
Fix bad management when inserting contacts of actioncomm
2022-05-23 00:49:59 +02:00
Laurent Destailleur
e271616bea
Scrutinizer
2022-05-23 00:22:26 +02:00
Laurent Destailleur
a193474fa3
Update card.php
2022-05-22 17:15:43 +02:00
Laurent Destailleur
3d5b322d98
Debug v16
2022-05-22 16:27:42 +02:00
Laurent Destailleur
7b4dae8773
CSS
2022-05-22 16:16:17 +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
1ca1afd734
fix #18339 : Attempt to read property creer
2022-05-22 01:50:10 +02:00
Eric Seigne
45bc1ff287
fix #18339 : Attempt to read property creer
2022-05-22 01:50:01 +02:00
Regis Houssin
6372bea326
FIX php8 warning
2022-05-22 00:14:01 +02:00
Laurent Destailleur
0f268b682a
Merge pull request #20882 from FHenry/dev_new_add_ref_clinet_intervention
...
NEW: Add Customer Ref on Intervention
2022-05-21 22:36:17 +02:00
Laurent Destailleur
2c2544d471
Fix scrutinizer
2022-05-21 15:31:08 +02:00
Laurent Destailleur
d38b9187f3
Merge branch 'develop' into dev_new_add_ref_clinet_intervention
2022-05-21 10:48:09 +02:00
Laurent Destailleur
21c3f27e72
Merge pull request #20941 from inovea-conseil/FIX#20448
...
FIX#20448 missing preg_replace for vat rate when adding a free line
2022-05-21 10:33:41 +02:00
IC-Ilies
c12ae28ad7
FIX#20448 missing preg_replace for vat rate when adding a free line
2022-05-21 09:31:33 +02:00
Maxime Kohlhaas
0d7386ab89
Fix select projet on event creation
2022-05-21 01:23:39 +02:00
Laurent Destailleur
ef32179ba7
Merge pull request #20935 from atm-maxime/fix_fields_check_enabled
...
Fix : fields must check module enabled
2022-05-21 00:48:22 +02:00
Maxime Kohlhaas
cff5ec8605
Fix : fields must check module enabled
2022-05-21 00:08:18 +02:00
Laurent Destailleur
d9dbfd063b
Debug v16
2022-05-20 23:34:58 +02:00
Florian HENRY
8af848c539
add Ref client in PDF and send to propal on create
2022-05-20 10:40:59 +02:00
Laurent Destailleur
4b996f79a9
Debug v16
2022-05-19 13:52:29 +02:00
Laurent Destailleur
7fd3bb0aae
Remove deprecated code
2022-05-19 12:08:03 +02:00
Laurent Destailleur
09cf9e82f8
Debug v16
2022-05-19 11:47:43 +02:00
Laurent Destailleur
5f9ef61d32
Debug v16
2022-05-19 09:36:47 +02:00
Laurent Destailleur
38aced687b
Fix scrutinizer
2022-05-18 23:52:43 +02:00
Laurent Destailleur
6d848edba7
Fix scrutinizer
2022-05-18 23:28:53 +02:00
Laurent Destailleur
25e70bead8
phpcs
2022-05-18 23:27:26 +02:00
Laurent Destailleur
177e8c17fb
Fix scrutinizer
2022-05-18 11:23:21 +02:00
Laurent Destailleur
68b25b35b4
Look and feel v16
2022-05-17 23:53:36 +02:00
Laurent Destailleur
a483af70df
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/index.php
2022-05-17 23:27:11 +02:00
Laurent Destailleur
c475789433
Debug v16
2022-05-17 23:23:50 +02:00
atm-lena
f18dc89bdf
Add ddate signature in fetch propal
2022-05-17 16:26:43 +02:00
Laurent Destailleur
4de50da0dd
Repare code to forbidden var_dump() into code
2022-05-17 14:55:38 +02:00
Christophe Battarel
2b59b677bf
Merge branch 'develop' into PROPAL_SKIP_ACCEPT_REFUSE
2022-05-16 14:17:13 +02:00
Laurent Destailleur
a92974c818
Fix typo
2022-05-16 14:08:16 +02:00
Christophe Battarel
7cf581148c
change buttons labels
2022-05-16 12:20:58 +02:00
stickler-ci
f70a9ad04c
Fixing style errors.
2022-05-11 13:42:27 +00:00
Gauthier PC portable 024
da2a8a59f3
Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function
2022-05-11 14:38:16 +02:00
Gauthier PC portable 024
b053dee279
NEW : update rank line is possible on API for orders propal and supplier invoice
2022-05-11 14:26:21 +02:00
Laurent Destailleur
fc718e68ee
css
2022-05-10 11:38:56 +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
6592eb5d73
Debug for php 8.1
2022-05-08 18:25:22 +02:00
Laurent Destailleur
bdc80d22ea
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-05-04 01:23:25 +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
0a7d7d503b
Make syntax for field_, titlefieldcreate, valuefieldcreate standard.
2022-05-04 00:52:49 +02:00
Philippe GRAND
356bc0d1e5
fix : do not display html tags into list
2022-05-03 17:41:26 +02:00
Laurent Destailleur
fa7254be9a
Fix picto and perm
2022-05-03 17:05:14 +02:00
Laurent Destailleur
8023e1b0cd
Debug v16
2022-04-30 20:41:18 +02:00
Laurent Destailleur
2e1dfc9a43
Fix method "file" for external URLs is forbidden.
2022-04-30 20:06:08 +02:00
Laurent Destailleur
c96e3bdddf
PHP v8 compatibility
2022-04-30 19:50:20 +02:00
Laurent Destailleur
147e61472c
Clean code: Remove all   entities.
2022-04-29 13:10:28 +02:00
Laurent Destailleur
708d3610a5
Look and feel v16
2022-04-29 13:04:29 +02:00
lmarcouiller
a77ae1ecd9
fix style errors
2022-04-15 14:31:59 +02:00
lmarcouiller
1ccf209c47
Close #20653 : edit discount pourcentage
2022-04-15 14:31:44 +02:00
Laurent Destailleur
0145fbebb6
Merge pull request #20626 from bb2a/formquestion-clone-order-or-propal
...
FIX - add morecss select_compagny
2022-04-14 21:05:09 +02:00
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
Florian HENRY
f15438dd03
NEW: data sign on propal list
2022-04-14 12:28:51 +02:00
BB2A Anthony Berton
d154696c32
morecss select_compagny
2022-04-13 16:15:07 +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
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
631d2da6b3
Fix php8
2022-04-09 03:26:38 +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
Marc de Lima Lucio
6e0888ca0e
FIX: action comm list: holiday last day not included + handle duration with halfdays
2022-04-07 17:17:20 +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
0ed7c643f8
Close #20547
2022-04-07 13:28:24 +02:00
Laurent Destailleur
4693ef42bd
Enhance responsive
2022-04-07 11:18:56 +02:00
Laurent Destailleur
f17db2a919
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-05 15:33:29 +02:00
Laurent Destailleur
40ad12c3c3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-05 15:29:54 +02:00
bomuux
63016b79ea
Bug: Cannot set thirdparty customer accountancy code to empty string
...
When thirdparty customer accountancy code is set to a non empty string, one cannot set it back to empty string due to thirdparty property deprecation :
code_compta to code_compta_client
2022-04-05 14:06:52 +02:00
bomuux
b03d7c60ff
Bug: Cannot set thirdparty customer accountancy code to empty string
...
When thirdparty customer accountancy code is set to a non empty string, one cannot set it back to empty string due to thirdparty property deprecation :
code_compta to code_compta_client
2022-04-04 18:06:11 +02:00
Atm-Gregr
53b185ce9c
fix condition on remx
2022-04-04 10:19:51 +02:00
Laurent Destailleur
5b91ae062f
All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
...
code consistency purpose.
2022-04-02 10:31:58 +02:00
Laurent Destailleur
a51c868a8e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Laurent Destailleur
106e3072dc
Update card.php
2022-04-01 13:20:40 +02:00
Laurent Destailleur
a3dbcd0c27
Clean language files
2022-04-01 13:09:11 +02:00
Florian HENRY
e7db103b57
fix: on update with action reminder in future there is user key error
2022-03-31 18:55:54 +02:00
Laurent Destailleur
7b84b3e92d
css
2022-03-31 13:27:14 +02:00
ATM john
c1d9ea95dc
fix function name
2022-03-30 12:16:17 +02:00
Laurent Destailleur
95dc25587c
Standardize code of the fetch_lines()
2022-03-28 13:50:47 +02:00
Laurent Destailleur
78ee498151
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-26 16:13:54 +01:00
Marc de Lima Lucio
cbba7d7d5f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2022-03-25 16:14:53 +01:00
Laurent Destailleur
488b35d096
Merge pull request #20232 from hregis/fix_missing_advanced_perms
...
FIX missing advanced perms
2022-03-24 20:32:58 +01:00
Laurent Destailleur
6438a99960
Fix php syntax
2022-03-24 11:48:51 +01:00
Laurent Destailleur
6abeb2804e
Fix phpcs
2022-03-24 11:47:12 +01:00
Laurent Destailleur
4a80f35aaa
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Laurent Destailleur
c620757dbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/langs/en_US/projects.lang
htdocs/product/price.php
htdocs/reception/class/reception.class.php
2022-03-23 17:23:21 +01:00