Laurent Destailleur
38f54d0582
FIX Missing extrafields into export of agenda record
2021-04-16 10:26:35 +02:00
Laurent Destailleur
8b2304ec8e
Better warning
2021-04-15 19:28:13 +02:00
Laurent Destailleur
ceb50d90ca
NEW Add a page about security setup advices
...
NEW Add a page about performance setup advices
2021-04-15 19:25:37 +02:00
Laurent Destailleur
8e2cc43eb1
Clean code
2021-04-15 19:19:58 +02:00
Laurent Destailleur
f2bd030f91
Clean code
2021-04-15 19:14:43 +02:00
Laurent Destailleur
db5dcd3e52
NEW When a doc file is shared, link is visible from main page of doc.
2021-04-15 17:56:55 +02:00
stickler-ci
f76d540451
Fixing style errors.
2021-04-15 15:49:42 +00:00
Ferran Marcet
512b54d049
New: Streamline data loading on replenishment
2021-04-15 17:44:35 +02:00
Dorian Vabre
71befd15f9
typo v2
2021-04-15 17:10:11 +02:00
Dorian Vabre
ed857481a2
typo
2021-04-15 17:09:26 +02:00
Laurent Destailleur
f1d55d38ba
Show link to shared file if it exists.
2021-04-15 17:09:15 +02:00
Dorian Vabre
db6ca73882
deletion of vardumps and correction in the invoice creation
2021-04-15 17:00:53 +02:00
Dorian Vabre
2cbe5b188e
wip invoice
2021-04-15 16:57:41 +02:00
Givriz
0a0804e7d5
Update dict.php
2021-04-15 16:36:17 +02:00
Laurent Destailleur
48a80dcef7
Fix: make crash on some apache setup when setting option not allowed.
2021-04-15 16:28:32 +02:00
Dorian Vabre
ae69cc93be
wip on payment page
2021-04-15 16:16:45 +02:00
Dorian Vabre
208478906c
add type product in modulebuilder
2021-04-15 16:10:01 +02:00
Laurent Destailleur
707efa7765
Debug v14
2021-04-15 15:54:54 +02:00
Laurent Destailleur
af39923a62
Debug v14
2021-04-15 15:41:21 +02:00
Laurent Destailleur
754b0e9853
Debug v14
2021-04-15 15:30:02 +02:00
Laurent Destailleur
37fa8f4c19
Fix method not found
2021-04-15 15:07:06 +02:00
Laurent Destailleur
bf547cf20d
Debug v14
2021-04-15 14:33:48 +02:00
Laurent Destailleur
ce1a257522
Fix remove a setup that should not exists. Info is already into a table
2021-04-15 13:53:24 +02:00
Laurent Destailleur
d4884e9063
Debug
2021-04-15 13:36:05 +02:00
Laurent Destailleur
7e4f7f7200
Nicer page of widget setup
2021-04-15 13:31:40 +02:00
Laurent Destailleur
09365c29c9
Nicer page of widget setup
2021-04-15 13:22:03 +02:00
Dorian Vabre
12a796fd8e
dynamic selector print improved, now using ref instead of id
2021-04-15 12:57:19 +02:00
Laurent Destailleur
e1a33e6c55
css
2021-04-15 12:50:47 +02:00
Dorian Vabre
764d984ebf
fix on dynamic selector
2021-04-15 12:28:53 +02:00
NextGestion
010b89ce78
Merge branch 'dolibarr_partnership' of https://github.com/NextGestion/dolibarr into dolibarr_partnership
2021-04-15 11:22:46 +01:00
NextGestion
e8fc6fe293
Code optimization
2021-04-15 11:21:33 +01:00
Dorian Vabre
98c622446e
dynamic selector of service/product used for the invoice added
2021-04-15 12:14:34 +02:00
Laurent Destailleur
bd1aa38c64
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-04-15 12:04:08 +02:00
Dorian Vabre
880d763abe
wip on payment page
2021-04-15 11:55:28 +02:00
Dorian Vabre
dd7c09582f
payment page structure ok, still need to confirm the attendee after the payment
2021-04-15 10:45:44 +02:00
altairis-noe
2e340c61cc
preselect project when warehouse created from there
2021-04-15 10:31:18 +02:00
altairis-noe
3fe0eb54c7
association of warehouses to projects
2021-04-15 09:59:08 +02:00
Alexandre SPANGARO
1be8bfe5c0
Text
2021-04-15 06:08:41 +02:00
Laurent Destailleur
5e2bec9cad
Look and feel v14
2021-04-15 02:09:29 +02:00
andreubisquerra
662caadd18
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS
2021-04-14 23:32:08 +02:00
Alexandre SPANGARO
b2a1b06736
text
2021-04-14 23:19:10 +02:00
Alexandre SPANGARO
957968eea2
typo
2021-04-14 23:17:26 +02:00
Alexandre SPANGARO
140f098c79
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-14 23:16:30 +02:00
Laurent Destailleur
e7d64d073a
Look and feel v14
2021-04-14 23:14:38 +02:00
Laurent Destailleur
d4420bbfd9
Look and feel v14
2021-04-14 22:31:44 +02:00
Givriz
47cdfee1d2
Compatibility pvpv8
2021-04-14 22:03:04 +02:00
Pierre Payet
377c730363
add missing group by hook in fichinter list
2021-04-14 21:27:53 +02:00
Laurent Destailleur
195d3b578b
Fix phpcs
2021-04-14 20:44:34 +02:00
Laurent Destailleur
59f1270264
Trans
2021-04-14 19:12:25 +02:00
Laurent Destailleur
8bfb69cdba
Fix security check
2021-04-14 18:56:31 +02:00
Gauthier PC portable 024
9ca67b81f8
FIX : correction migration queries for postgres
2021-04-14 18:49:21 +02:00
stickler-ci
5d404836f7
Fixing style errors.
2021-04-14 16:35:19 +00:00
Givriz
598156de04
Update modDataPolicy.class.php
...
There was useless condition
2021-04-14 17:58:46 +02:00
NextGestion
03a944edf5
Manage membership expiration
2021-04-14 16:32:23 +01:00
Alexandre SPANGARO
89281d4875
Merge remote-tracking branch 'upstream/develop' into 14a38
2021-04-14 16:43:16 +02:00
Dorian Vabre
caf74fe1cb
pull problem corrected
2021-04-14 16:20:05 +02:00
stickler-ci
4700fd467f
Fixing style errors.
2021-04-14 14:14:39 +00:00
Gauthier PC portable 024
4d643db4e6
FIX : travis
2021-04-14 16:14:03 +02:00
altairis-noe
658e1de45d
stickler adjust
2021-04-14 16:08:28 +02:00
Givriz
9b66895945
Update mails_templates.php
2021-04-14 16:06:53 +02:00
Dorian Vabre
c58414c0ca
merging with dev_EventOrganization after the changes on it
2021-04-14 16:04:36 +02:00
stickler-ci
6f0f527a89
Fixing style errors.
2021-04-14 14:04:33 +00:00
Gauthier PC portable 024
a596424328
FIX : Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid
2021-04-14 16:01:48 +02:00
Dorian Vabre
3d5e439d92
company name is now required if price is set
2021-04-14 15:55:59 +02:00
Dorian Vabre
2f3f2509b2
wip on asking for the company name only if price is set v2
2021-04-14 15:54:21 +02:00
Dorian Vabre
6238ff0321
wip on asking for the company name only if price is set
2021-04-14 15:52:46 +02:00
Givriz
32d401bed4
Update mails.php
2021-04-14 15:26:18 +02:00
Laurent Destailleur
63d4d83025
Better text
2021-04-14 15:15:52 +02:00
Laurent Destailleur
b298420ac5
Fix bad test
2021-04-14 15:12:40 +02:00
Laurent Destailleur
a68a5b0c04
Look and feel v14
2021-04-14 15:11:26 +02:00
NextGestion
4e45011e45
Manage Partnership for third-party
2021-04-14 13:59:38 +01:00
NextGestion
a91a9256a3
Fix extrafields in list
2021-04-14 13:49:26 +01:00
Anthony Berton
a612831e28
next_change
2021-04-14 14:45:55 +02:00
Dorian Vabre
55afc59db2
removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice
2021-04-14 14:33:11 +02:00
altairis-noe
4c8d37ce28
warehouse can now be linked to a project with
...
fk_project
2021-04-14 13:45:25 +02:00
Laurent Destailleur
9154e07689
Fix picto for tags
2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248
Use css on img_picto
2021-04-14 12:28:01 +02:00
Laurent Destailleur
485095c5ed
Merge pull request #17264 from bb2a/mass_action_bill_picto_right
...
ADD Picto mass actions in lists
2021-04-14 12:10:23 +02:00
Laurent Destailleur
3a0ca6f3e1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-14 12:03:49 +02:00
Laurent Destailleur
4c7547576b
Fix label
2021-04-14 12:02:56 +02:00
Laurent Destailleur
b22d8efc6c
Merge pull request #17267 from bb2a/bug_install_v14_societe_entrepot_warehouse
...
BUG New install v14 bug fk_warehouse not fk_entrepot in table
2021-04-14 12:01:52 +02:00
Laurent Destailleur
0520a6044b
Merge pull request #17262 from andreubisquerra/master
...
TakePOS notes improvements
2021-04-14 11:58:31 +02:00
Anthony Berton
7137b3ddcc
Update llx_societe.sql
2021-04-14 11:49:37 +02:00
Anthony Berton
707bf5adca
picto_mass_actions
2021-04-14 10:20:34 +02:00
altairis-noe
7040330914
project select in edit or create warehouse
2021-04-14 10:13:31 +02:00
stickler-ci
bcab8d5164
Fixing style errors.
2021-04-14 07:49:18 +00:00
Adrien Raze
c83819bd90
NEW : Add possibility to exports userGroups fields on user exports
2021-04-14 09:44:01 +02:00
Christophe Battarel
ccc05a0a43
Merge branch 'develop' into batch_mask_product
2021-04-14 08:30:19 +02:00
stickler-ci
69fd2cf24c
Fixing style errors.
2021-04-14 02:50:23 +00:00
Alexandre SPANGARO
2f31720896
Maxi debug of societe/product per entity
2021-04-14 04:45:17 +02:00
stickler-ci
26767c1550
Fixing style errors.
2021-04-14 00:36:07 +00:00
Anthony Berton
3b2a27de16
Update list.php
2021-04-14 02:35:39 +02:00
Anthony Berton
5a68718eb2
Update list.php
2021-04-14 02:32:39 +02:00
stickler-ci
6324879215
Fixing style errors.
2021-04-14 00:25:05 +00:00
Anthony Berton
92ca59d20b
Update list.php
2021-04-14 02:23:23 +02:00
Anthony Berton
25ac8bed68
Update list.php
2021-04-14 01:54:30 +02:00
Anthony Berton
e1557b15ee
Update list.php
2021-04-14 01:12:20 +02:00
Anthony Berton
c7d0ff94f9
Update list.php
2021-04-14 01:03:32 +02:00
Anthony Berton
6814488d86
Update list.php
2021-04-14 00:51:19 +02:00
andreubisquerra
88f95b7f9b
Update index.php
2021-04-14 00:32:49 +02:00
Anthony Berton
992cf0a091
Update list.php
2021-04-14 00:29:06 +02:00
Anthony Berton
2c18e31ee0
Merge branch 'mass_action_propal_right' of https://github.com/bb2a/dolibarr into mass_action_propal_right
2021-04-14 00:28:07 +02:00
Anthony Berton
9e40b8bf4c
Update list.php
2021-04-14 00:27:46 +02:00
jove@bisquerra.com
db83428e89
Notes improvements
2021-04-14 00:15:02 +02:00
stickler-ci
78b08586e3
Fixing style errors.
2021-04-13 22:11:04 +00:00
Anthony Berton
29dd2e4b67
Update list.php
2021-04-14 00:07:29 +02:00
Anthony Berton
22d48c9cb6
Update list.php
2021-04-14 00:03:33 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks
...
Product masks
2021-04-13 23:06:09 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition
...
fix date closing option position
2021-04-13 23:03:02 +02:00
Laurent Destailleur
7e4dcde089
Merge pull request #17257 from ibuiv/patch-4
...
Fix Infinite Loop in trigger
2021-04-13 23:01:28 +02:00
Laurent Destailleur
7f62b6c49b
Look and feel v14
2021-04-13 22:58:37 +02:00
Laurent Destailleur
25a6aa1388
NEW Add data-eec=1 for EEC countries on select for js interaction
2021-04-13 22:50:50 +02:00
Laurent Destailleur
1c8a2ce15a
Fix phpcs
2021-04-13 22:12:47 +02:00
Laurent Destailleur
161baa672a
Fix phpcs
2021-04-13 21:11:02 +02:00
Laurent Destailleur
97292d6843
Fix phpcs
2021-04-13 20:28:25 +02:00
stickler-ci
0511d5848e
Fixing style errors.
2021-04-13 18:24:18 +00:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
ibuiv
2a391dc13f
Fix Loop in trigger with CommandeFournisseur::createFromClone
...
added param $notrigger to avoid an infinite loop when createFromClone calls create
2021-04-13 20:19:02 +02:00
Laurent Destailleur
fe57ba2116
Fix phpcs
2021-04-13 20:00:36 +02:00
Laurent Destailleur
f54fd1063b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 19:39:08 +02:00
Laurent Destailleur
c93f88e47a
Debug mass action after regression on close on proposal
2021-04-13 19:38:55 +02:00
Pierre Payet
75ed5e45f2
fix date closing option position
2021-04-13 17:21:51 +02:00
altairis-noe
2e297b5753
one more print
2021-04-13 17:02:58 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership
...
Create Partnership Module
2021-04-13 16:33:54 +02:00
Givriz
bc78b87020
pvpv8 continuous integration
2021-04-13 16:32:19 +02:00
Laurent Destailleur
ce18d416e6
Merge pull request #17222 from aspangaro/13p31
...
FIX Write right on document
2021-04-13 16:18:48 +02:00
Laurent Destailleur
d09be1f86f
Do not make new twice
2021-04-13 16:18:18 +02:00
altairis-noe
ee1693edf0
colspans and inconditional GETPOST
2021-04-13 16:13:57 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36
2021-04-13 16:05:57 +02:00
Laurent Destailleur
4edf710594
Merge pull request #17220 from dolibit-ut/patch-263
...
Update llx_10_c_regions.sql
2021-04-13 15:58:43 +02:00
Laurent Destailleur
add6853581
Merge branch 'develop' into filter_warehouse
2021-04-13 15:58:13 +02:00
Laurent Destailleur
8aeed353c7
Merge pull request #17232 from dolibit-ut/patch-270
...
Update eventorganizationindex.php
2021-04-13 15:56:24 +02:00
Laurent Destailleur
da400ee17e
Merge pull request #17235 from dolibit-ut/patch-273
...
Update myobject_agenda.php
2021-04-13 15:56:06 +02:00
Laurent Destailleur
946a93dcd9
Update myobject_agenda.php
2021-04-13 15:55:50 +02:00
Laurent Destailleur
f99d4897a0
Merge pull request #17230 from dolibit-ut/patch-268
...
Update mo_card.php
2021-04-13 15:53:54 +02:00
Laurent Destailleur
91b8ccafbb
Fix empty label
2021-04-13 15:53:05 +02:00
Laurent Destailleur
4ad14a1f65
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 15:51:47 +02:00
Laurent Destailleur
97336ad417
Fix label of empty value in select of warehouse
2021-04-13 15:51:34 +02:00
Laurent Destailleur
302dd3e43d
Merge pull request #17238 from dolibit-ut/patch-275
...
Update agenda.php
2021-04-13 15:41:35 +02:00
Laurent Destailleur
adbebac0fc
Merge pull request #17243 from frederic34/patch-3
...
fix MAIN_ADD_PDF_BACKGROUND
2021-04-13 15:41:20 +02:00
Laurent Destailleur
6b542a89f6
Merge pull request #17245 from Robin-Yann/13-fix-project-visibility-field
...
FIX: project visibility field with two option
2021-04-13 15:40:04 +02:00
Laurent Destailleur
ee07796131
Update card.php
2021-04-13 15:39:34 +02:00
Laurent Destailleur
de73c0adb2
Update card.php
2021-04-13 15:38:51 +02:00
Laurent Destailleur
4bbe02c209
Merge pull request #17223 from atm-gauthier/fix_migration_script
...
FIX : UPDATE query must not use alias for postgres compatibility
2021-04-13 15:37:42 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer
...
Dev event organizer: public registration page to a conference
2021-04-13 15:31:40 +02:00
Dorian Vabre
339596f134
ref add in redirection url to payment page
2021-04-13 15:30:28 +02:00
Anthony Berton
5fec4c346e
Update index.php
2021-04-13 15:28:16 +02:00
Laurent Destailleur
0efe49e461
Merge pull request #17249 from Robin-Yann/13-fix-missing_param_settings
...
FIX missing parameter in select for POP
2021-04-13 15:19:14 +02:00
Dorian Vabre
a3e75c587c
adding amount and source to redirection url to newpayment
2021-04-13 15:07:15 +02:00
Dorian Vabre
633a3d39c6
wip on adding taxes and price to invoice
2021-04-13 14:32:17 +02:00
Dorian Vabre
db8dfb219c
addition of the subscriptionok page when the subscription price is not set or 0
2021-04-13 14:10:20 +02:00
Anthony Berton
68e46515a4
Update index.php
2021-04-13 13:54:37 +02:00
Anthony Berton
1b2f78ca06
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into filter_warehouse
2021-04-13 13:07:58 +02:00
Anthony Berton
69d489c12b
Update list.php
2021-04-13 13:00:44 +02:00
Dorian Vabre
fa47106ed7
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment
2021-04-13 12:21:27 +02:00
Laurent Destailleur
15d8a4af73
Merge pull request #17227 from dolibit-ut/patch-265
...
Update member_emails.php
2021-04-13 12:12:05 +02:00
Laurent Destailleur
e62c234c84
Merge pull request #17231 from dolibit-ut/patch-269
...
Update recruitmentcandidature_agenda.php
2021-04-13 12:11:39 +02:00
Laurent Destailleur
facfb5d305
Merge pull request #17237 from dolibit-ut/patch-274
...
Update agenda.php
2021-04-13 12:10:52 +02:00
Laurent Destailleur
bcaf251c53
Merge pull request #17239 from dolibit-ut/patch-276
...
Create .htaccess
2021-04-13 12:10:27 +02:00
Dorian Vabre
0c6431efd5
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer
2021-04-13 12:10:15 +02:00
Dorian Vabre
3c265b2a5b
fixing style error
2021-04-13 12:09:53 +02:00
Laurent Destailleur
6b5091bb4a
Merge pull request #17244 from Robin-Yann/fix_13_addmissinghook
...
fix: add missing hook
2021-04-13 12:09:38 +02:00
Laurent Destailleur
8aecf24294
Merge pull request #17233 from dolibit-ut/patch-271
...
Update mo_agenda.php
2021-04-13 12:08:46 +02:00
Laurent Destailleur
bafdb00ea0
Update mo_agenda.php
2021-04-13 12:08:25 +02:00
Laurent Destailleur
91c55e1c91
Merge pull request #17229 from dolibit-ut/patch-267
...
Update bom_card.php
2021-04-13 12:07:47 +02:00
Laurent Destailleur
f177d91456
Merge pull request #17226 from dolibit-ut/patch-264
...
Update member_type_extrafields.php
2021-04-13 12:07:18 +02:00
stickler-ci
839edb5abe
Fixing style errors.
2021-04-13 10:06:42 +00:00
Laurent Destailleur
1be53379aa
Merge pull request #17228 from dolibit-ut/patch-266
...
Update bom_note.php
2021-04-13 12:06:41 +02:00
Laurent Destailleur
9e4f73306b
Merge pull request #17234 from dolibit-ut/patch-272
...
Delete index.html
2021-04-13 12:05:57 +02:00
Dorian Vabre
14e64f4a33
security changes: encryption is now with instead of hard coded keys
2021-04-13 11:57:36 +02:00
altairis-noe
14c93d14e4
whitespace correction
2021-04-13 11:39:12 +02:00
Laurent Destailleur
1bae707246
Prepare table for future enhancement
2021-04-13 11:38:37 +02:00
Dorian Vabre
149aa8e81b
email is now used as name, if name is empty
2021-04-13 11:31:22 +02:00
Laurent Destailleur
3439bc4a0f
Clean code
2021-04-13 11:30:23 +02:00
altairis-noe
a95911e096
stickler corrections
2021-04-13 11:21:41 +02:00
Robin
dbd56bc03e
FIX: mask selector fournisseur if module not activate
2021-04-13 11:00:28 +02:00
Anthony Berton
b2eaca75bf
Update list.php
2021-04-13 10:55:48 +02:00
Robin
0839ee25cd
FIX missing parameter in select for POP
...
All options can be modified for selector in pop
2021-04-13 10:44:14 +02:00
Anthony Berton
1b995226b7
add_filter_warehouse_propal
2021-04-13 10:43:36 +02:00
Dorian Vabre
0b4149cb91
removal of subscriptionok page, bad branch
2021-04-13 10:43:23 +02:00
Dorian Vabre
caeb357aab
security improvement by adding id to securekey before encryption
2021-04-13 10:40:33 +02:00
altairis-noe
eee40a1840
Merge branch 'develop' of github.com:altairisfr/dolibarr into batch_mask_product
2021-04-13 10:36:37 +02:00
stickler-ci
6ab0de145b
Fixing style errors.
2021-04-13 08:33:57 +00:00
altairis-noe
f69ccbbab8
remove empty line
2021-04-13 10:31:24 +02:00
Laurent Destailleur
0d136d6806
Enhance barcode scanner tool
2021-04-13 10:24:57 +02:00
Robin
d6caa057f2
FIX: project visibility field with two option
...
If two option of disabled visibility are add on constant, combo is not display
2021-04-13 10:23:05 +02:00
Laurent Destailleur
9e491ad30c
Add comment
2021-04-13 10:18:23 +02:00
Frédéric FRANCE
d007e75a8e
Update pdf_eratosthene.modules.php
2021-04-13 09:55:04 +02:00
Frédéric FRANCE
8085f10995
Update pdf_einstein.modules.php
2021-04-13 09:53:51 +02:00
Laurent Destailleur
7004747ca3
Add more tooltips on edition of accounting account
...
Fix setup of accountancy
Conflicts:
htdocs/accountancy/admin/account.php
2021-04-13 09:51:17 +02:00
Florian HENRY
cf1c4ce11f
add missing hook
2021-04-13 09:51:08 +02:00
Frédéric FRANCE
8953c0ac3a
Update pdf_cyan.modules.php
2021-04-13 09:49:30 +02:00
Frédéric FRANCE
ee4f846eb9
Update pdf_azur.modules.php
2021-04-13 09:49:03 +02:00
Laurent Destailleur
2f77181781
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 09:47:18 +02:00
Frédéric FRANCE
fcca5d7d5c
Update pdf_sponge.modules.php
2021-04-13 09:47:15 +02:00
Laurent Destailleur
243fcb38ba
Add more tooltips on edition of accounting account
...
Fix setup of accountancy
2021-04-13 09:46:50 +02:00
Frédéric FRANCE
9ce6d841cc
Update pdf_crabe.modules.php
2021-04-13 09:40:16 +02:00
Alexandre SPANGARO
f66ec58865
Fix travis error
2021-04-12 22:06:44 +02:00
Alexandre SPANGARO
bb74a8b1b5
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-12 22:01:46 +02:00
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
UT from dolibit
6785cdd751
Create .htaccess
2021-04-12 19:48:42 +02:00
stickler-ci
6724fb7ba0
Fixing style errors.
2021-04-12 17:37:21 +00:00
UT from dolibit
bae363cf0c
Update agenda.php
...
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda';
llxHeader('', $title, $help_url);
2021-04-12 19:35:14 +02:00
UT from dolibit
8e8db6a48f
Update agenda.php
...
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda';
2021-04-12 19:32:34 +02:00
UT from dolibit
488e80e959
Update myobject_agenda.php
2021-04-12 19:28:32 +02:00
UT from dolibit
769f052618
Delete index.html
2021-04-12 19:25:19 +02:00
UT from dolibit
dc3574923e
Update mo_agenda.php
2021-04-12 19:24:25 +02:00
UT from dolibit
511848d8dc
Update eventorganizationindex.php
...
$title = $langs->trans('EventOrganizationArea');
llxHeader('', $title, '');
2021-04-12 19:09:52 +02:00
UT from dolibit
f173cabf39
Update recruitmentcandidature_agenda.php
...
$help_url = 'Module_Agenda_En';
2021-04-12 19:05:22 +02:00
UT from dolibit
38d87494c0
Update mo_card.php
...
$title = $langs->trans('Mo');
llxHeader('', $title, '');
2021-04-12 19:02:15 +02:00
UT from dolibit
3d18b0fbf7
Update bom_card.php
...
$title = $langs->trans('BOM');
2021-04-12 18:51:44 +02:00
UT from dolibit
fd870e9eaf
Update bom_note.php
2021-04-12 18:49:35 +02:00
stickler-ci
d7665b49c1
Fixing style errors.
2021-04-12 16:44:07 +00:00
UT from dolibit
e177bb059d
Update member_emails.php
2021-04-12 18:41:44 +02:00
UT from dolibit
a917382f6c
Update member_type_extrafields.php
...
$help_url => |DE:Modul_Mitglieder';
2021-04-12 18:29:07 +02:00
altairis-noe
0965f28bf7
a pinch of jquery to display only what we need when we need it
2021-04-12 17:56:57 +02:00
Dorian Vabre
7644174c4a
subscriptionok page addition
2021-04-12 17:29:44 +02:00
Laurent Destailleur
202243d8a3
Fix payment link for renewal with a unique secure key
2021-04-12 17:19:58 +02:00
Dorian Vabre
167da1445d
securekey added in
2021-04-12 17:16:24 +02:00
Dorian Vabre
358a2bf365
hardcoded label put in ->trans
2021-04-12 17:10:57 +02:00
Dorian Vabre
d9513da8de
email now required in the attendee_subscription page, company name no longer required. Check on existing third party now depends on the email. todo: what if the name is empty?
2021-04-12 17:05:09 +02:00
Dorian Vabre
e1fb368d3a
wip
2021-04-12 16:50:56 +02:00
Laurent Destailleur
a7a95cff03
Fix payment link for renewal with a unique secure key
2021-04-12 16:41:40 +02:00
Damien BENOIT
9abc7a5b0d
Update modDataPolicy.class.php
2021-04-12 16:16:48 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer
...
new: working on conference or booth object and event type #FoundationFunding
2021-04-12 16:06:13 +02:00
Givriz
7a54e5d346
Using empty instead of isset
...
I used empty instead of isset, and I fixed some problems of my previous pull request
2021-04-12 16:03:56 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Dorian Vabre
15d103e957
subs validation for free conferences added
2021-04-12 15:52:49 +02:00
Dorian Vabre
ebd5f29231
invoice OK except price, wip on the payment page
2021-04-12 15:44:25 +02:00
Laurent Destailleur
81487d76b2
Clean code of ol deprecated option
2021-04-12 15:37:26 +02:00
Gauthier PC portable 024
aff07ac13c
FIX : UPDATE query must not use alias for postgres compatibility
2021-04-12 14:43:28 +02:00
altairis-noe
ab39cfdf09
oops, better if we test the right const
2021-04-12 14:32:05 +02:00
Laurent Destailleur
8fa943edc3
Fix select field in multiselect of languages
2021-04-12 14:26:09 +02:00
altairis-noe
beecc6f935
Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks
2021-04-12 14:13:37 +02:00
altairis-noe
a61c1f8807
checkboxes for custom masks
2021-04-12 14:01:36 +02:00
Laurent Destailleur
eb3438baa7
css
2021-04-12 13:02:34 +02:00
Laurent Destailleur
5dd0d05c4e
Test to disable text in menu
2021-04-12 12:07:11 +02:00
Christophe Battarel
855e736d32
Merge branch 'develop' into product_masks
2021-04-12 11:42:23 +02:00
Laurent Destailleur
86328462c7
Enhance getURLContent
2021-04-12 11:20:44 +02:00
Laurent Destailleur
a68378da3f
Fix #yogosha5840
2021-04-12 10:32:41 +02:00
Laurent Destailleur
97ace5e3bb
Look and feel v14
2021-04-12 10:19:38 +02:00
Dorian Vabre
fd476b6cb9
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment
2021-04-12 10:16:38 +02:00
Dorian Vabre
bb70908dac
modifications to match @eldy's expectations
2021-04-12 10:09:05 +02:00
Dorian Vabre
58abeb1e1e
Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment
2021-04-12 10:02:04 +02:00
Alexandre SPANGARO
fb221a0541
Add right supplier_order
2021-04-12 09:59:03 +02:00
Alexandre SPANGARO
8d72448f43
Add right supplier_order
2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
1ef89b8e7a
Add right supplier_invoice
2021-04-12 08:59:25 +02:00
Alexandre SPANGARO
87cc1b2601
Add right supplier_invoice
2021-04-12 07:37:34 +02:00
Alexandre SPANGARO
80995c34b5
FIX Write right on document
2021-04-12 07:13:05 +02:00
Alexandre SPANGARO
2a1a22763d
Work on split module fournisseur
2021-04-12 06:51:00 +02:00
Alexandre SPANGARO
f749111148
Work on split module fournisseur
2021-04-12 06:27:46 +02:00
Alexandre SPANGARO
ab35b6b4f2
Work on split module fournisseur
2021-04-12 06:21:25 +02:00
Alexandre SPANGARO
2d77b9bdf0
Work on split module fournisseur
2021-04-12 06:15:47 +02:00
Alexandre SPANGARO
b3744bce24
Work on split module fournisseur
2021-04-12 06:04:08 +02:00
Alexandre SPANGARO
bbd774f987
Work on split module fournisseur
2021-04-12 05:50:57 +02:00
Alexandre SPANGARO
77d751b03e
Work on split module fournisseur
2021-04-12 05:41:37 +02:00
Alexandre SPANGARO
c2f7e15add
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 05:31:12 +02:00
Laurent Destailleur
f6251679a1
Fix label
2021-04-11 22:41:53 +02:00
Laurent Destailleur
062f451b20
css
2021-04-11 22:40:07 +02:00
Laurent Destailleur
990da5574d
Fix trans
2021-04-11 22:35:20 +02:00
Alexandre SPANGARO
80c6458faa
Work on split module fournisseur
2021-04-11 22:25:45 +02:00
Laurent Destailleur
35d37c75fc
Fix EN Translation
2021-04-11 22:25:22 +02:00
Laurent Destailleur
04081954b1
Fix translation
2021-04-11 22:19:15 +02:00
Laurent Destailleur
3893c69dc1
Enhance perf and security page
2021-04-11 21:30:41 +02:00
Alexandre SPANGARO
ab5599a672
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-11 20:53:30 +02:00
Laurent Destailleur
70383cca73
Add protection to avoid to overwrite a page with another similar name
2021-04-11 18:49:17 +02:00
UT from dolibit
8faaebb05f
Update llx_10_c_regions.sql
...
add new: Denmark
2021-04-11 18:10:33 +02:00
Laurent Destailleur
6f6c9058c1
CSS for dark theme
2021-04-11 17:08:48 +02:00
Laurent Destailleur
91fc78ac9c
FIX #17192 - With tz < 0, event is show in bad day on calendar views
...
Conflicts:
htdocs/comm/action/index.php
2021-04-11 16:18:16 +02:00
Laurent Destailleur
f437e70ac6
Selection of theme is easier
2021-04-11 16:11:05 +02:00
Laurent Destailleur
cf51ccb479
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-11 16:03:07 +02:00
Laurent Destailleur
053be7a63c
FIX #17192 - With tz < 0, event is show in bad day on calendar views
2021-04-11 16:02:52 +02:00
Laurent Destailleur
5eda49632a
Add more accurate information on login and last login date
2021-04-11 15:57:58 +02:00
Laurent Destailleur
c0b8aac12d
Merge pull request #17218 from dolibit-ut/patch-262
...
Update llx_10_c_regions.sql
2021-04-11 14:34:18 +02:00
Laurent Destailleur
6156a5690a
Merge pull request #17217 from dolibit-ut/patch-261
...
Update llx_20_c_departements.sql
2021-04-11 14:34:08 +02:00
Laurent Destailleur
46031dc39e
Fix missing column
2021-04-11 13:53:36 +02:00
Laurent Destailleur
fa231d85c9
Fix sql
2021-04-11 13:48:49 +02:00
Laurent Destailleur
0ab31a8680
Look and feel v14
2021-04-11 13:30:30 +02:00
UT from dolibit
ec9efd8018
Update llx_10_c_regions.sql
...
USA
Honduras
India
Indonesia
Panama
Mexique
Romania
2021-04-11 12:49:08 +02:00
UT from dolibit
051b3cf9ad
Update llx_20_c_departements.sql
...
Hungary - new sorting
2021-04-11 12:37:23 +02:00
Alexandre SPANGARO
ce7c5a0c7b
Work on split module fournisseur
2021-04-11 04:24:21 +02:00
Alexandre SPANGARO
451164ba64
Merge remote-tracking branch 'upstream/develop' into 14a26
2021-04-10 21:44:23 +02:00
Laurent Destailleur
ac64938266
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 15:31:39 +02:00
Laurent Destailleur
8526ca5304
Merge pull request #17121 from 0x00FE/add-friday-holiday
...
NEW Add support for Friday as a holiday
2021-04-10 15:30:57 +02:00
Laurent Destailleur
421a515f75
Merge pull request #17214 from dolibit-ut/patch-260
...
Update llx_20_c_departements.sql
2021-04-10 15:29:05 +02:00
Laurent Destailleur
09e840a355
Merge pull request #17212 from dolibit-ut/patch-259
...
Update llx_10_c_regions.sql
2021-04-10 15:28:55 +02:00
Laurent Destailleur
be800e07f2
Use urlencode even on security key
2021-04-10 15:27:44 +02:00
Laurent Destailleur
0bc93d437e
css
2021-04-10 14:21:03 +02:00
Laurent Destailleur
35a64e08bf
Fix link
2021-04-10 14:12:51 +02:00
Laurent Destailleur
5be6ed3996
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/activity/perweek.php
2021-04-10 14:02:12 +02:00
Laurent Destailleur
cb57546d99
NEW Can hide columns "time consumed" on timesheet per week.
2021-04-10 13:53:23 +02:00
UT from dolibit
cb08151473
Update llx_20_c_departements.sql
...
Romania
2021-04-10 13:47:35 +02:00
Laurent Destailleur
95a5296d45
NEW Can hide columns "time consumed" on timesheet per week.
2021-04-10 13:29:24 +02:00
UT from dolibit
260f39a4d2
Update llx_10_c_regions.sql
...
Switzerland/Suisse
San Salvador
Netherlands
United Kingdom
2021-04-10 13:18:57 +02:00
Laurent Destailleur
1444920f57
Merge pull request #17204 from Hystepik/develop#1
...
Close #17193 : Move button added with PR 17161
2021-04-10 13:02:21 +02:00
Laurent Destailleur
5dfebcf351
Merge pull request #17203 from dolibit-ut/patch-256
...
Update llx_20_c_departements.sql
2021-04-10 12:58:31 +02:00
Laurent Destailleur
6241ba559b
Trans
2021-04-10 12:44:41 +02:00
Laurent Destailleur
11330fd6c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 12:42:55 +02:00
Laurent Destailleur
ce6f8eebf5
Close #17206 Add comment on type of constants
2021-04-10 12:42:43 +02:00
Laurent Destailleur
4e6436c1bb
Merge pull request #17202 from dolibit-ut/patch-255
...
Update llx_10_c_regions.sql
2021-04-10 12:34:51 +02:00
Laurent Destailleur
19b223c484
Merge pull request #17209 from dolibit-ut/patch-258
...
Update llx_c_type_contact.sql
2021-04-10 12:34:37 +02:00
Laurent Destailleur
c86b100477
Update llx_c_type_contact.sql
2021-04-10 12:34:30 +02:00
Laurent Destailleur
af16c9c1e8
Merge pull request #17207 from dolibit-ut/patch-257
...
Update llx_c_socialnetworks.sql
2021-04-10 12:34:01 +02:00
Laurent Destailleur
b6e4bdbc6c
Merge pull request #17210 from Csardelacal/dev/goodfriday
...
Good friday is a holiday
2021-04-10 12:33:26 +02:00
Laurent Destailleur
1b88f05f28
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 12:06:21 +02:00
Laurent Destailleur
3895142772
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2021-04-10 12:06:11 +02:00
NextGestion
2035b956a6
Fix Sql & translate files
2021-04-10 10:57:23 +01:00
César de la Cal Bretschneider
eadd8defaf
Good friday is a holiday
2021-04-10 11:39:48 +02:00
Laurent Destailleur
83e272951f
Fix phpcs
2021-04-10 00:31:20 +02:00
Laurent Destailleur
280d534b7a
Fix phpcs
2021-04-10 00:29:32 +02:00
Laurent Destailleur
0cf659eb85
Fix syntax error
2021-04-10 00:26:28 +02:00
UT from dolibit
0c343f1f0f
Update llx_c_type_contact.sql
2021-04-09 21:18:42 +02:00
Laurent Destailleur
52213d0ac7
Fix duplicate permissions
2021-04-09 21:15:43 +02:00
UT from dolibit
d269e8da15
Update llx_c_socialnetworks.sql
2021-04-09 20:55:28 +02:00
Ahmad Hadeed
63f7369adb
Fixing 'stickler-ci' complaint, function description not in order
2021-04-09 21:16:24 +03:00
Ahmad Hadeed
20e51016ed
fixing function description comment to satisfy 'stickler-ci'
2021-04-09 21:11:37 +03:00
Ahmad Hadeed
937fe333f1
Moving Friday to end of function declaration to maintain backward compatibility
2021-04-09 20:49:39 +03:00
Dorian Vabre
eef5b9514d
wip
2021-04-09 16:55:54 +02:00
NextGestion
85bef29b3d
Fix declaration of property
2021-04-09 15:43:19 +01:00
stickler-ci
2b58bc904b
Fixing style errors.
2021-04-09 14:36:02 +00:00
Dorian Vabre
a58e0ac8ac
nouveau fichier : public/eventorganization/attendee_subscription.php
2021-04-09 16:25:40 +02:00
Dorian Vabre
b3415f9031
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-09 16:23:42 +02:00
Dorian Vabre
a99dd2be35
new: add attendees public registration page
2021-04-09 16:20:12 +02:00
Dorian Vabre
a590f945e9
thirdparty creation OK, wip on conforboothattendee creation
2021-04-09 16:12:25 +02:00
lmarcouiller
19ee78e123
Close #17193 : Move button convert in webp
2021-04-09 15:44:47 +02:00
UT from dolibit
cf83963e5f
Update llx_20_c_departements.sql
...
Netherlands/Nederland
2021-04-09 15:07:32 +02:00
UT from dolibit
4d243ae072
Update llx_10_c_regions.sql
...
Italy
Spain
2021-04-09 14:56:52 +02:00
Laurent Destailleur
42ddb6e5f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/website2.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/paiementfourn.class.php
htdocs/public/ticket/view.php
2021-04-09 14:17:41 +02:00
Laurent Destailleur
7f91713c4a
Fix merge not complete
2021-04-09 14:06:30 +02:00
Laurent Destailleur
4b1974080a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-04-09 14:02:14 +02:00
Laurent Destailleur
b008cb6b6f
Merge pull request #17147 from glu000/13.0-fix17146
...
13.0-fix17146
2021-04-09 13:57:50 +02:00
Laurent Destailleur
e8bf09862f
Merge pull request #17152 from marc-dll/FIX_12.0_zero_packaging
...
FIX: supplier order: error 500 when using packaging with product where it is not defined
2021-04-09 13:51:16 +02:00
altairis-noe
000342c2d8
custom masks : create, edit and display
2021-04-09 13:40:37 +02:00
Laurent Destailleur
4016c300d2
Fix missing lin to thirdparty on some actions
2021-04-09 13:38:29 +02:00
Laurent Destailleur
fe7654c067
Complete doc
2021-04-09 13:34:19 +02:00
Laurent Destailleur
4025488e08
css
2021-04-09 13:19:57 +02:00
Laurent Destailleur
a50b0e7441
Debug inventory module
2021-04-09 13:15:27 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership
2021-04-09 12:01:44 +01:00
Laurent Destailleur
06a7b8f5cb
Merge pull request #17159 from Hystepik/develop#1
...
Close #17145 : add link to autofill with expected qty
2021-04-09 12:50:33 +02:00
Laurent Destailleur
592800555f
Merge pull request #17148 from indelog/fix_empty_website_otherlang
...
Fix empty string WEBSITE_OTHERLANG (better fix)
2021-04-09 12:49:01 +02:00
Laurent Destailleur
95d3dabdf6
Update website2.lib.php
2021-04-09 12:48:06 +02:00
Laurent Destailleur
f7bab13c3c
Merge pull request #17187 from glu000/13.0-fix17186
...
FIX email is not case sensitive
2021-04-09 12:36:49 +02:00
Laurent Destailleur
44ec5ad12f
Merge pull request #17194 from daraelmin/daraelmin-amountbymebertype
...
NEW option to select membership type on the online payment page for membership subscription or renewal
2021-04-09 12:35:04 +02:00
Laurent Destailleur
17b446e8f7
Update adherent.class.php
2021-04-09 12:27:10 +02:00
Laurent Destailleur
445309bef2
Clean code
2021-04-09 12:25:45 +02:00
Laurent Destailleur
725c6be7db
CSS
2021-04-09 12:13:02 +02:00
Laurent Destailleur
e34335974c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-09 12:09:07 +02:00
Laurent Destailleur
afca96a8ee
Enhance barcode scanner tool
2021-04-09 12:08:56 +02:00
Laurent Destailleur
bbb75bd3c3
Merge pull request #17195 from FHenry/fix_dev_right_def_id
...
fix: right definition id in modulebuilder
2021-04-09 11:55:11 +02:00
Laurent Destailleur
5eb9acf3e1
Update modMyModule.class.php
2021-04-09 11:50:34 +02:00
Laurent Destailleur
0864daf2ad
Merge pull request #17189 from altairisfr/wh_project
...
add fk_project to warehouse table
2021-04-09 11:49:08 +02:00
Laurent Destailleur
45f9885978
Merge pull request #17196 from DorianVabre/new_add_config_type_securekey_module_builder
...
NEW: add config type securekey module builder
2021-04-09 11:47:29 +02:00
Laurent Destailleur
c0dc784061
Update eventorganization.php
2021-04-09 11:46:50 +02:00
Laurent Destailleur
e028195769
Merge pull request #17199 from Hystepik/develop#3
...
Fix error on module builder delete of a property
2021-04-09 11:42:23 +02:00
Laurent Destailleur
8a0ef6e17a
Update index.php
2021-04-09 11:41:29 +02:00
Laurent Destailleur
b3c382c02d
Update index.php
2021-04-09 11:38:23 +02:00
Laurent Destailleur
6609ef4941
Update index.php
2021-04-09 11:37:32 +02:00
Gauthier PC portable 024
c35c15e782
FIX : test must be === and not ==
2021-04-09 11:31:50 +02:00
lmarcouiller
fdb5b3b3da
Fix error on module builder delete of a property
2021-04-09 11:28:40 +02:00
lmarcouiller
b582396afc
edit objects in module builder with changes
2021-04-09 11:20:26 +02:00
Dorian Vabre
056143450b
NEW: add config type securekey module builder
2021-04-09 10:58:33 +02:00
lmarcouiller
3153966b24
New edit object in module builder
2021-04-09 09:19:52 +02:00
Florian HENRY
5555807104
fix: right definition id in modulebuilder
2021-04-09 08:51:09 +02:00
daraelmin
555a968f93
Fix html style error
2021-04-09 02:54:11 +02:00
daraelmin
071b50debf
Copyright
2021-04-09 02:51:05 +02:00
daraelmin
9ee80be23f
fix code style errors
2021-04-09 02:40:21 +02:00
stickler-ci
dce5c6be8f
Fixing style errors.
2021-04-09 00:28:07 +00:00
daraelmin
f2a49ef72f
New option amount by member type
2021-04-09 02:23:22 +02:00
Laurent Destailleur
475bdc24f4
Fix sql error
2021-04-09 01:31:55 +02:00
Laurent Destailleur
2d771704d0
Better suggestion for data after clone of social contribution
2021-04-09 00:36:08 +02:00
Laurent Destailleur
60711f415d
Fix permission on external user
2021-04-08 19:52:07 +02:00
Laurent Destailleur
667481acd5
Fix #yogosha5832 - Missin test on permission for /index routes on APIs
2021-04-08 19:05:28 +02:00
Laurent Destailleur
6c84b858ee
Fix #yogosha5832
2021-04-08 18:51:42 +02:00
NextGestion
d51001af31
Declare visibility for method "__construct
2021-04-08 17:42:59 +01:00
Laurent Destailleur
76c3229c97
Update to phpspreadsheet 1.8.2
2021-04-08 18:32:02 +02:00
altairis-noe
7c0d3d4d14
create custom masks in product cards
2021-04-08 18:03:46 +02:00
Laurent Destailleur
04536f9ec8
Fix import
2021-04-08 17:49:13 +02:00
Laurent Destailleur
d098bf412d
Move directory to match the one of composer package for phpspreadsheet
2021-04-08 17:35:52 +02:00
Dorian Vabre
60341e8a14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-08 17:29:16 +02:00
Dorian Vabre
6f51c69588
securekey ok
2021-04-08 17:15:49 +02:00
Christophe Battarel
4f413ca983
add fk_project to warehouse table
2021-04-08 16:46:52 +02:00
Dorian Vabre
af5b623b59
securekey added
2021-04-08 16:32:50 +02:00
Laurent Destailleur
c4a4d238f7
Merge pull request #17151 from OGPayet/fix/fournPayment
...
fix paiementfourn ref is now different from id
2021-04-08 16:26:34 +02:00
lmarcouiller
482b4e808b
chnages with eldy's advices
2021-04-08 16:21:50 +02:00
Laurent Destailleur
de7c3f5e0c
Merge pull request #17139 from OPEN-DSI/fix_00001
...
FIX: Fix when add or modify ressources on events with duplicate entries
2021-04-08 15:50:00 +02:00
Laurent Destailleur
5fd9ee20eb
Merge branch 'develop' into develop#4
2021-04-08 15:42:07 +02:00
Laurent Destailleur
b37cf2eb1c
Merge pull request #17157 from DorianVabre/fix_member_public_page
...
fix: new member public page firstname test
2021-04-08 15:40:24 +02:00
Laurent Destailleur
385053f107
Merge pull request #17158 from dolibit-ut/patch-239
...
Update llx_20_c_departements.sql
2021-04-08 15:34:48 +02:00
UT from dolibit
f609d03acc
Update llx_20_c_departements.sql
...
Chile
2021-04-08 15:24:59 +02:00
altairis-noe
b7280f6524
product masks are relevant only if we are in advanced mode
2021-04-08 15:15:58 +02:00
UT from dolibit
539c29b05f
Update llx_10_c_regions.sql
...
Chile
2021-04-08 14:38:43 +02:00
Laurent Destailleur
f8b5bee9eb
Add function getListOfPossibleImageExt
2021-04-08 14:20:59 +02:00
stickler-ci
0b1e3ce7e4
Fixing style errors.
2021-04-08 12:15:35 +00:00
Laurent Destailleur
638a4a6194
Merge pull request #17161 from Hystepik/develop#3
...
Close #17108 : New button to convert images in webp format
2021-04-08 14:06:45 +02:00
Laurent Destailleur
80582a4d7e
Merge pull request #17160 from dolibit-ut/patch-240
...
Update llx_10_c_regions.sql
2021-04-08 14:02:34 +02:00
Günter Lukas
11700f2162
Fix Ticket-Module public interface: uppercase/lowercaser in e-mail should be ignored #17186
2021-04-08 13:52:29 +02:00
Laurent Destailleur
244e83e18d
Merge pull request #17164 from draceo/art261-7
...
Add bill tax code article for non profit organization VAT (fixes #17163 )
2021-04-08 13:46:22 +02:00
Laurent Destailleur
aacea00460
Merge pull request #17167 from OPEN-DSI/fix_00004
...
NEW : Add new permok for edit extrafields on contact card
2021-04-08 13:43:39 +02:00
Laurent Destailleur
a39d45e111
Merge pull request #17170 from dolibit-ut/patch-243
...
Create index.html
2021-04-08 13:32:42 +02:00
Laurent Destailleur
602d6e0265
Merge pull request #17169 from dolibit-ut/patch-242
...
Create index.html
2021-04-08 13:32:30 +02:00
Laurent Destailleur
65e1d70232
Merge pull request #17172 from dolibit-ut/patch-245
...
Create index.html
2021-04-08 13:32:18 +02:00
Laurent Destailleur
cbf3c1c62e
Merge pull request #17173 from dolibit-ut/patch-246
...
Create index.html
2021-04-08 13:32:04 +02:00
Laurent Destailleur
4ef425da69
Merge pull request #17175 from dolibit-ut/patch-248
...
Create index.html
2021-04-08 13:29:59 +02:00
Laurent Destailleur
5ffcc9f5f4
Merge pull request #17174 from dolibit-ut/patch-247
...
Create index.html
2021-04-08 13:18:34 +02:00
Laurent Destailleur
30355d05c9
Merge pull request #17176 from dolibit-ut/patch-249
...
Create index.html
2021-04-08 13:18:26 +02:00
Laurent Destailleur
d395c21152
Merge pull request #17177 from dolibit-ut/patch-250
...
Create index.html
2021-04-08 13:18:14 +02:00
Laurent Destailleur
3fac86eaa5
Merge pull request #17178 from dolibit-ut/patch-251
...
Create index.html
2021-04-08 13:17:57 +02:00
Laurent Destailleur
70ce5f38a3
Merge pull request #17180 from dolibit-ut/patch-253
...
Create index.html
2021-04-08 13:16:36 +02:00
Laurent Destailleur
10f4b29111
Merge pull request #17168 from dolibit-ut/patch-241
...
Create index.html
2021-04-08 13:15:08 +02:00
Laurent Destailleur
93269bab9e
Merge pull request #17183 from OPEN-DSI/fix_00005
...
FIX : Fix warning
2021-04-08 13:14:53 +02:00
Dorian Vabre
2f005db4a5
basic encryption of id in url + wip on creating a thirdparty
2021-04-08 11:06:34 +02:00
kamel
1ec6317b80
FIX : Fix warning (function errorHandler() is not defined in this class so let the class handle the errors)
2021-04-08 10:33:27 +02:00
Laurent Destailleur
aef164a7ee
Fix bad permission
2021-04-08 02:05:36 +02:00
Laurent Destailleur
3f119c8004
Fix eol
2021-04-08 01:43:38 +02:00
Laurent Destailleur
489cff46a3
FIX #yogosha5828
2021-04-08 00:37:17 +02:00
Laurent Destailleur
59c8e70fd2
Fix #yogosha4510
2021-04-07 23:43:10 +02:00
Laurent Destailleur
6c4f5b851d
Use all param of getURLContent
2021-04-07 23:31:16 +02:00
UT from dolibit
baf8c47ceb
Create index.html
2021-04-07 20:48:49 +02:00
UT from dolibit
2f349146ed
Create index.html
2021-04-07 19:44:39 +02:00
UT from dolibit
6d8bbaeeae
Create index.html
2021-04-07 19:42:47 +02:00
UT from dolibit
c9c7a55748
Create index.html
2021-04-07 19:42:11 +02:00
UT from dolibit
c910fb7594
Create index.html
2021-04-07 19:40:46 +02:00
UT from dolibit
6fce28e7d0
Create index.html
2021-04-07 19:39:29 +02:00
Laurent Destailleur
1e1b963ca7
Restriction on name of files
2021-04-07 19:38:54 +02:00
Damien BENOIT
ac2cca51c0
Update delais.php
2021-04-07 19:37:17 +02:00
UT from dolibit
a144ae147f
Create index.html
2021-04-07 19:36:13 +02:00
UT from dolibit
2fd18ca836
Create index.html
2021-04-07 19:12:04 +02:00
UT from dolibit
2d6bbf1e87
Create index.html
2021-04-07 19:10:13 +02:00
UT from dolibit
49a6654b58
Create index.html
2021-04-07 19:09:16 +02:00
UT from dolibit
2d6eb2809c
Create index.html
2021-04-07 19:08:41 +02:00
Laurent Destailleur
87d4e6e2c5
Add option API_DISABLE_LOGIN_API
2021-04-07 19:07:22 +02:00
kamel
c06cc6d75a
NEW : Add new permok for edit extrafields on contact card
2021-04-07 17:28:13 +02:00
Dorian Vabre
c6d3510e30
form ok, todo : creation of an attendee
2021-04-07 17:16:26 +02:00
altairis-noe
c5a0bc1f52
Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks
2021-04-07 16:47:47 +02:00
altairis-noe
14e5e63612
one space too much
2021-04-07 16:44:51 +02:00
Christophe Battarel
05efc85008
Merge pull request #2 from altairis-noe/product_masks
...
Product masks
2021-04-07 16:20:39 +02:00
altairis-noe
4ffc6531fe
masks options are boolean
2021-04-07 16:09:27 +02:00
Florent Peyraud
7be9a98ef0
Add bill tax code article for non profit organization VAT
2021-04-07 13:51:08 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership
2021-04-07 12:30:37 +01:00
stickler-ci
c9aed75837
Fixing style errors.
2021-04-07 11:24:31 +00:00
NextGestion
5f5f0eb3f3
Add menu entries into thirdparty menu or member menu & Allow extrafields
2021-04-07 12:21:59 +01:00
UT from dolibit
efb88936fd
Update llx_10_c_regions.sql
...
Greece
2021-04-07 12:49:52 +02:00
lmarcouiller
843882c7c7
update stock.lang
2021-04-07 12:46:51 +02:00
lmarcouiller
41db9abff8
Close #17145 : add link to autofill with expected qty
2021-04-07 12:46:28 +02:00
Laurent Destailleur
f4d56c710b
Fix log levels
2021-04-07 12:43:28 +02:00
UT from dolibit
9997ac59c7
Update llx_20_c_departements.sql
...
Honduras Departamentos
2021-04-07 12:38:49 +02:00
Dorian Vabre
999be03f8d
fix: new member public page firstname test
2021-04-07 12:36:30 +02:00
Dorian Vabre
07e018dc7d
work in progress
2021-04-07 12:30:08 +02:00
Laurent Destailleur
bf6ea78211
Better log
2021-04-07 12:22:30 +02:00
Laurent Destailleur
6dc10bc87d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-04-07 12:19:39 +02:00
Laurent Destailleur
18154d6d21
Standardize log
2021-04-07 12:18:53 +02:00
lmarcouiller
0611db68cf
add of tooltip
2021-04-07 11:21:41 +02:00
lmarcouiller
49b3970700
Close #17113 : Can upload a favicon in website module
2021-04-07 11:13:14 +02:00
Pierre Payet
d209dbe43e
add missing hooks in fourn invoice list
2021-04-07 11:01:51 +02:00
Marc de Lima Lucio
7df09b6e9e
FIX: esupplier order: error 500 when using packaging with product where it is not defined
2021-04-07 10:41:36 +02:00
altairis-noe
fc76e06058
Better tooltip, better name, translation
2021-04-07 10:25:30 +02:00
Pierre Payet
113db33a24
fix paiementfourn ref is now different from id
2021-04-07 10:24:02 +02:00
Dorian Vabre
f7b6e239e9
nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable)
2021-04-07 10:06:38 +02:00
Indelog
426e846f58
Fix website create/update empty otherlang
...
Empty otherlang value was not correctly ignored.
2021-04-07 10:01:05 +02:00
kamel
fcc27e9177
Corrections
2021-04-07 09:49:20 +02:00
Indelog
17fa9559a3
Fix empty string WEBSITE_OTHERLANG
...
If post WEBSITE_OTHERLANG with empty value or with value like this
'en,,sv' or 'en,sv,' we can get an otherlang with empty value. This can lead
unexpected behaviour when we use an element of otherlang to set the
subdirectory name to store pages for a sub lang.
2021-04-07 09:29:40 +02:00
Günter Lukas
04a55a3df3
Fix #17146
2021-04-07 09:08:34 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35
...
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-07 02:51:32 +02:00
Laurent Destailleur
558d595798
Debug inventory module
2021-04-07 02:46:41 +02:00
Laurent Destailleur
7cfcb7472d
css
2021-04-07 02:31:13 +02:00
Laurent Destailleur
4ccb27ad40
Work on inventory module
2021-04-07 02:24:15 +02:00
Laurent Destailleur
20fbfc5b15
Merge pull request #17144 from indelog/fix_website_savepagealias_empty_otherlang
...
Fix empty $sublang dolSavePageAlias
2021-04-07 01:40:11 +02:00
Laurent Destailleur
0219a18a5c
trans
2021-04-07 01:27:56 +02:00
Laurent Destailleur
2816677d94
Fix css
2021-04-07 01:09:23 +02:00
Laurent Destailleur
bb9ba68c2b
Fix token expired
2021-04-07 00:52:38 +02:00
Laurent Destailleur
2e862f815a
Fix field total_ht
2021-04-07 00:44:01 +02:00
Laurent Destailleur
6609695a8d
index.html not required, there is already index.php
2021-04-07 00:30:28 +02:00
Laurent Destailleur
e23ddb383e
css
2021-04-06 23:38:52 +02:00
Laurent Destailleur
7c27ab6121
Fix css
2021-04-06 23:35:30 +02:00
Laurent Destailleur
1f76a99ee4
Fix status in popup
2021-04-06 23:07:47 +02:00
Indelog
4d60fe8ff9
Fix empty $sublang dolSavePageAlias
...
Avoid to loop on `explode(',', $object->otherlang)` if
`$object->otherlang` is empty. Else we loop once on empty string which
is set in `$sublang` and erase the main alias for the page.
2021-04-06 22:21:00 +02:00
Laurent Destailleur
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
Laurent Destailleur
90b122035f
Fix css
2021-04-06 20:28:00 +02:00
Laurent Destailleur
5c0f0834dc
css
2021-04-06 20:23:44 +02:00
Laurent Destailleur
98e567a8f7
Fix css
2021-04-06 20:21:54 +02:00
Laurent Destailleur
7ff74768eb
Fix pb with renaming field total
2021-04-06 20:16:14 +02:00
Laurent Destailleur
0377508100
Fix sql
2021-04-06 20:10:29 +02:00
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22
...
Code enhanced - Standardize field name #14697
2021-04-06 20:01:38 +02:00
NextGestion
78b4aa61fa
Add a new tab "Partnership" on the record of a thirdparty or a member (depending on setup)
2021-04-06 18:57:45 +01:00
Laurent Destailleur
baf3cbdd6f
Merge pull request #17096 from Hystepik/develo#2
...
Close #17073 : Add of select line for mass deletion of chart of account lines
2021-04-06 19:46:46 +02:00
Laurent Destailleur
ab2231c9cf
Update account.php
2021-04-06 19:44:31 +02:00
Laurent Destailleur
b7cd3270cb
Merge pull request #17118 from ptibogxiv/patch-424
...
FIX uniformization of external link
2021-04-06 19:36:26 +02:00
Laurent Destailleur
435b47631d
Merge pull request #17126 from dolibit-ut/patch-229
...
Update llx_20_c_departements.sql
2021-04-06 19:32:36 +02:00
Laurent Destailleur
e993d4e244
Merge pull request #17127 from dolibit-ut/patch-230
...
Create index.html
2021-04-06 19:32:24 +02:00
Laurent Destailleur
a0d7d1d5f0
Merge pull request #17125 from dolibit-ut/patch-228
...
Update llx_10_c_regions.sql
2021-04-06 19:31:59 +02:00
Laurent Destailleur
bbbf1dc7c8
Merge pull request #17133 from dolibit-ut/patch-235
...
Update box.php
2021-04-06 19:31:45 +02:00
Laurent Destailleur
fedf29097b
Merge pull request #17138 from dolibit-ut/patch-237
...
Update productMargins.php
2021-04-06 19:31:25 +02:00
Laurent Destailleur
7c4c2deab3
Merge pull request #17128 from dolibit-ut/patch-231
...
Create index.html
2021-04-06 19:29:01 +02:00
Laurent Destailleur
a774a02452
Merge pull request #17129 from dolibit-ut/patch-232
...
Create index.html
2021-04-06 19:28:27 +02:00
Laurent Destailleur
60f6908d83
Merge pull request #17130 from dolibit-ut/patch-233
...
Create index.html
2021-04-06 19:28:12 +02:00
Laurent Destailleur
d64a3a4eb5
Merge pull request #17131 from dolibit-ut/patch-234
...
Create index.html
2021-04-06 19:27:59 +02:00
Laurent Destailleur
2a51dadc72
Merge pull request #17135 from frederic34/patch-3
...
doxygen
2021-04-06 19:27:42 +02:00
Laurent Destailleur
f08b0be9f1
Merge pull request #17140 from atm-gauthier/develop_fix_cant_update_task_if_closed_project
...
FIX : we can't update task if closed project because of wrong test wi…
2021-04-06 19:27:12 +02:00
Laurent Destailleur
58b963901e
Merge pull request #17111 from aspangaro/14a32
...
Accountancy - Add a constant to enable fk_docdet register
2021-04-06 19:02:39 +02:00
Laurent Destailleur
adbe832826
Update bookkeeping.class.php
2021-04-06 19:02:17 +02:00
Laurent Destailleur
d1df327284
Add tab for import/export profiles
2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7
Look and feel v14
2021-04-06 18:18:07 +02:00
altairis-noe
4015e1607f
add masks to product_lot
2021-04-06 17:36:51 +02:00
stickler-ci
f5aa199c94
Fixing style errors.
2021-04-06 15:03:07 +00:00
Gauthier PC portable 024
04cb8453f0
FIX : we can't update task if closed project because of wrong test with PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE conf
2021-04-06 16:59:00 +02:00
stickler-ci
e4022e25e9
Fixing style errors.
2021-04-06 14:56:23 +00:00
NextGestion
debef2fb6d
initial Batch to cancel partnership for expired members
2021-04-06 15:53:51 +01:00
kamel
c44522594a
FIX: Fix when add or modify ressources on events with duplicate entries
2021-04-06 16:04:30 +02:00
Laurent Destailleur
a16f70ca09
Enhance sample code
2021-04-06 14:59:03 +02:00
Laurent Destailleur
10fb793fb1
Enhance the security page
2021-04-06 13:56:33 +02:00
UT from dolibit
8bb0d57645
Update productMargins.php
...
$helpurl => $help_url
2021-04-06 13:12:29 +02:00
Laurent Destailleur
767aa605a2
Enhance security page
2021-04-06 13:09:00 +02:00
lmarcouiller
c04387ff3b
Close #17108 : New button to convert images in webp format
2021-04-06 11:52:04 +02:00
stickler-ci
1419b75f22
Fixing style errors.
2021-04-06 08:32:27 +00:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
241b0d3f63
Merge remote-tracking branch 'upstream/develop' into 14a32
2021-04-06 10:13:13 +02:00
lmarcouiller
3f70904398
changes to match eldy advices
2021-04-06 09:42:05 +02:00
stickler-ci
30d26c1e28
Fixing style errors.
2021-04-06 07:20:07 +00:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Frédéric FRANCE
d44bf8be14
doxygen
2021-04-05 22:54:13 +02:00
Ahmad Hadeed
f2f2aed6cd
Fix 3 weekend holiday behavior after adding support to Friday as a holiday.
2021-04-05 22:05:22 +03:00
UT from dolibit
40059f1d05
Update box.php
...
$userid defined twice
2021-04-05 20:37:58 +02:00
UT from dolibit
904dca335a
Create index.html
2021-04-05 20:24:06 +02:00
UT from dolibit
74cbf34d61
Create index.html
2021-04-05 20:22:41 +02:00
UT from dolibit
c35621a2e7
Create index.html
2021-04-05 20:20:10 +02:00
UT from dolibit
888dfdba4a
Create index.html
2021-04-05 20:19:23 +02:00
UT from dolibit
cd556d3dfc
Create index.html
2021-04-05 20:17:45 +02:00
UT from dolibit
5c01b126a4
Update llx_20_c_departements.sql
...
Luxembourg
2021-04-05 20:01:05 +02:00
UT from dolibit
52ef2fefd4
Update llx_10_c_regions.sql
...
France
Germany
2021-04-05 19:47:12 +02:00
Laurent Destailleur
a3fb8d3e14
Factorize code
2021-04-05 19:34:56 +02:00
NextGestion
6da2c47360
Add template email for cancel partnership
2021-04-05 18:13:51 +01:00
stickler-ci
caa2facd47
Fixing style errors.
2021-04-05 17:09:25 +00:00
Ahmad Hadeed
235725b528
Add support for Friday as a holiday and some comment alignment fixes
2021-04-05 19:57:33 +03:00
Laurent Destailleur
2da5d8838d
Fix trans
2021-04-05 15:47:35 +02:00
Laurent Destailleur
95de241245
FIx #yogosha5774
2021-04-05 15:21:17 +02:00
Laurent Destailleur
01eec2b919
FIx #yogosha5774
2021-04-05 15:11:28 +02:00
Laurent Destailleur
5769701cd0
Better example
2021-04-05 15:05:21 +02:00
Laurent Destailleur
6261f23a38
css
2021-04-05 14:58:33 +02:00
Laurent Destailleur
685c880e6c
Debug module workstation
2021-04-05 14:56:47 +02:00
Laurent Destailleur
6c521073ea
Fix perm id and sort of modules by id.
2021-04-05 13:52:19 +02:00
ptibogxiv
1b3b2ca023
Update payments.lib.php
2021-04-05 13:52:09 +02:00
ptibogxiv
93341b1514
FIX uniformization of external link
2021-04-05 13:51:21 +02:00
Laurent Destailleur
f03190e23b
Fix permissions in module workstation
2021-04-05 12:57:43 +02:00
NextGestion
4464903ffc
remove unnecessary files
2021-04-05 11:47:16 +01:00
Laurent Destailleur
7cba3f8a0a
css
2021-04-05 12:41:39 +02:00
ptibogxiv
bd88806982
Fix order status label in comm index page
2021-04-05 12:07:51 +02:00
Laurent Destailleur
e048d73487
Show text of permission in tooltip
2021-04-05 11:18:24 +02:00
Damien BENOIT
1bac38eef2
Update company.php
2021-04-04 18:24:58 +02:00
Laurent Destailleur
fd82776f67
Fix
2021-04-04 18:00:07 +02:00
Laurent Destailleur
932d1a6a25
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-04 17:07:07 +02:00
Laurent Destailleur
6fc19c626d
Try fix for #17094
2021-04-04 17:05:01 +02:00
Alexandre SPANGARO
a50ca93a3e
FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries
2021-04-04 16:34:17 +02:00
Laurent Destailleur
f4703aaa00
Merge pull request #17112 from aspangaro/14a33
...
FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries
2021-04-04 16:33:44 +02:00
Laurent Destailleur
93133f1092
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-04 13:43:45 +02:00
Laurent Destailleur
c254d7dded
css
2021-04-04 13:42:58 +02:00
Alexandre SPANGARO
9e8ed661b3
FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries
2021-04-04 08:06:59 +02:00
Alexandre SPANGARO
025304ad6d
Accountancy - Add a constant to enable fk_docdet register
2021-04-04 07:12:01 +02:00
Alexandre SPANGARO
f64d0377c5
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-04 06:03:41 +02:00
Laurent Destailleur
37db3ffb90
Merge pull request #17065 from Hystepik/develop#1
...
Debug feature to import stock movement from csv file
2021-04-04 01:41:14 +02:00
Laurent Destailleur
46c71c244f
Merge pull request #17100 from dolibit-ut/patch-221
...
Create index.html
2021-04-04 01:21:10 +02:00
Laurent Destailleur
f32cc4d011
Merge pull request #17102 from dolibit-ut/patch-222
...
Create index.html
2021-04-04 01:20:57 +02:00
Laurent Destailleur
e0e883b791
Merge pull request #17105 from dolibit-ut/patch-224
...
Update llx_20_c_departements.sql
2021-04-04 01:19:40 +02:00
Laurent Destailleur
9ebb51cdcf
Merge pull request #17104 from dolibit-ut/patch-223
...
Update llx_10_c_regions.sql
2021-04-04 01:19:25 +02:00
Laurent Destailleur
1a70aebba6
NEW Can set a target image in dolcropresize function.
2021-04-04 01:12:25 +02:00
UT from dolibit
44b8ea2b5f
Update llx_20_c_departements.sql
...
Colombia Departamentos
2021-04-03 17:38:31 +02:00
UT from dolibit
bf59287770
Update llx_10_c_regions.sql
2021-04-03 17:19:16 +02:00
Givriz
5ed01f6733
Fix errors phpv8
2021-04-03 17:09:14 +02:00
UT from dolibit
fa1e46cc6a
Create index.html
2021-04-03 16:48:03 +02:00
UT from dolibit
e30f7fb6e6
Create index.html
2021-04-03 16:45:53 +02:00
Youvious
5e9ce734a7
Clean llx_accounting_account_be.sql of all 'PRODUCT' and 'SERVICE' (pcg_subtype)
2021-04-03 15:14:33 +02:00
Laurent Destailleur
17437670b1
Set include of js as async
2021-04-03 13:24:34 +02:00
NextGestion
21f86c05d4
Merge branch 'develop' into dolibarr_partnership
2021-04-03 09:44:21 +01:00
NextGestion
05e267d09c
Fix parameter $notrigger
2021-04-03 09:40:44 +01:00
stickler-ci
eb4d8848e2
Fixing style errors.
2021-04-03 08:29:04 +00:00
NextGestion
6cac5f2212
Create Partnership Module
2021-04-03 09:24:07 +01:00
lmarcouiller
369994fa92
Fix #17073 : Add of select line and mass delete
2021-04-03 10:12:05 +02:00
Laurent Destailleur
231f441876
Look and feel v14
2021-04-03 02:11:16 +02:00
Laurent Destailleur
858693d631
CSS
2021-04-03 01:39:08 +02:00
Laurent Destailleur
5ce9bc5801
FIX #yogosha5748
2021-04-02 23:23:44 +02:00
Laurent Destailleur
92da23945b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-04-02 22:51:14 +02:00
Laurent Destailleur
cbbaecd100
Merge branch 'pr_batch_mask' of https://github.com/altairisfr/dolibarr
...
into altairisfr-pr_batch_mask
# Conflicts:
# htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-04-02 22:49:49 +02:00
Laurent Destailleur
25e32c4fcd
Merge branch 'develop' into dev_EventOrganisation
2021-04-02 22:43:10 +02:00
Laurent Destailleur
d9a8673ca3
Merge pull request #17078 from dolibit-ut/patch-205
...
Update llx_10_c_regions.sql
2021-04-02 22:35:03 +02:00
Laurent Destailleur
942c6f6687
Merge pull request #17079 from dolibit-ut/patch-206
...
Update llx_20_c_departements.sql
2021-04-02 22:34:41 +02:00
Laurent Destailleur
af17a07d87
Merge pull request #17080 from dolibit-ut/patch-207
...
Update workstation_document.php
2021-04-02 22:34:24 +02:00
Laurent Destailleur
e422d77c28
Merge pull request #17081 from dolibit-ut/patch-208
...
Update workstation_list.php
2021-04-02 22:34:16 +02:00
Laurent Destailleur
b3ce53c9ab
Merge pull request #17082 from dolibit-ut/patch-209
...
Update workstation_note.php
2021-04-02 22:34:06 +02:00
Laurent Destailleur
1c47072c94
Merge pull request #17083 from dolibit-ut/patch-210
...
Update workstation_agenda.php
2021-04-02 22:33:56 +02:00
Laurent Destailleur
b528011392
Merge pull request #17084 from dolibit-ut/patch-211
...
Create index.html
2021-04-02 22:33:48 +02:00
Laurent Destailleur
ecac9d3c47
Merge pull request #17085 from dolibit-ut/patch-212
...
Create index.html
2021-04-02 22:33:38 +02:00
Laurent Destailleur
02c1d65702
Merge pull request #17086 from dolibit-ut/patch-213
...
Create index.html
2021-04-02 22:33:23 +02:00
Laurent Destailleur
51ee0b07c0
Removed duplicate comment
2021-04-02 22:32:52 +02:00
Laurent Destailleur
a9953fdffd
Merge pull request #17087 from dolibit-ut/patch-214
...
Update contact.php
2021-04-02 22:32:19 +02:00
Laurent Destailleur
88c80065c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-02 22:20:24 +02:00
Laurent Destailleur
60e13f6727
FIX #17060
2021-04-02 22:20:13 +02:00
Laurent Destailleur
e0cb175208
Doxygen
2021-04-02 21:49:21 +02:00
Laurent Destailleur
cadef101db
Fix var name
2021-04-02 21:40:33 +02:00
UT from dolibit
828345b69f
Update contact.php
...
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';
llxHeader('', $langs->trans('Order'), $help_url);
2021-04-02 20:58:08 +02:00
UT from dolibit
fbc0a0fce7
Create index.html
2021-04-02 20:50:04 +02:00
UT from dolibit
58dda89b7a
Create index.html
2021-04-02 20:49:00 +02:00
UT from dolibit
acdbd2d172
Create index.html
2021-04-02 20:48:23 +02:00
UT from dolibit
b988c5973f
Update workstation_agenda.php
...
$help_url = 'EN:Module_Workstation';
2021-04-02 20:41:49 +02:00
UT from dolibit
a745aad24b
Update workstation_note.php
...
$help_url = 'EN:Module_Workstation';
2021-04-02 20:40:22 +02:00
UT from dolibit
13b586f0b9
Update workstation_list.php
...
$help_url = 'EN:Module_Workstation';
llxHeader('', $title, $help_url);
2021-04-02 20:38:43 +02:00
UT from dolibit
8f53ca17ed
Update workstation_document.php
...
$help_url = 'EN:Module_Workstation';
2021-04-02 20:35:40 +02:00
UT from dolibit
473134cc46
Update llx_20_c_departements.sql
...
Angola - up & fix fk_region 'xx'
2021-04-02 20:26:11 +02:00
UT from dolibit
9677d35aca
Update llx_10_c_regions.sql
2021-04-02 20:18:14 +02:00
Laurent Destailleur
0a03ee5cd4
Comment
2021-04-02 15:44:06 +02:00
Laurent Destailleur
b237126679
Clean code
2021-04-02 13:33:41 +02:00
Laurent Destailleur
c23610f851
Rename const
2021-04-02 13:31:03 +02:00
Florian HENRY
4cf8c4c685
add conf or booth contact tab and roles
2021-04-02 12:06:03 +02:00
Florian HENRY
88b481e5a8
keep tab project
2021-04-02 11:25:14 +02:00
lmarcouiller
fbb3373d40
Update to match eldy's advices
2021-04-02 09:08:08 +02:00
Christophe Battarel
0adbffd864
fix typo
2021-04-02 08:24:10 +02:00
Laurent Destailleur
9794908b0d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-02 02:50:35 +02:00
Laurent Destailleur
bb8ec90b79
Fix css
2021-04-02 02:50:07 +02:00
Laurent Destailleur
5d7efcc0d1
Merge pull request #17063 from aspangaro/13p31
...
FIX: Periodicity by default on fiscal year, according to the now date, we have plus 1 year added
2021-04-02 01:53:24 +02:00
Laurent Destailleur
4e94e2f047
Merge pull request #17069 from dolibit-ut/patch-204
...
Update llx_20_c_departements.sql
2021-04-02 01:51:54 +02:00
Laurent Destailleur
aacc9cb26e
Merge pull request #17068 from ATM-Consulting/fix/13.0_warning_undefined_constant_missing_quotes
...
FIX 13.0 warning - missing quotes around 'label'
2021-04-02 01:51:16 +02:00
Laurent Destailleur
aac85f08ff
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-02 01:43:48 +02:00
Laurent Destailleur
32d1bce677
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/paiement/list.php
2021-04-02 01:43:39 +02:00
Laurent Destailleur
b078c2dcc9
Update list.php
2021-04-02 01:34:53 +02:00
Laurent Destailleur
5b22eae3a3
Merge pull request #17071 from FHenry/fix_13_right_definition_ID_in_modulebuilder
...
fix: Right ID defenition in module builder
2021-04-02 01:34:16 +02:00
Laurent Destailleur
17b5228bd3
Update modMyModule.class.php
2021-04-02 01:34:04 +02:00
Laurent Destailleur
5fa6aa0ac1
Update modMyModule.class.php
2021-04-02 01:32:46 +02:00
Laurent Destailleur
8ff15d7567
Try to fix some id parent, at least for SKR03
2021-04-02 01:28:18 +02:00
Laurent Destailleur
83ed2ffefd
Fix syntax errors
2021-04-02 01:12:45 +02:00
Laurent Destailleur
39fc2e6e60
NEW Save old page with .old in edition of a website page
2021-04-01 19:49:36 +02:00
Florian HENRY
b1562cffb1
better doc comment
2021-04-01 17:20:14 +02:00
Florian HENRY
03ee7ec433
fix: Right ID defenition in module builder
2021-04-01 17:08:26 +02:00
Ferran Marcet
75d395c848
FIX: Filter on supplier payment list
2021-04-01 14:13:59 +02:00
Laurent Destailleur
d4f14183b7
Code comment
2021-04-01 13:15:23 +02:00
Laurent Destailleur
fb83d66d27
NEW Can show the project ref or label into PDF documents
2021-04-01 13:04:24 +02:00
Laurent Destailleur
06078f231b
NEW Can show the project ref or label into PDF documents
2021-04-01 13:02:44 +02:00
UT from dolibit
166ed32c32
Update llx_20_c_departements.sql
...
Algeria
Brazil
2021-04-01 12:52:06 +02:00
Florian Mortgat
f5617a6247
FIX 13.0 warning - missing quotes around 'label'
2021-04-01 12:33:23 +02:00
Laurent Destailleur
354adbde54
Look and feel v14
2021-04-01 12:27:02 +02:00
Laurent Destailleur
3d1c47db35
Fix bad table name for migration
2021-04-01 11:28:35 +02:00
Laurent Destailleur
8e14b4d434
FIX #yogosha5775
2021-04-01 11:27:39 +02:00
Laurent Destailleur
ef8c6ec117
FIX #yogosha5775
2021-04-01 11:18:35 +02:00
Laurent Destailleur
5fd8612891
FIX #yogosha5758
2021-04-01 11:01:07 +02:00
Laurent Destailleur
4b35645920
FIX #yogosha5753
2021-04-01 10:11:54 +02:00
Laurent Destailleur
9c92dfd3e1
Function set_price_level() has been renamed into setPriceLevel() to
...
follow camelcase rules
2021-04-01 10:05:37 +02:00
lmarcouiller
fd6822b202
Debug feature to import stock movement
2021-04-01 09:34:14 +02:00
Alexandre SPANGARO
b5702fcb13
Merge branch '13.0' into 13p31
2021-04-01 04:38:08 +02:00
Alexandre SPANGARO
530b122f1e
FIX: Periodicity by default on fiscal year, according to the date, we have plus 1 year added
2021-04-01 04:37:47 +02:00
Laurent Destailleur
39b71e1ea6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-31 23:16:42 +02:00
Laurent Destailleur
eed14ad6e1
Fix missing token
2021-03-31 23:15:33 +02:00
Laurent Destailleur
6fc70fba8c
Merge pull request #16981 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-31 22:29:39 +02:00
Laurent Destailleur
5e67427922
Merge pull request #16483 from frederic34/repairToUtf8mb4
...
NEW Add experimental repair script to switch to dynamic row format and utf8mb4 encoding
2021-03-31 22:28:58 +02:00
Laurent Destailleur
55741506c8
Merge pull request #17053 from aspangaro/14a30
...
NEW: Accountancy - Add FEC import
2021-03-31 22:15:26 +02:00
Laurent Destailleur
3fb69f8ec0
Fix report
2021-03-31 21:28:07 +02:00
Laurent Destailleur
0fd36d96f3
Fix report
2021-03-31 21:25:01 +02:00
stickler-ci
416a09672f
Fixing style errors.
2021-03-31 18:43:09 +00:00
Alexandre SPANGARO
dd913b2385
Update
2021-03-31 20:40:26 +02:00
Florian HENRY
73d7eefdcf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-31 20:09:44 +02:00
Florian HENRY
c3f4e5e2d5
better attendded woth project tabs
2021-03-31 20:09:13 +02:00
Laurent Destailleur
2af8b7078c
Fix turnover calculation was wrong. We must include only
2021-03-31 19:50:43 +02:00
Frédéric FRANCE
6831d0e883
add dynamic
2021-03-31 18:49:19 +02:00
Frédéric FRANCE
1823fb34bb
Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4
2021-03-31 18:41:49 +02:00
Laurent Destailleur
e01b6b6789
FIX filter on date on invoice list
2021-03-31 18:39:59 +02:00
Laurent Destailleur
2e3af575be
Look and feel v14
2021-03-31 18:12:26 +02:00
Laurent Destailleur
27bc05a039
Debug report accountancy
2021-03-31 17:59:42 +02:00
Laurent Destailleur
32f9a04776
FIX Must use the server TZ for accounting report
2021-03-31 17:37:45 +02:00
Laurent Destailleur
cf57826a5e
Trans
2021-03-31 16:57:58 +02:00
Laurent Destailleur
f2f0e4a6fd
css
2021-03-31 16:47:36 +02:00
Laurent Destailleur
d5cc006250
Look and feel v14
2021-03-31 16:45:53 +02:00
Laurent Destailleur
653ed82bb2
Fix empty page
2021-03-31 16:23:43 +02:00
Laurent Destailleur
05d9140f8f
Look and feel
2021-03-31 15:28:12 +02:00
Laurent Destailleur
213544e4a7
Fix text
2021-03-31 15:26:34 +02:00
Laurent Destailleur
3face8b1c4
Debug feature to import stock movements from a file.
2021-03-31 15:15:07 +02:00
Laurent Destailleur
fafff6d9a4
Debug feature to import stock movements from a file.
2021-03-31 15:07:18 +02:00
Laurent Destailleur
66385d4ed5
Merge pull request #17059 from Hystepik/develop#3
...
new mass stock transfer with an import file
2021-03-31 14:02:17 +02:00
Laurent Destailleur
b695c4a1c8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-31 13:59:35 +02:00
Laurent Destailleur
14c7ce7492
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/reception/card.php
2021-03-31 13:59:21 +02:00
Laurent Destailleur
89dbd745bf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/modules/modAccounting.class.php
2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-31 13:47:00 +02:00
Laurent Destailleur
8be7ffb519
Merge pull request #17043 from dolibit-ut/patch-198
...
Update card.php
2021-03-31 13:42:09 +02:00
Laurent Destailleur
addb9fd7e0
Merge pull request #17051 from frederic34/patch-3
...
use same code from actioncom card
2021-03-31 13:41:48 +02:00
Laurent Destailleur
7641f7258b
Merge pull request #17044 from aspangaro/14a27
...
FIX: Add a sub table to manage accountancy on product/company
2021-03-31 13:39:17 +02:00
Laurent Destailleur
9b244671f9
Merge pull request #17057 from atm-gauthier/fix_uniformisation_payment_salary
...
FIX : last uniformizations
2021-03-31 13:36:54 +02:00
Laurent Destailleur
6060dedb52
Merge pull request #17056 from OPEN-DSI/new-propal-signature-date-langs-en
...
NEW translate in "en_US" to complete PR 16980
2021-03-31 13:10:36 +02:00
Laurent Destailleur
e4b01b7ffc
FIX #yogosha5791
2021-03-31 13:01:49 +02:00
Laurent Destailleur
6aa1229c19
FIX #yogosha5791
2021-03-31 12:44:13 +02:00
Laurent Destailleur
625ade1a53
Clean log
2021-03-31 12:41:44 +02:00
Hystepik
69c47f1d39
Merge branch 'develop' into develop#3
2021-03-31 12:21:28 +02:00
lmarcouiller
633b8f1431
Close #16761 : Info template import
2021-03-31 12:18:31 +02:00
lmarcouiller
bd092cc84d
Close #16761 : new mass stock transfer
2021-03-31 12:04:37 +02:00
Gauthier PC portable 024
96ea23f0fa
Merge branch 'fix_uniformisation_payment_salary' of github.com:atm-gauthier/dolibarr into fix_uniformisation_payment_salary
2021-03-31 10:34:36 +02:00
Gauthier PC portable 024
c27c52331a
FIX : default value
2021-03-31 10:34:21 +02:00
stickler-ci
508dc33749
Fixing style errors.
2021-03-31 08:16:02 +00:00
Gauthier PC portable 024
19265179ca
FIX : last uniformizations
2021-03-31 10:11:51 +02:00
Ferran Marcet
b6faa6b605
FIX: Show Ref.Supplier in LinkToObjectBlock
2021-03-31 09:40:12 +02:00
lvessiller
4e1b84af45
NEW translate in "en_US" to complete PR 16980
2021-03-31 08:27:27 +02:00
Alexandre SPANGARO
14a62442c4
FIX: Accountancy - Import in general ledger
2021-03-31 05:07:05 +02:00
Alexandre SPANGARO
9b65529fc7
NEW: Accountancy - Add FEC import
2021-03-31 04:59:12 +02:00
Alexandre SPANGARO
5723dbb836
FIX: Add a sub table to manage accountancy on product/company
2021-03-31 04:52:24 +02:00
Frédéric FRANCE
d13435cc84
use same code from actioncom card
2021-03-31 00:46:47 +02:00
Florian HENRY
cd37d3440a
fix : test on reception must be done on lineToTest if checked
2021-03-30 23:04:29 +02:00
Florian HENRY
0f6dae313d
fix : test on reception must be done on lineToTest if checked
2021-03-30 23:02:53 +02:00
Alexandre SPANGARO
38d47c184e
FIX: Add a sub table to manage accountancy on product/company
2021-03-30 22:12:57 +02:00
UT from dolibit
ba84a36282
Update card.php
...
$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
2021-03-30 22:12:13 +02:00
Alexandre SPANGARO
4e30481fa2
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-30 22:05:03 +02:00
Laurent Destailleur
6ba725eb5e
Fix sql error
2021-03-30 21:04:12 +02:00
Laurent Destailleur
38f1710b43
Merge pull request #17020 from Hystepik/develop#1
...
Close #4951 : New module Inventory
2021-03-30 20:43:52 +02:00
Laurent Destailleur
12f14f8bd5
Merge pull request #17021 from bb2a/add_option_warehouse_affect_thirparty
...
ADD Option warehouse affect thirparty
2021-03-30 19:47:19 +02:00
Laurent Destailleur
48f97d77df
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-30 19:35:25 +02:00
Laurent Destailleur
cdd3e385e7
Merge branch 'new-propal-signature-date-and-user' of
...
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user
# Conflicts:
# htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-03-30 19:34:25 +02:00
Laurent Destailleur
0c76d830fd
Merge pull request #17031 from dolibit-ut/patch-193
...
Update PSWebServiceLibrary.class.php
2021-03-30 19:28:50 +02:00
Laurent Destailleur
7223512d47
Merge pull request #17030 from dolibit-ut/patch-192
...
Update type_translation.php
2021-03-30 19:23:01 +02:00
Laurent Destailleur
e763bb5483
Update type_translation.php
2021-03-30 19:22:51 +02:00
Laurent Destailleur
bea355fa62
Merge pull request #17025 from dolibit-ut/patch-188
...
Update card.php
2021-03-30 19:22:26 +02:00
Laurent Destailleur
dc23d8316c
Merge pull request #17024 from dolibit-ut/patch-187
...
Update llx_20_c_departements.sql
2021-03-30 19:22:10 +02:00
Laurent Destailleur
fd410adcf3
Update llx_20_c_departements.sql
2021-03-30 19:22:02 +02:00
Laurent Destailleur
47e9f7c458
Merge pull request #17032 from atm-gauthier/fix_develop
...
FIX : several fix after lists uniformization
2021-03-30 19:20:15 +02:00
Laurent Destailleur
d6b5e24d96
Update payments.php
2021-03-30 19:20:02 +02:00
Laurent Destailleur
78b8af3a4a
Merge pull request #17038 from frederic34/patch-3
...
fix missing global mod_facture_mars.php
2021-03-30 19:18:50 +02:00
Laurent Destailleur
32287d8734
Merge pull request #17036 from dolibit-ut/patch-196
...
Update box_supplier_orders_awaiting_reception.php
2021-03-30 19:18:20 +02:00
Laurent Destailleur
d905d2e22d
Merge pull request #17035 from dolibit-ut/patch-195
...
Update box_accountancy_suspense_account.php
2021-03-30 19:18:12 +02:00
Laurent Destailleur
fa83b28505
Merge pull request #17037 from dolibit-ut/patch-197
...
Update canvas.class.php
2021-03-30 19:17:57 +02:00
Laurent Destailleur
56b44d2e33
Merge pull request #17034 from dolibit-ut/patch-194
...
Update sms.php
2021-03-30 19:17:41 +02:00
Laurent Destailleur
0a28db619b
Merge pull request #17022 from dolibit-ut/patch-186
...
Update llx_10_c_regions.sql
2021-03-30 19:17:20 +02:00
Laurent Destailleur
ab58ba80c9
Update llx_10_c_regions.sql
2021-03-30 19:17:12 +02:00
Laurent Destailleur
fb7cfe6c50
Fix sql error
2021-03-30 19:15:20 +02:00
Laurent Destailleur
be6bb3a756
FIX #yogosha5746 - next step (work in progress)
2021-03-30 19:12:07 +02:00
Frédéric FRANCE
4c874ddf15
Update mod_facture_terre.php
2021-03-30 18:35:46 +02:00
Frédéric FRANCE
a9e720eec3
Update mod_facture_mars.php
2021-03-30 18:33:52 +02:00
UT from dolibit
34077d5b8a
Update canvas.class.php
2021-03-30 18:31:36 +02:00
UT from dolibit
479421d923
Update box_supplier_orders_awaiting_reception.php
...
https://
2021-03-30 18:30:07 +02:00
UT from dolibit
0203eab0b0
Update box_accountancy_suspense_account.php
...
https://
2021-03-30 18:28:07 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494
FIX #yogosha5746 - next step (work in progress)
2021-03-30 17:45:15 +02:00
UT from dolibit
5935d7d082
Update sms.php
...
href="https://www.dolistore.com/
2021-03-30 17:42:44 +02:00
Laurent Destailleur
c80a8517d4
Fix position of line for ticket group
2021-03-30 17:39:48 +02:00
Laurent Destailleur
9ad3ba1572
Fix regression in export
2021-03-30 17:28:58 +02:00
stickler-ci
4903f92172
Fixing style errors.
2021-03-30 15:26:15 +00:00
Gauthier PC portable 024
3259d70e72
FIX : several fix after lists uniformization
2021-03-30 17:23:05 +02:00
UT from dolibit
87c9b4b9fd
Update PSWebServiceLibrary.class.php
...
https://
2021-03-30 17:21:10 +02:00
UT from dolibit
0585712014
Update type_translation.php
...
LICENSE
https://
2021-03-30 17:18:49 +02:00
UT from dolibit
804fbd421d
Update card.php
2021-03-30 16:44:41 +02:00
Laurent Destailleur
6e422d26f3
FIX #yogosha5746 - next step (wip)
2021-03-30 16:20:18 +02:00
UT from dolibit
a9bc37c63e
Update llx_20_c_departements.sql
2021-03-30 16:19:07 +02:00
UT from dolibit
d098ca7bec
Update llx_10_c_regions.sql
...
LICENSE
Australia
Barbados
Brazil
Canada
2021-03-30 16:01:35 +02:00
Anthony Berton
96b450a849
20210330
2021-03-30 14:58:47 +02:00
lmarcouiller
bf42a2ad87
Close #4951 : Add TestUnit
2021-03-30 14:38:53 +02:00
lmarcouiller
55560b7d38
Inventory module working
2021-03-30 12:35:20 +02:00
Laurent Destailleur
08c7458dd9
FIX #yogosha5746
2021-03-30 11:36:50 +02:00
Laurent Destailleur
6c98276ead
FIX #yogosha5782
2021-03-30 11:26:49 +02:00
Ferran Marcet
b4f638602a
FIX: Show Ref.Supplier in LinkToObjectBlock
2021-03-30 11:10:07 +02:00
lvessiller
85fff685db
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user
2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user
2021-03-30 08:04:19 +02:00
Laurent Destailleur
d61f61ab45
Clean $_GET
2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Alexandre SPANGARO
ea6b22f06e
FIX: Add a sub table to manage accountancy on product/company
2021-03-30 03:27:46 +02:00
Laurent Destailleur
4de6a3ee7d
Debug dark mode
2021-03-30 02:55:53 +02:00
Laurent Destailleur
bfbde43c95
Debug dark mode
2021-03-30 02:35:26 +02:00
Laurent Destailleur
9edb2fd857
Fix sql error
2021-03-30 02:13:57 +02:00
Laurent Destailleur
b863b2a3f3
Look and feel v14
2021-03-30 02:01:08 +02:00
Laurent Destailleur
f34700b012
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-30 01:45:04 +02:00
Laurent Destailleur
c2d583e665
Fix picto
2021-03-30 01:44:50 +02:00
Laurent Destailleur
de5df84207
Merge pull request #16990 from daraelmin/daraelmin-adh-create-soc
...
Close #15830 Add setup option ADHERENT_DEFAULT_CREATE_THIRDPARTY
2021-03-30 00:55:17 +02:00
Laurent Destailleur
23afb60dc5
Merge pull request #16554 from AlexisLaurier/develop
...
Add standard fields property and fetchAll method to ProductFournisseur class
2021-03-30 00:38:25 +02:00
daraelmin
c36c4937ea
Update societe.class.php
2021-03-30 00:31:37 +02:00
Laurent Destailleur
e57ed16c51
Merge pull request #16999 from dolibit-ut/patch-171
...
Update document.php
2021-03-29 23:56:03 +02:00
Laurent Destailleur
95ccf077e4
Merge pull request #17000 from dolibit-ut/patch-172
...
Update index.php
2021-03-29 23:55:47 +02:00
Laurent Destailleur
6aeb016a80
Merge pull request #17001 from dolibit-ut/patch-173
...
Update info.php
2021-03-29 23:55:30 +02:00
Laurent Destailleur
7e802036e3
Merge pull request #17002 from dolibit-ut/patch-174
...
Update list.php
2021-03-29 23:55:18 +02:00
Laurent Destailleur
48a8786995
Merge pull request #17003 from dolibit-ut/patch-175
...
Update note.php
2021-03-29 23:54:56 +02:00
Laurent Destailleur
2d83686ddd
Keep copyright in same section than licence
2021-03-29 23:53:27 +02:00
Laurent Destailleur
ea3923cb4c
Merge pull request #17007 from dolibit-ut/patch-179
...
Update about.php
2021-03-29 23:48:41 +02:00
Laurent Destailleur
94c5660ef0
Merge pull request #17008 from dolibit-ut/patch-180
...
Create index.html
2021-03-29 23:46:55 +02:00
Laurent Destailleur
33a8e64831
Merge pull request #17009 from dolibit-ut/patch-181
...
Create index.html
2021-03-29 23:46:42 +02:00
Laurent Destailleur
2885ecbccf
Merge pull request #17004 from dolibit-ut/patch-176
...
Update llx_holiday_extrafields.sql
2021-03-29 23:46:31 +02:00
Laurent Destailleur
6d8c4984a8
Merge pull request #17013 from dolibit-ut/patch-184
...
Update llx_10_c_regions.sql
2021-03-29 23:45:11 +02:00
Laurent Destailleur
70f00294e4
Merge pull request #17014 from dolibit-ut/patch-185
...
Update bom_note.php
2021-03-29 23:44:53 +02:00
Laurent Destailleur
62cac7caa5
Merge pull request #17010 from dolibit-ut/patch-182
...
Create index.html
2021-03-29 23:44:39 +02:00
Laurent Destailleur
0d553008ad
Merge pull request #17012 from dolibit-ut/patch-183
...
Update llx_20_c_departements.sql
2021-03-29 23:44:23 +02:00
Laurent Destailleur
46b33a4bbd
Merge pull request #16998 from dolibit-ut/patch-170
...
Update card.php
2021-03-29 23:40:48 +02:00
UT from dolibit
bd1f3d8b69
Update bom_note.php
...
$help_url = 'EN:Module_BOM';
2021-03-29 23:35:41 +02:00
Laurent Destailleur
3616d2ba44
FIX #yogosha5770
2021-03-29 23:24:52 +02:00
Laurent Destailleur
32bec56529
Using " for html is better
2021-03-29 23:14:42 +02:00
UT from dolibit
f2e0e54024
Update llx_10_c_regions.sql
...
Argentina
2021-03-29 23:06:14 +02:00
UT from dolibit
ed1107f095
Update llx_20_c_departements.sql
...
Argentina
2021-03-29 23:01:35 +02:00
Laurent Destailleur
b702d2b534
Fix CSRF for more GET
2021-03-29 22:58:44 +02:00
UT from dolibit
81437473c2
Create index.html
2021-03-29 22:46:46 +02:00
Laurent Destailleur
ce5bea7b34
FIX #yogosha5751
2021-03-29 22:43:39 +02:00
UT from dolibit
9586aea96b
Create index.html
2021-03-29 22:40:15 +02:00
UT from dolibit
77f0bc7141
Create index.html
2021-03-29 22:39:37 +02:00
UT from dolibit
3087ba0581
Update about.php
...
http:// -> https://
2021-03-29 22:37:03 +02:00
stickler-ci
a01403c4de
Fixing style errors.
2021-03-29 20:16:58 +00:00
daraelmin
57b15c1821
use dol_getIdFromCode for TE_PRIVATE
2021-03-29 22:15:28 +02:00
UT from dolibit
f46dadcd89
Update llx_holiday_extrafields.sql
...
LICENSE
https
2021-03-29 22:12:09 +02:00
Laurent Destailleur
41ec8893e4
Fix get mode
2021-03-29 22:05:04 +02:00
UT from dolibit
da0aa0f828
Update note.php
...
$helpurl -> $help_url
$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden';
2021-03-29 21:48:02 +02:00
Laurent Destailleur
843e0a2c39
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/html.formother.class.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
htdocs/projet/tasks/time.php
htdocs/webservices/server_thirdparty.php
2021-03-29 21:47:31 +02:00
UT from dolibit
9f6028104a
Update list.php
...
$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden';
llxHeader('', $langs->trans("Donations"), $help_url);
2021-03-29 21:46:08 +02:00
UT from dolibit
390932d2a5
Update info.php
...
$helpurl -> $help_url
$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden';
2021-03-29 21:44:19 +02:00
UT from dolibit
31442f30c4
Update index.php
...
DE:Modul_Spenden
2021-03-29 21:42:38 +02:00
UT from dolibit
9b10f4ab5c
Update document.php
...
$helpurl => $help_url
$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden';
2021-03-29 21:41:13 +02:00
Laurent Destailleur
2689bc938d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-29 21:40:01 +02:00
Laurent Destailleur
f4ae8af9ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyaccount.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
2021-03-29 21:39:53 +02:00
UT from dolibit
1453bf6daa
Update card.php
...
add => DE:Modul_Spenden
2021-03-29 21:38:59 +02:00
Laurent Destailleur
6057d8aabd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2021-03-29 21:37:21 +02:00
Laurent Destailleur
eabe5ae616
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2021-03-29 21:35:54 +02:00
Laurent Destailleur
8c08b3945b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2021-03-29 21:35:46 +02:00
Laurent Destailleur
c4a8dca4ab
FIX #yogosha5756
2021-03-29 21:35:19 +02:00
Laurent Destailleur
dc0922c8f0
Clean file not used
2021-03-29 21:33:01 +02:00
Laurent Destailleur
1d87f060dc
Fix #yogosha5756
2021-03-29 21:30:26 +02:00
Laurent Destailleur
d93fbcd00b
Fix sql error
2021-03-29 21:17:41 +02:00
Laurent Destailleur
0d5c613008
Complete fix
2021-03-29 21:10:21 +02:00
Laurent Destailleur
adf15e4e64
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-29 21:04:49 +02:00
Laurent Destailleur
ae0468e107
FIX #yogosha5765
2021-03-29 21:04:33 +02:00
Laurent Destailleur
0740633ec8
Update facture-rec.class.php
2021-03-29 20:42:59 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22
2021-03-29 20:35:35 +02:00
Florian HENRY
11dcf656c6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 20:30:31 +02:00
Florian HENRY
1f08e37a03
more feature
2021-03-29 20:28:29 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27
...
NEW: Add a sub table to manage accountancy on product/company
2021-03-29 20:11:02 +02:00
Laurent Destailleur
92e479955f
Merge pull request #16969 from dolibit-ut/patch-168
...
Update llx_20_c_departements.sql
2021-03-29 19:24:32 +02:00
Laurent Destailleur
9183c73846
Merge pull request #16968 from dolibit-ut/patch-167
...
Update llx_10_c_regions.sql
2021-03-29 19:23:58 +02:00
Laurent Destailleur
715490be0b
Merge pull request #16929 from aspangaro/14a28
...
NEW: Add company info in dropdown login menu
2021-03-29 19:02:12 +02:00
Christophe Battarel
bbc263f4b3
llx_product batch_mask definition
2021-03-29 18:39:22 +02:00
Laurent Destailleur
93627012cd
Merge pull request #16995 from atm-gauthier/fix_list_uniformization
...
FIX : display debug if !$conf->banque->enabled
2021-03-29 18:02:58 +02:00
Laurent Destailleur
f4b0723f30
Update list.php
2021-03-29 17:41:19 +02:00
Laurent Destailleur
b732a82c3d
Update list.php
2021-03-29 17:40:36 +02:00
Laurent Destailleur
a23a2a0119
Merge pull request #16988 from daraelmin/daraelmin-patch-excluded
...
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
2021-03-29 17:39:58 +02:00
Laurent Destailleur
64b925a5d8
Update index.php
2021-03-29 17:39:11 +02:00
Laurent Destailleur
cdc1ae6f59
Update adherent.class.php
2021-03-29 17:38:37 +02:00
Florian HENRY
14a90a3a9d
on goung
2021-03-29 17:26:43 +02:00
stickler-ci
e1e3bcbf28
Fixing style errors.
2021-03-29 15:26:24 +00:00
Gauthier PC portable 024
139a1ba70d
FIX : if $conf->banque->enabled
2021-03-29 17:22:19 +02:00
Laurent Destailleur
36dfcc0646
Merge pull request #16976 from atm-florianm/NEW_14.0_hooks_on_CA_by_product_report
...
WIP: NEW 14.0 - SQL-altering hooks in the turnover by product report
2021-03-29 17:18:17 +02:00
Laurent Destailleur
66ca619669
Merge pull request #16986 from asolslk/patch-6
...
Update contact.php
2021-03-29 17:13:52 +02:00
Laurent Destailleur
f985a7df3f
Merge pull request #16979 from atm-gauthier/fix_list_uniformization
...
Fix list uniformization
2021-03-29 17:09:22 +02:00
Laurent Destailleur
96363b3913
Merge pull request #16974 from ksar-ksar/develop
...
FIX #16940
2021-03-29 17:07:19 +02:00
Gauthier PC portable 024
28620fe8d8
Merge branch 'fix_list_uniformization' of github.com:atm-gauthier/dolibarr into fix_list_uniformization
2021-03-29 16:27:59 +02:00
Gauthier PC portable 024
53ae1f9d5b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization
2021-03-29 16:27:44 +02:00
stickler-ci
caa56729b3
Fixing style errors.
2021-03-29 14:25:36 +00:00
Florian HENRY
e18c010490
fix bug on list
2021-03-29 16:25:34 +02:00
Laurent Destailleur
6ad7b12f89
Merge pull request #16973 from ksar-ksar/patch-1
...
FIX #16843
2021-03-29 16:25:18 +02:00
Gauthier PC portable 024
c8e40727c2
FIX : uniformization
2021-03-29 16:22:22 +02:00
Laurent Destailleur
5c2ee240b2
FIX #yogosha5752
2021-03-29 15:59:37 +02:00
Florian HENRY
f25360cc4c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 15:49:43 +02:00
Laurent Destailleur
22da450a96
FIX #yogosha5755
2021-03-29 15:49:34 +02:00
Laurent Destailleur
3a4bb69c05
FIX #yogosha5749
2021-03-29 15:32:09 +02:00
Laurent Destailleur
78d7cfffa8
FIX #yogosha5747
2021-03-29 15:25:28 +02:00
lmarcouiller
966d3a6f30
add setrecorded and commit to db
2021-03-29 15:18:34 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
e03fbda96a
Avoid to obfuscate attributes with html tags inside
2021-03-29 14:50:44 +02:00
Laurent Destailleur
4cacca413e
FIX #yogosha5757
2021-03-29 14:43:40 +02:00
Laurent Destailleur
50635cea89
With a shopping-cart, it is clearer what is the hour in top bar menu
2021-03-29 14:03:19 +02:00
Laurent Destailleur
9f3b9f6917
Fix var_dump
2021-03-29 13:53:54 +02:00
Laurent Destailleur
e382d49299
Fix bad permission
2021-03-29 13:49:24 +02:00
Laurent Destailleur
6bc56b7671
Look and feel v14
2021-03-29 13:41:28 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +02:00
Florian HENRY
5926db2704
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft1
2021-03-29 12:10:35 +02:00
Florian HENRY
2970f1a968
retreive missing fileds...
2021-03-29 12:07:47 +02:00
Laurent Destailleur
85f6a15678
Fix position of users in combo list
2021-03-29 11:58:51 +02:00
Laurent Destailleur
ad6f5e5a64
Fix permission export of services
2021-03-29 10:26:17 +02:00
lmarcouiller
cdd777ecc8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-03-29 09:02:39 +02:00
daraelmin
8a43d65476
Copyright box_members_by_type.php
2021-03-29 07:49:15 +02:00
daraelmin
ae94ce594e
Update copyright
2021-03-29 03:30:44 +02:00
daraelmin
f83cf3a17b
Update copyright
2021-03-29 03:29:21 +02:00
daraelmin
c700767b54
Update copyright
2021-03-29 03:28:32 +02:00
daraelmin
b6d03dcad0
Update copyright
2021-03-29 03:27:02 +02:00
daraelmin
28ff0f2bc3
Copyright adherent_type.class.php
2021-03-28 22:50:27 +02:00
daraelmin
39933f97be
Copyright adherent.class.php
2021-03-28 22:46:19 +02:00
daraelmin
8b1d4a6024
Copyright adherents/index.php
2021-03-28 22:40:41 +02:00
daraelmin
d9733b395e
Copyright in adherents/card.php
2021-03-28 22:30:47 +02:00
Laurent Destailleur
2a431d4951
Protect backtourl from using external urls
2021-03-28 21:39:18 +02:00
stickler-ci
b7045ef3a0
Fixing style errors.
2021-03-28 17:42:18 +00:00
daraelmin
1ae0e2a920
fix stafix style errorsle fix stale errorfix style errors
2021-03-28 19:38:20 +02:00
Laurent Destailleur
a5d84200dc
Clean code for invoice list
2021-03-28 19:22:04 +02:00
daraelmin
6fdff2c3ab
autoaffect individual status for thirdparty
2021-03-28 19:19:40 +02:00
Laurent Destailleur
8f29ff0c66
css
2021-03-28 17:42:38 +02:00
Alexandre SPANGARO
2a1cc04b66
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-28 06:16:33 +02:00
daraelmin
e0551f1e32
Add ADHERENT_DEFAULT_CREATE_THIRDPARTY
2021-03-27 17:29:06 +01:00
Laurent Destailleur
4c90e93108
Fix permissions
2021-03-27 15:49:18 +01:00
Laurent Destailleur
a2c2d46e5c
Fix loosing html content in edit
2021-03-27 15:22:48 +01:00
Laurent Destailleur
d5bab315e3
FIX #yogosha5738
2021-03-27 15:03:18 +01:00
Laurent Destailleur
95a7e13e3a
Debug establishment
2021-03-27 14:54:09 +01:00
Laurent Destailleur
5b64a517ea
Fix label
2021-03-27 14:30:10 +01:00
Laurent Destailleur
ef4f8fd585
Lang
2021-03-27 14:02:30 +01:00
Laurent Destailleur
1bb07c0eb1
Look and feel v14
2021-03-27 13:59:50 +01:00
stickler-ci
6a9d6a8634
Fixing style errors.
2021-03-27 12:44:34 +00:00
daraelmin
bad5aa6468
fix excluded member color in graph
2021-03-27 13:39:15 +01:00
Laurent Destailleur
1d48b883a7
Look and feel v14
2021-03-27 13:17:56 +01:00
daraelmin
c8a455edf4
add excluded memer on graph
2021-03-27 13:14:59 +01:00
Laurent Destailleur
50de0777e4
Look and feel v14
2021-03-27 12:45:57 +01:00
stickler-ci
20ae94b84b
Fixing style errors.
2021-03-27 08:08:26 +00:00
asolslk
992a4c7c21
Update contact.php
...
fix for issue #16985
2021-03-27 16:05:42 +08:00
Alexandre SPANGARO
3c70a3d06c
Move to _PERENTITY
2021-03-27 07:25:31 +01:00
Alexandre SPANGARO
56ae51375d
FIX Search on date in accountancy
2021-03-27 07:11:28 +01:00
Alexandre SPANGARO
1382323f77
FIX Start hour on ACCOUNTING_DATE_START_BINDING
2021-03-27 06:56:34 +01:00
Alexandre SPANGARO
22f809c517
Move to _PERENTITY
2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-27 05:02:55 +01:00
Alexandre SPANGARO
c1ceefb70f
Update with new functionality
2021-03-27 04:44:20 +01:00
Alexandre SPANGARO
6809dab2c0
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-27 04:12:15 +01:00
Florian HENRY
aa9d4342cd
fix translation
2021-03-26 20:18:22 +01:00
Florian HENRY
7a6cc742a6
fix translation
2021-03-26 19:57:20 +01:00
Florian HENRY
6399423526
fix translation
2021-03-26 19:56:06 +01:00
Florian HENRY
47675d28d7
add filter for select list attendees
2021-03-26 19:47:48 +01:00
Florian HENRY
a254bbcc02
fix translation
2021-03-26 19:05:55 +01:00
Florian HENRY
a8b486c7b9
fix error translation
2021-03-26 19:00:56 +01:00
Florian HENRY
3e12820f0e
fix comment
2021-03-26 18:37:11 +01:00
Florian HENRY
f87711bf2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-26 18:30:08 +01:00
Florian HENRY
32246e4d69
workiong attendees
2021-03-26 18:29:06 +01:00
Laurent Destailleur
01c1101b29
Look and feel v14
2021-03-26 18:16:12 +01:00
lvessiller
05bf3cdab1
FIX stickler-ci errors
2021-03-26 17:59:16 +01:00
Laurent Destailleur
84ec032cc0
Look and feel v14
2021-03-26 17:58:00 +01:00
lvessiller
8a2e49d6e7
NEW date and user signature on proposal (Issue 16062)
2021-03-26 17:44:41 +01:00
stickler-ci
895c6efc14
Fixing style errors.
2021-03-26 15:26:05 +00:00
Gauthier PC portable 024
f553ad3fc8
FIX : orders columns
2021-03-26 16:14:00 +01:00
Laurent Destailleur
4a22c8e87e
CSS
2021-03-26 15:12:39 +01:00
Laurent Destailleur
3a5f130ed5
Add protections
2021-03-26 14:54:12 +01:00
Laurent Destailleur
a4ca16db32
Doc
2021-03-26 14:48:14 +01:00
Laurent Destailleur
7c2e3c4930
Removed old deprecated API browser
2021-03-26 14:47:10 +01:00
Laurent Destailleur
1f75c12957
Add test for API explorer using redoc
2021-03-26 14:40:23 +01:00
Laurent Destailleur
8dd07fb6d5
NEW The swagger.json file of API can be included into external sources
2021-03-26 14:30:47 +01:00
Laurent Destailleur
77bb5b78b6
Show swagger json file of APIs
2021-03-26 13:57:16 +01:00
Laurent Destailleur
cfd992b930
Add call of rebuild_sequence with pgsql.
2021-03-26 13:10:06 +01:00
Laurent Destailleur
992e2e0825
Show None if no account found.
2021-03-26 12:27:23 +01:00
Laurent Destailleur
02ba8810cf
Better error message
2021-03-26 12:23:42 +01:00
Laurent Destailleur
cd88c7ad74
Position of permission
2021-03-26 12:17:18 +01:00
Gauthier PC portable 024
3fe1a05f26
FIX : employee must be after label as well as sociale charges list + social charges payments list must use INNER JOIN instead of LEFT JOIN
2021-03-26 10:23:44 +01:00
Gauthier PC portable 024
f5bf26e5d0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization
2021-03-26 09:59:27 +01:00
Laurent Destailleur
93d4da5f41
Fix deprecated code
2021-03-26 02:43:24 +01:00
Laurent Destailleur
e2b02726a7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-26 01:37:37 +01:00
Laurent Destailleur
512a570b63
FIX error for duplicate thirdparty found correctly returned by ws
2021-03-26 01:37:19 +01:00
Laurent Destailleur
44cb9dca67
FIX must use getUrlContent to get external url in RSS module
2021-03-25 19:05:01 +01:00
Laurent Destailleur
d9108362ba
War against $_POST
2021-03-25 16:59:47 +01:00
Florian Mortgat
d17256bde5
NEW 14.0 - hook printFieldListTitle for cabyprodserv.php
2021-03-25 16:14:44 +01:00
Florian Mortgat
3c8e15a87c
NEW 14.0 - SQL-altering hooks in the turnover by product report
2021-03-25 15:12:25 +01:00
stickler-ci
c3d8df3ab2
Fixing style errors.
2021-03-25 13:53:41 +00:00
ksar
288d8d97cc
FIX #16940
...
Update nblines after hook
2021-03-25 14:52:17 +01:00
ksar
ccd6d28f6f
FIX #16843
...
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4
fa-mail-forward => fa-share
2021-03-25 14:39:42 +01:00
UT from dolibit
7248ffa4dd
Update llx_20_c_departements.sql
...
Canada
2021-03-25 13:57:23 +01:00
UT from dolibit
045db51811
Update llx_10_c_regions.sql
2021-03-25 13:52:51 +01:00
Laurent Destailleur
5b68c6af62
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-25 13:48:41 +01:00
Laurent Destailleur
c98f38a209
Fix #yogosha5737
2021-03-25 13:36:43 +01:00
Laurent Destailleur
663138328e
Merge pull request #16962 from atm-gauthier/fix_autofill_amount_payment_salary
...
FIX : autofill payment salary amount + several fixes
2021-03-25 13:03:38 +01:00
Laurent Destailleur
32ae43b770
Merge pull request #16932 from AlexisLaurier/feature/addRestApiCompression
...
NEW Add native compression in rest apis
2021-03-25 12:54:01 +01:00
Laurent Destailleur
94b98403ab
Update index.php
2021-03-25 12:52:35 +01:00
Laurent Destailleur
3ae270b390
Merge pull request #16956 from atm-gauthier/fix_special_expense_index
...
FIX : old query using tva object for payments list
2021-03-25 12:43:37 +01:00
Laurent Destailleur
4e05fded3a
Merge pull request #16967 from dolibit-ut/patch-166
...
Update card.php
2021-03-25 12:39:47 +01:00
Laurent Destailleur
2d76410a39
Merge pull request #16966 from dolibit-ut/patch-165
...
Create index.html
2021-03-25 12:39:36 +01:00
Laurent Destailleur
7aff5c3bc8
Merge pull request #16965 from dolibit-ut/patch-164
...
Create index.html
2021-03-25 12:39:27 +01:00
Laurent Destailleur
2fa31586f7
Merge pull request #16964 from dolibit-ut/patch-163
...
Create index.html
2021-03-25 12:39:19 +01:00
Gauthier PC portable 024
014ae0a8da
FIX : lists uniformization
2021-03-25 11:59:22 +01:00
Laurent Destailleur
172b615d6c
Debug auto numbering of lot/serial.
2021-03-25 11:51:29 +01:00
UT from dolibit
f5ec6abc48
Update card.php
...
$helpurl => $help_url
2021-03-25 11:32:15 +01:00
Laurent Destailleur
5ddd98cd39
Move module intracomm as experimental
2021-03-25 11:24:46 +01:00
UT from dolibit
a33986e630
Create index.html
2021-03-25 11:21:30 +01:00
UT from dolibit
3570fea7aa
Create index.html
2021-03-25 11:20:49 +01:00
UT from dolibit
72c194e2d8
Create index.html
2021-03-25 11:04:47 +01:00
Gauthier PC portable 024
368bad1943
FIX : autofill payment salary amount + several fixes
2021-03-25 10:39:12 +01:00
Gauthier PC portable 024
155978f2d2
FIX : Must be a left join here to be able to see vat declarations even if no payments are done
2021-03-25 09:29:53 +01:00
Alexis LAURIER
69d57f48fd
api compression - add API_DISABLE_COMPRESSION
2021-03-25 09:20:31 +01:00
Gauthier PC portable 024
a20bb3d66e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_special_expense_index
2021-03-25 09:15:42 +01:00
Laurent Destailleur
a906b1437c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-25 08:38:18 +01:00
Laurent Destailleur
c30c6bcf43
css
2021-03-25 08:37:59 +01:00
Laurent Destailleur
ff52b1ee41
Merge pull request #16620 from altairisfr/pr_batch_masks
...
Define Masks for Batch Products Equipments
2021-03-25 08:36:36 +01:00
Laurent Destailleur
a4aa806e44
Merge pull request #16933 from daraelmin/daraelmin-patch-2
...
Fix #16794 V13 order by status instead of statut
2021-03-25 08:31:44 +01:00
Laurent Destailleur
99496e365f
css
2021-03-25 04:13:28 +01:00
Laurent Destailleur
a82ce2e5af
css
2021-03-25 04:11:13 +01:00
Laurent Destailleur
5af02d96cd
Show entity for user only if different than current entity
2021-03-25 03:58:54 +01:00
Laurent Destailleur
dce3b3e7af
Rename page to avoid to have an index.html page
2021-03-25 03:47:45 +01:00
Laurent Destailleur
594c94feb2
Clean code. Allow iframes into the external frame module.
2021-03-25 03:44:38 +01:00
Laurent Destailleur
45b0c4c2be
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-25 02:12:25 +01:00
Laurent Destailleur
57662e60a4
Better explanation of internal/external user
2021-03-25 02:11:54 +01:00
Laurent Destailleur
930742dadf
Merge pull request #16846 from ptibogxiv/patch-418
...
NEW auto notification with templated emails
2021-03-25 01:48:44 +01:00
Laurent Destailleur
52625325ff
Merge pull request #16922 from dolibit-ut/patch-155
...
Create index.html
2021-03-25 01:39:12 +01:00
Laurent Destailleur
6eac8ee25d
Merge pull request #16921 from dolibit-ut/patch-154
...
Create index.html
2021-03-25 01:39:03 +01:00
Laurent Destailleur
e994fbf093
Merge pull request #16923 from dolibit-ut/patch-156
...
Create index.html
2021-03-25 01:30:53 +01:00
Laurent Destailleur
36a49aacee
Merge pull request #16924 from dolibit-ut/patch-157
...
Create index.html
2021-03-25 01:30:45 +01:00
Laurent Destailleur
bd837101f7
Merge pull request #16925 from dolibit-ut/patch-158
...
Create index.html
2021-03-25 01:30:34 +01:00
Laurent Destailleur
a4a6239c83
Merge pull request #16926 from dolibit-ut/patch-159
...
Create index.html
2021-03-25 01:30:25 +01:00
Laurent Destailleur
ba1358bd56
Merge pull request #16927 from dolibit-ut/patch-160
...
Create index.html
2021-03-25 01:30:17 +01:00
Laurent Destailleur
5826d7747c
Merge pull request #16938 from FHenry/13_fix_POST
...
change $_POST to GETPOST
2021-03-25 01:30:08 +01:00
Laurent Destailleur
ba04a8a9cc
Merge pull request #16928 from dolibit-ut/patch-161
...
Create index.html
2021-03-25 01:29:54 +01:00
Laurent Destailleur
ab04c0a904
Merge pull request #16935 from dolibit-ut/patch-162
...
Update llx_c_forme_juridique.sql
2021-03-25 01:10:23 +01:00
Laurent Destailleur
443fd544be
Update time.php
2021-03-25 01:07:29 +01:00
Laurent Destailleur
c5d9c1481a
Merge pull request #16948 from hregis/fix_return_edit_mode_if_update_error
...
FIX missing return edit if update error
2021-03-25 01:04:03 +01:00
Laurent Destailleur
602da43195
Fix filters
2021-03-25 01:03:18 +01:00
Laurent Destailleur
374e84119c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-25 00:49:23 +01:00
Laurent Destailleur
f9796bd4f8
Merge pull request #16951 from atm-adrien/FIX/bookmarks_on_searchList_develop
...
FIX : Bookmarks on list filtered by multiselect field
2021-03-25 00:49:05 +01:00
Laurent Destailleur
2bf5e1373b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-25 00:47:17 +01:00
Laurent Destailleur
ce422f514f
Fix title of reports
2021-03-25 00:47:05 +01:00
Laurent Destailleur
768b5a34fd
Merge pull request #16949 from artis-auxilium/fix_13024
...
Fix #13024 wrong line is used for reception
2021-03-25 00:33:13 +01:00
Laurent Destailleur
3f8d71d024
Merge pull request #16950 from code42fr/fix_translation_tag_#16941
...
Fix translation tag #16941
2021-03-25 00:26:48 +01:00
Laurent Destailleur
87bb84310d
Update translate.class.php
2021-03-25 00:26:16 +01:00
Laurent Destailleur
f9722b7c3b
Merge pull request #16955 from atm-gauthier/fix_dol_get_fiche_head_salary
...
FIX : wrong dol_get_fiche_end()
2021-03-25 00:22:33 +01:00
Laurent Destailleur
b011a67698
Fix remove var_dump
2021-03-25 00:03:31 +01:00
Laurent Destailleur
cc54b7fe29
Fix dol_string_onlythesehtmlattributes
2021-03-25 00:03:09 +01:00
Laurent Destailleur
8b4870b8b2
Fix look and feel v14
2021-03-24 23:44:50 +01:00
Laurent Destailleur
6f01869bcb
Enhance the WAF
2021-03-24 23:14:22 +01:00
Laurent Destailleur
d1fa46089f
Removed not used page.
...
Enhance the WAF
2021-03-24 22:54:40 +01:00
Florian HENRY
53a9fd5823
almost done
2021-03-24 22:21:31 +01:00
Laurent Destailleur
eeba9e4d50
Code comment
2021-03-24 21:58:06 +01:00
Laurent Destailleur
965ee16270
Fix typo
2021-03-24 21:53:56 +01:00
Laurent Destailleur
21a9779fe2
FIX inconsistency in margin recording with option "Force to sale price"
2021-03-24 21:49:45 +01:00
Laurent Destailleur
b3c15089f0
Fix var init
2021-03-24 21:23:37 +01:00
Florian HENRY
e898fbb834
almost done
2021-03-24 21:21:53 +01:00
Florian HENRY
373a52063d
add commit
2021-03-24 20:13:30 +01:00
Laurent Destailleur
a5034d44f7
$_POST war
2021-03-24 19:53:31 +01:00
Laurent Destailleur
047471c220
Remove $_POST war
2021-03-24 19:06:44 +01:00
Laurent Destailleur
86c7ab922a
Fix #yogosha5728
2021-03-24 18:57:23 +01:00
Gauthier PC portable 024
8ffb40035f
FIX : old query using tva object for payments list
2021-03-24 17:29:16 +01:00
Gauthier PC portable 024
708f028888
FIX : wrong dol_get_fiche_end()
2021-03-24 15:30:22 +01:00
Alexandre SPANGARO
34abb53c25
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-24 14:09:46 +01:00
Laurent Destailleur
911971c879
FIx #yogosha5728
2021-03-24 13:43:44 +01:00
Laurent Destailleur
1a5d129bd0
Fix #yogosha5731
2021-03-24 13:32:09 +01:00
Laurent Destailleur
211c5b53eb
NEW Can set if a ticket group is visible on public interface or not.
2021-03-24 13:16:17 +01:00
Laurent Destailleur
4015f5952e
Look and feel v14
2021-03-24 12:51:14 +01:00
Laurent Destailleur
37c04b794f
Add property "ticket group is public" in dicitonary of ticket groups.
2021-03-24 12:13:23 +01:00
Alexandre SPANGARO
49faedae6f
Work on date_validation
2021-03-24 11:56:23 +01:00
Laurent Destailleur
d420a4c0ba
Fix token into link
2021-03-24 11:05:27 +01:00
Laurent Destailleur
4ecd1def49
css
2021-03-24 11:00:26 +01:00
Adrien Raze
a30fcceca0
FIX : Allow to set bookmarks on list filtered by multiselect fields
2021-03-24 10:50:01 +01:00
hugo
8a1cd3e471
FIX #16941 langs trans escape tag <i
2021-03-24 10:08:19 +01:00
Dev2a
9a85bdd38a
Fix #13024 wrong line is used for reception
2021-03-24 09:55:55 +01:00
Laurent Destailleur
00630478ea
Look and feel v14
2021-03-24 02:25:54 +01:00
Laurent Destailleur
537e979e5a
Debug v13
2021-03-24 02:06:16 +01:00
Laurent Destailleur
367ff3c9f0
Look and feel v14
2021-03-24 01:53:08 +01:00
Florian HENRY
26cffd139d
working on attendees
2021-03-23 22:12:30 +01:00
Florian HENRY
ebe0b503f6
working on attendees
2021-03-23 22:12:20 +01:00
Laurent Destailleur
4d1fdd8763
Fix #yogosha5725
2021-03-23 21:45:37 +01:00
Florian HENRY
d043c8f4ba
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-23 21:05:11 +01:00
Florian HENRY
cc78e7c685
add field on conf or booth tabs
2021-03-23 21:04:38 +01:00
Laurent Destailleur
02509ccbc4
Responsive
2021-03-23 20:39:11 +01:00
Laurent Destailleur
28ca2990f0
CSS
2021-03-23 20:09:26 +01:00
Regis Houssin
05419441aa
FIX missing return edit if update error
2021-03-23 19:58:15 +01:00
ATM john
4f693b86c2
shhhhhh ! There is nothing here...
2021-03-23 19:27:40 +01:00
Laurent Destailleur
1ffc598bef
Use placeholder
2021-03-23 18:15:12 +01:00
Laurent Destailleur
3857daed94
Fix remove log
2021-03-23 18:08:44 +01:00
Laurent Destailleur
5ff9038e4e
Fix permissions on BOMs
2021-03-23 18:02:52 +01:00
Laurent Destailleur
3a463ac061
FIX #yogosha5723
2021-03-23 17:46:06 +01:00
Laurent Destailleur
cfa39597c3
FIX #yogosha5707
2021-03-23 17:28:38 +01:00
Laurent Destailleur
7c69b45c68
FIX #yogosha5707
2021-03-23 17:27:43 +01:00
Laurent Destailleur
053fe4831a
Fix translations
2021-03-23 16:59:12 +01:00
Laurent Destailleur
538547acfe
Add currency into combo of bank account (for a future use in js)
2021-03-23 16:26:31 +01:00
Laurent Destailleur
00e48aa922
Clean and secured code for ajax/row.php
2021-03-23 16:09:02 +01:00
Laurent Destailleur
b275789223
Fix regression
2021-03-23 12:22:30 +01:00
Florian HENRY
edf7c02dd6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-23 11:45:24 +01:00
Florian HENRY
bc1a412d1b
ongoing
2021-03-23 11:45:17 +01:00
Laurent Destailleur
a1366da130
FIX #yogosha5715
2021-03-23 03:45:17 +01:00
Laurent Destailleur
e06b8bb586
Look and feel v14
2021-03-23 03:20:23 +01:00
Laurent Destailleur
0d11b5f81b
css
2021-03-23 02:57:24 +01:00
Laurent Destailleur
e3b019f923
Clean code
2021-03-23 01:32:17 +01:00
Laurent Destailleur
bc9b4fa637
Fix id
2021-03-23 00:35:30 +01:00
Laurent Destailleur
af593099df
Clean string
2021-03-22 23:52:14 +01:00
Laurent Destailleur
2d5fbfc105
Fix php8
2021-03-22 23:43:28 +01:00
Laurent Destailleur
f7ba0ee381
Fix set of parent company with ajax
2021-03-22 22:50:43 +01:00
Laurent Destailleur
3f07317f30
FIx #yogosha5695
2021-03-22 19:19:18 +01:00
Laurent Destailleur
146706bafa
Fix label
2021-03-22 19:11:29 +01:00
Laurent Destailleur
ca0a04fb61
Fix missing payment ref
2021-03-22 18:56:02 +01:00
Laurent Destailleur
cce4ebdb8c
Clean code
2021-03-22 18:50:47 +01:00
Laurent Destailleur
f405505e0f
Do not load each invoice of payment for tooltip
2021-03-22 18:34:01 +01:00
Laurent Destailleur
010b084444
Do not load each invoice of payment for tooltip
2021-03-22 18:32:36 +01:00
Laurent Destailleur
5a8d757a30
Add missing data
2021-03-22 18:23:29 +01:00
Laurent Destailleur
5d6fb0cfea
Perf: Enhance performance of VAT report
2021-03-22 18:11:44 +01:00
Laurent Destailleur
df9546662a
Fix trans
2021-03-22 16:18:31 +01:00
Laurent Destailleur
897d653144
Debug default date for vat reports
2021-03-22 16:09:18 +01:00
stickler-ci
ba66eaeb18
Fixing style errors.
2021-03-22 14:42:31 +00:00
Florian HENRY
b121587582
change to GETPOST
2021-03-22 15:39:54 +01:00
Laurent Destailleur
e79284ea29
FIX Vulnerability: Idor leading to lock admin users.
2021-03-22 13:56:19 +01:00
Laurent Destailleur
7b01133493
Fix escape
2021-03-22 13:41:43 +01:00
Laurent Destailleur
4ff26bd8c5
Removed deprecated code
2021-03-22 13:39:34 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
UT from dolibit
4ebcfb558c
Update llx_c_forme_juridique.sql
2021-03-22 13:06:18 +01:00
Laurent Destailleur
6063b02bf4
Fix #ygosha5698
2021-03-22 12:47:23 +01:00
Laurent Destailleur
6a0e0f4c06
Fix #ygosha5698
2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
stickler-ci
5463a705c7
Fixing style errors.
2021-03-22 08:40:06 +00:00
Alexis LAURIER
bcb3265678
rest api - manage data compression
2021-03-22 09:37:25 +01:00
Alexis LAURIER
cf3f813c0d
rest api - manage data compression
2021-03-22 09:28:57 +01:00
daraelmin
6ba878725e
Fix #16794 V13 order by status instead of statut
2021-03-22 07:28:16 +01:00
Alexandre SPANGARO
98e482de71
Add text for popup
2021-03-22 06:53:09 +01:00
Laurent Destailleur
debcef9b55
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-22 00:08:19 +01:00
Laurent Destailleur
f1fb7e732e
Fix trans
2021-03-22 00:07:35 +01:00
stickler-ci
5af4b4673c
Fixing style errors.
2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
0c2ada4299
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-21 23:08:01 +01:00
stickler-ci
db8279b192
Fixing style errors.
2021-03-21 22:06:08 +00:00
Alexandre SPANGARO
17e0cc4bad
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-21 22:59:41 +01:00
Alexandre SPANGARO
ea938f64da
NEW: Add company info in dropdown login menu
2021-03-21 22:58:21 +01:00
Laurent Destailleur
1c6585f06b
Fix deprecated function
2021-03-21 22:37:24 +01:00
UT from dolibit
9062385f9d
Create index.html
2021-03-21 22:30:06 +01:00
UT from dolibit
cdbfcfd41f
Create index.html
2021-03-21 22:28:01 +01:00
Laurent Destailleur
4ac5d32c48
Fix picto
2021-03-21 22:27:12 +01:00
UT from dolibit
ccbe0d2ea5
Create index.html
2021-03-21 22:27:11 +01:00
UT from dolibit
dd0e419361
Create index.html
2021-03-21 22:26:35 +01:00
Laurent Destailleur
6c89ef803e
Merge pull request #16894 from daraelmin/daraelmin-patch-5
...
Fix #16893 #16897 V13 picto UpToDate change to Unpaid sometimes
2021-03-21 22:19:15 +01:00
UT from dolibit
32cf5240f8
Create index.html
2021-03-21 22:17:50 +01:00
Laurent Destailleur
726296b59b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-21 22:16:10 +01:00
Laurent Destailleur
9d1dcccb86
Fix css
2021-03-21 22:15:37 +01:00
UT from dolibit
e6a2243627
Create index.html
2021-03-21 22:15:33 +01:00
UT from dolibit
6dc0d8202b
Create index.html
2021-03-21 22:14:13 +01:00
UT from dolibit
34b1b18a89
Create index.html
2021-03-21 22:12:19 +01:00
Laurent Destailleur
2e6c8f2479
Merge pull request #16920 from dolibit-ut/patch-153
...
Update llx_20_c_departements.sql
2021-03-21 22:11:00 +01:00
UT from dolibit
80810ba0b2
Update llx_20_c_departements.sql
2021-03-21 22:06:06 +01:00
UT from dolibit
bd0dbe6538
Update llx_10_c_regions.sql
2021-03-21 22:00:57 +01:00
Laurent Destailleur
45a1bd8575
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-21 21:54:22 +01:00
Laurent Destailleur
168e50a45b
Removed unexpected files
2021-03-21 21:54:11 +01:00
Laurent Destailleur
2a7b687fbf
Merge pull request #16918 from dolibit-ut/patch-151
...
Create index.html
2021-03-21 21:47:04 +01:00
Laurent Destailleur
4806d2f40b
Merge pull request #16916 from dolibit-ut/patch-149
...
Create index.html
2021-03-21 21:46:56 +01:00
Laurent Destailleur
ffb81d5acc
Merge pull request #16905 from dolibit-ut/patch-138
...
Create index.html
2021-03-21 21:46:49 +01:00
Laurent Destailleur
fa82f2161f
Merge pull request #16915 from dolibit-ut/patch-148
...
Create index.html
2021-03-21 21:46:43 +01:00
Laurent Destailleur
7f9199691a
Merge pull request #16908 from dolibit-ut/patch-141
...
Create index.html
2021-03-21 21:46:36 +01:00
Laurent Destailleur
4f025e419e
Merge pull request #16901 from dolibit-ut/patch-134
...
Create index.html
2021-03-21 21:46:29 +01:00
Laurent Destailleur
92b5d12574
Merge pull request #16903 from dolibit-ut/patch-136
...
Create index.html
2021-03-21 21:46:21 +01:00
Laurent Destailleur
2a25f3096c
Merge pull request #16902 from dolibit-ut/patch-135
...
Create index.html
2021-03-21 21:46:14 +01:00
Laurent Destailleur
449315c225
Merge pull request #16904 from dolibit-ut/patch-137
...
Create index.html
2021-03-21 21:46:07 +01:00
Laurent Destailleur
5ccbd62fc8
Merge pull request #16906 from dolibit-ut/patch-139
...
Create index.html
2021-03-21 21:45:59 +01:00
Laurent Destailleur
b798321f09
Merge pull request #16913 from dolibit-ut/patch-146
...
Create index.html
2021-03-21 21:45:53 +01:00
Laurent Destailleur
84487e4ef8
Merge pull request #16907 from dolibit-ut/patch-140
...
Create index.html
2021-03-21 21:45:46 +01:00
Laurent Destailleur
472fe901a7
Merge pull request #16909 from dolibit-ut/patch-142
...
Create index.html
2021-03-21 21:45:39 +01:00
Laurent Destailleur
ddea352092
Merge pull request #16910 from dolibit-ut/patch-143
...
Create index.html
2021-03-21 21:45:32 +01:00
Laurent Destailleur
d9ec217210
Merge pull request #16912 from dolibit-ut/patch-145
...
Create index.html
2021-03-21 21:45:25 +01:00
Laurent Destailleur
a78e62a16e
Merge pull request #16914 from dolibit-ut/patch-147
...
Create index.html
2021-03-21 21:45:18 +01:00
Laurent Destailleur
4f092eb10b
Merge pull request #16917 from dolibit-ut/patch-150
...
Create index.html
2021-03-21 21:45:12 +01:00
Laurent Destailleur
3d29892b60
Merge pull request #16911 from dolibit-ut/patch-144
...
Update datapolicy.lang
2021-03-21 21:45:03 +01:00
UT from dolibit
9eb50eee00
Create index.html
2021-03-21 21:40:37 +01:00
UT from dolibit
0241e2d449
Create index.html
2021-03-21 21:38:53 +01:00
UT from dolibit
98c2c59486
Create index.html
2021-03-21 21:36:41 +01:00
UT from dolibit
39190dc07f
Create index.html
2021-03-21 21:34:21 +01:00
UT from dolibit
5b028d192d
Create index.html
2021-03-21 21:33:39 +01:00
UT from dolibit
9925cdcbee
Create index.html
2021-03-21 21:32:35 +01:00
UT from dolibit
d0cace4f2c
Create index.html
2021-03-21 21:32:05 +01:00
Laurent Destailleur
e16b7fe1ee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-21 21:29:23 +01:00
Laurent Destailleur
c69ad6ee8b
Update setup page
2021-03-21 21:29:11 +01:00
UT from dolibit
8e5a1d535c
Update datapolicy.lang
2021-03-21 21:27:49 +01:00
UT from dolibit
50672bfe31
Create index.html
2021-03-21 21:19:54 +01:00
UT from dolibit
2a069a0a2c
Create index.html
2021-03-21 21:19:12 +01:00
UT from dolibit
4b3b4d072a
Create index.html
2021-03-21 21:17:12 +01:00
UT from dolibit
2f957667ed
Create index.html
2021-03-21 21:16:32 +01:00
UT from dolibit
163b960da9
Create index.html
2021-03-21 21:15:40 +01:00
UT from dolibit
8ec3c4a5b5
Create index.html
2021-03-21 21:14:52 +01:00
UT from dolibit
21a2b4e222
Create index.html
2021-03-21 21:13:33 +01:00
ptibogxiv
6d26b4aec3
Update notify.class.php
2021-03-21 21:11:39 +01:00
UT from dolibit
e4921fa843
Create index.html
2021-03-21 21:11:01 +01:00
UT from dolibit
c0e7800251
Create index.html
2021-03-21 21:10:13 +01:00
UT from dolibit
ae91f3be63
Create index.html
2021-03-21 21:07:25 +01:00
Laurent Destailleur
17e5605430
Merge branch 'develop' into patch-3
2021-03-21 21:02:53 +01:00
Laurent Destailleur
0f9b88d828
Merge pull request #16899 from daraelmin/daraelmin-status-exclu
...
Close #16255 Add new status "excluded" in membership management module
2021-03-21 20:56:07 +01:00
Laurent Destailleur
153ca5a572
Merge pull request #16896 from dolibit-ut/patch-133
...
Update llx_20_c_departements.sql
2021-03-21 20:50:31 +01:00
Laurent Destailleur
d282b0fd71
Merge pull request #16890 from frederic34/patch-4
...
fix php8 warnings
2021-03-21 20:50:20 +01:00
Laurent Destailleur
6cdfbc2e8c
Update website.php
2021-03-21 20:50:00 +01:00
Laurent Destailleur
800eeef868
Clean code
2021-03-21 18:20:37 +01:00
Laurent Destailleur
3c8bf2167b
Debug permissions
2021-03-21 18:01:43 +01:00
stickler-ci
e779723ae3
Fixing style errors.
2021-03-21 13:50:35 +00:00
daraelmin
054864eccc
Merge branch 'develop' into daraelmin-status-exclu
2021-03-21 14:42:01 +01:00
daraelmin
e910810037
activate exlcude button
2021-03-21 14:38:15 +01:00
daraelmin
99d4618ab5
Fix 16897 V13 Wrong picto for Expired membership
...
Force picto for Expired membership when no subscription is needed to Waiting (as other)
2021-03-21 13:49:17 +01:00
Laurent Destailleur
e688987d63
css
2021-03-21 13:46:32 +01:00
Laurent Destailleur
af199189b3
NEW Add color and picto for direction of movement
2021-03-21 13:46:01 +01:00
UT from dolibit
065561b2be
Update llx_20_c_departements.sql
...
Australia
2021-03-21 12:46:53 +01:00
daraelmin
860a2f2ffa
Fix #16893 picto UpToDate change to Unpaid sometimes
...
#Fix #16893 picto UpToDate change to Unpaid sometimes
As $now is set on the start of the script.
But, the timestamp may change before LibStatut is called at the end.
To avoid this we add 10 second to $now before comparing to dol_now() in LibStatut
2021-03-21 11:36:23 +01:00
Frédéric FRANCE
b7a46ae838
fix php8 warnings
2021-03-20 21:50:47 +01:00
Laurent Destailleur
eeb1c5d884
Replace deprecated code
2021-03-20 21:46:10 +01:00
Laurent Destailleur
fc2308d810
Fix trans
2021-03-20 21:38:01 +01:00
Laurent Destailleur
0008e916ac
Fix sql error
2021-03-20 21:36:42 +01:00
Laurent Destailleur
2b3599dba5
Clean code
2021-03-20 21:29:36 +01:00
Laurent Destailleur
70be2dbcf0
Fix regression in tests
2021-03-20 20:51:19 +01:00
Laurent Destailleur
9900429fd0
Merge pull request #16889 from frederic34/adherent_to_member
...
rename files from adherent to member
2021-03-20 20:37:44 +01:00
Laurent Destailleur
f206fd67f1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 20:35:58 +01:00
Laurent Destailleur
ca74fa7372
Look and feel v14
2021-03-20 20:02:58 +01:00
Laurent Destailleur
f95aa9c6e1
Merge pull request #16612 from atm-adrien/FIX/develop_update_pencil
...
FIX : Update pencil
2021-03-20 19:54:47 +01:00
Laurent Destailleur
8f6f8248a3
Merge pull request #16885 from daraelmin/daraelmin-patch-4
...
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 19:51:26 +01:00
Laurent Destailleur
861a5becf1
Merge pull request #16884 from daraelmin/daraelmin-patch-3
...
#Fix #16767 v13 unremovable attached file in mailmodel
2021-03-20 19:51:07 +01:00
Laurent Destailleur
e330c0f91a
Merge pull request #16883 from aspangaro/14a28
...
Uniformize information on modules
2021-03-20 19:49:33 +01:00
Laurent Destailleur
a2b3afb511
Merge branch 'develop' into 14a22
2021-03-20 19:48:43 +01:00
Laurent Destailleur
6a8f4ac892
NEW Add permission "export website"
2021-03-20 19:30:08 +01:00
Laurent Destailleur
e5a94d9257
Fix export
2021-03-20 19:16:44 +01:00
Laurent Destailleur
46aa01aea0
Fix permission on export of BOM and website
2021-03-20 19:15:15 +01:00
Frédéric FRANCE
d2f7d3064d
can use $conf->member
2021-03-20 19:09:49 +01:00
Frédéric FRANCE
f6e7285949
rename files from adherent to member
2021-03-20 19:06:15 +01:00
Laurent Destailleur
f6145a119f
Fix #yogosha5679
2021-03-20 18:58:34 +01:00
Frédéric FRANCE
fdcd7cc316
remove old fixed boxes in member area
2021-03-20 18:49:56 +01:00
Laurent Destailleur
6e8a4bbc48
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 18:44:17 +01:00
Laurent Destailleur
8df083c955
Look and feel v14
2021-03-20 18:43:44 +01:00
daraelmin
4d8ed4bd40
merge develop
2021-03-20 15:34:30 +01:00
daraelmin
cb71936ccd
#Fix #16767 unremovable attached file in mailmodel
...
#Fix #16767 make default attached file of a mail model selected removable
2021-03-20 14:10:56 +01:00
daraelmin
2d7f858c1a
#Fix #16767 unremovable attached file in mailmodel
...
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 14:04:20 +01:00
Alexandre SPANGARO
3669c374c2
Uniformize information on modules
2021-03-20 13:55:43 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22
2021-03-20 13:42:54 +01:00
Laurent Destailleur
d0f647301b
Merge pull request #16882 from frederic34/patch-4
...
fix php8 warning
2021-03-20 13:41:32 +01:00
Frédéric FRANCE
c1cab76722
fix php8 warning
2021-03-20 13:15:54 +01:00
Frédéric FRANCE
7df344191f
fix php8 warnings
2021-03-20 13:07:46 +01:00
Laurent Destailleur
ae2d7b5096
Merge pull request #16826 from dolibit-ut/patch-119
...
Update document.php
2021-03-20 12:50:03 +01:00
Laurent Destailleur
e1f23105a6
Finally try to follow install per entity instead of per instance.
2021-03-20 12:49:44 +01:00
Laurent Destailleur
65bf47b693
Merge pull request #16845 from hregis/fix_warning_php8
...
FIX avoid php8 warning with multicompany
2021-03-20 12:46:02 +01:00
stickler-ci
625f72303b
Fixing style errors.
2021-03-20 11:43:13 +00:00
Laurent Destailleur
d8aa5f5eab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2021-03-20 12:42:46 +01:00
Regis Houssin
972380860a
FIX use new function getDolGlobalInt() instead
2021-03-20 12:40:24 +01:00
Regis Houssin
29e090b025
FIX force to entity 0 for all entities
2021-03-20 12:35:41 +01:00
Laurent Destailleur
7f6044c52e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/task.php
2021-03-20 12:18:40 +01:00
Regis Houssin
573ca669da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8
2021-03-20 12:11:12 +01:00
Laurent Destailleur
d5865dbfcc
Merge pull request #16791 from Robin-Yann/12.0
...
FIX: fix checkbox displayed according to module project setup parameters - work in progress
2021-03-20 12:06:03 +01:00
Laurent Destailleur
0e2234db8b
Merge pull request #16818 from daraelmin/daraelmin-patch-2
...
Code translation
2021-03-20 11:59:29 +01:00
Laurent Destailleur
779f706d32
Merge pull request #16880 from frederic34/patch-4
...
fix stats
2021-03-20 11:58:01 +01:00
Laurent Destailleur
976b61456a
Merge pull request #16824 from dolibit-ut/patch-117
...
Update fiscalyear_info.php
2021-03-20 11:57:34 +01:00
Laurent Destailleur
139cd5e8b7
Merge pull request #16823 from dolibit-ut/patch-116
...
Update fiscalyear_card.php
2021-03-20 11:57:24 +01:00
Chl
36baf9b76b
FIX #16143 Old PG requires "()" on DROP FUNCTION
...
On PostgreSQL 9.6 and previous, the upgrade script fails with a syntax
error if the dropped function's name is not followed by parentheses.
Patch tested on 9.6 and 13.2.
2021-03-20 11:56:19 +01:00
Laurent Destailleur
7565937a3b
Merge pull request #16820 from bugness-chl/develop
...
FIX #16143 Old PG requires "()" on DROP FUNCTION
2021-03-20 11:55:04 +01:00
Laurent Destailleur
1230c99629
Merge pull request #16822 from dolibit-ut/patch-115
...
Update fiscalyear.php
2021-03-20 11:53:01 +01:00
Laurent Destailleur
9774d5ea4f
Merge pull request #16825 from dolibit-ut/patch-118
...
Update agenda.php
2021-03-20 11:52:51 +01:00
Laurent Destailleur
86094525b1
Merge pull request #16829 from dolibit-ut/patch-121
...
Update subscription.php
2021-03-20 11:52:42 +01:00
Laurent Destailleur
655dc68087
Merge pull request #16827 from dolibit-ut/patch-120
...
Update note.php
2021-03-20 11:52:32 +01:00
Laurent Destailleur
ee84bef3b2
Merge pull request #16828 from frederic34/membersboxfix
...
fix new boxes add
2021-03-20 11:52:19 +01:00
Laurent Destailleur
db71b3cbf8
Merge pull request #16830 from dolibit-ut/patch-122
...
Update type_translation.php
2021-03-20 11:51:05 +01:00
Laurent Destailleur
8f241d5670
Merge pull request #16832 from dolibit-ut/patch-124
...
Update info.php
2021-03-20 11:50:52 +01:00
Laurent Destailleur
b04fb9463a
Merge pull request #16831 from dolibit-ut/patch-123
...
Update document.php
2021-03-20 11:50:40 +01:00
Laurent Destailleur
99243045c7
Merge pull request #16833 from dolibit-ut/patch-125
...
Update type.php
2021-03-20 11:50:30 +01:00
Laurent Destailleur
4c811d462c
Merge pull request #16837 from dolibit-ut/patch-129
...
Update document.php
2021-03-20 11:50:20 +01:00
Laurent Destailleur
835f9d4ae8
Merge pull request #16834 from dolibit-ut/patch-126
...
Update card.php
2021-03-20 11:50:06 +01:00
Laurent Destailleur
668519e7f5
Merge pull request #16836 from dolibit-ut/patch-128
...
Update card.php
2021-03-20 11:49:57 +01:00
Laurent Destailleur
ee1d7faf96
Merge pull request #16835 from dolibit-ut/patch-127
...
Update viewcat.php
2021-03-20 11:49:50 +01:00
Laurent Destailleur
7d122cf921
Merge pull request #16838 from hregis/fix_php8
...
FIX php 8 warning
2021-03-20 11:49:41 +01:00
Laurent Destailleur
827a952dca
Merge pull request #16839 from dolibit-ut/patch-130
...
Update card.php
2021-03-20 11:49:18 +01:00
Laurent Destailleur
3edeb8b4aa
Merge pull request #16840 from dolibit-ut/patch-131
...
Update document.php
2021-03-20 11:49:06 +01:00
Laurent Destailleur
2da85a9ca2
Merge pull request #16842 from hregis/fix_avoid_warning_php8
...
FIX avoid php8 warning in products list
2021-03-20 11:48:53 +01:00
Laurent Destailleur
329bb7bf88
Merge pull request #16841 from dolibit-ut/patch-132
...
Update llx_20_c_departements.sql
2021-03-20 11:46:16 +01:00
Frédéric FRANCE
4cb7c90184
fix stats
2021-03-20 11:38:53 +01:00
Laurent Destailleur
0e4d977549
Merge pull request #16847 from ptibogxiv/patch-419
...
FIx get optionnal in membertype with API
2021-03-20 11:38:00 +01:00
Laurent Destailleur
30d25f6a82
Merge pull request #16848 from frederic34/patch-3
...
fix php8 warning
2021-03-20 11:37:12 +01:00
Laurent Destailleur
285b166b12
Merge pull request #16849 from frederic34/ecmindex
...
fix php8 warnings
2021-03-20 11:37:00 +01:00
Laurent Destailleur
3cc8a8e2ee
Merge pull request #16850 from frederic34/patch-4
...
fix php8 warning
2021-03-20 11:28:47 +01:00
Laurent Destailleur
e2433a0bbf
Merge pull request #16851 from frederic34/patch-5
...
fix warning
2021-03-20 11:28:34 +01:00
Laurent Destailleur
acbce4b380
Merge pull request #16852 from frederic34/patch-7
...
fix php8 warning
2021-03-20 11:28:18 +01:00
Laurent Destailleur
f26abf73ce
Merge pull request #16853 from frederic34/patch-8
...
fix php8 warnings
2021-03-20 11:27:50 +01:00
Laurent Destailleur
e54ca79a8c
Merge pull request #16854 from frederic34/confglobal
...
get conf global function
2021-03-20 11:26:32 +01:00
Laurent Destailleur
430bb24049
Merge pull request #16857 from frederic34/patch-9
...
fix nested comments for doxygen
2021-03-20 11:25:11 +01:00
Laurent Destailleur
25f1b82c34
Merge pull request #16859 from frederic34/patch-11
...
fix doxygen
2021-03-20 11:24:50 +01:00
Laurent Destailleur
ba6f97acbc
Merge pull request #16865 from frederic34/uniformisecomment
...
uniformise comments to remove nested comments
2021-03-20 11:24:39 +01:00
Laurent Destailleur
68f9824f17
Merge pull request #16860 from frederic34/patch-12
...
fix doxygen
2021-03-20 11:24:10 +01:00
Laurent Destailleur
7b7db14473
Fix regression
2021-03-20 11:23:32 +01:00
Laurent Destailleur
996ee2caee
Merge pull request #16856 from aspangaro/14a28
...
FIX SQL Error on v14 fresh install
2021-03-20 11:19:54 +01:00
Laurent Destailleur
0dd49d4022
Merge pull request #16861 from frederic34/patch-13
...
fix doxygen
2021-03-20 11:17:37 +01:00
Laurent Destailleur
ebebce8730
Merge pull request #16862 from frederic34/patch-14
...
fix nested comments
2021-03-20 11:17:29 +01:00
Laurent Destailleur
c058bd9e71
Merge pull request #16863 from frederic34/patch-15
...
fix nested comments
2021-03-20 11:17:13 +01:00
Laurent Destailleur
7b5e5eeaf8
Merge pull request #16864 from frederic34/patch-16
...
fix nested comments
2021-03-20 11:17:03 +01:00
Laurent Destailleur
b3b68d65f2
Merge pull request #16866 from frederic34/patch-17
...
fix doxygen
2021-03-20 11:16:51 +01:00
Laurent Destailleur
824d73d935
Merge pull request #16867 from frederic34/patch-18
...
fix doxygen
2021-03-20 11:16:35 +01:00
Laurent Destailleur
bb57d773e9
Merge pull request #16869 from frederic34/patch-20
...
fix doxygen
2021-03-20 11:16:18 +01:00
Laurent Destailleur
d9f52ea11c
Merge pull request #16870 from frederic34/patch-21
...
fix doxygen
2021-03-20 11:16:00 +01:00
Laurent Destailleur
5f0a2e648b
Merge pull request #16871 from frederic34/patch-19
...
fix doxygen
2021-03-20 11:15:48 +01:00
Laurent Destailleur
685ec0bc63
Merge pull request #16872 from frederic34/patch-22
...
fix doxygen
2021-03-20 11:15:32 +01:00
Laurent Destailleur
3ce4762710
Merge pull request #16873 from frederic34/patch-23
...
fix doxygen
2021-03-20 11:15:22 +01:00
Laurent Destailleur
bc639045c0
Merge pull request #16874 from frederic34/patch-24
...
fix doxygen
2021-03-20 11:15:12 +01:00
Laurent Destailleur
810b15f73a
Merge pull request #16875 from frederic34/patch-25
...
fix doxygen
2021-03-20 11:14:57 +01:00
Laurent Destailleur
1d2b3a0967
Merge pull request #16876 from frederic34/patch-26
...
fix doxygen
2021-03-20 11:12:46 +01:00
Laurent Destailleur
11a7420b59
Merge pull request #16877 from frederic34/patch-27
...
fix doxygen
2021-03-20 11:12:33 +01:00
Laurent Destailleur
a510b52441
Merge pull request #16878 from frederic34/patch-29
...
fix doxygen
2021-03-20 11:12:22 +01:00
Frédéric FRANCE
8142d76394
fix php8 warnings
2021-03-20 10:50:02 +01:00
Frédéric FRANCE
3d3715f55d
fix doxygen
2021-03-20 10:37:51 +01:00
Frédéric FRANCE
81c885dbf1
fix doxygen
2021-03-20 10:36:53 +01:00
Frédéric FRANCE
65c3dced1c
fix doxygen
2021-03-20 10:34:23 +01:00
Frédéric FRANCE
5da597d947
fix doxygen
2021-03-20 10:32:18 +01:00
Frédéric FRANCE
a8d8775328
fix doxygen
2021-03-20 10:30:26 +01:00
Frédéric FRANCE
dad7038a0d
fix doxygen
2021-03-20 10:22:34 +01:00
Frédéric FRANCE
49ff44e414
fix doxygen
2021-03-20 10:21:23 +01:00
Frédéric FRANCE
8af1f278ae
fix doxygen
2021-03-20 10:19:03 +01:00
Frédéric FRANCE
9f02d8cdb1
fix doxygen
2021-03-20 10:15:00 +01:00
Laurent Destailleur
5c3b7a249e
Merge pull request #16868 from frederic34/patch-19
...
Create index.html
2021-03-20 10:14:51 +01:00
Laurent Destailleur
b5264e978b
Merge pull request #16776 from frederic34/boxticket
...
fix php8 warnings
2021-03-20 10:14:34 +01:00
Frédéric FRANCE
0cacdf3320
fix doxygen
2021-03-20 10:11:56 +01:00
Frédéric FRANCE
1bc3301a7f
fix doxygen
2021-03-20 10:10:41 +01:00
Frédéric FRANCE
283cf9b8d2
Create index.html
2021-03-20 10:08:57 +01:00
Frédéric FRANCE
1552c16dd3
fix doxygen
2021-03-20 10:08:22 +01:00
Frédéric FRANCE
a872f6ebd3
fix doxygen
2021-03-20 10:06:59 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Frédéric FRANCE
434f5821f7
fix nested comments
2021-03-20 09:38:21 +01:00
Frédéric FRANCE
ed341197ea
fix nested comments
2021-03-20 09:30:09 +01:00
Frédéric FRANCE
3b673d0acd
fix nested comments
2021-03-20 09:28:21 +01:00
Frédéric FRANCE
53ff22d625
fix doxygen
2021-03-20 09:18:40 +01:00
Frédéric FRANCE
48e1a796e0
fix doxygen
2021-03-20 09:16:38 +01:00
Frédéric FRANCE
1a2b22def4
fix doxygen
2021-03-20 09:14:52 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen
2021-03-20 09:02:29 +01:00
Frédéric FRANCE
e2fcadef4a
fix nested comments for doxygen
2021-03-20 08:59:54 +01:00
Alexandre SPANGARO
0b23ea072b
FIX SQL Error on fresh install
2021-03-20 08:15:16 +01:00
Alexandre SPANGARO
74c4f97040
FIX SQL Error on fresh install
2021-03-20 08:15:05 +01:00
Alexandre SPANGARO
17d3b85ec4
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42
NEW: Add a sub table to manage accountancy on product/company
2021-03-20 07:42:16 +01:00
Frédéric FRANCE
4c5ddc44dc
get conf global function
2021-03-19 17:58:01 +01:00
Frédéric FRANCE
65e4acdb82
fix php8 warnings
2021-03-19 17:23:28 +01:00
Frédéric FRANCE
19079dcae6
fix php8 warning
2021-03-19 17:17:08 +01:00
Frédéric FRANCE
d20e8798e8
fix warning
2021-03-19 17:14:05 +01:00
Frédéric FRANCE
93ae7a3fed
fix php8 warning
2021-03-19 17:01:14 +01:00
Frédéric FRANCE
239dae03bf
fix php8 warnings
2021-03-19 16:57:12 +01:00
Frédéric FRANCE
84b71dbcc8
fix php8 warning
2021-03-19 16:34:17 +01:00
Alexis LAURIER
4a90584ce1
product fournisseur price - clean
2021-03-19 16:07:52 +01:00
Alexis LAURIER
c3366ccd61
remove moved methods and properties from fournisseurproduct
2021-03-19 16:04:07 +01:00
Alexis LAURIER
60086276d9
add product fournisseur price crud class
2021-03-19 15:53:41 +01:00
Laurent Destailleur
3414511d7f
Code position
2021-03-19 15:09:06 +01:00
Laurent Destailleur
7056cf7614
FIX #yogosha5675
2021-03-19 15:05:28 +01:00
Laurent Destailleur
be90f5f2de
Fix id of advanced perm
2021-03-19 15:00:22 +01:00
Laurent Destailleur
a3be3dd0e2
Responsive
2021-03-19 14:46:30 +01:00
Laurent Destailleur
3a9a3b2b3e
FIX #yogosha5665
2021-03-19 14:41:57 +01:00
Laurent Destailleur
1540f62df0
FIX #yogosha5678
2021-03-19 14:25:59 +01:00
Laurent Destailleur
ae7261c0a7
FIX #yogosha5677
2021-03-19 14:12:08 +01:00
Laurent Destailleur
8462c4d3d3
Clean menu
2021-03-19 13:37:43 +01:00
Laurent Destailleur
ff7f1feaae
Fix test on perm
2021-03-19 13:28:04 +01:00
Laurent Destailleur
aef2f1713e
FIX #yogosha5673
2021-03-19 13:25:58 +01:00
Laurent Destailleur
5a4ffc18b9
FIx #yogosha5667
2021-03-19 13:02:55 +01:00
Laurent Destailleur
14611f3f7a
More complete protection for doprev donext, dvprev, dvnext action.
2021-03-19 12:49:28 +01:00
Laurent Destailleur
d83d005284
FIX #yogosha5674
2021-03-19 12:44:59 +01:00
stickler-ci
ba29f327a9
Fixing style errors.
2021-03-19 11:41:27 +00:00
ptibogxiv
a9398e5630
FIx get optionnal in membertype with API
2021-03-19 12:39:38 +01:00
Laurent Destailleur
3df866518d
FIx #yogosha5676
2021-03-19 12:15:46 +01:00
Laurent Destailleur
ebf409f831
FIX #yogosha5668
2021-03-19 12:08:40 +01:00
stickler-ci
08727a86b0
Fixing style errors.
2021-03-19 10:53:06 +00:00
ptibogxiv
d38f7f7dfe
NEW auto notification with templated emails
2021-03-19 11:50:15 +01:00
Regis Houssin
a8ecdc14dd
FIX syntax error
2021-03-19 11:46:57 +01:00
Regis Houssin
5978196e3b
FIX missing current entity id
2021-03-19 11:31:46 +01:00
Regis Houssin
43e1dbb9ef
FIX avoid php8 warning with multicompany
2021-03-19 11:27:31 +01:00
Robin
26dc897042
Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0
...
htdocs/projet/card.php
2021-03-19 11:12:49 +01:00
stickler-ci
ee701bb480
Fixing style errors.
2021-03-19 09:05:20 +00:00
Regis Houssin
a1f6886e97
FIX avoid php8 warning in products list
2021-03-19 10:01:40 +01:00
Robin
d852816101
FIX: fix checkbox displayed according to module project setup parameters
2021-03-19 09:54:11 +01:00
UT from dolibit
91ed200a1f
Update llx_20_c_departements.sql
2021-03-19 09:51:27 +01:00
UT from dolibit
46c23807e9
Update document.php
...
$helpurl -> $help_url
2021-03-19 09:38:33 +01:00
UT from dolibit
b4e929e57f
Update card.php
...
$helpurl -> $help_url
2021-03-19 09:36:49 +01:00
Regis Houssin
b5905bb032
FIX php 8 warning
2021-03-19 09:34:40 +01:00
UT from dolibit
6e6609d876
Update document.php
...
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
2021-03-19 09:33:10 +01:00
UT from dolibit
e5f8ca77a9
Update card.php
...
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
2021-03-19 09:30:28 +01:00
UT from dolibit
953b09adf6
Update viewcat.php
...
$helpurl -> $help_url
2021-03-19 09:27:29 +01:00
UT from dolibit
31e018636d
Update card.php
...
$help_url = 'EN:Module_Categories|FR:Module_Catégories|DE:Modul_Kategorien';
llxHeader("", $langs->trans("Categories"), $help_url);
2021-03-19 09:25:47 +01:00
UT from dolibit
21963dbc65
Update type.php
...
$help_url = '';
llxHeader('', $langs->trans("AssetsTypeSetup"), $help_url);
2021-03-19 09:23:57 +01:00
UT from dolibit
8c59ad974b
Update info.php
...
$help_url = "";
llxHeader('', $title, $help_url);
2021-03-19 09:22:58 +01:00
UT from dolibit
01e4f4bff5
Update document.php
...
$help_url = '';
llxHeader('', $title, $help_url);
2021-03-19 09:20:43 +01:00
UT from dolibit
74de272236
Update type_translation.php
...
$help_url = '';
....
$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Mitglieder';
llxHeader('', $title, $help_url);
2021-03-19 09:19:28 +01:00
UT from dolibit
c0a420bcb7
Update subscription.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:17:24 +01:00
stickler-ci
668deefc9e
Fixing style errors.
2021-03-19 08:16:44 +00:00
UT from dolibit
b17c5b50cd
Update note.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:15:48 +01:00
Frédéric FRANCE
7183bfeb94
fix new boxes add
2021-03-19 09:15:35 +01:00
stickler-ci
e5eddff0a5
Fixing style errors.
2021-03-19 08:15:14 +00:00
UT from dolibit
b0f26ca2ee
Update document.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:14:47 +01:00
UT from dolibit
d76bd583f5
Update agenda.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:13:06 +01:00
UT from dolibit
a0feed2517
Update fiscalyear_info.php
...
$help_url = "EN:Module_Double_Entry_Accounting";
llxHeader('', $title, $help_url);
2021-03-19 09:08:55 +01:00
UT from dolibit
19f7b10e4f
Update fiscalyear_card.php
...
$help_url = "EN:Module_Double_Entry_Accounting";
llxHeader('', $title, $help_url);
2021-03-19 09:07:27 +01:00
UT from dolibit
6713d9b099
Update fiscalyear.php
...
$help_url = "EN:Module_Double_Entry_Accounting";
llxHeader('', $title, $help_url);
2021-03-19 09:05:49 +01:00
Chl
6cf970df8e
FIX #16143 Old PG requires "()" on DROP FUNCTION
...
On PostgreSQL 9.6 and previous, the upgrade script fails with a syntax
error if the dropped function's name is not followed by parentheses.
Patch tested on 9.6 and 13.2.
2021-03-19 03:20:01 +01:00
Laurent Destailleur
bdb78956b7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-19 00:04:57 +01:00
Laurent Destailleur
b9aacca771
Fix css
2021-03-19 00:04:43 +01:00
Laurent Destailleur
b42da41041
Merge pull request #16639 from fbosman/patch-5
...
Update list.php wrong number presentation in stock
2021-03-19 00:01:54 +01:00
Laurent Destailleur
78aec3daae
Removed option MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES. The
...
implmentation did not make any test on subsidiaries. It has same effect
than being an internal user.
2021-03-19 00:00:06 +01:00
Laurent Destailleur
e9f9cf62af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-18 23:59:03 +01:00
Laurent Destailleur
3785346835
Revert " fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject"
2021-03-18 23:57:48 +01:00
Laurent Destailleur
ce4aadba84
Merge branch 'develop' into abb120359
2021-03-18 23:54:27 +01:00
Laurent Destailleur
5ecef1bad3
Merge pull request #16739 from altairisfr/pr_searchbatch
...
NEW Add search on lots or serials into quick search bar
2021-03-18 23:43:23 +01:00
Laurent Destailleur
1fdd9c00d3
Merge pull request #16765 from dolibit-ut/patch-103
...
Update ftpclient.php
2021-03-18 23:42:28 +01:00
Laurent Destailleur
9f0ebf96d0
Merge pull request #16766 from dolibit-ut/patch-104
...
Update card.php
2021-03-18 23:42:20 +01:00
Laurent Destailleur
072ef75f02
Merge pull request #16817 from frederic34/patch-17
...
fix php8 warning
2021-03-18 23:42:10 +01:00
Laurent Destailleur
27c7950417
Fix migration of boxes
2021-03-18 23:39:19 +01:00
daraelmin
529edb167a
merge develop
2021-03-18 23:33:02 +01:00
Frédéric FRANCE
5b253eeb47
fix the fix
2021-03-18 23:30:42 +01:00
daraelmin
e290884552
update subscription and type
2021-03-18 23:23:57 +01:00
Laurent Destailleur
9a5d1acc1d
Merge pull request #16769 from frederic34/patch-4
...
fix php8 warning
2021-03-18 23:20:43 +01:00
Laurent Destailleur
22eb9960fe
Merge pull request #16770 from dolibit-ut/patch-105
...
Update llx_20_c_departements.sql
2021-03-18 23:20:28 +01:00
Laurent Destailleur
49f376bf83
Merge pull request #16768 from frederic34/patch-3
...
fix php8 warning
2021-03-18 23:19:50 +01:00
Laurent Destailleur
5037de49c4
Merge pull request #16773 from frederic34/patch-5
...
fix php8 warning
2021-03-18 23:19:32 +01:00
Laurent Destailleur
b66173a111
Merge pull request #16771 from frederic34/projet_task_stats
...
fix php8 warnings
2021-03-18 23:15:37 +01:00
Laurent Destailleur
dc0482e98c
Merge pull request #16774 from frederic34/php8-fix-functionlib
...
fix php8 warnings
2021-03-18 23:13:12 +01:00
Laurent Destailleur
148abf7546
Merge pull request #16775 from frederic34/patch-7
...
fix php8 warning
2021-03-18 23:12:51 +01:00
daraelmin
071b6a1bdc
Code translation
2021-03-18 23:11:19 +01:00
Laurent Destailleur
0c882739e3
Merge pull request #16777 from frederic34/patch-8
...
fix php8 warning
2021-03-18 23:10:59 +01:00
Laurent Destailleur
63b78af05f
Merge pull request #16778 from frederic34/patch-9
...
fix php8 warning
2021-03-18 23:10:20 +01:00
Laurent Destailleur
d4147afa35
Merge pull request #16779 from frederic34/patch-10
...
fix php8 warning
2021-03-18 23:10:06 +01:00
Laurent Destailleur
1ecb2ed342
Merge pull request #16780 from frederic34/patch-11
...
fix php8 warning
2021-03-18 23:09:54 +01:00
Laurent Destailleur
99f95741d1
Merge pull request #16781 from frederic34/patch-12
...
fix php8 warning
2021-03-18 23:09:22 +01:00
Frédéric FRANCE
bd44658cbd
fix php8 warning
2021-03-18 23:09:13 +01:00
Laurent Destailleur
50b7096cd7
Merge pull request #16782 from frederic34/patch-13
...
fix php8 warning
2021-03-18 23:08:57 +01:00
Laurent Destailleur
2fa1790fe9
Merge pull request #16784 from frederic34/patch-15
...
fix php8 warning
2021-03-18 23:08:31 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin
...
fix php8 warning
2021-03-18 23:08:15 +01:00
Laurent Destailleur
71b89f4bde
Merge pull request #16786 from frederic34/patch-16
...
fix php8 warning
2021-03-18 23:07:51 +01:00
Laurent Destailleur
e5b72ba52f
Merge pull request #16787 from frederic34/admincron
...
fix php8 warnings
2021-03-18 23:07:39 +01:00
Laurent Destailleur
c17e1ac67b
Merge pull request #16816 from frederic34/patch-24
...
fix php8 warning
2021-03-18 23:05:35 +01:00
Laurent Destailleur
3522af926a
Merge pull request #16799 from AlexisLaurier/addInvoiceListHook
...
invoice list - add new standard hooks
2021-03-18 22:58:18 +01:00
Laurent Destailleur
ebd79afa6f
Merge pull request #16788 from frederic34/patch-17
...
fix php8 warning
2021-03-18 22:57:57 +01:00
Laurent Destailleur
43494df56c
Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice
...
add invoice getNomUrl hook
2021-03-18 22:57:37 +01:00
Laurent Destailleur
319fe108fc
Merge pull request #16811 from frederic34/patch-19
...
fix php8 warning
2021-03-18 22:53:56 +01:00
Laurent Destailleur
f78b4b903d
Merge pull request #16795 from frederic34/patch-18
...
fix php7.4 php8 warning when upgrade reloads modules
2021-03-18 22:53:44 +01:00
Laurent Destailleur
599b65eafe
Merge pull request #16801 from frederic34/ecm_user_create_statut
...
fix php8 warning
2021-03-18 22:53:21 +01:00
Laurent Destailleur
725439c5e7
Merge pull request #16806 from dolibit-ut/patch-110
...
Update create.php
2021-03-18 22:52:34 +01:00
Laurent Destailleur
f0901b90ec
Merge pull request #16813 from frederic34/patch-21
...
fix php8 warning
2021-03-18 22:52:26 +01:00
Laurent Destailleur
4c9e4ab213
Merge pull request #16812 from frederic34/patch-20
...
fix php8 warning
2021-03-18 22:52:03 +01:00
Laurent Destailleur
7cbde7f4fb
Merge pull request #16803 from dolibit-ut/patch-107
...
Update card.php
2021-03-18 22:51:49 +01:00
Laurent Destailleur
d90a739c86
Merge pull request #16802 from dolibit-ut/patch-106
...
Update productlot_list.php
2021-03-18 22:51:41 +01:00
Laurent Destailleur
45618c56e6
Merge pull request #16804 from dolibit-ut/patch-108
...
Update massstockmove.php
2021-03-18 22:51:33 +01:00
Laurent Destailleur
74506232e4
Merge pull request #16805 from dolibit-ut/patch-109
...
Update card.php
2021-03-18 22:51:23 +01:00
Laurent Destailleur
c2f2fefbd9
Merge pull request #16807 from dolibit-ut/patch-111
...
Update create_val.php
2021-03-18 22:51:12 +01:00
Laurent Destailleur
017232f5ef
Merge pull request #16808 from dolibit-ut/patch-112
...
Update workstation_card.php
2021-03-18 22:51:03 +01:00
Laurent Destailleur
9e8c2a5c4c
Merge pull request #16809 from dolibit-ut/patch-113
...
Update type.php
2021-03-18 22:50:54 +01:00
Laurent Destailleur
55367f2000
Merge pull request #16810 from dolibit-ut/patch-114
...
Update card.php
2021-03-18 22:50:44 +01:00
Laurent Destailleur
172cb02b4a
Merge pull request #16814 from frederic34/patch-22
...
fix php8 warning
2021-03-18 22:50:31 +01:00
Frédéric FRANCE
a400559342
fix php8 warning
2021-03-18 22:44:58 +01:00
Frédéric FRANCE
0d67f68174
Update card.php
2021-03-18 22:36:17 +01:00
Frédéric FRANCE
181436f279
fix php8 warning
2021-03-18 22:31:41 +01:00
Frédéric FRANCE
ba33bc8eac
fix php8 warning
2021-03-18 22:29:08 +01:00
Frédéric FRANCE
8423bd676c
fix php8 warning
2021-03-18 22:26:14 +01:00
Frédéric FRANCE
d2ce3b2d60
fix php8 warning
2021-03-18 22:19:58 +01:00
Frédéric FRANCE
37fcaf2a57
fix php8 warning
2021-03-18 22:07:35 +01:00
UT from dolibit
569d33392d
Update card.php
...
change $helpurl -> $help_url
$help_url = 'EN:Category:Accounting';
2021-03-18 21:49:29 +01:00
Laurent Destailleur
4e3e2a23bc
More complete fix for #yogosha5644
2021-03-18 21:22:50 +01:00
UT from dolibit
972d162c5e
Update type.php
...
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
2021-03-18 21:16:44 +01:00
Frédéric FRANCE
b584adf299
fix project replace projet
2021-03-18 21:10:55 +01:00
UT from dolibit
88ec31c042
Update workstation_card.php
...
$help_url = 'EN:Module_Workstation';
2021-03-18 21:09:18 +01:00
Laurent Destailleur
9ba568eb25
Fix security check
2021-03-18 20:57:50 +01:00
UT from dolibit
8844f4fda9
Update create_val.php
...
$help_url = 'EN:Module_Products#Variants';
llxHeader('', $title, $help_url);
2021-03-18 20:57:09 +01:00
Frédéric FRANCE
e7ad9f1290
fix project replace projet
2021-03-18 20:55:47 +01:00
UT from dolibit
b7aed07284
Update create.php
...
$help_url = 'EN:Module_Products#Variants';
llxHeader('', $title, $help_url);
2021-03-18 20:55:41 +01:00
UT from dolibit
3ca9bee5de
Update card.php
...
$help_url = 'EN:Module_Products#Variants';
llxHeader('', $title, $help_url);
2021-03-18 20:52:24 +01:00
Frédéric FRANCE
c43d3dff92
fix project replace projet
2021-03-18 20:51:40 +01:00
Laurent Destailleur
d881c73e58
Fix #yogosha5664
2021-03-18 20:44:53 +01:00
Laurent Destailleur
e318a84940
Fix #yogosha5664
2021-03-18 20:38:19 +01:00
UT from dolibit
daa8c1e00f
Update massstockmove.php
...
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks|DE:Modul_Bestände';
llxHeader('', $title, $help_url);
2021-03-18 20:38:08 +01:00
UT from dolibit
82f16086be
Update card.php
...
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks|DE:Modul_Bestände';
2021-03-18 20:34:38 +01:00
UT from dolibit
3aed47c1db
Update productlot_list.php
...
$help_url = 'EN:Module_Lot_/_Serial|FR:Module_Lot_/_Série';
2021-03-18 20:32:11 +01:00
Laurent Destailleur
461d748f97
Fix #yogosha235
2021-03-18 20:27:36 +01:00
Frédéric FRANCE
3380f740e5
need to clean glasses
2021-03-18 18:56:28 +01:00
Frédéric FRANCE
f810fffc01
fix php8 wzrning
2021-03-18 18:50:38 +01:00
Florian HENRY
df4a243f18
fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature
2021-03-18 17:13:34 +01:00
Alexandre SPANGARO
18d247026d
NEW: Add a sub table to manage product/societe
2021-03-18 17:08:55 +01:00
Alexis LAURIER
5b72193f0d
invoice list - ajust hooks
2021-03-18 17:06:49 +01:00
Alexis LAURIER
ada5d728b5
invoice list - ajust hooks
2021-03-18 17:00:57 +01:00
Alexis LAURIER
06bc999614
Add group by and having hooks on invoice list
2021-03-18 16:51:02 +01:00
Alexis LAURIER
c3f8e0e397
invoice list - add new standard hook
2021-03-18 16:21:54 +01:00
Laurent Destailleur
640f5f6051
FIx #yogosha5661
2021-03-18 14:41:48 +01:00
Laurent Destailleur
46972ec669
FIx #5660
2021-03-18 14:34:44 +01:00
Frédéric FRANCE
1b4b48a634
fix php8 warning when upgrade reloads modules
2021-03-18 13:18:50 +01:00
Laurent Destailleur
8d19c57731
Add fields to know authentication method used
2021-03-18 12:54:49 +01:00
Laurent Destailleur
d2ef4b0506
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/bankentries_list.php
htdocs/opensurvey/card.php
htdocs/opensurvey/index.php
htdocs/opensurvey/results.php
2021-03-18 12:24:34 +01:00
Laurent Destailleur
03941a59af
Clean code
2021-03-18 12:21:35 +01:00
Laurent Destailleur
af340ec133
Fix #yogosha5657
2021-03-18 12:18:38 +01:00
Laurent Destailleur
e37e0399e5
Fix bad message
2021-03-18 12:10:23 +01:00
Laurent Destailleur
c58ed98347
Removed deprecated images
2021-03-18 12:04:24 +01:00
Laurent Destailleur
ac6b6f22e7
Enhance sanitizing of data
2021-03-18 11:39:23 +01:00
Alexis LAURIER
b416223194
fix
2021-03-18 11:16:49 +01:00
Alexis LAURIER
c33347b461
add invoice getNomUrl hook
2021-03-18 11:10:43 +01:00
Robin
b3757a6f69
FIX: fix checkbox displayed according to module project setup parameters - work in progress
2021-03-18 11:07:48 +01:00
Frédéric FRANCE
39acef8df7
Update card.php
2021-03-18 08:26:47 +01:00
Frédéric FRANCE
c147d47ad9
fix php8 warning
2021-03-18 08:23:06 +01:00
Frédéric FRANCE
0769c8ee22
fix php8 warnings
2021-03-18 08:16:28 +01:00
Frédéric FRANCE
7878f3cba0
fix php8 warning
2021-03-18 08:08:37 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning
2021-03-17 23:55:46 +01:00
Frédéric FRANCE
efe75b5d0d
fix php8 warning
2021-03-17 23:45:48 +01:00
Frédéric FRANCE
ca8884b5ec
fix php8 warning
2021-03-17 22:53:01 +01:00
Frédéric FRANCE
f9e1624a78
fix php8 warning
2021-03-17 22:41:18 +01:00
Frédéric FRANCE
22ac6c79b3
fix php8 warning
2021-03-17 22:29:33 +01:00
Frédéric FRANCE
8ab8043557
fix php8 warning
2021-03-17 22:27:39 +01:00
Frédéric FRANCE
00cd4cd953
fix php8 warning
2021-03-17 22:19:40 +01:00
Frédéric FRANCE
da3fcf3ca5
fix php8 warning
2021-03-17 22:16:54 +01:00
Laurent Destailleur
31478d5ac0
Look and feel v14
2021-03-17 22:01:25 +01:00
Frédéric FRANCE
0080d42b66
fix php8 warnings
2021-03-17 21:49:05 +01:00
Laurent Destailleur
35869f1449
Add function dol_string_onlythesehtmlattributes() and option
...
MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to enable it.
2021-03-17 21:39:28 +01:00
Frédéric FRANCE
afafe81d8a
fix php8 warning
2021-03-17 21:36:47 +01:00
Frédéric FRANCE
9609c3095a
fix php8 warnings
2021-03-17 20:13:20 +01:00
Frédéric FRANCE
fced63e93b
fix php8 warning
2021-03-17 20:11:22 +01:00
Laurent Destailleur
11427cd49c
Add filter onloadend into WAF
2021-03-17 19:41:59 +01:00
Laurent Destailleur
3fab4696ae
Fix test on token is not done for login page.
2021-03-17 19:27:15 +01:00
Laurent Destailleur
73e55f1b73
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-17 18:44:47 +01:00
Frédéric FRANCE
a420d0acbd
fix php8 warnings
2021-03-17 18:40:11 +01:00
Frédéric FRANCE
efaa2be3b8
fix php8 warnings
2021-03-17 18:38:24 +01:00
UT from dolibit
e33c035218
Update llx_20_c_departements.sql
2021-03-17 18:27:20 +01:00
Laurent Destailleur
0da5c89973
Look and feel v14
2021-03-17 18:24:37 +01:00
Frédéric FRANCE
340f67fce8
fix php8 warning
2021-03-17 18:23:44 +01:00
Frédéric FRANCE
432131ddc7
fix php8 warning
2021-03-17 18:21:07 +01:00
UT from dolibit
373e225dd0
Update card.php
...
translations of comments (fr->en)
----------------------------------------------------
insert:
$help_url = 'EN:Module_Holiday';
llxHeader('', $langs->trans('CPTitreMenu'), $help_url);
--------------------------------------------------------------------
start creatrion of
https://wiki.dolibarr.org/index.php/Module_Holiday
2021-03-17 18:17:03 +01:00
UT from dolibit
18ef8031cd
Update ftpclient.php
...
$help_url = 'EN:Module_FTP_En|FR:Module_FTP|ES:Módulo_FTP';
llxHeader('', 'FTP', $help_url);
2021-03-17 17:57:07 +01:00
Laurent Destailleur
24576897ef
Merge pull request #16750 from frederic34/restrictiononfksoc
...
fix php8 warnings
2021-03-17 17:05:23 +01:00
Laurent Destailleur
48e9b8c796
Merge pull request #16738 from dolibit-ut/patch-99
...
Update card.php
2021-03-17 17:04:30 +01:00
Laurent Destailleur
df6ce2fe4a
Merge pull request #16737 from dolibit-ut/patch-98
...
Update setup.php
2021-03-17 17:04:20 +01:00
Laurent Destailleur
b5b86d794f
Merge pull request #16740 from dolibit-ut/patch-100
...
Update dav.php
2021-03-17 17:04:07 +01:00
Laurent Destailleur
b2dc72e9b7
Merge pull request #16748 from frederic34/memberstats
...
fix php8 warnings
2021-03-17 17:02:41 +01:00
Laurent Destailleur
e0512fafbd
Merge pull request #16745 from frederic34/patch-7
...
fix php8 warnings
2021-03-17 17:02:07 +01:00
Laurent Destailleur
84b7588438
Merge pull request #16751 from frederic34/agenda_ext
...
fix php8 warnings
2021-03-17 17:01:40 +01:00
Laurent Destailleur
704b8386ba
Merge pull request #16752 from frederic34/patch-11
...
fix php8 warnings
2021-03-17 17:01:07 +01:00
Laurent Destailleur
1f9d4eca3d
Merge pull request #16746 from frederic34/patch-8
...
fix php8 warnings
2021-03-17 17:00:22 +01:00
Laurent Destailleur
7c0b22fd80
Merge pull request #16747 from frederic34/patch-9
...
fix unknown var
2021-03-17 16:58:59 +01:00
Laurent Destailleur
35b0b0a82e
Merge pull request #16736 from dolibit-ut/patch-97
...
Update card.php
2021-03-17 16:58:42 +01:00
Laurent Destailleur
81f8b7f304
Merge pull request #16741 from frederic34/patch-3
...
fix typo
2021-03-17 16:58:21 +01:00
Laurent Destailleur
8829d42e1d
Merge pull request #16742 from frederic34/fix-php8-20210306
...
Fix php8
2021-03-17 16:58:05 +01:00
Laurent Destailleur
31ecffdbfb
Merge pull request #16744 from frederic34/patch-5
...
fix php8 warnings
2021-03-17 16:57:01 +01:00
Laurent Destailleur
b5e5bdbd60
Merge pull request #16743 from frederic34/patch-4
...
fix php8
2021-03-17 16:56:49 +01:00
Laurent Destailleur
1a1202953a
Merge pull request #16749 from frederic34/patch-10
...
doxygen
2021-03-17 16:56:30 +01:00
Laurent Destailleur
09f8ccd882
Merge pull request #16753 from frederic34/patch-12
...
fix php8 warning
2021-03-17 16:56:10 +01:00
Laurent Destailleur
1e402f9ea2
Merge pull request #16754 from frederic34/patch-13
...
fix php8 warnings
2021-03-17 16:55:54 +01:00
Laurent Destailleur
9cbb2e8d42
Merge pull request #16755 from frederic34/patch-14
...
fix php7 php8 warning
2021-03-17 16:52:07 +01:00
Laurent Destailleur
1e93091a22
Merge pull request #16757 from dolibit-ut/patch-101
...
Update llx_10_c_regions.sql
2021-03-17 16:51:37 +01:00
Laurent Destailleur
9d18be0e6f
Merge pull request #16758 from dolibit-ut/patch-102
...
Update llx_20_c_departements.sql
2021-03-17 16:51:10 +01:00
Laurent Destailleur
36cb213a83
Merge pull request #16764 from hregis/fix_php_8_warning_again
...
FIX avoid php 8.x warning
2021-03-17 16:50:21 +01:00
Laurent Destailleur
33c3b9d1a3
Merge pull request #16763 from hregis/fix_avoid_php_8_warning
...
FIX avoid php 8 warning
2021-03-17 16:50:08 +01:00
Laurent Destailleur
f1bc296b6c
Merge pull request #16762 from hregis/fix_avoid_warnin_php_8
...
FIX avoid warning with php 8
2021-03-17 16:49:55 +01:00
Regis Houssin
4d149dc3fe
FIX avoid php 8.x warning
2021-03-17 15:15:51 +01:00
Regis Houssin
5fc40f2b12
FIX avoid php 8 warning
2021-03-17 14:32:25 +01:00
Regis Houssin
bb4c8d9114
FIX avoid warning with php 8
2021-03-17 12:48:59 +01:00
Laurent Destailleur
1685e1be79
Fix to keep tms not updated
2021-03-17 12:39:29 +01:00
Laurent Destailleur
8de1b4c94e
Factorize code
2021-03-17 11:34:19 +01:00
Laurent Destailleur
bd58e96430
Fix position of param
2021-03-17 11:12:30 +01:00
UT from dolibit
7a1f81f521
Update llx_20_c_departements.sql
2021-03-17 09:10:07 +01:00
UT from dolibit
c24e3006c0
Update llx_10_c_regions.sql
2021-03-17 08:46:31 +01:00
Frédéric FRANCE
11a6961c13
fix php8 warning
2021-03-16 23:02:28 +01:00
Frédéric FRANCE
ff690861c4
fix php8 warnings
2021-03-16 22:50:14 +01:00
Frédéric FRANCE
dde51a23f0
fix php8 warning
...
sometimes $size == '' and cause warnings later in the code
2021-03-16 22:01:59 +01:00
Frédéric FRANCE
567a65b44d
fix php8 warnings
2021-03-16 21:41:11 +01:00
Frédéric FRANCE
6cbb400d0c
fix php8 warnings
2021-03-16 21:28:56 +01:00
Frédéric FRANCE
4e8ea5c07e
fix php8 warnings
2021-03-16 21:13:15 +01:00
Laurent Destailleur
22ed95a629
Look and feel v14
2021-03-16 19:09:56 +01:00
Frédéric FRANCE
3de108aea2
doxygen
2021-03-16 19:07:07 +01:00
Laurent Destailleur
26dc3ef1b0
FIX Filter on debit/credit
...
Conflicts:
htdocs/compta/bank/bankentries_list.php
2021-03-16 18:59:28 +01:00
Laurent Destailleur
9ea7c92b1b
FIX Filter on debit/credit
2021-03-16 18:56:10 +01:00
Frédéric FRANCE
bdae679463
fix php8 warnings
2021-03-16 18:42:35 +01:00
Frédéric FRANCE
d4ad9294c4
fix unknown var
2021-03-16 18:32:10 +01:00
Frédéric FRANCE
519b08b782
fix php8 warnings
2021-03-16 18:25:25 +01:00
Frédéric FRANCE
aefc3bcef8
fix php8 warnings
2021-03-16 18:13:02 +01:00
Frédéric FRANCE
7b8d1abfcf
fix php8 warnings
2021-03-16 18:04:51 +01:00
Frédéric FRANCE
dc39a68b58
fix php8
2021-03-16 17:50:43 +01:00
Frédéric FRANCE
e1ad7013d9
fix php8
2021-03-16 17:47:24 +01:00
Frédéric FRANCE
358dcff0cf
fix php8
2021-03-16 17:38:12 +01:00
Frédéric FRANCE
29f55fbeac
fix typo
2021-03-16 17:12:31 +01:00
UT from dolibit
a18e27688d
Update dav.php
...
$help_url = 'EN:Module_DAV';
llxHeader('', $langs->trans("DAVSetup"), $help_url);
2021-03-16 16:54:58 +01:00
Christophe Battarel
f59c19b573
search on lots or serials
2021-03-16 16:50:59 +01:00
UT from dolibit
e1ddeb1e41
Update card.php
...
$help_url = 'EN:Module_Ticket|
2021-03-16 16:44:33 +01:00
UT from dolibit
eedf76dd46
Update setup.php
...
$help_url = 'EN:Module_Point_of_sale_(TakePOS)';
llxHeader('', $langs->trans("CashDeskSetup"), $help_url);
2021-03-16 16:40:25 +01:00
UT from dolibit
a65f4e5990
Update card.php
...
$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
llxHeader('', $langs->trans('CommRequests'), $help_url);
2021-03-16 16:35:35 +01:00
Laurent Destailleur
8246eb814b
Enhance the page for security advices
2021-03-16 16:02:15 +01:00
Laurent Destailleur
17031fdad8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-16 15:16:01 +01:00
Laurent Destailleur
0e645aefbd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-16 15:15:50 +01:00
Laurent Destailleur
59174315ae
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-16 15:15:12 +01:00
Laurent Destailleur
a29a9e5435
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-16 15:14:46 +01:00
Laurent Destailleur
dd2f1a547d
Merge pull request #16733 from dolibit-ut/patch-96
...
Update import.php
2021-03-16 15:13:57 +01:00
Laurent Destailleur
07ab1b5a43
Merge pull request #16732 from dolibit-ut/patch-95
...
Update card.php
2021-03-16 15:13:46 +01:00
Laurent Destailleur
84042abf5f
Merge pull request #16731 from dolibit-ut/patch-94
...
Update index.php
2021-03-16 15:13:35 +01:00
Laurent Destailleur
03f6201bdf
Merge pull request #16728 from dolibit-ut/patch-91
...
Update card.php
2021-03-16 15:13:27 +01:00
Laurent Destailleur
f33acb1a9b
Merge pull request #16729 from dolibit-ut/patch-92
...
Update card.php
2021-03-16 15:13:17 +01:00
Laurent Destailleur
88321d2778
Merge pull request #16730 from dolibit-ut/patch-93
...
Update card.php
2021-03-16 15:13:07 +01:00
Laurent Destailleur
bb76b3a9be
Merge pull request #16727 from dolibit-ut/patch-90
...
Update card.php
2021-03-16 15:12:56 +01:00
Laurent Destailleur
2b7a167615
Merge pull request #16726 from dolibit-ut/patch-89
...
Update card.php
2021-03-16 15:12:38 +01:00
Laurent Destailleur
66bbc7f54f
Merge pull request #16734 from AlexisLaurier/11.0
...
correct nb_expedition count
2021-03-16 15:12:18 +01:00
Alexis LAURIER
971b97d78f
correct nb_expedition count
2021-03-16 15:00:46 +01:00
Laurent Destailleur
e366d2c379
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
2021-03-16 14:57:04 +01:00
Laurent Destailleur
f514dec6ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
2021-03-16 14:50:06 +01:00
Laurent Destailleur
3a3c0bad2f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-16 14:46:15 +01:00
Laurent Destailleur
95ede60de2
Fix css
2021-03-16 14:46:00 +01:00
UT from dolibit
914702fa8f
Update import.php
...
$help_url = 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones';
use of $help_url
2021-03-16 14:00:25 +01:00
UT from dolibit
e35dc732e2
Update card.php
...
$help_url = 'EN:Module_Interventions';
llxHeader('', $langs->trans("Intervention"), $help_url);
2021-03-16 13:49:34 +01:00
UT from dolibit
272bf984a1
Update index.php
...
$help_url = 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones';
llxHeader('', $langs->trans("ExportsArea"), $help_url);
2021-03-16 13:45:33 +01:00
UT from dolibit
edd7de7abf
Update card.php
...
changed: $helpurl to $help-url
add: FR:Module_Notes_de_frais
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
llxHeader("", $title, $help_url);
2021-03-16 13:42:30 +01:00
UT from dolibit
d4777e76be
Update card.php
...
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';
llxHeader('', $langs->trans('Shipment'), 'Expedition', $help_url);
2021-03-16 13:38:46 +01:00
UT from dolibit
1e2093ebb3
Update card.php
...
$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones';
llxHeader('', $langs->trans("Donation"), $help_url);
2021-03-16 13:32:38 +01:00
UT from dolibit
59f581bc71
Update card.php
...
add: $help_url = 'EN:Module_Contracts|FR:Module_Contrat';
changed: llxHeader('', $langs->trans("Contract"), $help_url);
2021-03-16 13:28:46 +01:00
UT from dolibit
6157fd4c79
Update card.php
...
$help_url add -> DE:Modul_Geschäftspartner
2021-03-16 13:16:03 +01:00
Bahfir Abbes
9c51e62d0f
Update security.lib.php
...
MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES
2021-03-16 12:25:17 +01:00
Laurent Destailleur
9a474602a8
Fix #yogosha5644
2021-03-16 11:58:03 +01:00
Laurent Destailleur
882a9c0792
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-16 10:59:17 +01:00
Laurent Destailleur
1495630254
Fix #yogosha5645
2021-03-16 10:59:01 +01:00
Laurent Destailleur
efaeeb2d06
Merge pull request #16701 from dolibit-ut/patch-82
...
Update card.php
2021-03-16 10:43:08 +01:00
Laurent Destailleur
017120f017
Merge pull request #16697 from frederic34/patch-3
...
fix syntax
2021-03-16 10:42:49 +01:00
Laurent Destailleur
7bbcb62795
Merge pull request #16695 from dolibit-ut/patch-79
...
Update hook_document.php
2021-03-16 10:42:28 +01:00
Laurent Destailleur
9aa72e8c06
Update hook_document.php
2021-03-16 10:42:15 +01:00
Laurent Destailleur
1f4a3dee5f
Merge pull request #16696 from dolibit-ut/patch-80
...
Update list.php
2021-03-16 10:40:13 +01:00
Laurent Destailleur
57481bdb88
Merge pull request #16699 from dolibit-ut/patch-81
...
Update index.php
2021-03-16 10:39:43 +01:00
Laurent Destailleur
71e7f10a54
FIX #16698
2021-03-16 10:39:10 +01:00
Laurent Destailleur
9480e15755
Merge pull request #16703 from dolibit-ut/patch-84
...
Update card.php
2021-03-16 10:37:07 +01:00
Laurent Destailleur
a733275559
Merge pull request #16702 from dolibit-ut/patch-83
...
Update card.php
2021-03-16 10:36:53 +01:00
Laurent Destailleur
3c3bb67e51
Merge pull request #16704 from dolibit-ut/patch-85
...
Update card.php
2021-03-16 10:36:39 +01:00
Laurent Destailleur
26931a7e52
Merge pull request #16705 from dolibit-ut/patch-86
...
Update card.php
2021-03-16 10:36:27 +01:00
Laurent Destailleur
87ab711a0f
Merge pull request #16707 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-16 10:34:55 +01:00
Laurent Destailleur
310b03b770
Merge pull request #16710 from frederic34/patch-7
...
fix php8 warnings
2021-03-16 10:34:15 +01:00
Laurent Destailleur
a357ab0ee7
Merge pull request #16708 from frederic34/patch-4
...
fix php8 warning
2021-03-16 10:34:02 +01:00
Laurent Destailleur
bcf7fa1fc8
Merge pull request #16711 from frederic34/patch-8
...
fix php8 warnings
2021-03-16 10:33:21 +01:00
Laurent Destailleur
897f4be033
Merge pull request #16712 from frederic34/patch-9
...
fix php8 warnings
2021-03-16 10:33:01 +01:00
Laurent Destailleur
401aeb8a7f
Merge pull request #16706 from frederic34/htmlforcc
...
decompose code
2021-03-16 10:32:44 +01:00
Laurent Destailleur
462164a5a8
Merge pull request #16709 from frederic34/patch-5
...
fix php8 warnings
2021-03-16 10:31:53 +01:00
Laurent Destailleur
ccedc0f7fb
Merge pull request #16713 from frederic34/patch-10
...
fix php8 warning
2021-03-16 10:31:37 +01:00
Laurent Destailleur
aa2758d00e
Merge pull request #16714 from frederic34/patch-11
...
fix php8 warning
2021-03-16 10:31:23 +01:00
Laurent Destailleur
8a23d515e9
Merge pull request #16715 from frederic34/patch-12
...
fix php8 warning
2021-03-16 10:31:09 +01:00
Laurent Destailleur
c84395281e
Merge pull request #16716 from frederic34/patch-13
...
fix php8 warning
2021-03-16 10:30:54 +01:00
Laurent Destailleur
a0eb67ade5
Merge pull request #16720 from frederic34/patch-14
...
Update conferenceorbooth_list.php
2021-03-16 10:30:42 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25
...
Translation "Generated documents"
2021-03-16 10:25:31 +01:00
Laurent Destailleur
aba4af85a5
Merge pull request #16722 from aspangaro/14a26
...
Uniformize translation
2021-03-16 10:24:42 +01:00
Laurent Destailleur
66a820ee15
Merge pull request #16718 from dolibit-ut/patch-88
...
Update llx_c_tva.sql
2021-03-16 10:24:08 +01:00
Laurent Destailleur
03f79a88c6
Merge pull request #16717 from dolibit-ut/patch-87
...
Update llx_c_format_cards.sql
2021-03-16 10:23:36 +01:00
Laurent Destailleur
a9b2eeae37
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-16 10:20:30 +01:00
Laurent Destailleur
39849de96e
Look and feel v14
2021-03-16 10:19:56 +01:00
Florian HENRY
9d8254eff4
fix price output in commoncard
2021-03-16 09:59:45 +01:00
Alexandre SPANGARO
6960f0dc25
Uniformize translation
2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197
Uniformize translation
2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
f8703a0691
Translation "Generated documents"
2021-03-16 04:04:33 +01:00
Alexandre SPANGARO
4fd24c6855
Translation "Generated documents"
2021-03-16 04:04:18 +01:00
Alexandre SPANGARO
6e17a588bb
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-16 03:26:28 +01:00
Frédéric FRANCE
4714e03848
Update conferenceorbooth_list.php
2021-03-15 22:37:51 +01:00
UT from dolibit
7d9022b71d
Update llx_c_tva.sql
...
-- EN:
-- VAT - value-added tax
-- Source: https://en.wikipedia.org/wiki/Value-added_tax
2021-03-15 21:56:21 +01:00
UT from dolibit
dcce376f4c
Update llx_c_format_cards.sql
2021-03-15 21:50:43 +01:00
Frédéric FRANCE
89219fe7fa
fix php8 warning
2021-03-15 21:13:15 +01:00
Frédéric FRANCE
50cd8274a5
fix php8 warning
2021-03-15 21:07:30 +01:00
Frédéric FRANCE
2d741a33f0
fix php8 warning
2021-03-15 21:03:54 +01:00
Frédéric FRANCE
0b1e31e7a7
fix php8 warning
2021-03-15 20:58:35 +01:00
Frédéric FRANCE
f7d43ce4fb
fix php8 warnings
2021-03-15 20:55:59 +01:00
Frédéric FRANCE
6abe96289f
fix php8 warnings
2021-03-15 20:50:14 +01:00
Frédéric FRANCE
bd021e9031
fix php8 warnings
2021-03-15 20:34:22 +01:00
Frédéric FRANCE
a0e6f454ff
fix php8 warnings
2021-03-15 20:31:55 +01:00
Frédéric FRANCE
c437b2d5c9
fix php8 warning
...
Undefined property: stdClass::$fin_validite
Undefined property: stdClass::$date_cloture
$dateterm, $dateclose, $late not used
2021-03-15 20:28:37 +01:00
Florian HENRY
177a6bfe4f
conference or booth card and list ok
2021-03-15 20:20:53 +01:00
Frédéric FRANCE
e89cfc3753
decompose code
2021-03-15 20:17:01 +01:00
UT from dolibit
7b8d2e55b7
Update card.php
...
$helpurl = "EN:Module_Banks_and_Cash";
2021-03-15 19:46:51 +01:00
UT from dolibit
94802346cf
Update card.php
...
add DE:Modul_Kundenaufträge
2021-03-15 19:44:00 +01:00
UT from dolibit
9eb87ab43a
Update card.php
...
$help_url add -> DE:Modul_Angebot
2021-03-15 19:28:48 +01:00
UT from dolibit
1d11dfd468
Update card.php
...
$help_url add -> DE:Modul_Geschäftspartner
2021-03-15 19:24:49 +01:00
UT from dolibit
884859d649
Update card.php
...
$helpurl = 'EN:Module_Categories|FR:Module_Catégories';
two translations of comments
2021-03-15 19:08:02 +01:00
Florian HENRY
cdf5d2399a
fix warning
2021-03-15 19:07:40 +01:00
UT from dolibit
83af43afdb
Update index.php
2021-03-15 18:58:47 +01:00
Frédéric FRANCE
910b4f1daf
Update html.formmail.class.php
2021-03-15 18:58:35 +01:00
Frédéric FRANCE
dd4b8f2880
Update html.formmail.class.php
2021-03-15 18:22:50 +01:00
Juanjo Menent
76cf3da449
FIX: Cannot delete a batch material from item receipts
2021-03-15 18:10:59 +01:00
Florian HENRY
17c49e6ce9
ongoinf card and list
2021-03-15 18:06:23 +01:00
Frédéric FRANCE
bde33fb6a3
fix syntax
2021-03-15 17:36:31 +01:00
Laurent Destailleur
f0d3c19d51
Merge pull request #16690 from dolibit-ut/patch-75
...
Update card.php
2021-03-15 17:17:35 +01:00
Laurent Destailleur
765fdff871
Merge pull request #16689 from dolibit-ut/patch-74
...
Update thirdparty_lettering_supplier.php
2021-03-15 17:17:21 +01:00
Laurent Destailleur
654d8a82c4
Merge pull request #16688 from dolibit-ut/patch-73
...
Update thirdparty_lettering_customer.php
2021-03-15 17:17:03 +01:00
Laurent Destailleur
dfda1bfa0d
Merge pull request #16686 from frederic34/patch-5
...
fix php8 warning
2021-03-15 17:16:52 +01:00
Laurent Destailleur
62d1170771
Merge pull request #16685 from frederic34/patch-4
...
fix php8 warning
2021-03-15 17:16:40 +01:00
Laurent Destailleur
9d874b1947
Merge pull request #16691 from dolibit-ut/patch-76
...
Update adherent.php
2021-03-15 17:15:24 +01:00
Laurent Destailleur
27605588ed
Merge pull request #16694 from dolibit-ut/patch-78
...
Update barcode.php
2021-03-15 17:15:10 +01:00
Laurent Destailleur
032d0982e9
Merge pull request #16693 from dolibit-ut/patch-77
...
Update card.php
2021-03-15 17:14:56 +01:00
Laurent Destailleur
1e323b302e
Merge pull request #16684 from frederic34/patch-3
...
fix php8 warning
2021-03-15 17:14:42 +01:00
UT from dolibit
b34982866f
Update list.php
...
$help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:Módulo_Usuarios|DE:Modul_Benutzer';
2021-03-15 16:58:59 +01:00
UT from dolibit
3e24d455b7
Update hook_document.php
...
add $help_url = 'EN:Hooks_system|FR:Système_de_Hooks';
delete //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
2021-03-15 16:55:02 +01:00
UT from dolibit
a131d9be63
Update barcode.php
...
$help_url add -> DE:Modul_Barcode
2021-03-15 16:19:29 +01:00
UT from dolibit
032ffc657f
Update card.php
...
at $helpurl add -> DE:Modul_Produkte
at $helpurl add -> DE:Modul_Leistungen
2021-03-15 16:03:56 +01:00
UT from dolibit
2040596b8c
Update adherent.php
...
-> $help_url add 'DE:Modul_Mitglieder'
2021-03-15 15:46:43 +01:00
UT from dolibit
d7e930fe63
Update card.php
...
-> $help_url add 'DE:Modul_Mitglieder'
2021-03-15 15:44:29 +01:00
UT from dolibit
4923bb3577
Update thirdparty_lettering_supplier.php
...
-> $help_url add 'DE:Modul_Geschäftspartner'
2021-03-15 15:40:58 +01:00
UT from dolibit
15f9d07d57
Update thirdparty_lettering_customer.php
...
-> $help_url add 'DE:Modul_Geschäftspartner'
2021-03-15 15:36:08 +01:00
Frédéric FRANCE
99cd866eba
fix php8 warning
2021-03-15 15:12:10 +01:00
Laurent Destailleur
614720fc0a
FIX #16671 Can not generate zip file of documents in backup tool
2021-03-15 14:51:36 +01:00
Laurent Destailleur
2eaf794b17
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-15 14:17:18 +01:00
Laurent Destailleur
a8c34a5b05
Invert MAIN_EXTRAFIELDS_USE_SELECT2 into
...
MAIN_EXTRAFIELDS_DISABLE_SELECT2
2021-03-15 14:16:55 +01:00
Frédéric FRANCE
691b8d5976
fix php8 warning
2021-03-15 14:05:05 +01:00
Frédéric FRANCE
d4eecf3eb2
fix php8 warning
2021-03-15 13:51:54 +01:00
Frans Bosman
ba4fd3d44f
Update list.php
2021-03-15 13:44:40 +01:00
Laurent Destailleur
967be12491
Merge pull request #16683 from frederic34/patch-4
...
fix php8 warning
2021-03-15 13:31:28 +01:00
Laurent Destailleur
8d3ed71f5f
Merge pull request #16682 from frederic34/patch-3
...
fix php8 warning
2021-03-15 13:28:50 +01:00
Laurent Destailleur
3964801d40
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-03-15 13:26:20 +01:00
Laurent Destailleur
2129adf129
Add more fields to llx_oauth_token
2021-03-15 13:25:08 +01:00
daraelmin
82509e2102
merged conflict with develop
2021-03-15 13:12:13 +01:00
Laurent Destailleur
85eaec48e1
Merge pull request #16307 from aspangaro/14a15
...
NEW: VAT report - Optimisation & collapse by rate
2021-03-15 11:56:06 +01:00
Frédéric FRANCE
d6f6097f4a
fix php8 warning
2021-03-15 11:54:16 +01:00
Christophe Battarel
090dc4f28a
Merge branch 'develop' into pr_batch_masks
2021-03-15 11:42:33 +01:00
Laurent Destailleur
5daf881660
Merge pull request #16642 from frederic34/patch-5
...
Add index.html in directories with no index files
2021-03-15 11:40:03 +01:00
Laurent Destailleur
5a243e0857
Merge pull request #16673 from frederic34/patch-27
...
fix php8 warnings
2021-03-15 11:38:32 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-15 11:37:57 +01:00
Laurent Destailleur
d905d92434
Merge pull request #16637 from frederic34/patch-4
...
force check if newref needed if project create fail
2021-03-15 11:31:07 +01:00
Laurent Destailleur
cb9d661158
Merge pull request #16648 from frederic34/php8-fix
...
fix php8 fatal error
2021-03-15 11:26:44 +01:00
Laurent Destailleur
a3ccf070c2
Code comment
2021-03-15 11:26:31 +01:00
Frédéric FRANCE
cc25fb727b
fix php8 warning
2021-03-15 11:25:23 +01:00
Laurent Destailleur
7bbcf4aa00
FIX #16629
2021-03-15 11:23:08 +01:00
Laurent Destailleur
902c237ed5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-15 11:21:58 +01:00
Laurent Destailleur
5a806c1ece
FIX #16629
2021-03-15 11:21:14 +01:00
Frédéric FRANCE
29d86adcb3
move function declaration
2021-03-15 11:20:15 +01:00
Frédéric FRANCE
15c751ae89
Merge remote-tracking branch 'upstream/develop' into php8-fix
2021-03-15 11:18:41 +01:00
Laurent Destailleur
4d1544a44a
Merge pull request #16641 from frederic34/patch-3
...
fix getpost filter
2021-03-15 11:14:59 +01:00
Laurent Destailleur
cbaaff799b
Merge pull request #16643 from dolibit-ut/patch-72
...
Update card.php
2021-03-15 11:14:26 +01:00
Frédéric FRANCE
9f5d0dbb6b
Update card-rec.php
2021-03-15 11:11:41 +01:00
Laurent Destailleur
b9fe897f9a
Merge pull request #16650 from frederic34/patch-7
...
fix php8 warning
2021-03-15 11:11:41 +01:00
Laurent Destailleur
0dd33fed4f
Merge pull request #16654 from daraelmin/daraelmin-patch-1
...
Standardize var $AdherentsXXX in $MembersXXX
2021-03-15 11:10:52 +01:00
Laurent Destailleur
503f07a7ca
Merge pull request #16651 from frederic34/patch-8
...
fix php8 warning
2021-03-15 11:10:13 +01:00
Laurent Destailleur
a1cfacfa9e
Merge pull request #16652 from frederic34/patch-9
...
fix php8 warnings
2021-03-15 11:09:23 +01:00
Laurent Destailleur
5a61d82ce8
Merge pull request #16653 from frederic34/patch-10
...
fix php8 warnings
2021-03-15 11:09:05 +01:00
Laurent Destailleur
d799631177
Merge pull request #16658 from frederic34/patch-13
...
fix php8 warning
2021-03-15 11:08:44 +01:00
Laurent Destailleur
04c5cd3069
Merge pull request #16655 from daraelmin/daraelmin-patch-2
...
Use dol_now instead of time()
2021-03-15 11:08:25 +01:00
Laurent Destailleur
21400b96fa
Merge pull request #16656 from frederic34/patch-11
...
remove dol_buildpath
2021-03-15 11:08:01 +01:00
Laurent Destailleur
85f8ac1946
Merge pull request #16661 from frederic34/patch-16
...
fix php8 warning
2021-03-15 11:07:30 +01:00
Laurent Destailleur
007201ea64
Merge pull request #16662 from frederic34/patch-17
...
fix php8 warning
2021-03-15 11:06:38 +01:00
Laurent Destailleur
fe1838a36f
Merge pull request #16660 from frederic34/patch-15
...
remove dol_include_once in workstation.class.php
2021-03-15 11:06:06 +01:00
Laurent Destailleur
7b61f756f8
Merge pull request #16659 from frederic34/patch-14
...
fix php8 warnings
2021-03-15 11:05:53 +01:00
Laurent Destailleur
51d6fc2d77
Merge pull request #16663 from frederic34/patch-18
...
fix php8 warning
2021-03-15 11:05:37 +01:00
Laurent Destailleur
41a6e9e526
Merge pull request #16664 from frederic34/patch-19
...
fix php8 warning
2021-03-15 11:05:18 +01:00
Laurent Destailleur
a54f680a67
Merge pull request #16665 from frederic34/patch-20
...
fix php8 warning
2021-03-15 11:03:36 +01:00
Laurent Destailleur
b7c7bd8d94
Merge pull request #16666 from frederic34/patch-21
...
fix php8 warning
2021-03-15 11:03:20 +01:00
Laurent Destailleur
57f9607e3e
Update accounting.lib.php
2021-03-15 11:01:01 +01:00
Laurent Destailleur
130d0dc625
Merge pull request #16667 from frederic34/patch-22
...
fix php8 warning
2021-03-15 11:00:22 +01:00
Laurent Destailleur
6de5ef286d
Merge pull request #16668 from frederic34/patch-23
...
fix php8 warning
2021-03-15 11:00:07 +01:00
Laurent Destailleur
c2c434ab7f
Update quadri_detail.php
2021-03-15 10:59:41 +01:00
Laurent Destailleur
4d7fb00cbd
Merge pull request #16669 from frederic34/patch-24
...
fix php8 warning
2021-03-15 10:58:58 +01:00
Laurent Destailleur
0c29fcf8ec
Merge pull request #16670 from frederic34/patch-25
...
fix php8 warning
2021-03-15 10:58:38 +01:00
Laurent Destailleur
f2c228ee68
Merge pull request #16672 from frederic34/patch-26
...
fix php8 warnings
2021-03-15 10:58:18 +01:00
Laurent Destailleur
95c9465000
Merge pull request #16674 from frederic34/patch-28
...
fix php8 warning
2021-03-15 10:56:17 +01:00
Laurent Destailleur
909653c65e
Update byratecountry.php
2021-03-15 10:56:10 +01:00
Laurent Destailleur
8cd8bd5936
Merge pull request #16675 from frederic34/patch-29
...
fix php8 warning
2021-03-15 10:55:24 +01:00
Laurent Destailleur
5b5e403ceb
Merge pull request #16676 from frederic34/patch-30
...
fix php8 warning
2021-03-15 10:55:13 +01:00
Laurent Destailleur
e7205a4f79
Merge pull request #16677 from frederic34/patch-31
...
fix php8 warning
2021-03-15 10:55:01 +01:00
Laurent Destailleur
a46bbb83f8
Merge pull request #16678 from frederic34/patch-32
...
fix php8 warnings
2021-03-15 10:54:23 +01:00
Laurent Destailleur
f5312cbace
Merge pull request #16679 from frederic34/patch-33
...
fix php8 warning
2021-03-15 10:53:45 +01:00
Laurent Destailleur
e20afdc4b6
Merge pull request #16680 from frederic34/patch-34
...
fix php8 warning
2021-03-15 10:53:20 +01:00
Laurent Destailleur
4d0c44ce14
Merge pull request #16681 from frederic34/patch-35
...
fix copy/paste
2021-03-15 10:53:06 +01:00
Laurent Destailleur
22cdb0ef97
Merge pull request #16657 from frederic34/patch-12
...
Fix php8 warning
2021-03-15 10:52:19 +01:00
Laurent Destailleur
26e8a9c795
Code comment
2021-03-15 10:08:02 +01:00
Frédéric FRANCE
18f5c4613e
fix copy/paste
2021-03-15 08:10:45 +01:00
Frédéric FRANCE
5d99dfea50
fix php8 warning
2021-03-15 08:08:05 +01:00
Frédéric FRANCE
531f02c1e9
fix php8 warning
2021-03-15 00:59:07 +01:00
Frédéric FRANCE
1e85e8f37d
fix php8 warnings
2021-03-15 00:53:34 +01:00
Frédéric FRANCE
e8b994ece5
fix php8 warning
2021-03-15 00:40:10 +01:00
Frédéric FRANCE
3acd681a42
fix php8 warning
2021-03-15 00:34:48 +01:00
Frédéric FRANCE
7b99c1e8e9
fix php8 warning
2021-03-15 00:32:05 +01:00
Frédéric FRANCE
c15f2ea4dc
fix php8 warning
2021-03-15 00:26:50 +01:00
Frédéric FRANCE
523b189017
fix php8 warnings
2021-03-15 00:23:07 +01:00
Laurent Destailleur
382b810ba1
Fix phpcs
2021-03-15 00:18:26 +01:00
Frédéric FRANCE
c5af6d2087
fix php8 warnings
2021-03-15 00:17:43 +01:00
Frédéric FRANCE
191ca62420
fix php8 warning
2021-03-15 00:11:37 +01:00
Laurent Destailleur
1d2929e3f5
Clean code
2021-03-15 00:01:55 +01:00
Frédéric FRANCE
0afd05c664
fix php8 warning
2021-03-14 23:56:04 +01:00
Frédéric FRANCE
bfd954b91e
fix php8 warning
2021-03-14 23:51:49 +01:00
Frédéric FRANCE
0bf0fc3504
fix php8 warning
2021-03-14 23:44:54 +01:00
Laurent Destailleur
4ca0942229
Addoption in get_arbo_each_prod for performance enhancement
2021-03-14 23:44:20 +01:00
Frédéric FRANCE
abd9a639a2
fix php8 warning
2021-03-14 23:41:06 +01:00
Frédéric FRANCE
a3eb1899b6
fix php8 warning
2021-03-14 23:33:06 +01:00
Frédéric FRANCE
64a0666a3e
fix php8 warning
...
$notooltip not defined
2021-03-14 20:51:02 +01:00
Frédéric FRANCE
4377a5eccb
fix php8 warning
2021-03-14 20:42:06 +01:00
Laurent Destailleur
9aa8916a9c
Disallow use of &# into dol_sanitizeUrl()
2021-03-14 20:35:55 +01:00
Frédéric FRANCE
bbb0d9acc4
fix php8 warning
2021-03-14 20:31:13 +01:00
Frédéric FRANCE
ed5b5628fb
Update index.php
2021-03-14 20:26:41 +01:00
Frédéric FRANCE
e15ac07c44
fix php8 warning
2021-03-14 20:19:27 +01:00
Laurent Destailleur
cd12b7c39f
CSS
2021-03-14 19:57:15 +01:00
Laurent Destailleur
0bb9834c67
Protect fetch
2021-03-14 19:10:32 +01:00
Laurent Destailleur
45579edd43
Enhance WAF and dol_sanitizeUrl
2021-03-14 18:57:18 +01:00
Frédéric FRANCE
d6ed11c5be
Update workstation.class.php
2021-03-14 18:34:03 +01:00
Frédéric FRANCE
0cbf57327b
fiw php8 warnings
2021-03-14 18:18:21 +01:00
Laurent Destailleur
bd838d0b8a
Fix sql syntax error #yogosha5628 + 1 SQL injection
2021-03-14 18:07:53 +01:00
Frédéric FRANCE
11afb74bae
fix php8 warning
2021-03-14 18:04:51 +01:00
Frédéric FRANCE
1b291ea582
Fix php8 warning
2021-03-14 17:58:05 +01:00
Frédéric FRANCE
220b1539f7
Update cron.lib.php
2021-03-14 17:36:27 +01:00
daraelmin
0127a3bedb
Update index.php
2021-03-14 17:34:38 +01:00
Frédéric FRANCE
02e21913ce
remove dol_buildpath
2021-03-14 17:33:13 +01:00
Laurent Destailleur
619df7bf23
Use internal linke
2021-03-14 17:18:04 +01:00
daraelmin
639e234d4b
Use dol_now instead of time()
2021-03-14 16:44:34 +01:00
Laurent Destailleur
c2a86e71be
fix phpv8
2021-03-14 16:44:11 +01:00
Laurent Destailleur
4965ce8768
Fix method to sanitize an URL
2021-03-14 16:14:24 +01:00
daraelmin
32a79cfd8d
Standardize var $AdherentsXXX in $MembersXXX
2021-03-14 15:51:00 +01:00
Laurent Destailleur
74a61d559f
FIX sanitizing with GETPOST(alphanohtml) #yogosha5629
2021-03-14 15:39:59 +01:00
Laurent Destailleur
72766c830d
FIX #Yogosha5631
2021-03-14 15:06:40 +01:00
daraelmin
30dc375ecc
Graphcolor
2021-03-14 14:42:55 +01:00
daraelmin
749e33d518
Add SommeE
2021-03-14 14:37:20 +01:00
daraelmin
ed7dc56c82
Update index.php
2021-03-14 14:31:27 +01:00
daraelmin
193082b195
Update index.php
2021-03-14 13:59:50 +01:00
Laurent Destailleur
95006ec94c
Fix sanitizing backtopage
2021-03-14 12:58:37 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
Laurent Destailleur
0a542ad9f9
Fix redirect to external website. Bad sanitizing of backtopage parameter
2021-03-14 11:38:42 +01:00
Frédéric FRANCE
fb43a2fa73
fix php8 warnings
2021-03-14 09:56:45 +01:00
Frédéric FRANCE
f5ae12f4dc
fix php8 warnings
2021-03-14 09:41:53 +01:00
Frédéric FRANCE
f1481638eb
fix php8 warning
2021-03-14 09:14:43 +01:00
Frédéric FRANCE
909dd63482
fix php8 warning
2021-03-14 08:50:17 +01:00
daraelmin
ed3b0032bb
Syntax error
2021-03-13 22:46:51 +01:00
daraelmin
e2ba3b599d
Update index.php
2021-03-13 22:42:49 +01:00
daraelmin
47f7ee09cf
img_picto for excluded should be status8
2021-03-13 21:10:47 +01:00
daraelmin
64c347edfa
Add exclusion email template global variable
2021-03-13 20:25:29 +01:00
daraelmin
d979440ca6
Call exclude() when updating status to -2
2021-03-13 19:21:44 +01:00
Laurent Destailleur
bcfe711544
Fix redirect to extern url
2021-03-13 19:20:34 +01:00
daraelmin
39fba3c4a9
Update comment to mention exclude() fonction
2021-03-13 19:17:28 +01:00
daraelmin
5f0249894d
Add property mail_exclusion
...
Unused for the moment
2021-03-13 19:11:21 +01:00
Laurent Destailleur
5faecef0e1
Look and feel v14
2021-03-13 18:56:02 +01:00
Frédéric FRANCE
c3c03e9de3
fix php8 fatal error
2021-03-13 18:42:50 +01:00
daraelmin
8f73334a79
Add excluded status in adherent class
2021-03-13 18:24:17 +01:00
daraelmin
6f7f5a57e1
Search on excluded member
2021-03-13 16:11:48 +01:00
daraelmin
e038408195
Update comment on subscription creation
...
subscription is not allowed if the membre status is "excluded"
2021-03-13 15:34:29 +01:00
daraelmin
fa25ba797f
Add excluded status in adherent type stats
2021-03-13 15:28:31 +01:00
UT from dolibit
83c6e5f8e7
Update card.php
...
at $help_url add DE:Modul_Projekte
2021-03-13 15:19:09 +01:00
daraelmin
d138430684
Adding Excluded status in adherent as -2
2021-03-13 15:18:44 +01:00
Frédéric FRANCE
7997598fd9
Create index.html
2021-03-13 14:20:59 +01:00
Frédéric FRANCE
7856643705
Create index.html
2021-03-13 14:20:32 +01:00
Frédéric FRANCE
64db6f81c6
Create index.html
2021-03-13 14:20:20 +01:00
Frédéric FRANCE
d50eca4189
Create index.html
2021-03-13 14:18:47 +01:00
Frédéric FRANCE
9c1e4064d2
Create index.html
2021-03-13 14:18:29 +01:00
Frédéric FRANCE
66cff32aef
Create index.html
2021-03-13 14:18:11 +01:00
Frédéric FRANCE
ae3019f7da
Create index.html
2021-03-13 14:17:57 +01:00
Frédéric FRANCE
c12568c9c7
Create index.html
2021-03-13 14:17:39 +01:00
Frédéric FRANCE
2c5eb37f96
Create index.html
2021-03-13 14:17:23 +01:00
Frédéric FRANCE
0d310a7a82
Create index.html
2021-03-13 14:15:40 +01:00
Frédéric FRANCE
03992257f6
Create index.html
2021-03-13 14:15:25 +01:00
Frédéric FRANCE
69514b0003
Create index.html
2021-03-13 14:15:11 +01:00
Frédéric FRANCE
bf8c677b79
Create index.html
2021-03-13 14:13:15 +01:00
Frédéric FRANCE
b9a81b673c
Create index.html
2021-03-13 14:12:57 +01:00
Frédéric FRANCE
840c32e8bb
Rename index.htlk to index.html
2021-03-13 14:12:36 +01:00
Frédéric FRANCE
3de691788f
Create index.htlk
2021-03-13 14:11:09 +01:00
Laurent Destailleur
0dfe79e619
CSS
2021-03-13 14:10:07 +01:00
Frédéric FRANCE
6777f15db0
Update card.php
2021-03-13 13:30:19 +01:00
Frédéric FRANCE
c74cd63728
Create index.html
2021-03-13 13:27:24 +01:00
Laurent Destailleur
7755a44958
Reduce possible actions
2021-03-13 13:23:44 +01:00
Laurent Destailleur
ff2f93815f
Fix backtourl
2021-03-13 12:33:26 +01:00
Laurent Destailleur
0bd7d28fd9
Better log
2021-03-13 12:13:33 +01:00
stickler-ci
f68bbdcf45
Fixing style errors.
2021-03-13 07:46:46 +00:00
Frans Bosman
dcb7958be9
Update list.php
...
Changed the presentation of the stock to show decimals and thousands separator. changes price2num to price and use MAIN_MAX_DECIMALS_STOCK
2021-03-13 08:44:16 +01:00
Laurent Destailleur
8c6fe6f29b
Merge pull request #16638 from frederic34/patch-5
...
go back actioncomm create after create project
2021-03-12 20:19:30 +01:00
Laurent Destailleur
aa26f873ff
Merge pull request #16634 from mrtnnbr/develop
...
Add UPC support to built-in barcode generator
2021-03-12 20:16:45 +01:00
stickler-ci
f507df994b
Fixing style errors.
2021-03-12 18:07:16 +00:00
Frédéric FRANCE
6be6e306b1
Update interface_50_modEventOrganization_EventOrganization.class.php
2021-03-12 19:05:03 +01:00
Frédéric FRANCE
67abd6d1d6
go back actioncomm create after create project
2021-03-12 17:05:11 +01:00
Frédéric FRANCE
815a7683a2
force getnextref if project create fail
2021-03-12 16:48:43 +01:00
Laurent Destailleur
af5db0f5fa
Look and feel v14
2021-03-12 15:34:31 +01:00
Martin Neubauer
85eb82c8c3
Tweak offsets for UPC barcode text
2021-03-12 14:44:04 +01:00
Laurent Destailleur
dc5557e4f7
Fix test on precommit hook
2021-03-12 14:30:32 +01:00
Christophe Battarel
c339af533d
fix conflict
2021-03-12 14:15:55 +01:00
Laurent Destailleur
ab9d10edd3
test
2021-03-12 13:58:18 +01:00
Martin Neubauer
0db65597fd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2021-03-12 13:58:00 +01:00
Martin Neubauer
09cedb5a5e
ISBN might start with 979 these days
2021-03-12 13:55:39 +01:00
Martin Neubauer
5aaeb6742c
Add UPC support to built-in barcode generator
2021-03-12 13:54:27 +01:00
Laurent Destailleur
964abbee28
aaa
2021-03-12 13:52:08 +01:00
Laurent Destailleur
a282dbcb1b
test
2021-03-12 13:51:55 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant
2021-03-12 13:14:53 +01:00
Martin Neubauer
7b59a3ac2b
Factor out generating EAN bars
2021-03-12 13:11:17 +01:00
lmarcouiller
4a185ba063
add warehouse quabtity + fix input new quantity
2021-03-12 12:47:58 +01:00
Laurent Destailleur
706ba46295
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-12 12:46:49 +01:00
Laurent Destailleur
cab0e0ee05
Prepare 13.0.2
2021-03-12 12:45:45 +01:00
Laurent Destailleur
777ba369c4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-12 12:44:25 +01:00
Laurent Destailleur
9956373a14
Backport the log to detect module that claim a new token.
2021-03-12 12:42:26 +01:00
Laurent Destailleur
a79c9a9019
Fix help of an option
2021-03-12 12:07:38 +01:00
Laurent Destailleur
f9918dd51f
Code comment
2021-03-12 11:50:48 +01:00
Laurent Destailleur
aee3fda3d1
Merge pull request #16280 from bafbes/abb120358
...
New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users
2021-03-12 11:14:31 +01:00
Regis Houssin
5375add08c
FIX just add mp4
2021-03-12 08:41:56 +01:00
Regis Houssin
290f49a3e0
FIX wrong extension
2021-03-12 08:39:36 +01:00
Regis Houssin
05532ca6b7
FIX missing video mime
2021-03-12 08:35:13 +01:00
Florian HENRY
f17aa47ad6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft
2021-03-11 22:03:51 +01:00
Laurent Destailleur
fc08c48bf3
Merge pull request #16591 from Givriz/dev
...
Replace gender and civility by a picto
2021-03-11 21:36:16 +01:00
Laurent Destailleur
b7a66769bb
Merge pull request #16603 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-11 21:35:39 +01:00
Laurent Destailleur
e8bbef8d2d
Update interface_50_modEventOrganization_EventOrganization.class.php
2021-03-11 21:35:22 +01:00
Florian HENRY
862926316a
working on list
2021-03-11 19:09:42 +01:00
Damien BENOIT
420a3a73dd
Update html.form.class.php
2021-03-11 18:15:22 +01:00
Florian HENRY
3ae93679cf
Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_draft
2021-03-11 16:59:13 +01:00
Florian HENRY
3af4f3fbca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft
2021-03-11 16:59:08 +01:00
Florian HENRY
6742241639
better tranaction and condition
2021-03-11 16:55:49 +01:00
stickler-ci
345fe648b3
Fixing style errors.
2021-03-11 15:37:27 +00:00
Laurent Destailleur
c596eb91a8
Merge branch 'develop' into abb120358
2021-03-11 16:35:21 +01:00
Laurent Destailleur
6a5d3bdec2
Merge pull request #16602 from fmarcet/13.0
...
FIX: Buttons to disable bindings not working
2021-03-11 16:05:12 +01:00
Laurent Destailleur
50bf0b92e3
Merge pull request #16614 from frederic34/patch-3
...
replace value with constant
2021-03-11 15:58:19 +01:00
Laurent Destailleur
0b8f738c9e
Merge pull request #16618 from Hystepik/develop#3
...
Fix #16617 : fix event add when removing boxes
2021-03-11 15:57:35 +01:00
Laurent Destailleur
1404c36a92
Merge pull request #16616 from Hystepik/develop#1
...
Fix #16615 : Adherent statistics color
2021-03-11 15:56:53 +01:00
Christophe Battarel
14ba83f81f
try to fix sticker
2021-03-11 14:20:50 +01:00
Laurent Destailleur
5e75da3319
Fix return page if error
2021-03-11 14:10:50 +01:00
Laurent Destailleur
26cb59e2f9
Enhance regeneration of pages
2021-03-11 14:10:08 +01:00
Laurent Destailleur
245453f3c6
Add ignore
2021-03-11 12:47:55 +01:00
Christophe Battarel
7529a5cd7c
try to fix sticker
2021-03-11 11:46:12 +01:00
Christophe Battarel
229c581a25
try to fix sticker
2021-03-11 11:30:12 +01:00
Christophe Battarel
e8aacc7acf
try to fix sticker
2021-03-11 11:12:03 +01:00
Christophe Battarel
eb0ce8aa0c
Merge branch 'master' into pr_batch_masks
2021-03-11 11:02:37 +01:00
Christophe Battarel
461e4981bd
remove multicompany
2021-03-11 10:59:58 +01:00
Christophe Battarel
ba51c5dc70
differentiate masks for lot management and serial numbers management
2021-03-11 10:44:55 +01:00
lmarcouiller
9aa20585be
Fix #16617 : fix event add when removing boxes
2021-03-11 10:10:20 +01:00
Christophe Battarel
2c711f1a2d
add masks for batch
2021-03-11 10:02:31 +01:00
Christophe Battarel
d2650d31cf
add multicompany module
2021-03-11 09:50:05 +01:00
lmarcouiller
1b242a8a19
Fix #16615 : Adherent statistics color
2021-03-11 09:43:56 +01:00
Bahfir Abbes
0158cbb893
Update security.lib.php
2021-03-11 04:02:30 +01:00
Bahfir Abbes
1359326337
Update card.php
2021-03-11 04:01:43 +01:00
Laurent Destailleur
3007141b2b
Fix phpcs
2021-03-10 20:40:34 +01:00
Laurent Destailleur
8bdc80918b
trans
2021-03-10 18:57:24 +01:00
Laurent Destailleur
e015f66936
Fix filter on employee
2021-03-10 17:31:33 +01:00
Laurent Destailleur
46d835b2bd
Fix css
2021-03-10 17:25:26 +01:00
Laurent Destailleur
3769a56c7a
Merge pull request #16589 from atm-adrien/FIX/salaries_card
...
FIX : Salaries card
2021-03-10 17:19:00 +01:00
Laurent Destailleur
2ff2640c8d
Update card.php
2021-03-10 17:16:49 +01:00
Laurent Destailleur
c75fade649
Fix regression
2021-03-10 17:07:44 +01:00
Laurent Destailleur
13d8807bb4
Merge pull request #16606 from tuxgasy/mo_allow_kits_option
...
Add hidden option ALLOW_USE_KITS_INTO_BOM_AND_MO
2021-03-10 17:05:45 +01:00
Laurent Destailleur
82d5c7289d
Add property widgettype
2021-03-10 17:02:39 +01:00
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop
...
Update fork
2021-03-10 16:53:35 +01:00
Laurent Destailleur
8192349320
Fix migration
2021-03-10 16:49:42 +01:00
Laurent Destailleur
2e4a4b527b
Fix migration
2021-03-10 16:45:28 +01:00
Laurent Destailleur
521e3b20dc
Rename widget
2021-03-10 16:44:46 +01:00
Damien BENOIT
93675082d7
Update html.form.class.php
2021-03-10 16:42:14 +01:00
Laurent Destailleur
c2200e6ffd
Clean code
2021-03-10 16:41:48 +01:00
stickler-ci
d5e6f54b5c
Fixing style errors.
2021-03-10 15:33:53 +00:00
Givriz
6e46396b17
Ajout de picto pour le genre et la civilité
2021-03-10 16:31:50 +01:00
Laurent Destailleur
514a9fb96a
Merge pull request #16561 from Hystepik/develop#1
...
Close #15917 : Improvement to ticket module
2021-03-10 15:49:20 +01:00
Frédéric FRANCE
204302ac15
replace value with constant
2021-03-10 15:43:50 +01:00
Damien BENOIT
628d434823
Merge pull request #10 from Dolibarr/develop
...
Update fork
2021-03-10 15:42:49 +01:00
Adrien Raze
6a7ecf210f
FIX : Travis returns
2021-03-10 15:38:01 +01:00
Laurent Destailleur
9ed128c6fa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/class/html.formaccounting.class.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/langs/en_US/errors.lang
htdocs/product/card.php
2021-03-10 15:35:09 +01:00
Adrien Raze
83b06734a2
FIX : Travis return
2021-03-10 15:34:43 +01:00
Laurent Destailleur
c209d9b45e
Update paiement_charge.php
2021-03-10 15:29:05 +01:00
stickler-ci
3a9c1613bf
Fixing style errors.
2021-03-10 14:12:29 +00:00
Adrien Raze
0bd4b132a4
FIX : Update pencil should be shoxn only when no payment has been entered
2021-03-10 14:39:04 +01:00
atm-lena
b798535af9
FIX create sociales : keep values error form
2021-03-10 14:15:03 +01:00
Laurent Destailleur
fbe5ec8bb2
Complete test on setup
2021-03-10 13:12:28 +01:00
Florian HENRY
bd6aae71a2
fix modulebuilder boxes showboxes
2021-03-10 11:58:21 +01:00
Florian HENRY
ccf71cd980
fix modulebuilder boxes showboxes
2021-03-10 11:56:44 +01:00
Laurent Destailleur
9a13ebfdb8
Fix look and feel v13
2021-03-10 11:08:39 +01:00
Laurent Destailleur
680f6257a0
FIX warning if setup of chart of account is not yet done.
2021-03-10 11:04:28 +01:00
stickler-ci
a9a8a177a2
Fixing style errors.
2021-03-10 09:54:43 +00:00
Laurent Destailleur
a0c7c6bad9
Fix selection of accounting account
2021-03-10 10:45:01 +01:00
TuxGasy
3a3793d509
Add hidden option ALLOW_USE_KITS_INTO_BOM_AND_MO
2021-03-10 10:24:20 +01:00
Laurent Destailleur
b1f4c29fde
Fix missing alias
2021-03-09 20:12:14 +01:00
Laurent Destailleur
28f54eeb75
Fix translation
2021-03-09 19:55:47 +01:00
Laurent Destailleur
67f5837072
Fix permission to create a holiday when advanced permissions are set
2021-03-09 19:51:11 +01:00
Laurent Destailleur
8babacfe55
Look and feel v14
2021-03-09 19:10:41 +01:00
Florian HENRY
7aec2fc02b
create task
2021-03-09 18:52:52 +01:00
Ferran Marcet
1dae21e608
FIX: Buttons to disable bindings not working
2021-03-09 18:44:06 +01:00
Laurent Destailleur
e82e812c36
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-09 17:01:53 +01:00
Laurent Destailleur
5b74fefb60
Fix look and feel v13
2021-03-09 17:01:20 +01:00
Laurent Destailleur
b778820fe2
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList
...
Dev allow alias in common object get filed list
2021-03-09 16:54:22 +01:00
Laurent Destailleur
5e68eee407
Fix filter
2021-03-09 16:47:38 +01:00
Laurent Destailleur
9cb4dce485
Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing
2021-03-09 16:12:30 +01:00
Laurent Destailleur
1fe90091b6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-09 15:35:25 +01:00
Laurent Destailleur
cf30e90b93
Work on inventory
2021-03-09 15:35:10 +01:00
Laurent Destailleur
6b37d392a8
Merge pull request #16597 from ksar-ksar/develop
...
FIX #16590
2021-03-09 15:14:31 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php
2021-03-09 15:13:20 +01:00
Laurent Destailleur
f3508eed83
Update card.php
2021-03-09 15:09:28 +01:00
Laurent Destailleur
b822f04cbb
Merge pull request #16593 from frederic34/patch-3
...
fix unknown variable
2021-03-09 15:08:11 +01:00
Laurent Destailleur
1b3aae1984
Fix regression
2021-03-09 12:17:32 +01:00
stickler-ci
93e50bcba6
Fixing style errors.
2021-03-09 10:50:59 +00:00
Adrien Raze
b82f14859c
FIX : no fetch required
2021-03-09 11:48:25 +01:00
stickler-ci
1afddabed4
Fixing style errors.
2021-03-09 10:41:03 +00:00
Adrien Raze
07015ef29e
FIX : Using function getSommePaiement() instead of using SQL request
2021-03-09 11:35:24 +01:00
stickler-ci
c55c1ab854
Fixing style errors.
2021-03-09 09:58:11 +00:00
Adrien Raze
a67fd6c0a4
FIX : Update pencil should be shown only when no payments has been entered
2021-03-09 10:55:10 +01:00
ksar
429992ee7f
FIX #16590
2021-03-09 10:46:11 +01:00
Laurent Destailleur
53f8ff060a
Fix phpcs
2021-03-09 10:40:22 +01:00
Florian HENRY
ce5324c08c
Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList
2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a
allow table alias into commonObject getFieldList
2021-03-09 10:21:32 +01:00
Alexandre SPANGARO
b5c84bfc4f
Resolve some mistakes
2021-03-09 05:02:37 +01:00
Frédéric FRANCE
de1cf54e2f
Update box_members_by_type.php
2021-03-09 00:20:28 +01:00
Laurent Destailleur
c3a047ee06
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
htdocs/compta/sociales/card.php
htdocs/societe/consumption.php
2021-03-08 19:27:34 +01:00
Laurent Destailleur
bada3afebb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-08 19:18:26 +01:00
Laurent Destailleur
28c04a684f
Fix position of field
2021-03-08 19:09:02 +01:00
stickler-ci
5294e10ecf
Fixing style errors.
2021-03-08 18:07:15 +00:00
Laurent Destailleur
14d6893c63
Complete fields of product
2021-03-08 18:56:32 +01:00
Givriz
fb54f6912c
feature #16570
...
Ajout de picto pour le genre et la civilité
2021-03-08 18:37:03 +01:00
Alexis LAURIER
cfc56da263
fournisseur product class - update style code
2021-03-08 17:59:58 +01:00
Alexis LAURIER
061e797d64
correct product fournisseur class fetchAll
2021-03-08 17:35:12 +01:00
stickler-ci
cb5d532665
Fixing style errors.
2021-03-08 16:24:54 +00:00
Adrien Raze
946a1fe82d
Merge branch 'NEW/12.0_new_payments_on_salaries' of https://github.com/ATM-Consulting/dolibarr into FIX/salaries_card
2021-03-08 17:12:48 +01:00
stickler-ci
e7f24e2109
Fixing style errors.
2021-03-08 16:00:49 +00:00
Alexis LAURIER
ae5a581175
correct mistakes
2021-03-08 16:59:13 +01:00
Alexis LAURIER
c0b5ba4bb5
correct mistakes
2021-03-08 16:52:43 +01:00
Alexis LAURIER
76858f06cd
ProductFournisseur fields update to reflect Product Class inheritance
2021-03-08 16:49:04 +01:00
Laurent Destailleur
a3896bd237
Restore default tabs
2021-03-08 16:47:49 +01:00
Laurent Destailleur
3b80b9dd75
Fix regression
2021-03-08 16:37:52 +01:00
Laurent Destailleur
146b57700c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-08 16:34:32 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex
2021-03-08 16:34:05 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation
...
FIX : Add "Now" link on social charges creation card
2021-03-08 16:31:41 +01:00
Laurent Destailleur
8b555d33e7
Merge pull request #16586 from atm-adrien/FIX/rouding_socialesCard_amount_on_card_updating
...
FIX : Rounding amount on social charges card updating
2021-03-08 16:30:53 +01:00
Laurent Destailleur
20c30bade8
Update card.php
2021-03-08 16:30:32 +01:00
Laurent Destailleur
f3486e49fa
CSS
2021-03-08 16:28:39 +01:00
Laurent Destailleur
24a0700426
Merge pull request #16573 from frederic34/box_index_societe
...
can add box on thirparties index
2021-03-08 16:25:46 +01:00
Laurent Destailleur
870e0e77de
Merge pull request #16579 from ptibogxiv/patch-417
...
Fix get thirdparties by barcode or email
2021-03-08 16:23:38 +01:00
Laurent Destailleur
3b9f38caa1
Update api_thirdparties.class.php
2021-03-08 16:22:26 +01:00
Laurent Destailleur
77b60d4d1c
Update api_thirdparties.class.php
2021-03-08 16:20:15 +01:00
Laurent Destailleur
33cd0ae04e
Merge pull request #16580 from frederic34/patch-5
...
Do not return specimen if searching empty string value
2021-03-08 16:18:10 +01:00
Laurent Destailleur
66e7a9b283
NEW API Add option $includeifobjectisused to get a product
2021-03-08 16:17:20 +01:00
Laurent Destailleur
e3c31aa7b3
Merge pull request #16576 from c3do/patch-19
...
NEW API Get the list of product ids only
2021-03-08 16:08:30 +01:00
Laurent Destailleur
6367b843c3
Update api_products.class.php
2021-03-08 16:08:18 +01:00
Laurent Destailleur
67211d24fb
Update api_products.class.php
2021-03-08 16:07:30 +01:00
Laurent Destailleur
263605a11f
Merge pull request #16578 from frederic34/patch-4
...
fix usage of else if
2021-03-08 16:04:37 +01:00
Laurent Destailleur
06affc61be
Merge pull request #16582 from atm-gauthier/FIX_salaries2
...
Fix useless num_payment on llx_salary
2021-03-08 16:04:23 +01:00
Laurent Destailleur
1aba0c2bc9
NEW Can set order of execution of hooks
2021-03-08 15:56:41 +01:00
Adrien Raze
67c6577177
FIX : Add "Now" link on social charges card creation
2021-03-08 15:47:02 +01:00
lmarcouiller
b71a8c5d6f
Close #15917 : boxes on ticket index
2021-03-08 15:26:35 +01:00
Laurent Destailleur
7bd93aa3ad
Fix price format
2021-03-08 14:31:02 +01:00
Laurent Destailleur
8184e34de4
Merge pull request #16587 from ATM-Consulting/NEW/12.0_new_payments_on_vat
...
FIX : Rounding amount on VAT card updating
2021-03-08 14:29:29 +01:00
atm-gauthier
23f913ee86
Merge pull request #171 from atm-adrien/NEW/12.0_new_payments_on_salaries_rounding-amount
...
FIX : Rounding amount on card updating
2021-03-08 14:05:31 +01:00
lmarcouiller
d8a74bad93
update for continuous integration
2021-03-08 13:58:23 +01:00
Laurent Destailleur
4ad24dd665
Merge pull request #16584 from hregis/fix_missing_user_get_rights
...
FIX missing user get rights
2021-03-08 13:48:42 +01:00
stickler-ci
66230c3f24
Fixing style errors.
2021-03-08 12:27:24 +00:00
Cédric
01db1161b6
Update api_products.class.php
2021-03-08 13:25:31 +01:00
Cédric
15fe2a7205
indicate if the product is used
2021-03-08 13:25:01 +01:00
lmarcouiller
8c7764ed5d
Move of 2 graph in boxes
2021-03-08 12:18:55 +01:00
Cédric
5fc5d9ab48
Update api_products.class.php
2021-03-08 12:12:29 +01:00
Laurent Destailleur
89066e50f8
css
2021-03-08 12:07:01 +01:00
Adrien Raze
cbb7751a15
FIX : rounding amount on card updating
2021-03-08 11:51:18 +01:00
Laurent Destailleur
9d8ec0441b
css
2021-03-08 11:43:03 +01:00
x
e087c6ffe0
FIX : Rounding amount on card updating
2021-03-08 11:35:59 +01:00
Regis Houssin
4f4829ea70
FIX missing user get rights
2021-03-08 11:33:37 +01:00
Laurent Destailleur
ab89d85095
Fix for php8
2021-03-08 11:33:07 +01:00
x
1fec98c546
FIX : Rounding amount on card updating
2021-03-08 11:10:51 +01:00
Laurent Destailleur
c0e0300eb3
Enhance the page security
2021-03-08 11:08:58 +01:00
Florian Mortgat
c73dbebd8f
Merge pull request #169 from atm-adrien/NEW/12.0_new_payments_on_salaries_devadrien
...
FIX : pencil to update employee field on card view
2021-03-08 10:31:51 +01:00
lmarcouiller
f627637490
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-03-08 10:15:00 +01:00
x
55e9908601
FIX : PR returns
2021-03-08 10:09:38 +01:00
ksar
ec8baa6bff
Update commondocgenerator.class.php
...
#16341
2021-03-08 10:00:19 +01:00
Alexandre SPANGARO
2f86971f84
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-08 09:56:57 +01:00
Gauthier PC portable 024
f9a1b5fd3e
FIX : quote forgotten in merge
2021-03-08 09:21:03 +01:00
Laurent Destailleur
4d409e23f5
Missing declaration of properties
2021-03-08 09:16:33 +01:00
Gauthier PC portable 024
e7c030f576
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into FIX_salaries2
2021-03-08 09:16:00 +01:00
Laurent Destailleur
a1d97274fb
Clean code for php8
2021-03-08 09:14:23 +01:00
Gauthier PC portable 024
ff97a41386
FIX : num_payment on llx_salary is useless
2021-03-08 09:00:52 +01:00
Frédéric FRANCE
c0c9ac439f
Update api_agendaevents.class.php
2021-03-08 00:23:05 +01:00
Frédéric FRANCE
c2c1005345
Update api_thirdparties.class.php
2021-03-08 00:17:58 +01:00
Frédéric FRANCE
45189de496
Update api_agendaevents.class.php
2021-03-08 00:16:28 +01:00
Alexandre SPANGARO
339af419bc
Fix strftime
2021-03-07 21:59:28 +01:00
Laurent Destailleur
1affaa8c87
fix phpunit
2021-03-07 20:26:36 +01:00
Laurent Destailleur
1ca3e433d2
Fix phpunit
2021-03-07 19:55:09 +01:00
Laurent Destailleur
0f7085154b
Fix phpunit
2021-03-07 19:47:55 +01:00
Laurent Destailleur
91245e22d4
Fix phpunit phpv8
2021-03-07 19:16:09 +01:00
Laurent Destailleur
13d0398bd2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/price.php
2021-03-07 19:07:18 +01:00
Laurent Destailleur
142f878633
Fix look and feel v13
2021-03-07 18:56:16 +01:00
Laurent Destailleur
b28a757530
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-07 18:41:24 +01:00
Laurent Destailleur
4666c7f090
Fix responsive
2021-03-07 18:41:07 +01:00
ptibogxiv
4834f5fdf4
Fix get thirdparties by barcode or email
2021-03-07 17:32:43 +01:00
Frédéric FRANCE
fee5bbf65b
fix usage of else if
2021-03-07 09:12:46 +01:00
stickler-ci
7ae57fb8d0
Fixing style errors.
2021-03-06 18:48:55 +00:00
Cédric
1f55f50d19
NEW API Get the list of product ids only
2021-03-06 19:46:30 +01:00
Frédéric FRANCE
92754760f4
can add box on thirparties index
2021-03-06 16:38:07 +01:00
Laurent Destailleur
63aa2f4ec2
Fix phpunit
2021-03-06 12:50:38 +01:00
Laurent Destailleur
0a0bb92689
Fix phpcs
2021-03-06 11:37:23 +01:00
Laurent Destailleur
6b09452104
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-06 11:34:37 +01:00
Laurent Destailleur
c483ad5dda
Merge branch 'develop' into develop
2021-03-06 11:25:52 +01:00
Laurent Destailleur
315e66aa5a
Merge pull request #16537 from altairisfr/pr_sn_unicity
...
Unique serial number management
2021-03-06 11:22:44 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0
...
fix: set class attribute at right place
2021-03-06 11:18:02 +01:00
Laurent Destailleur
b42ccd896c
Merge pull request #16550 from atm-gauthier/FIX_salaries
...
FIX : several bugs on salaries + id salary in payments list
2021-03-06 11:17:04 +01:00
Laurent Destailleur
db0e3dd180
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-06 11:10:43 +01:00
Laurent Destailleur
1ad04bb67a
Merge pull request #16548 from frederic34/patch-5
...
Fix #16544
2021-03-06 11:09:58 +01:00
Laurent Destailleur
387c016287
Merge pull request #16547 from frederic34/patch-4
...
FIX #16544
2021-03-06 11:09:38 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter
...
NEW: LDAP: usergroup search can be filtered
2021-03-06 11:08:24 +01:00
Laurent Destailleur
aa06744aeb
Merge pull request #16549 from Hystepik/develop#3
...
Fix #16524 : Add support disassemble BOM
2021-03-06 11:06:54 +01:00
Laurent Destailleur
0816cb9c04
Merge pull request #16560 from code-chicken/patch-12
...
Don't discard previously collected data
2021-03-06 10:57:18 +01:00
Laurent Destailleur
74d20e1b1f
Merge pull request #16557 from atm-gauthier/NEW_vatmigration
...
NEW : sql migration from llx_tva to llx_payment_vat
2021-03-06 10:50:59 +01:00
Laurent Destailleur
3ac9829a14
Update 13.0.0-14.0.0.sql
2021-03-06 10:50:27 +01:00
Laurent Destailleur
150cb052d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-06 10:48:22 +01:00
Laurent Destailleur
a8c7579efd
Merge pull request #16565 from devicemxl/develop
...
Accounting charts used in Mexico
2021-03-06 10:43:10 +01:00
Laurent Destailleur
56cbf04e77
Update llx_accounting_abc.sql
2021-03-06 10:43:01 +01:00
Laurent Destailleur
7959bc99d7
Fix phpcs
2021-03-06 10:39:51 +01:00
Frédéric FRANCE
5d1b231f0a
doxygen
2021-03-06 09:35:18 +01:00
David
ba6d2c3444
Create llx_accounting_account_mx.sql
...
Hi, i propose add the 'Catalogo y codigo agrupador fiscal del 2019' it's a list taken from the oficial accounts for the electronic accounting in Mexico indicated by government since 2019
And here is the 'oficial' publication: https://dof.gob.mx/nota_detalle.php?codigo=5559612&fecha=07/05/2019
2021-03-05 14:14:18 -08:00
Frédéric FRANCE
7e5330496b
fis tyo
2021-03-05 22:50:28 +01:00
David
fd17f80bb6
Update llx_accounting_abc.sql
...
Hi, i propose add the 'Catalogo y codigo agrupador fiscal del 2019' it's a list taken from the oficial accounts for the electronic accounting in Mexico indicated by government since 2019
And here is the 'oficial' publication: https://dof.gob.mx/nota_detalle.php?codigo=5559612&fecha=07/05/2019
2021-03-05 13:34:51 -08:00
Laurent Destailleur
3cbced439a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
Laurent Destailleur
98c7814fa3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-05 18:28:15 +01:00
Laurent Destailleur
3cfcad284b
Fix unsubscribe to MLs
2021-03-05 17:48:55 +01:00
Laurent Destailleur
1cd822bd75
Fix DOS attack on emailings wrappers
2021-03-05 14:54:17 +01:00
Laurent Destailleur
7a193b4c87
Add index on tag. Reduce tag length
2021-03-05 14:53:13 +01:00
lmarcouiller
7ab1e0d9a0
Fix #15917 : Improvement to ticket module
2021-03-05 14:28:23 +01:00
Gauthier PC portable 024
83fa8812f9
NEW : sql migration from llx_tva to llx_payment_vat
2021-03-05 11:41:17 +01:00
Rüdiger Hahn
18fc169cd0
Don't discard previously collected data
...
For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one.
2021-03-05 11:32:03 +01:00
stickler-ci
06cabb35ec
Fixing style errors.
2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
396fb3fae3
FIX: ldap: bad function comment
2021-03-05 11:21:04 +01:00
Marc de Lima Lucio
25b1469b54
FIX: ldap group search test: bad key used + edit label/comments + remove useless code
2021-03-05 11:18:51 +01:00
Marc de Lima Lucio
f731545af4
NEW: ldap: filter search on usergroups
2021-03-05 11:14:21 +01:00
Alexis LAURIER
5a47e4b7ec
add standard fetchAll method on ProductFournisseur
2021-03-05 10:59:11 +01:00
Alexis LAURIER
4c81f0a52a
Add fields property to ProductFournisseur class
2021-03-05 10:46:26 +01:00
Gauthier PC portable 024
dd83363392
FIX : several bugs on salaries + id salary in payments list
2021-03-05 10:15:35 +01:00
Laurent Destailleur
83df996bc2
Fix english translation
2021-03-05 09:52:25 +01:00
stickler-ci
ebf92ba440
Fixing style errors.
2021-03-05 08:50:49 +00:00
lmarcouiller
c00d64855a
Fix #16524 : Add support disassemble BOM
2021-03-05 09:47:38 +01:00
Frédéric FRANCE
7543b63a6e
Fix #16544
2021-03-05 08:49:56 +01:00
Frédéric FRANCE
d13ed6bdfb
Update consumption.php
2021-03-05 08:44:29 +01:00
Florian HENRY
6de6782458
fix: set class at right place
2021-03-05 08:41:04 +01:00
Christophe Battarel
acb8741849
fix typo
2021-03-05 08:40:26 +01:00
Christophe Battarel
acea36acf2
better check for unicity
2021-03-05 08:39:30 +01:00
Christophe Battarel
863ba52b15
add inner join and test error
2021-03-05 07:59:55 +01:00
Laurent Destailleur
dfb791837c
Debug split of payment salary into salary + payment
2021-03-04 21:43:01 +01:00
Laurent Destailleur
aee6d78928
Debug split of payment salary into salary + payment
2021-03-04 21:33:29 +01:00
Laurent Destailleur
d0ba10efe5
Fix phpcs
2021-03-04 19:48:50 +01:00
Laurent Destailleur
c55932090a
Fix phpcs
2021-03-04 19:48:08 +01:00
Laurent Destailleur
c044b43b66
Fix phpcs
2021-03-04 19:20:16 +01:00
Laurent Destailleur
525d643915
Fix debug split of payment salary into salary + payment
2021-03-04 18:57:03 +01:00
Laurent Destailleur
fa03cde0a5
Better migration script
2021-03-04 18:23:29 +01:00
Laurent Destailleur
69f76d2f9d
Fix migration to fill llx_salary table
2021-03-04 18:22:21 +01:00
Laurent Destailleur
036c4bc730
Fix phpcs
2021-03-04 18:01:41 +01:00
Laurent Destailleur
b5def91b46
Fix phpcs
2021-03-04 17:57:08 +01:00
Christophe Battarel
64036706ed
fix for sticker
2021-03-04 17:52:05 +01:00
Christophe Battarel
c4ad4a33e4
fix for sticker
2021-03-04 17:49:28 +01:00
Christophe Battarel
1d2372b9ef
fix for travis and sticker
2021-03-04 17:47:43 +01:00
Laurent Destailleur
59f205596e
Fix phpcs
2021-03-04 17:46:34 +01:00
Laurent Destailleur
d56890de17
Fix phpcs
2021-03-04 17:24:58 +01:00
Laurent Destailleur
d5e0a8be56
Fix phpcs
2021-03-04 17:24:13 +01:00
Laurent Destailleur
6eafc3b774
Clean code
2021-03-04 17:23:12 +01:00
Laurent Destailleur
10a6774ede
Merge pull request #16534 from atm-lena/develop_FIX_OrderBy_UserThirdParty_BankEntries
...
Bank Entries : Error order by user/thirdparty
2021-03-04 17:08:12 +01:00
Laurent Destailleur
b92bfb007f
Merge pull request #16520 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-04 17:06:57 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
...
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0
...
avoid warning into modulebuilder
2021-03-04 16:52:47 +01:00
Laurent Destailleur
8189106627
Merge pull request #16532 from Hystepik/develop#1
...
Close #16523 : New column Contact assigned
2021-03-04 16:52:20 +01:00
Laurent Destailleur
87da30d2d9
Update tasks.php
2021-03-04 16:50:39 +01:00
Laurent Destailleur
beb8dbcc01
Update project.lib.php
2021-03-04 16:48:25 +01:00
Gauthier PC portable 024
4fe292c76d
FIX : getNomUrl() user in title and travis feedbacks
2021-03-04 16:29:32 +01:00
Laurent Destailleur
87c1e85017
Update mo_production.php
2021-03-04 16:10:50 +01:00
Laurent Destailleur
dcff298c5f
FIX #16533
2021-03-04 15:57:03 +01:00
Christophe Battarel
83350cde8f
remove hidden constant MAIN_ADVANCE_NUMLOT
2021-03-04 15:40:23 +01:00
Christophe Battarel
53cf042a57
adapt tobatch import/export
2021-03-04 15:35:53 +01:00
Laurent Destailleur
98eb0fc969
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-04 15:34:44 +01:00
Laurent Destailleur
ffa0e6c391
FIX Timezone management for datetime on list of events
2021-03-04 15:34:29 +01:00
Christophe Battarel
a4dcf603ed
fix repair batch stock for batch=2
2021-03-04 15:33:06 +01:00
Christophe Battarel
faf7b1d659
adapt dispatch for serial numbers
2021-03-04 15:31:51 +01:00
Christophe Battarel
6a242edd8b
check unicity of serial number
2021-03-04 15:29:47 +01:00
lmarcouiller
33f7f2c7d2
Fix #16525 : new button manufacturing order
2021-03-04 15:02:46 +01:00
atm-greg
c41b59b14c
Fix : when we have got models in database attached files are cleared even if we did not have selected a model
2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0
Fix: lost selecteds items in ticket creation
2021-03-04 11:50:46 +01:00
atm-lena
cd1c1c54d4
Merge branch 'FIX_BankEntries_OrderByUserSoc' of github.com:atm-lena/dolibarr into develop_FIX_OrderBy_UserThirdParty_BankEntries
2021-03-04 11:50:08 +01:00
atm-lena
0cce782a21
No orderby for user/thirdparty in bankentries list
2021-03-04 11:42:47 +01:00
stickler-ci
47dd477c61
Fixing style errors.
2021-03-04 09:36:17 +00:00
lmarcouiller
e94f703f5d
Fix #16523 : return to backward compatibility
2021-03-04 10:33:18 +01:00
Laurent Destailleur
7bc2e1ffad
FIX Timezone management for datetime with modulebuilder and extrafields
2021-03-04 10:31:31 +01:00
Florian HENRY
bf775855f6
avoid warning into modulebuilder
2021-03-04 10:28:41 +01:00
lmarcouiller
500f192a05
Fix #16523 : New column Contact assigned
2021-03-04 10:15:41 +01:00
Laurent Destailleur
5553bae3a1
FIX Timezone management for datetime with modulebuilder
2021-03-04 09:44:01 +01:00
Laurent Destailleur
33c4180781
FIX Timezone management for datetime with modulebuilder
2021-03-04 09:36:19 +01:00
Laurent Destailleur
a371647bca
FIX picto on shipment to reset qty to 0. Some quantities were not reset.
2021-03-04 08:52:55 +01:00
Florian HENRY
6844c57413
fix sql
2021-03-04 07:53:32 +01:00
Florian HENRY
ecd1915c0a
fix sql
2021-03-04 07:45:27 +01:00
Florian HENRY
c362a16df1
fix sql
2021-03-04 07:45:02 +01:00
Florian HENRY
89bd9c4e05
fix sql
2021-03-04 07:44:31 +01:00
Florian HENRY
879e8fe5f6
fix sql
2021-03-04 07:44:00 +01:00
Laurent Destailleur
31845e1dae
Fix phpcs
2021-03-04 00:04:43 +01:00
Laurent Destailleur
6503c81f47
FIX #16530
2021-03-03 23:55:28 +01:00
Laurent Destailleur
30dd4ac6ec
FIX #16530
2021-03-03 22:52:02 +01:00
Laurent Destailleur
aa1551bf1f
FIX class not found when creating recuring invoice from invoice+discount
2021-03-03 22:46:25 +01:00
Florian HENRY
ec52ed445c
fix ambigous
2021-03-03 22:18:42 +01:00
Florian HENRY
04c6d5dd8f
fix sql
2021-03-03 22:16:35 +01:00
Florian HENRY
91b93ac7ce
fix sql
2021-03-03 22:10:17 +01:00
Florian HENRY
9162574262
Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_draft
2021-03-03 22:00:35 +01:00
Florian HENRY
de4a76a266
ongoung
2021-03-03 22:00:23 +01:00
Florian HENRY
9c256ab8a8
fix review
2021-03-03 21:40:37 +01:00
Florian HENRY
5233ad7424
revert wrong code in commonobject
2021-03-03 21:38:43 +01:00
Laurent Destailleur
71370bd558
Fix links in cheque receipt pages
2021-03-03 21:18:14 +01:00
Florian HENRY
4e2f929460
test
2021-03-03 21:11:04 +01:00
Florian HENRY
55e9a6596b
test
2021-03-03 21:10:50 +01:00
Florian HENRY
1f2dc448d7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-03-03 20:28:27 +01:00
Florian HENRY
c682309817
migration ok
2021-03-03 20:27:55 +01:00
x
ae60f452cc
FIX : pencil to update employee field on card view
2021-03-03 16:36:21 +01:00
Florian HENRY
1434e58031
Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation
2021-03-03 16:28:31 +01:00
Florian HENRY
1913564b38
fix travis
2021-03-03 16:28:14 +01:00
Florian HENRY
c909306f34
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-03 16:27:05 +01:00
Laurent Destailleur
43e58f70a1
Merge pull request #16528 from frederic34/patch-4
...
remove unused code
2021-03-03 15:10:58 +01:00
Laurent Destailleur
d22f929779
Merge pull request #16526 from frederic34/patch-3
...
fix unknown constant and variable
2021-03-03 15:10:38 +01:00
stickler-ci
6cbc979520
Fixing style errors.
2021-03-03 13:52:21 +00:00
Gauthier PC portable 024
3643afd761
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries
2021-03-03 14:49:29 +01:00
Gauthier PC portable 024
ca8d2a671d
FIX : conf ajax must be after main form
2021-03-03 14:47:30 +01:00
Gauthier PC portable 024
845b1c6c94
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries
2021-03-03 14:35:38 +01:00
x
049080991d
FIX : label must be over user
2021-03-03 14:13:36 +01:00
stickler-ci
e1159f422a
Fixing style errors.
2021-03-03 13:11:01 +00:00
Alexandre SPANGARO
59a2fb8ed5
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-03 14:08:40 +01:00
Frédéric FRANCE
d05c0b749a
remove unused code
2021-03-03 13:11:10 +01:00
Frédéric FRANCE
2d9f00eb57
Update commonobject.class.php
2021-03-03 12:24:44 +01:00
Laurent Destailleur
da8b67da83
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-03 12:07:42 +01:00
Laurent Destailleur
5f8b52ffc9
Code comment
2021-03-03 12:05:43 +01:00
Laurent Destailleur
093eab188e
Code comment
2021-03-03 12:02:57 +01:00
Frédéric FRANCE
a8bf47b9ce
fix unknown constant and variable
2021-03-03 12:02:48 +01:00
Laurent Destailleur
f11a85a3e3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
2021-03-03 11:37:34 +01:00
Laurent Destailleur
889a496661
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-03 11:31:55 +01:00
Laurent Destailleur
b5d1e36ece
Fix include
2021-03-03 11:31:40 +01:00
Laurent Destailleur
6fcec3e99b
Merge pull request #16522 from FHenry/13.0
...
fix: warning on install
2021-03-02 23:58:26 +01:00
Laurent Destailleur
c2f0d9f42c
Update functions.lib.php
2021-03-02 23:57:37 +01:00
Laurent Destailleur
7abf572f2d
Merge pull request #16512 from Hystepik/develop#1
...
Fix #16432 : Update of getCountriesinEEC
2021-03-02 23:56:37 +01:00
Laurent Destailleur
348b8d2ffe
More phpunit tests
2021-03-02 23:55:41 +01:00
Florian HENRY
4e5849e50b
remove debug
2021-03-02 23:13:05 +01:00
Laurent Destailleur
7eb3e324c7
FIX #16503
2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1
fix warning
2021-03-02 22:55:43 +01:00
Frédéric FRANCE
6c30eca11d
user home
2021-03-02 22:41:20 +01:00
Florian HENRY
81f54003f6
set migration auto increment
2021-03-02 22:35:47 +01:00
stickler-ci
95d7380317
Fixing style errors.
2021-03-02 21:34:19 +00:00
Florian HENRY
c2d8dde4b1
Merge branch 'develop' of github.com:FHenry/dolibarr into develop
2021-03-02 22:33:36 +01:00
Florian HENRY
88f8642048
Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation
2021-03-02 22:32:27 +01:00
Florian HENRY
5dcbea4cc5
revome dev hack
2021-03-02 22:32:12 +01:00
Frédéric FRANCE
b0f735350f
new box replace
2021-03-02 22:31:55 +01:00
stickler-ci
e28f844d54
Fixing style errors.
2021-03-02 21:31:48 +00:00
Frédéric FRANCE
da038cf590
new box replace
2021-03-02 22:29:02 +01:00
Florian HENRY
e5e3abd685
class conference or booth or and table actioncomm ok
2021-03-02 22:23:54 +01:00
Frédéric FRANCE
22bc3b879b
new box replace
2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b
new box replace
2021-03-02 22:00:09 +01:00
Florian HENRY
6862c206aa
merge from develop
2021-03-02 21:48:35 +01:00
Frédéric FRANCE
742c12f9d6
rename new boxes
2021-03-02 20:58:21 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 20:41:01 +01:00
Laurent Destailleur
40f0304182
Merge pull request #16516 from OPEN-DSI/fix-commonobject-select-list-dependancies
...
FIX select list dependancies on common object (FIX #16510 )
2021-03-02 19:16:03 +01:00
Laurent Destailleur
1756d2833c
Merge pull request #16513 from AlexisLaurier/develop
...
Avoid loss of data on RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED
2021-03-02 19:15:22 +01:00
Frédéric FRANCE
bb2a505404
Update eventorganization.php
2021-03-02 18:26:04 +01:00
lvessiller
66ad8fbb24
FIX select list dependancies on common object ( FIX #16510 )
2021-03-02 17:21:55 +01:00
Frédéric FRANCE
15623ae852
fix
2021-03-02 16:39:04 +01:00
Frédéric FRANCE
5d78c3530b
test stickler
2021-03-02 16:34:04 +01:00
lmarcouiller
2eaa6ad6c6
Fix #16432 : Add cache use in function
2021-03-02 16:21:43 +01:00
Laurent Destailleur
c81d5ff4d0
Introduce a variable to cache some data.
2021-03-02 16:13:00 +01:00
Alexis LAURIER
516e7a3955
Merge branch 'develop' of https://github.com/AlexisLaurier/dolibarr into develop
2021-03-02 16:04:37 +01:00
Alexis LAURIER
e219972936
avoid lost of data for RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED
2021-03-02 16:04:26 +01:00
stickler-ci
b374a8a00b
Fixing style errors.
2021-03-02 15:03:36 +00:00
lmarcouiller
fc86784cfc
Fix #16432 : update with eldy advices
2021-03-02 16:03:14 +01:00
Laurent Destailleur
1876cd661a
Remove UK from list of european countries
2021-03-02 16:00:10 +01:00
Laurent Destailleur
8fc89b9ef1
Merge pull request #16511 from FHenry/13.0
...
fix #16510 (missing ($this->) in previous PR
2021-03-02 15:49:13 +01:00
Laurent Destailleur
7f1d61f8a8
Fix phpcs
2021-03-02 15:34:43 +01:00
Florian HENRY
373d52a562
Merge remote-tracking branch 'origin/13.0' into 13.0
2021-03-02 15:33:38 +01:00
Laurent Destailleur
a5bcc47d0d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-02 15:29:54 +01:00
Laurent Destailleur
a82ad6a02c
Fix phpcs
2021-03-02 15:29:27 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
lmarcouiller
c5ac79e34c
Fix #16432 : Update of getCountriesinEEX
2021-03-02 15:24:55 +01:00
Florian HENRY
2c163b8163
fix #16510
2021-03-02 15:22:22 +01:00
Laurent Destailleur
495c61c231
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-03-02 15:12:41 +01:00
Laurent Destailleur
5fd341bbd3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2021-03-02 15:11:18 +01:00
Laurent Destailleur
1f25f2bb7e
Fix phpcs
2021-03-02 15:09:29 +01:00
Laurent Destailleur
5af8e49c86
Fix permission on generated sitemap file
2021-03-02 15:08:03 +01:00
Laurent Destailleur
f219c9454a
Merge pull request #16251 from Hystepik/develop#5
...
Close #16218 : new button sitemap file
2021-03-02 14:56:10 +01:00
Laurent Destailleur
13e1ccb795
Update index.php
2021-03-02 14:55:42 +01:00
Laurent Destailleur
cdfb9254b3
Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields
...
FIX : select list dependencies now work for ModuleBuilder sellist field
2021-03-02 14:51:53 +01:00
Laurent Destailleur
3982a36a3e
Update commonobject.class.php
2021-03-02 14:47:35 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus
...
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
2021-03-02 14:45:05 +01:00
Laurent Destailleur
3a00952cd1
Update user.class.php
2021-03-02 14:44:31 +01:00
Florian HENRY
27c354567a
FIX : select list dependencies now work for ModuleBuilder sellist field
2021-03-02 14:06:11 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule
...
Add rule
2021-03-02 12:52:03 +01:00
Laurent Destailleur
1132ed306c
Merge pull request #16506 from andreubisquerra/patch-1
...
Avoid php errors if negative var in Receipt Module
2021-03-02 12:50:57 +01:00
Laurent Destailleur
2d200a523d
Merge pull request #16505 from frederic34/fixmerge
...
fix merge
2021-03-02 12:42:12 +01:00
Frédéric FRANCE
e1ff1c736c
fix typo
...
Conflicts:
htdocs/core/login/functions_openid.php
2021-03-02 12:41:34 +01:00
Laurent Destailleur
25b2de4874
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-02 12:40:00 +01:00
Laurent Destailleur
ba04c94b2d
Merge pull request #16502 from frederic34/patch-3
...
fix typo
2021-03-02 12:39:26 +01:00
Laurent Destailleur
ef99b0f98c
Update modulebuilder.lib.php
2021-03-02 12:38:17 +01:00
stickler-ci
35cb48d649
Fixing style errors.
2021-03-02 11:37:46 +00:00
Laurent Destailleur
1d642f49f7
Update facture.class.php
2021-03-02 12:37:24 +01:00
Laurent Destailleur
a161edefb1
Look and feel v14
2021-03-02 12:33:55 +01:00
Florian HENRY
812d3279b3
Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus
2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus
2021-03-02 11:05:20 +01:00
Florian HENRY
0f51072222
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-03-02 11:01:02 +01:00
Florian HENRY
17c8a32780
fix civility createion PK
2021-03-02 11:00:16 +01:00
Florian HENRY
593ae78761
avoid php wrning
2021-03-02 10:55:23 +01:00
atm-lena
2d2e76ee7f
Affichage conf
2021-03-02 10:07:23 +01:00
Frédéric FRANCE
cb507a61b9
backup with utf8mb4
2021-03-02 09:54:52 +01:00
Florian HENRY
d063533efb
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-03-02 09:46:05 +01:00
Florian HENRY
d7500b1609
fix php warning
2021-03-02 09:45:49 +01:00
Frédéric FRANCE
883faf6f43
Merge remote-tracking branch 'upstream/develop' into fixmerge
2021-03-02 08:13:33 +01:00
Laurent Destailleur
07aa533add
Disable box not related to page
2021-03-02 03:08:29 +01:00
Laurent Destailleur
d6b81b21f1
fix phpcs
2021-03-02 03:03:41 +01:00
Laurent Destailleur
7f209f7cc7
Clean code
2021-03-02 02:55:24 +01:00
Laurent Destailleur
592dacd849
Fix phpcs
2021-03-02 02:45:39 +01:00
Laurent Destailleur
5d6ada77ca
Fix test
2021-03-02 02:42:04 +01:00
Laurent Destailleur
0670a00b83
Fix phpcs
2021-03-02 02:06:09 +01:00
Laurent Destailleur
ebc3210308
FIX #16343
2021-03-02 01:58:36 +01:00
Laurent Destailleur
23e8401e61
FIX #16296
2021-03-02 01:22:23 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Laurent Destailleur
f1f950e8b7
Close #16395 - Can filter on proposal source in list
2021-03-02 00:11:15 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 00:09:44 +01:00
Frédéric FRANCE
c54a61bb67
fix
2021-03-01 23:54:03 +01:00
Frédéric FRANCE
284cdaf845
Merge remote-tracking branch 'upstream/develop' into patch-3
2021-03-01 23:43:47 +01:00
andreubisquerra
5bb7c521aa
Update dolreceiptprinter.class.php
2021-03-01 23:30:38 +01:00
andreubisquerra
15cc0f8775
Avoid php errors if negative var in Receipt Module
...
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
2021-03-01 23:09:07 +01:00
Laurent Destailleur
b8bd5cd0ee
FIX Protection to avoid #16504
2021-03-01 23:08:03 +01:00
Laurent Destailleur
fb0eda446e
Fix bad break
2021-03-01 22:00:48 +01:00
Laurent Destailleur
f64f53e460
Reduce errors
2021-03-01 21:57:45 +01:00
Laurent Destailleur
5b771eb798
Fix merge of 2 record.
2021-03-01 21:56:14 +01:00
Frédéric FRANCE
13c9a96107
fix phpcs
2021-03-01 21:44:59 +01:00
Frédéric FRANCE
287b215ef0
use tabs
2021-03-01 21:40:22 +01:00
Frédéric FRANCE
f2cdbf6bb2
Merge remote-tracking branch 'upstream/develop' into add_rule
2021-03-01 21:22:34 +01:00
Frédéric FRANCE
b54d9751f5
Merge remote-tracking branch 'upstream/develop' into fixmerge
2021-03-01 21:19:39 +01:00
Laurent Destailleur
d4512c48cd
Fix regression
2021-03-01 21:11:55 +01:00
Frédéric FRANCE
a5974bcf57
fix merge
2021-03-01 21:10:06 +01:00
stickler-ci
54d35fa59f
Fixing style errors.
2021-03-01 20:00:32 +00:00
Florian HENRY
32ef55cd9e
working default status/percent for event actioncomm
2021-03-01 20:58:02 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule
2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5
set Default values as CURD classes
2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus
2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab
default envent status
2021-03-01 19:54:30 +01:00
Laurent Destailleur
6e61ae8e56
Fix responsive
2021-03-01 19:50:35 +01:00
Florian HENRY
0edae6e19a
add class default values
2021-03-01 18:25:23 +01:00
Frédéric FRANCE
eb62750aab
fix typo
2021-03-01 18:06:03 +01:00
Laurent Destailleur
1cdea45707
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/societe/canvas/company/tpl/card_create.tpl.php
htdocs/societe/canvas/individual/tpl/card_create.tpl.php
htdocs/societe/card.php
2021-03-01 17:46:36 +01:00
Florian HENRY
b5fd3e4984
on going
2021-03-01 17:06:03 +01:00
stickler-ci
d20ba5a665
Fixing style errors.
2021-03-01 15:38:15 +00:00
Gauthier PC portable 024
861b583668
FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice
2021-03-01 16:34:42 +01:00
Juanjo Menent
96eb7a341a
FIX: Bad project filter in ticket list
2021-03-01 16:14:38 +01:00
Laurent Destailleur
222012da37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/paymentvarious.class.php
htdocs/compta/bank/various_payment/card.php
htdocs/don/card.php
htdocs/langs/en_US/main.lang
htdocs/public/payment/newpayment.php
test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Florian HENRY
5ba9ffeb09
change comlumn name
2021-03-01 15:36:50 +01:00
Florian HENRY
036d1d5802
change comlumn name
2021-03-01 15:36:22 +01:00
Florian HENRY
e101ff0d6d
change comlumn name
2021-03-01 15:34:02 +01:00
Laurent Destailleur
c5dac4854a
Merge pull request #16474 from bafbes/abb120370
...
fix:fk_region links to region code field and not to the rowid's
2021-03-01 14:16:14 +01:00
Laurent Destailleur
8a602ad143
Merge pull request #16493 from aspangaro/13p8
...
FIX: Various payment - Missing fields for check transmitter & bank name
2021-03-01 14:11:33 +01:00
Laurent Destailleur
b2cfc431bc
Merge pull request #16489 from aspangaro/13p7
...
FIX: Total_ht not show in contract link element
2021-03-01 14:07:29 +01:00
Laurent Destailleur
8bc3cf37ec
Merge pull request #16490 from frederic34/cron_code_syntax
...
code syntax cron directory
2021-03-01 14:03:39 +01:00
Laurent Destailleur
5cddd0465c
Fix trans
2021-03-01 13:25:54 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-01 12:55:45 +01:00
Laurent Destailleur
81f1bee10c
Fix option DONATION_USE_THIRDPARTIES
2021-03-01 11:18:14 +01:00
Gauthier PC portable 024
6da28f5e44
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-03-01 11:12:03 +01:00
Laurent Destailleur
a68721c5b4
Fix missing translation
2021-03-01 10:58:06 +01:00
Laurent Destailleur
c80151717e
Fix set of payment
2021-03-01 10:45:37 +01:00
Laurent Destailleur
0796bc45b1
Fix amount for some language on public payment page
2021-03-01 10:39:27 +01:00
lmarcouiller
b097e909a6
changes to fix pr with eldy advices
2021-03-01 09:52:34 +01:00
Hystepik
460bc2dbde
Merge branch 'develop' into develop#5
2021-03-01 09:03:38 +01:00
Alexandre SPANGARO
0abe576fdc
FIX: Various payment - Missing fields for check transmitter & bank name
2021-03-01 04:49:06 +01:00
Alexandre SPANGARO
d0ccdfafb4
FIX stats supplier proposal
2021-03-01 04:12:53 +01:00
Alexandre SPANGARO
abc93446bb
Fix list proposal
2021-03-01 04:12:15 +01:00
Alexandre SPANGARO
94a861c1c8
Code enhanced - Standardize field name
2021-03-01 04:07:31 +01:00
Alexandre SPANGARO
e35379a95d
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-01 03:20:25 +01:00
Alexandre SPANGARO
3b1a9cd668
FIX: Total_ht not show in contract link element
2021-03-01 03:18:14 +01:00
Alexandre SPANGARO
0d954cb1c7
FIX: Total_ht not show in contract link element
2021-03-01 03:09:36 +01:00
Frédéric FRANCE
ed3b637d7a
add new rule
2021-03-01 00:34:15 +01:00
Frédéric FRANCE
1b046f25cf
add new rule
2021-03-01 00:19:52 +01:00
Laurent Destailleur
77151bd560
Standardize tabs
2021-02-28 23:53:20 +01:00
Frédéric FRANCE
0a6f307716
code syntax cron directory
2021-02-28 23:47:30 +01:00
Laurent Destailleur
bcdfdae10c
FIX #16480
2021-02-28 23:43:07 +01:00
Laurent Destailleur
f7933a6884
Merge pull request #16470 from frederic34/s_code_syntax
...
code syntax s... t.. dir
2021-02-28 23:37:25 +01:00
Laurent Destailleur
26c8ee170f
Merge pull request #16469 from frederic34/r_code_syntax
...
code syntax r... dir
2021-02-28 23:37:14 +01:00
Laurent Destailleur
490faec547
FIX Timezone problems
...
Conflicts:
htdocs/core/lib/date.lib.php
test/phpunit/DateLibTest.php
2021-02-28 22:50:21 +01:00
Laurent Destailleur
ae81ab0c7c
FIX Timezone problems
2021-02-28 22:44:11 +01:00
Alexandre SPANGARO
de241eced3
FIX: Total_ht not show in contract link element
2021-02-28 22:22:20 +01:00
Laurent Destailleur
a6bc218280
Look and feel v14
2021-02-28 21:34:27 +01:00
Alexandre SPANGARO
706aad3b68
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-28 21:33:59 +01:00
Laurent Destailleur
5406de13ee
css
2021-02-28 21:33:13 +01:00
Alexandre SPANGARO
7a3dfda8ee
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 21:30:25 +01:00
Laurent Destailleur
0a0c7fdeb1
FIX hourglass and hide button to pay
2021-02-28 21:15:40 +01:00
Laurent Destailleur
79ed52c3d3
NEW Add last date of modification for website pages in list
2021-02-28 20:49:52 +01:00
Frédéric FRANCE
9e8aefbc75
Merge remote-tracking branch 'upstream/develop' into s_code_syntax
2021-02-28 17:49:17 +01:00
Frédéric FRANCE
ce9f09ae4e
Merge remote-tracking branch 'upstream/develop' into r_code_syntax
2021-02-28 17:41:39 +01:00
Frédéric FRANCE
709e2459e9
fix
2021-02-28 17:17:30 +01:00
Laurent Destailleur
87bc0f9c24
Fix align
2021-02-28 14:28:41 +01:00
Laurent Destailleur
6294ae61a8
Look and feel v14
2021-02-28 14:26:32 +01:00
Laurent Destailleur
886cbc61c8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
2021-02-28 13:37:45 +01:00
Laurent Destailleur
2a3b3753a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-28 13:27:38 +01:00
