Philippe GRAND
e10ce6a6a0
Update code
2022-09-03 11:07:45 +02:00
Philippe GRAND
a8465d16fa
Update code
2022-09-03 11:05:03 +02:00
Frédéric FRANCE
9150f5102e
Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009
2022-09-02 11:44:45 +02:00
Philippe GRAND
bc76c9357e
update code
2022-09-01 09:39:16 +02:00
Sylvain Legrand
a1bae3453a
Add an option to manage input size for customer / supplier references
2022-09-01 08:34:22 +02:00
Frédéric France
bb58f3a18f
use isModEnabled
2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e
replace ! empty by !empty
2022-08-31 22:14:20 +02:00
Philippe GRAND
628ed54955
update code
2022-08-31 22:02:34 +02:00
Frédéric France
e71692e745
fix php8 warnings
2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd
fix php8 warnings
2022-08-31 21:55:55 +02:00
Philippe GRAND
50e96a6356
update code
2022-08-31 21:55:01 +02:00
Philippe GRAND
8d73d2ecd5
update code
2022-08-31 21:54:11 +02:00
Philippe GRAND
97013cc956
update code
2022-08-31 21:53:29 +02:00
Philippe GRAND
50728f4b22
update code
2022-08-31 21:52:34 +02:00
Philippe GRAND
fa34b7ac20
update code
2022-08-31 21:52:00 +02:00
Philippe GRAND
1acc9bb99c
update code
2022-08-31 21:51:32 +02:00
Philippe GRAND
37a2cc3052
update code
2022-08-31 21:50:58 +02:00
Philippe GRAND
990ff193aa
update code
2022-08-31 21:50:12 +02:00
Philippe GRAND
1f3c390907
update code
2022-08-31 21:49:38 +02:00
Frédéric France
ece2f5553a
fix php8 warnings
2022-08-31 21:49:10 +02:00
Philippe GRAND
da5fb70473
update code
2022-08-31 21:49:06 +02:00
Philippe GRAND
1ab949b3c4
update code
2022-08-31 21:48:32 +02:00
Philippe GRAND
6e6b0d16cc
update code
2022-08-31 21:48:00 +02:00
Laurent Destailleur
a5c18ea776
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-08-31 17:57:14 +02:00
Philippe GRAND
6844d603ff
update code
2022-08-29 09:23:15 +02:00
Laurent Destailleur
d0e08818e1
Merge pull request #21931 from grandoc/new_branch_27_08_2022
...
FIX php8 compatibility
2022-08-29 01:09:49 +02:00
ptibogxiv
5d5ea3efd8
FIx clean code signature proposal
2022-08-29 00:33:00 +02:00
ptibogxiv
0e2ade76ad
FIx clean code signature proposal
2022-08-28 23:36:18 +02:00
Philippe GRAND
5f1d6b406f
FIX php8 compatibility
2022-08-28 13:47:36 +02:00
Philippe GRAND
3d64296992
FIX php8 compatibility
2022-08-28 13:43:50 +02:00
Philippe GRAND
5c6f9281c9
FIX php8 compatibility
2022-08-28 13:43:12 +02:00
Philippe GRAND
3bb1a2387b
FIX php8 compatibility
2022-08-28 13:42:27 +02:00
Laurent Destailleur
09ad9e6e92
css
2022-08-27 22:14:56 +02:00
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
lvessiller
74a2b58e85
FIX resolve conflicts
2022-08-12 14:55:06 +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
lvessiller
a3b240bd3b
FIX resolve conflicts
2022-08-05 11:23:02 +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
lvessiller
62b70b37d3
NEW set today start time at begining
2022-07-27 08:32:46 +02:00
lvessiller
bae3583fe3
FIX resolve conflicts
2022-07-26 16:49:35 +02:00
lvessiller
4d59fd2679
FIX reset today event time
2022-07-26 16:36:28 +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
lvessiller
993812dc70
FIX stickler-ci
2022-07-21 11:22:53 +02:00
lvessiller
161958d346
NEW color for start date and owner
2022-07-21 10:56:03 +02:00
lmarcouiller
eb38875119
Fix : PHP 8.1 warnings
2022-07-20 16:35:51 +02:00
lvessiller
ba1a607afc
FIX resolve conflicts
2022-07-20 14:21:24 +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
lvessiller
cda6e9184d
NEW color in action list and translated
2022-07-13 16:52:57 +02:00
lvessiller
1414f72794
NEW color in action list
2022-07-13 16:37:50 +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
Laurent Destailleur
32f2499c36
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/langs/en_US/projects.lang
htdocs/langs/en_US/propal.lang
htdocs/product/price.php
htdocs/projet/card.php
htdocs/reception/class/reception.class.php
2022-03-23 17:04:31 +01:00
Laurent Destailleur
94224e9275
Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices
...
NEW option update prices on proposal cloning
2022-03-23 16:49:12 +01:00
Laurent Destailleur
a06fc4691b
Merge pull request #20394 from hregis/new_add_hook_in_commercialindex
...
NEW add hooks in commercial index
2022-03-23 16:05:12 +01:00
Laurent Destailleur
bc9ec3e2b9
Merge pull request #20395 from hregis/fix_uniformize_with_element_name
...
FIX uniformize with element name "contact"
2022-03-23 16:04:53 +01:00
Laurent Destailleur
a5e9970866
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2022-03-22 16:58:57 +01:00
Marc de Lima Lucio
3aae8cc3bb
FIX: propal list: bad error management for set not ssigned mass action
2022-03-22 10:54:04 +01:00
Marc de Lima Lucio
d4f55ae116
FIX: propal list: bad error management in mass actions
2022-03-22 10:11:10 +01:00
Laurent Destailleur
6c0e333c7d
Fix we must user relative timezone of date.
2022-03-20 16:33:35 +01:00
Laurent Destailleur
8603d493ad
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06
Fix doxygen, missing error message
2022-03-18 16:14:20 +01:00
Regis Houssin
b70d3eb8eb
FIX uniformize with element name "contact"
2022-03-18 12:05:59 +01:00
Regis Houssin
56280f340f
NEW add hooks in commercial index
2022-03-18 11:55:45 +01:00
Laurent Destailleur
167df9593b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/products.lang
htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
lvessiller
a4508e656c
NEW pull develop
2022-03-17 12:20:15 +01:00
Laurent Destailleur
62f6686ad0
Merge pull request #20311 from Easya-Solutions/14.0_fix_error_propagation_and_triggers_position_on_delete_propal_line
...
[FIX] errors propagation and trigger position on delete proposal line
2022-03-17 02:35:30 +01:00
Laurent Destailleur
143660799b
Clean code using dolGetFirstLineOfText()
2022-03-16 21:22:03 +01:00
Florian HENRY
a028e795f7
add missing colspan
2022-03-16 13:54:21 +01:00
BB2A Anthony Berton
a1ac38ae03
entity
2022-03-12 21:03:11 +01:00
BB2A Anthony Berton
368a247f95
New method
2022-03-12 18:53:27 +01:00
BB2A Anthony Berton
4f4c95344e
Other
2022-03-12 16:36:32 +01:00
BB2A Anthony Berton
db799d7913
comm card propal preview
2022-03-12 16:00:22 +01:00
BB2A Anthony Berton
f3f1c9ba78
comm card order
2022-03-12 15:54:25 +01:00
Regis Houssin
c9cc067075
FIX missing parenthesis
2022-03-11 10:48:51 +01:00
Regis Houssin
e59befa76b
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms
2022-03-11 10:46:14 +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
kamel
1f00dff4da
Correction Stickler CI / stickler-ci
2022-03-09 11:40:26 +01:00
kamel
e06c386507
Fix errors propagation and trigger position on delete proposal line
2022-03-09 11:32:07 +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
lvessiller
2561fcbb85
FIX translate update prices and add const in proposal setup
2022-03-08 10:06:57 +01:00
Laurent Destailleur
6bb49797f8
Merge pull request #20243 from JohnXLivingston/fix_template_name_typo
...
Fix: typo in template name
2022-03-07 14:55:02 +01:00
Laurent Destailleur
2142440b6c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/langs/en_US/errors.lang
2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7
FIX list of visible type of event was not correctly filtered
...
FIX Error management on mass action "Approve holiday"
2022-03-07 12:01:34 +01:00
Florian HENRY
801402f46a
fix : #20267
2022-03-04 11:58:52 +01:00
lvessiller
6c172d6441
NEW option update prices on proposal cloning
2022-03-03 11:58:29 +01:00
John Livingston
1ece554c92
Fix: typo in template name
...
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
Laurent Destailleur
bd288f980d
FIX On large proposal or invoice, fix n(n+1) sql into a n sql.
2022-03-01 14:52:47 +01:00
Regis Houssin
e5fd11c8e0
FIX missing advanced perms
2022-03-01 09:28:38 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-27 08:40:01 +01:00
Laurent Destailleur
409da7f091
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-25 19:00:10 +01:00
Laurent Destailleur
73b04deb19
Fix error management.
2022-02-23 00:17:49 +01:00
Laurent Destailleur
e96061dd18
Fix phpunit SecurityTest
2022-02-22 23:46:57 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-22 21:49:17 +01:00
Laurent Destailleur
3697cb9ca4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/class/reception.class.php
2022-02-17 11:34:54 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1
...
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +01:00
Laurent Destailleur
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0
...
More generic management of parentline
2022-02-16 20:25:04 +01:00
lvessiller
7e17167faf
NEW total mark rate in list
2022-02-16 11:45:29 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-15 19:11:24 +01:00
Frédéric FRANCE
c8640f329e
add missing global
2022-02-15 18:31:05 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global
2022-02-15 18:14:44 +01:00
Frédéric FRANCE
a6a1e3886a
Update propal.class.php
2022-02-15 11:03:50 +01:00
Frédéric FRANCE
b2815c4973
add hook in propal tooltip
2022-02-15 10:53:33 +01:00
Christophe Battarel
288c58e533
fix parent line on propal
2022-02-15 10:41:21 +01:00
Laurent Destailleur
271e9da425
Add option MAIN_STORE_FULL_EVENT_IN_GMT to fix TZ pb with full day event
2022-02-11 15:15:50 +01:00
Laurent Destailleur
b84fd3ec3d
Clean code
2022-02-11 12:46:45 +01:00
Laurent Destailleur
27df3cc02c
FIX events on several days may missing the last day in calendar view.
...
FIX the drag and drop was not available on some events
2022-02-11 11:27:50 +01:00
Laurent Destailleur
30d7f807e4
Fix url
2022-02-10 21:03:10 +01:00
lvessiller
241a65e2ae
NEW add margin info in proposal and order list
2022-02-03 10:39:03 +01:00
Laurent Destailleur
44bc197d03
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-01 13:25:45 +01:00
Laurent Destailleur
d167e022eb
Debug v15
2022-01-31 12:08:51 +01:00
Laurent Destailleur
2fea78c90a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2022-01-29 16:48:40 +01:00
Laurent Destailleur
d75dd51bb7
Clean code to debug fulldayevent
2022-01-29 00:39:20 +01:00
Gauthier PC portable 024
3abe391f65
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2022-01-28 15:08:02 +01:00
Laurent Destailleur
eb336c81a1
Merge pull request #19926 from aspangaro/16a9
...
NEW API Proposals - Add POST lines
2022-01-26 12:06:33 +01:00
Alexandre SPANGARO
31787a99f0
NEW Proposal - Add filter on proposal get lines
2022-01-26 08:50:57 +01:00
stickler-ci
71876755d2
Fixing style errors.
2022-01-26 06:35:26 +00:00
Alexandre SPANGARO
68ba60896f
Copyright
2022-01-26 07:31:17 +01:00
Alexandre SPANGARO
30fd55addc
NEW API Proposals - Add POST lines
2022-01-26 07:29:37 +01:00
Laurent Destailleur
d06f570c23
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 16:50:11 +01:00
Laurent Destailleur
60b90056c4
Fix #yogosha8450
2022-01-19 15:20:10 +01:00
Laurent Destailleur
1087ddb22f
Clean code
2022-01-18 14:00:38 +01:00
Laurent Destailleur
ebc3ef2f37
Removed no more used property
2022-01-18 13:52:09 +01:00
Laurent Destailleur
fb6e5f03f9
Clean code and translation
2022-01-18 13:44:52 +01:00
Laurent Destailleur
e19994c756
Fix drag event on week view
2022-01-18 00:07:45 +01:00
Laurent Destailleur
254ed31fb1
Fix combo
2022-01-17 23:47:23 +01:00
Laurent Destailleur
70e4705149
Clean code
2022-01-17 22:52:56 +01:00
Laurent Destailleur
0e44bfd4e4
Fix remove $_GET
2022-01-17 18:53:57 +01:00
Laurent Destailleur
9d067d74ab
Fix responsive
2022-01-17 17:51:03 +01:00
Laurent Destailleur
6826b373fd
css
2022-01-16 13:22:21 +01:00
Laurent Destailleur
f51554fd4d
Fix missing token
2022-01-13 20:40:42 +01:00
Laurent Destailleur
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray
...
add thirdparty customer code to substitutionarray
2022-01-11 13:31:32 +01:00
Laurent Destailleur
54cf91eda4
Update card.php
2022-01-11 13:31:16 +01:00
Gauthier PC portable 024
6799d48944
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2022-01-11 09:59:25 +01:00
Laurent Destailleur
60b2479389
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/list.php
htdocs/core/class/utils.class.php
htdocs/install/mysql/data/llx_20_c_departements.sql
2022-01-07 15:56:21 +01:00
Laurent Destailleur
37daf7764d
Merge pull request #19753 from atm-lena/13.0_FIX_ActionCommList_LateWarning
...
FIX : late warning calculation on action comm list
2022-01-06 12:55:37 +01:00
stickler-ci
ec11be2480
Fixing style errors.
2022-01-06 10:31:50 +00:00
atm-lena
97d9b4571a
FIX : late warning calculation on action comm list
2022-01-06 11:21:46 +01:00
Laurent Destailleur
ef56631c80
FIX #yogosha8186
2022-01-03 18:15:19 +01:00
Laurent Destailleur
a49af456ce
Debug page customreports.php
2022-01-03 04:47:17 +01:00
Laurent Destailleur
3774eae510
Responsive
2022-01-02 15:08:46 +01:00
Laurent Destailleur
bdb03c8bd0
Fix responsive
2022-01-02 13:51:30 +01:00
Laurent Destailleur
a7d4aa9fb3
Responsive
2022-01-02 12:49:15 +01:00
Laurent Destailleur
7edba34107
Debug and secure the signature feature
2021-12-25 17:08:40 +01:00
Laurent Destailleur
0387b9922e
FIX error message on sqlfilter in API
2021-12-20 20:49:32 +01:00
Laurent Destailleur
19efa37e4b
Fix default value #19562
2021-12-19 20:55:24 +01:00
Laurent Destailleur
e2e2e69379
Fix bad link
2021-12-19 03:54:04 +01:00
Laurent Destailleur
4cd512738f
Merge pull request #19543 from mbinformatique68/develop
...
FIX Get societe terms of payment if getpost terms of payment is 0 on creating propal
2021-12-16 18:19:29 +01:00
Laurent Destailleur
84400cf1d3
Fix backto page
2021-12-16 13:35:17 +01:00
Laurent Destailleur
bb1d5daa82
css
2021-12-12 23:47:40 +01:00
Laurent Destailleur
2bc417fcf7
FIX parameter $action replaced with $mode. $action reserved for action
2021-12-11 13:22:43 +01:00
Laurent Destailleur
b2611e4cdb
CSS
2021-12-10 13:56:51 +01:00
Laurent Destailleur
d80f83caf4
Clean code
2021-12-09 17:19:31 +01:00
Laurent Destailleur
69cd7ae2ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
d4501a6f67
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-12-08 18:21:56 +01:00
Laurent Destailleur
c3bfd5caa4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/asset/type.php
htdocs/categories/edit.php
htdocs/comm/action/card.php
htdocs/compta/bank/card.php
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/class/extrafields.class.php
htdocs/don/card.php
htdocs/product/stock/card.php
htdocs/projet/card.php
htdocs/projet/tasks/task.php
htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/card.php
htdocs/categories/edit.php
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Laurent Destailleur
6886cca1fa
CSS
2021-12-07 02:35:46 +01:00
Quentin VIAL-GOUTEYRON
826bde0656
FIX set optional from post
2021-12-06 11:19:12 +01:00
mbinformatique68
1e845434e0
Get societe terms of payment if getpost terms of payment is 0
2021-12-03 09:42:50 +01:00
atm-greg
db06de0ac2
add printFieldListHaving hook
2021-11-30 16:28:21 +01:00
Laurent Destailleur
8bace4c64e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
4189229b84
Merge pull request #19165 from Hystepik/develop#5
...
Fix: php 8.0 warning commercial part
2021-11-30 15:31:51 +01:00
Laurent Destailleur
31393802ff
Update card.php
2021-11-30 15:29:19 +01:00
Laurent Destailleur
efe4b2363a
Merge pull request #19514 from atm-greg/FIX_Uniformize_printFieldListFrom_hook
...
uniformize hooks behaviour
2021-11-30 11:20:22 +01:00
atm-greg
71d4b3f082
add hook // Add from hooks
2021-11-29 17:02:57 +01:00
atm-greg
1dffc1c0fa
add hook to uniformize printFieldListFrom hook
2021-11-29 16:54:26 +01:00
Christian Foellmann
6608f5f0d8
update all script tags to be uniform. language="javascript" removed
...
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Frédéric FRANCE
661e404a14
fix tests
2021-11-24 22:56:32 +01:00
Frédéric FRANCE
ebc54f82e6
move actioncomm
2021-11-24 18:16:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental
2021-11-23 21:38:29 +01:00
Gauthier PC portable 024
2c2f456827
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-23 11:10:01 +01:00
Gauthier PC portable 024
74f5c092dc
FIX : use $linecount = count($this->lines);
2021-11-23 10:44:43 +01:00
Gauthier PC portable 024
e02405edc9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4
FIX : it's better with an input number
2021-11-22 16:13:46 +01:00
Laurent Destailleur
441af6b6fb
Fix add rel="noopener noreferrer"
2021-11-22 02:35:55 +01:00
Laurent Destailleur
48d7378282
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/card.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/ar_IQ/bills.lang
htdocs/langs/ar_IQ/cashdesk.lang
htdocs/langs/ar_IQ/modulebuilder.lang
htdocs/langs/ar_IQ/partnership.lang
htdocs/langs/ar_IQ/propal.lang
htdocs/langs/ar_IQ/stocks.lang
htdocs/langs/ar_IQ/ticket.lang
htdocs/langs/en_AE/admin.lang
htdocs/langs/en_US/receptions.lang
htdocs/langs/en_ZA/admin.lang
htdocs/product/stock/class/mouvementstock.class.php
htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00
lmarcouiller
d1f5cb9184
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5
2021-11-19 14:01:52 +01:00
lmarcouiller
3bcafb548a
fix errors
2021-11-19 14:01:37 +01:00
Gauthier PC portable 024
72614ecc0d
Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028
FIX : dev name
2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e
Fixing style errors.
2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
9d41c1390d
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9
NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled
2021-11-16 14:09:18 +01:00
Florian HENRY
bc64aba3a6
FIX: preselect task on create event from task
2021-11-16 13:43:08 +01:00
Laurent Destailleur
897b00faf0
Clean code
2021-11-05 14:23:19 +01:00
Laurent Destailleur
960319fd8a
dol_htmlentities is better for future than htmlentities
2021-11-01 10:33:54 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8
2021-10-31 17:54:32 +01:00
Laurent Destailleur
40683720a3
Merge pull request #19182 from frederic34/propallist
...
fix warnings in propal list
2021-10-31 17:51:52 +01:00
Laurent Destailleur
e1047afb05
Merge pull request #19194 from atm-florianm/FIX_minor_remove_two_unused_js_lines
...
[minor] remove two unused js lines
2021-10-31 17:46:00 +01:00
Laurent Destailleur
8ebbe32781
Merge pull request #19205 from frederic34/patch-13
...
fix warnings
2021-10-31 17:34:46 +01:00
Laurent Destailleur
ef21b5ca78
Merge pull request #19206 from frederic34/patch-14
...
fix warning
2021-10-31 17:34:18 +01:00
Laurent Destailleur
0017c15974
Debug v15
2021-10-30 17:19:46 +02:00
Laurent Destailleur
fe7e1d4118
Look and feel v15
2021-10-29 09:40:38 +02:00
Marc de Lima Lucio
7e059c0a22
NEW: deposit payment terms: futureproof evolutions by storing field as a string
2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
03c24b2274
FIX: deposit payment terms: getDictvalue() renamed to getDictionaryValue()
2021-10-28 16:51:59 +02:00
Marc de Lima Lucio
668088a63f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-28 15:54:18 +02:00
Laurent Destailleur
97d97af932
Clean: Remove fields for social networks (merged into "socialnetworks")
2021-10-27 16:39:34 +02:00
Laurent Destailleur
299376f221
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-26 01:32:37 +02:00
Laurent Destailleur
c376d40346
css
2021-10-26 01:30:00 +02:00
Scrutinizer Auto-Fixer
5567310e44
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Frédéric FRANCE
5469d49102
fix warning
2021-10-25 22:04:19 +02:00
Frédéric FRANCE
e3f4c70aea
Update list.php
2021-10-25 22:01:36 +02:00
Frédéric FRANCE
7638a2a8a0
fix warnings
2021-10-25 22:00:45 +02:00
Florian HENRY
52a4f4869d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-25 16:54:30 +02:00
Laurent Destailleur
28926ab174
Fix permission on page to set resource of an object
2021-10-25 16:25:32 +02:00
atm-florian
28c5b105ba
FIX: remove two lines of javascript referring to DOM elements that no longer exist in Dolibarr (form#move_event)
2021-10-25 11:20:28 +02:00
Florian HENRY
b282673f61
fix php8 warning
2021-10-25 09:01:05 +02:00
Frédéric FRANCE
677ac4635d
fix warnings in propal list
2021-10-24 14:34:47 +02:00
Lucas Marcouiller
051f6ca717
Fix: php 8.0 warning commercial part
2021-10-23 23:12:42 +02:00
Laurent Destailleur
ce4fe3f400
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-23 18:33:47 +02:00
Laurent Destailleur
8604f9b153
Clean DOM (remove ficheaddleft div)
2021-10-23 17:18:35 +02:00
Norbert Penel
64e58e305f
FIX #18893 : source was overwrited by mistake
2021-10-23 16:32:16 +02:00
Laurent Destailleur
06bc357409
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-23 14:49:50 +02:00
Laurent Destailleur
3f60cbbedc
Remove the div class="ficheaddleft"
2021-10-23 14:49:35 +02:00
Frédéric FRANCE
2d92e6006c
fix warnings
2021-10-23 07:04:13 +02:00
Florian HENRY
bb4eb2feea
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-22 23:38:44 +02:00
Florian HENRY
1f1e01aa88
fix php 8 warning
2021-10-22 23:38:35 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings
2021-10-22 22:15:59 +02:00
Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
c6ef6a162b
NEW Can edit fields of proposal when proposal is not yet signed
2021-10-19 22:20:23 +02:00
Laurent Destailleur
f4b5d14a34
Merge pull request #17536 from bb2a/Edit_in_propal
...
[NEW] Add edit option in propal
2021-10-19 22:10:12 +02:00
Laurent Destailleur
12d211815b
Debug v15
2021-10-19 21:38:36 +02:00
Laurent Destailleur
c40a73162e
Look and feel v15
2021-10-18 21:20:58 +02:00
lvessiller
a52ceaf1d2
FIX generate documents with PDF options
2021-10-18 12:12:00 +02:00
Laurent Destailleur
b66155de4b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
htdocs/filefunc.inc.php
2021-10-17 13:30:13 +02:00
Laurent Destailleur
8bdece7101
CSS
2021-10-16 21:43:48 +02:00
Laurent Destailleur
f2757a63a1
Clean code
2021-10-16 20:06:58 +02:00
Laurent Destailleur
dd0809b528
Fix trans labels status
2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
Marc de Lima Lucio
9a963da77c
FIX: deposit payment terms: adapt Form::form_conditions_reglement() calls to new parameter added in between PRs
2021-10-13 11:39:09 +02:00
Marc de Lima Lucio
29768a1c6e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-13 11:33:04 +02:00
Anthony Berton
8bbbe7b8bb
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Edit_in_propal
2021-10-11 12:11:08 +02:00
Laurent Destailleur
33761f9de3
Merge pull request #18917 from FHenry/NEW_dev_filter_from_dt_to_dt_actionlist
...
NEW:Add filter from date to date into action/evt list
2021-10-11 11:51:48 +02:00
Laurent Destailleur
874731af84
The 'action=delete&file=...' has been replaced with
...
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
2021-10-10 21:11:48 +02:00
lvessiller
be4a00213c
FIX optional visibility on create card
2021-10-08 15:58:08 +02:00
Florian HENRY
f52e2be10e
NEW:Add filter from date to date into action/evt list
2021-10-06 16:23:11 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21
...
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 16:51:41 +02:00
Marc de Lima Lucio
9d92260ec1
FIX: deposit payment terms: fatal error for lack of inclusion on class Facture
2021-10-05 14:57:14 +02:00
Marc de Lima Lucio
8a647f3f5b
FIX: deposit payment terms: sql syntax error
2021-10-05 14:01:34 +02:00
Marc de Lima Lucio
4059b64288
FIX: deposit payment terms: langs
2021-10-05 13:00:25 +02:00
Marc de Lima Lucio
47b9941203
FIX: deposit payment terms: show correct percentage is proposal/order lists
2021-10-05 11:18:49 +02:00
Marc de Lima Lucio
337531f832
FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices
2021-10-05 10:54:22 +02:00
Alexandre SPANGARO
c57aea1ead
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:10:37 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms
2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
cfc78a17f7
FIX: deposit payment terms: bad test for already existing deposit
2021-10-04 18:21:28 +02:00
Marc de Lima Lucio
1b2494855d
NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI
2021-10-04 18:09:24 +02:00
Marc de Lima Lucio
087157890e
FIX: deposit payment terms: unused variable
2021-10-04 15:06:52 +02:00
Laurent Destailleur
b3cb56f2ef
Clean css
2021-10-04 04:14:31 +02:00
Laurent Destailleur
d064ab2b17
Add more action to GET action to check
2021-10-02 12:58:15 +02:00
Laurent Destailleur
157112758b
Fix phpcs
2021-09-30 20:14:59 +02:00
Laurent Destailleur
673a2982a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/card.php
2021-09-30 16:32:40 +02:00
Laurent Destailleur
ed264182c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/product/card.php
htdocs/takepos/receipt.php
2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/product/card.php
2021-09-30 16:21:36 +02:00
stickler-ci
f6b9336a82
Fixing style errors.
2021-09-30 10:59:29 +00:00
Marc de Lima Lucio
d74776622d
NEW: deposit payment terms: check invoice module activation + rights
2021-09-30 12:57:00 +02:00
stickler-ci
e1c5d01361
Fixing style errors.
2021-09-30 10:43:40 +00:00
Marc de Lima Lucio
81ddc6c0f6
NEW: deposit payment terms: generate deposit from proposal
2021-09-30 12:41:07 +02:00
Marc de Lima Lucio
b0aa502ed4
NEW: deposit payment terms: set deposit percentage in proposals/orders + get from origin document or company
2021-09-29 14:51:30 +02:00
Marc de Lima Lucio
4d6c1d892b
NEW: deposit payment terms: set deposit percentage in company card
2021-09-29 14:03:35 +02:00
Marc de Lima Lucio
004b52f590
NEW: deposit payment terms: add field into CRUD methods
2021-09-29 12:05:38 +02:00
Laurent Destailleur
e15277bb6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-28 17:23:07 +02:00
Alexandre SPANGARO
43ed88f056
FIX Propal list - Problem of pagination on date
2021-09-27 23:02:19 +02:00
Laurent Destailleur
d4cc60640b
Clean code
2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
Laurent Destailleur
c9ae46db50
FIX Filter on categories
2021-09-27 11:34:26 +02:00
Laurent Destailleur
bb5eb9e292
FIX Filter on categories
2021-09-26 20:56:17 +02:00
lmarcouiller
f88d12f55d
Fix #18809 : error on client tooltip
2021-09-24 11:16:34 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes
...
another set of cleanup for action buttons
2021-09-24 01:55:25 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object
...
NEW : field and behavior in product object
2021-09-23 12:14:09 +02:00
Christian Foellmann
08b395e127
another set of cleanup for action buttons
2021-09-22 08:43:30 +02:00
kamel
9266b4e8fd
FIX Button text on proposal card for create a invoice
2021-09-21 19:44:49 +02:00
Laurent Destailleur
8cfccdcc5f
Merge pull request #18782 from OPEN-DSI/fix_00017
...
FIX Button text on proposal card for create a invoice
2021-09-21 19:44:05 +02:00
kamel
86a6e8af1f
FIX Button text on proposal card for create a invoice
2021-09-21 14:15:17 +02:00
Laurent Destailleur
deb1965cd5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/compta/paiement/list.php
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_list.php
htdocs/projet/tasks/task.php
htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
Laurent Destailleur
1d597e8a72
Fix add unset* action as sensible GET actions
2021-09-19 18:03:38 +02:00
Laurent Destailleur
5c8fb38426
Fix add del* action into list of sensitive actions
2021-09-19 14:41:46 +02:00
Laurent Destailleur
1f76165e46
Fix do not show link on objects for object with existing hard link field
2021-09-19 01:35:42 +02:00
Laurent Destailleur
96436cac3d
FIX unprivileged user can attach agenda with leave.
2021-09-19 00:50:23 +02:00
Laurent Destailleur
89e8f24e15
Fix CSRF protection for all massactions
2021-09-18 22:38:25 +02:00
Laurent Destailleur
d760686239
Fix case of newtoken()
2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a
Fix add action delete* as sensitive action
2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469
Fix Add action classify as sensitive actions
2021-09-18 20:49:24 +02:00
Laurent Destailleur
7dfedd242a
Fix add confirm_deleteline as sensitive action
2021-09-18 19:43:38 +02:00
Laurent Destailleur
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
675a30d500
Fix phpcs
2021-09-17 19:42:41 +02:00
Laurent Destailleur
3d9be1437a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/list.php
htdocs/fourn/paiement/list.php
htdocs/projet/tasks/time.php
2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2021-09-17 12:21:25 +02:00
Julien Gainza
65c4a21898
FIX move fetch_optionnal into $ac_static->fetch()
2021-09-13 16:35:13 +02:00
Laurent Destailleur
fa28621709
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/list.php
2021-09-09 16:11:29 +02:00
Laurent Destailleur
5406e3d34e
Fix phpcs
2021-09-09 16:06:16 +02:00
Laurent Destailleur
5d5b7c3af4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/peruser.php
htdocs/main.inc.php
2021-09-09 15:15:26 +02:00
Laurent Destailleur
ff74fbdf16
Update card.php
2021-09-09 02:37:47 +02:00
Laurent Destailleur
034c5651c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
4705d41ed2
FIX Relative discount with high nb of decimals
2021-09-08 22:00:16 +02:00
Regis Houssin
52419f28c5
FIX add DISTINCT
2021-09-07 12:38:15 +02:00
Regis Houssin
4aaaa8e21a
FIX multicompany transverse mode compatibility
2021-09-07 12:10:35 +02:00
Julien Gainza
9d89e48d15
Fix : Add extrafields on API "get events list"
2021-09-06 15:55:33 +02:00
jpb
65a2486f94
merge conflict
2021-09-06 09:43:52 +02:00
Laurent Destailleur
ee066ad725
Cast sql var
2021-09-03 21:25:43 +02:00
Laurent Destailleur
248e68aada
Code comment
2021-09-03 13:39:08 +02:00
