Ferran Marcet
|
b6faa6b605
|
FIX: Show Ref.Supplier in LinkToObjectBlock
|
2021-03-31 09:40:12 +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 |
|
Alexandre SPANGARO
|
38d47c184e
|
FIX: Add a sub table to manage accountancy on product/company
|
2021-03-30 22:12:57 +02:00 |
|
Alexandre SPANGARO
|
4e30481fa2
|
Merge remote-tracking branch 'upstream/develop' into 14a27
|
2021-03-30 22:05:03 +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
|
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
|
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 |
|
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 |
|
Laurent Destailleur
|
9ad3ba1572
|
Fix regression in export
|
2021-03-30 17:28:58 +02:00 |
|
Laurent Destailleur
|
6e422d26f3
|
FIX #yogosha5746 - next step (wip)
|
2021-03-30 16:20:18 +02:00 |
|
lmarcouiller
|
55560b7d38
|
Inventory module working
|
2021-03-30 12:35:20 +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
|
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
|
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
|
c2d583e665
|
Fix picto
|
2021-03-30 01:44:50 +02:00 |
|
Laurent Destailleur
|
3616d2ba44
|
FIX #yogosha5770
|
2021-03-29 23:24:52 +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 |
|
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 |
|
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
|
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
|
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 |
|
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
|
715490be0b
|
Merge pull request #16929 from aspangaro/14a28
NEW: Add company info in dropdown login menu
|
2021-03-29 19:02:12 +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 |
|
Florian HENRY
|
14a90a3a9d
|
on goung
|
2021-03-29 17:26:43 +02:00 |
|
Laurent Destailleur
|
96363b3913
|
Merge pull request #16974 from ksar-ksar/develop
FIX #16940
|
2021-03-29 17:07:19 +02:00 |
|
Florian HENRY
|
e18c010490
|
fix bug on list
|
2021-03-29 16:25:34 +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
|
3a4bb69c05
|
FIX #yogosha5749
|
2021-03-29 15:32:09 +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
|
e382d49299
|
Fix bad permission
|
2021-03-29 13:49:24 +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 |
|
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 |
|
daraelmin
|
8a43d65476
|
Copyright box_members_by_type.php
|
2021-03-29 07:49:15 +02:00 |
|
Laurent Destailleur
|
2a431d4951
|
Protect backtourl from using external urls
|
2021-03-28 21:39:18 +02:00 |
|
Laurent Destailleur
|
a5d84200dc
|
Clean code for invoice list
|
2021-03-28 19:22:04 +02:00 |
|
Alexandre SPANGARO
|
2a1cc04b66
|
Merge remote-tracking branch 'upstream/develop' into 14a22
|
2021-03-28 06:16:33 +02: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
|
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 |
|
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
|
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 |
|
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 |
|
Laurent Destailleur
|
cfd992b930
|
Add call of rebuild_sequence with pgsql.
|
2021-03-26 13:10:06 +01:00 |
|
Laurent Destailleur
|
02ba8810cf
|
Better error message
|
2021-03-26 12:23:42 +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 |
|
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 |
|
Laurent Destailleur
|
172b615d6c
|
Debug auto numbering of lot/serial.
|
2021-03-25 11:51:29 +01:00 |
|
Laurent Destailleur
|
5ddd98cd39
|
Move module intracomm as experimental
|
2021-03-25 11:24:46 +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
|
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
|
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
|
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
|
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
|
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 |
|
Laurent Destailleur
|
eeba9e4d50
|
Code comment
|
2021-03-24 21:58:06 +01:00 |
|
Laurent Destailleur
|
21a9779fe2
|
FIX inconsistency in margin recording with option "Force to sale price"
|
2021-03-24 21:49:45 +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
|
86c7ab922a
|
Fix #yogosha5728
|
2021-03-24 18:57:23 +01:00 |
|
Alexandre SPANGARO
|
34abb53c25
|
Merge remote-tracking branch 'upstream/develop' into 14a28
|
2021-03-24 14:09:46 +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
|
37c04b794f
|
Add property "ticket group is public" in dicitonary of ticket groups.
|
2021-03-24 12:13:23 +01:00 |
|
Laurent Destailleur
|
4ecd1def49
|
css
|
2021-03-24 11:00:26 +01:00 |
|
hugo
|
8a1cd3e471
|
FIX #16941 langs trans escape tag <i
|
2021-03-24 10:08:19 +01:00 |
|
Laurent Destailleur
|
367ff3c9f0
|
Look and feel v14
|
2021-03-24 01:53:08 +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 |
|
ATM john
|
4f693b86c2
|
shhhhhh ! There is nothing here...
|
2021-03-23 19:27:40 +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
|
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 |
|
Laurent Destailleur
|
a1366da130
|
FIX #yogosha5715
|
2021-03-23 03:45:17 +01:00 |
|
Laurent Destailleur
|
e3b019f923
|
Clean code
|
2021-03-23 01:32:17 +01:00 |
|
Laurent Destailleur
|
af593099df
|
Clean string
|
2021-03-22 23:52:14 +01:00 |
|
Laurent Destailleur
|
f7ba0ee381
|
Fix set of parent company with ajax
|
2021-03-22 22:50:43 +01:00 |
|
Laurent Destailleur
|
cce4ebdb8c
|
Clean code
|
2021-03-22 18:50:47 +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 |
|
Laurent Destailleur
|
ca1715df96
|
Add some protection for SQL injection
|
2021-03-22 13:31:06 +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 |
|
daraelmin
|
6ba878725e
|
Fix #16794 V13 order by status instead of statut
|
2021-03-22 07:28:16 +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 |
|
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
|
4ac5d32c48
|
Fix picto
|
2021-03-21 22:27:12 +01:00 |
|
UT from dolibit
|
32cf5240f8
|
Create index.html
|
2021-03-21 22:17:50 +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
|
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 |
|
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 |
|
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
|
800eeef868
|
Clean code
|
2021-03-21 18:20:37 +01:00 |
|
Laurent Destailleur
|
3c8bf2167b
|
Debug permissions
|
2021-03-21 18:01:43 +01:00 |
|
Laurent Destailleur
|
af199189b3
|
NEW Add color and picto for direction of movement
|
2021-03-21 13:46:01 +01:00 |
|
Laurent Destailleur
|
eeb1c5d884
|
Replace deprecated code
|
2021-03-20 21:46:10 +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
|
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
|
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 |
|
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
|
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
|
29e090b025
|
FIX force to entity 0 for all entities
|
2021-03-20 12:35:41 +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
|
ee84bef3b2
|
Merge pull request #16828 from frederic34/membersboxfix
fix new boxes add
|
2021-03-20 11:52:19 +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
|
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
|
e54ca79a8c
|
Merge pull request #16854 from frederic34/confglobal
get conf global function
|
2021-03-20 11:26:32 +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
|
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 |
|
Frédéric FRANCE
|
8142d76394
|
fix php8 warnings
|
2021-03-20 10:50:02 +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 |
|
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
|
1a2b22def4
|
fix doxygen
|
2021-03-20 09:14:52 +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
|
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 |
|
Laurent Destailleur
|
be90f5f2de
|
Fix id of advanced perm
|
2021-03-19 15:00:22 +01:00 |
|
Laurent Destailleur
|
8462c4d3d3
|
Clean menu
|
2021-03-19 13:37:43 +01:00 |
|
Laurent Destailleur
|
aef2f1713e
|
FIX #yogosha5673
|
2021-03-19 13:25:58 +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
|
43e1dbb9ef
|
FIX avoid php8 warning with multicompany
|
2021-03-19 11:27:31 +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 |
|
Frédéric FRANCE
|
7183bfeb94
|
fix new boxes add
|
2021-03-19 09:15:35 +01:00 |
|
Laurent Destailleur
|
b9aacca771
|
Fix css
|
2021-03-19 00:04:43 +01:00 |
|