lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
120,612 Commits 43 Branches 150 Tags 886 MiB
f8d3c28e68
Commit Graph

12711 Commits

Author SHA1 Message Date
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Laurent Destailleur
5e4cf97a16
Merge pull request #23758 from marcusdeangabriel/PROPALE_MODIFY_MARGIN_RATES 
NEW Can modify margin rates in offers like VAT rates.
 2023-02-22 17:29:20 +01:00
Laurent Destailleur
fb4e3ec123 Debug v17 2023-02-22 15:50:46 +01:00
Laurent Destailleur
04ca203ee8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-21 12:21:01 +01:00
Laurent Destailleur
6f869be8c0 Fix lang 2023-02-21 10:41:47 +01:00
Laurent Destailleur
80df9434db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-02-21 02:37:22 +01:00
Laurent Destailleur
7225cd0e40
Merge pull request #23969 from atm-adrien/FIX_Update_BomNetNeeds_table 
Fix update bom net needs table
 2023-02-20 16:26:35 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Laurent Destailleur
cdf221bfb1 Trans 2023-02-20 13:26:43 +01:00
Adrien Raze
ace11dbf98 FIX : Update bom net needs table 2023-02-20 11:47:42 +01:00
Laurent Destailleur
c3a0411f09 doc 2023-02-20 02:09:57 +01:00
Laurent Destailleur
d89ccaeaad Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-19 18:18:38 +01:00
Laurent Destailleur
760135a0bb Look and feel v18 2023-02-19 12:41:53 +01:00
Laurent Destailleur
09b84f0837 Look and feel v18 2023-02-19 12:10:59 +01:00
priojk
45a6d12d65 Fix: Original translation change misleading in many places 2023-02-18 22:33:42 +01:00
Laurent Destailleur
a691ecd8d3 trans 2023-02-18 10:49:35 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Eric Seigne
3581f14b40 NEW: add customize CSS in admin/ihm settings 2023-02-17 00:29:14 +01:00
marcusdeangabriel
f39d32255c
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-16 10:28:44 +01:00
Laurent Destailleur
dc9109ea63 Fix merge 2023-02-15 20:40:08 +01:00
Laurent Destailleur
11488a1f8d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-15 18:26:29 +01:00
Laurent Destailleur
c06f0e0b20 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-15 18:23:22 +01:00
Laurent Destailleur
6db1c1cd2f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-15 18:22:06 +01:00
Laurent Destailleur
32d27887b1 Fix message for profit calculation 2023-02-15 18:11:25 +01:00
Laurent Destailleur
55eb800beb trans 2023-02-15 15:58:10 +01:00
Laurent Destailleur
331f0290f9 Fix trans 2023-02-14 21:06:19 +01:00
Laurent Destailleur
a0c53bc0bc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-14 21:04:44 +01:00
Laurent Destailleur
0c855fbb3c Sync transifex 2023-02-14 20:56:10 +01:00
Laurent Destailleur
8a58c3e292 NEW Option to show column for field and line selection on the left 
(MAIN_CHECKBOX_LEFT_COLUMN)
 2023-02-14 18:48:46 +01:00
Laurent Destailleur
b3160b7dc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-13 19:48:36 +01:00
Laurent Destailleur
83727d08ba Enhance the virtual business card feature 2023-02-13 19:34:36 +01:00
Laurent Destailleur
66369567b3
Merge pull request #23883 from frederic34/knowledgemgmt 
add ajax tooltip on knowledge record
 2023-02-13 18:21:09 +01:00
Laurent Destailleur
cf7770262a
Merge pull request #23884 from frederic34/patch-4 
missing translations
 2023-02-13 18:17:23 +01:00
Laurent Destailleur
19bfb021e1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-13 13:51:35 +01:00
Frédéric FRANCE
08838d4deb clean code 2023-02-13 13:16:27 +01:00
marcusdeangabriel
77087ed700
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-13 09:36:08 +01:00
Frédéric FRANCE
509dfacbf7
missing translations 2023-02-12 18:02:58 +01:00
Frédéric FRANCE
6144b6e99d add two widgets 2023-02-12 09:54:57 +01:00
Laurent Destailleur
c02113de6a Debug v17 2023-02-11 13:04:23 +01:00
Laurent Destailleur
0d557d1afc Debug v17 2023-02-11 12:28:23 +01:00
Lamrani Abdel
844ee2f9e5 New functionality and fix som coherence in initial object & deleteObject 2023-02-10 18:02:25 +01:00
Laurent Destailleur
1554a54e17 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-09 19:41:55 +01:00
Laurent Destailleur
2a83487c46 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-09 19:37:33 +01:00
Laurent Destailleur
cab7600f6d
Merge pull request #23742 from frederic34/ajaxtooltip 
work on ajax tooltip
 2023-02-09 18:17:13 +01:00
Laurent Destailleur
a088ef99ee
Merge pull request #23855 from frederic34/patch-14 
missing translation
 2023-02-09 15:28:05 +01:00
Frédéric FRANCE
1fa1d11500 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-09 15:26:40 +01:00
Laurent Destailleur
d70fd76487
Merge pull request #23851 from lamrani002/deleteMenuManually 
NEW functionality "Delete menu manually" for moduleBuilder
 2023-02-09 14:48:41 +01:00
Frédéric FRANCE
4985d8b350
missing translation 2023-02-09 14:34:13 +01:00
Laurent Destailleur
dfda68a63c Debug v17 - Online membership subscription of members 2023-02-09 14:33:09 +01:00
Lamrani Abdel
78c6f12a8a NEW functionality (delete menu manually) in modulebuilder 2023-02-09 11:40:43 +01:00
marcusdeangabriel
5a0e231370
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-09 08:46:45 +01:00
Laurent Destailleur
f444dd8f49 Trans 2023-02-09 00:58:55 +01:00
Laurent Destailleur
34b4cad448 Complete trans 2023-02-08 13:18:32 +01:00
Laurent Destailleur
47128f2ccc Debug v17 2023-02-08 04:40:13 +01:00
Frédéric FRANCE
eef350d1d3 add ajax tooltip on dolresource 2023-02-07 21:44:39 +01:00
Laurent Destailleur
d82a8dc7b1 Trans 2023-02-07 20:35:11 +01:00
Laurent Destailleur
e71ad2e23b Maxi debug of OAuth module 2023-02-07 20:12:53 +01:00
Laurent Destailleur
c545b98a24 The Use of PHP-IMAP lib must be enabled from interface 2023-02-07 11:39:29 +01:00
Laurent Destailleur
7c4858fdc3 Add page with help for ingoing email setup 2023-02-07 11:05:09 +01:00
marcusdeangabriel
83b76ddfd9
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-07 08:23:48 +01:00
Laurent Destailleur
bce55fc3b4 Trans 2023-02-07 01:40:20 +01:00
Laurent Destailleur
e671b63a02 Trans 2023-02-07 01:32:44 +01:00
marcusdeangabriel
a004f8b62c
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-06 16:24:01 +01:00
Laurent Destailleur
5a25126117 Clean code and label of permission 2023-02-06 13:12:34 +01:00
marcusdeangabriel
f974295a45
Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-06 09:10:43 +01:00
Laurent Destailleur
3214b69786 Better messages 2023-02-06 00:28:02 +01:00
Frédéric FRANCE
9213ba76d8
Update admin.lang 2023-02-04 19:10:35 +01:00
lamrani abdelwadoud
385d068ed1
Merge branch 'develop' into RightsInModuleBuilder 2023-02-03 14:00:41 +01:00
Lamrani Abdel
ed42696a79 add message warning & error in library lang 2023-02-03 10:29:33 +01:00
Laurent Destailleur
1be5145148 NEW Add more zip, town, country for owner of a bank account 2023-02-02 16:04:16 +01:00
Laurent Destailleur
fc64d78247 NEW The upgrade process can be done by creating a file upgrade.unlock 2023-02-02 12:58:12 +01:00
mgabriel
895957e89d Modify margin rates in offers like VAT rates. 2023-02-02 08:41:08 +01:00
Laurent Destailleur
e67eac97e7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-01 00:00:59 +01:00
Laurent Destailleur
670d77ce34 Sync transifex 2023-01-31 23:41:05 +01:00
Laurent Destailleur
9fb08b5a0a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-31 21:28:59 +01:00
Laurent Destailleur
99f26b49b7 Trans 2023-01-31 19:46:02 +01:00
Laurent Destailleur
897477d1c7 Trans 2023-01-30 19:27:00 +01:00
Laurent Destailleur
5c6d0bc26f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-30 03:01:13 +01:00
Laurent Destailleur
4e80d42ad1
Merge pull request #23698 from emheyarssi/develop 
Add translation for hidind social network
 2023-01-29 20:54:11 +01:00
Laurent Destailleur
a2a18ffb71 Trans 2023-01-28 18:35:01 +01:00
Marc
7c385032ce
Merge branch 'Dolibarr:develop' into develop 2023-01-28 13:14:33 +01:00
Laurent Destailleur
9ecd2c4bee Trans 2023-01-27 14:47:43 +01:00
Laurent Destailleur
0765a1196f FIX Check of date of validity 2023-01-27 14:40:30 +01:00
Laurent Destailleur
923e63c8e3 Trans 2023-01-27 11:05:06 +01:00
Adrien Raze
52c39d05f7 FIX : Make help text part bold 2023-01-26 15:32:37 +01:00
Marc
b9903b587f
Merge branch 'develop' into develop 2023-01-26 12:14:45 +01:00
Laurent Destailleur
d36acc63dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-26 02:32:26 +01:00
Laurent Destailleur
a6daba61ce Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-26 02:32:08 +01:00
Laurent Destailleur
8675abeec8
Merge pull request #23342 from daraelmin/daraelmin-box-adh-tags 
NEW Add widget box_members_by_tags.php
 2023-01-26 00:55:42 +01:00
hystepik
d8ce744e4c New : Export for module ticket 2023-01-25 16:56:27 +01:00
Laurent Destailleur
fe6d9730cd Fix messages to avoid confusion. 2023-01-24 16:58:35 +01:00
Laurent Destailleur
5b5a3547e2 Debug v17 2023-01-24 13:00:09 +01:00
Laurent Destailleur
9a5f19984b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-20 19:14:10 +01:00
Laurent Destailleur
4ffda61432 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-20 19:13:13 +01:00
Laurent Destailleur
56f0efa2fc Fix greek language 2023-01-20 19:09:56 +01:00
Laurent Destailleur
f054dabbdf NEW expend/collapse list of social networks 2023-01-20 13:51:07 +01:00
Laurent Destailleur
b78eebaae2 Clean code 2023-01-20 12:44:56 +01:00
marc
db2d40c93d Add translation for hidind social network see #23583 2023-01-20 12:17:45 +01:00
Laurent Destailleur
e28fce6318 Debug 2023-01-19 01:16:39 +01:00
Laurent Destailleur
02c2a6f6d5
Merge pull request #23540 from fappels/develop_disallow_reopen_when_reception 
FIX Disallow supplier order line delete if already received.
 2023-01-18 23:34:05 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
bea715ea71
Merge pull request #23572 from dolibit-ut/patch-645 
Update bookmarks.lang
 2023-01-18 20:20:53 +01:00
Quentin-Seekness
d079348290
Update products.lang 2023-01-17 15:29:41 +01:00
Laurent Destailleur
251f5c7056 Trans 2023-01-17 12:25:51 +01:00
Laurent Destailleur
38e253fe0e Trans 2023-01-17 12:25:13 +01:00
Laurent Destailleur
7668233d0c NEW Tooltip to explain how to add a photo on product 2023-01-17 10:22:23 +01:00
Laurent Destailleur
f2f4cdbe6a NEW Invalidate all sessions of a user when password is modified. 2023-01-16 11:48:34 +01:00
Laurent Destailleur
5867b62496 Fix do not change password if same 2023-01-16 11:00:34 +01:00
Laurent Destailleur
acc30da1fe Fix do not change password if same 2023-01-16 10:57:31 +01:00
Francis Appels
f45ec82904 Disallow line delete if already dispatched 2023-01-15 13:13:49 +01:00
Francis Appels
d842d0394d Revert "FIX re-open supplier order should not be allowed when there is a reception." 
This reverts commit c52fab09e6.
 2023-01-15 12:51:21 +01:00
Laurent Destailleur
3026842467 trans 2023-01-15 11:39:38 +01:00
Laurent Destailleur
f8e5889ba7 Enhance vcard 2023-01-15 01:42:11 +01:00
UT from dolibit
39a224d7a1
Update bookmarks.lang 2023-01-15 01:18:32 +01:00
Laurent Destailleur
03842ca251 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-14 00:40:53 +01:00
Laurent Destailleur
3a64183f5c
Merge pull request #23071 from Easya-Solutions/new-emailcollector-operation-type-contact 
NEW operation type in email collector to load or create contact
 2023-01-13 23:30:56 +01:00
Laurent Destailleur
3bac52d053
Merge pull request #23143 from milenmk/massaction-delete-project-tasks 
NEW|New [Bulk delete Project tasks]
 2023-01-13 23:29:19 +01:00
Laurent Destailleur
1bd63b36d3 Trans 2023-01-13 19:57:14 +01:00
Laurent Destailleur
2890b7354f
Merge pull request #23533 from Hystepik/develop#1 
New : Add reload of modules in configuration
 2023-01-13 13:24:10 +01:00
Laurent Destailleur
8eb89e0ad1 Remove merged feature with too many pb: 
1=Not yet implemented everywhere.
2=Seems a duplicate info with the picto warning when late (so in past
not done)
3=Is also a duplicate with the existing css event-future, event-past,
event-current
4=It overwrites to choice done by the theme
5=Implementation is wrong, it must use css and not #background

Use CSS instead
 2023-01-13 12:14:20 +01:00
Laurent Destailleur
a074c89960
Merge pull request #21506 from Easya-Solutions/new-event-list-with-color 
NEW events list with color
 2023-01-13 11:29:22 +01:00
Francis Appels
c52fab09e6 FIX re-open supplier order should not be allowed when there is a reception. 2023-01-13 09:01:31 +01:00
Laurent Destailleur
5bbfdbb775 NEW Show counter of access of website in website list 2023-01-12 22:11:13 +01:00
hystepik
8a5423b464 add newline end of file 2023-01-12 16:29:58 +01:00
hystepik
551daa5ca1 New : Add reload of modules in configuration 2023-01-12 16:26:39 +01:00
Laurent Destailleur
99a58dc6db
Merge pull request #23479 from aspangaro/18a2 
NEW Accountancy - Add sub-account balance FPC22
 2023-01-11 21:23:09 +01:00
Laurent Destailleur
04a216bf62 Debug and clean link page 2023-01-10 10:39:07 +01:00
Laurent Destailleur
81d2c7fa0e NEW Can bin accounting line for a given month 2023-01-10 10:21:36 +01:00
Alexandre SPANGARO
6d26f242bb Merge remote-tracking branch 'upstream/develop' into 18a2 2023-01-10 05:46:00 +01:00
Alexandre SPANGARO
cce5741aca NEW Accountancy - Add sub-account balance - FPC22 2023-01-10 05:45:47 +01:00
Laurent Destailleur
ab870d99c1
Merge pull request #21196 from aspangaro/17p3 
NEW Accountancy - Manage customer retained warranty FPC21+
 2023-01-08 14:53:43 +01:00
Laurent Destailleur
b80c0e1b13
Merge pull request #21596 from BB2A/NEW---List-product-in-orders 
NEW - List product in orders
 2023-01-08 14:41:30 +01:00
Laurent Destailleur
4336b188c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-01-07 17:36:52 +01:00
Laurent Destailleur
75d9793145 Fix virtual card feature 2023-01-07 14:34:30 +01:00
Alexandre SPANGARO
183552461c NEW Accountancy - Add an option to disable autolettering when transferring to accounting 2023-01-07 08:20:48 +01:00
Laurent Destailleur
00740ca267 WIP Work on public virtual card 2023-01-07 04:42:24 +01:00
Laurent Destailleur
ba08457171 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-06 16:55:41 +01:00
Laurent Destailleur
b707c79d6d FIX look and feel v17 (always a message instead of empty lists) 2023-01-06 15:46:17 +01:00
Laurent Destailleur
81ed62223d Trans 2023-01-06 14:57:06 +01:00
Laurent Destailleur
d32f0304ba Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-06 14:48:10 +01:00
Laurent Destailleur
9db7daf449 Fix trans 2023-01-06 14:16:58 +01:00
Laurent Destailleur
1a7c700ed4 Sync transifex 2023-01-06 14:03:36 +01:00
Laurent Destailleur
52ba5b0913 Trans 2023-01-06 13:58:39 +01:00
Laurent Destailleur
1807587df7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-06 13:26:10 +01:00
Laurent Destailleur
e4dc10f6bd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-06 12:26:54 +01:00
Laurent Destailleur
68e4e71005 FIX: Amount of localtax1 and 2 not correctly save on purchase order (the 
rate was saved instead)
 2023-01-06 12:08:40 +01:00
Laurent Destailleur
3aa42d09e3 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-04 18:13:25 +01:00
Laurent Destailleur
c2b98856d3 Debug v17 2023-01-04 15:43:08 +01:00
Laurent Destailleur
0feac89942
Merge pull request #23209 from Easya-Solutions/new-accountancy-export-quadatus-with-archive 
NEW Quadratus export with attachments in accountancy export
 2023-01-04 07:53:52 +01:00
Laurent Destailleur
00fa438c05 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-03 02:40:22 +01:00