Commit Graph

10913 Commits

Author SHA1 Message Date
Gauthier PC portable 024
cbfb2d9b47 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 09:44:24 +02:00
Laurent Destailleur
39654260d6 Sync transifex 2021-04-20 00:45:48 +02:00
Laurent Destailleur
0ac380f23e Merge pull request #17248 from altairisfr/batch_mask_product
Batch mask product
2021-04-19 22:16:22 +02:00
Laurent Destailleur
ee9c823c33 Merge pull request #17279 from aspangaro/14a38
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
2021-04-19 21:42:13 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67 Merge branch 'develop' into new/check_update_for_module 2021-04-19 21:26:01 +02:00
Dorian Vabre
128dcb2e2b public registration page for booths and conferences created, wip 2021-04-19 17:26:01 +02:00
NextGestion
7cab4dd19d Manage partnership for members & code optimisation 2021-04-19 15:17:57 +01:00
Dorian Vabre
9a32526938 added space for the link to the conference/booth registration page 2021-04-19 15:49:51 +02:00
Laurent Destailleur
2cd9289de1 Fix error message 2021-04-19 15:09:13 +02:00
NextGestion
ea97cf5baf Change translate file 2021-04-19 13:46:21 +01:00
Gauthier PC portable 024
894eb1e5a4 NEW : "+" and "-" to show / hide batch details on product "stock" tab 2021-04-19 14:34:11 +02:00
NextGestion
263e110ca3 Enhance module Member 2021-04-19 13:19:32 +01:00
Laurent Destailleur
379f105e4c Trans 2021-04-19 14:18:41 +02:00
Dorian Vabre
701b53773b added description of the line in the invoice, problem with dates that are int 2021-04-19 09:54:29 +02:00
Laurent Destailleur
a1acc896e2 Accept several sizes for favicon 2021-04-18 23:25:47 +02:00
ATM john
7794927a64 New check update for modules 2021-04-18 20:12:24 +02:00
NextGestion
5a8742b3eb Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website 2021-04-17 13:25:28 +01:00
NextGestion
87bcb212df Merge branch 'develop' into dolibarr_partnership 2021-04-17 13:51:21 +01:00
Laurent Destailleur
0d8a354934 Set default length of password to 12 car.
FIX #yogosha5855
2021-04-17 03:11:58 +02:00
jove@bisquerra.com
712e1c4e7c NEW Edit sales lines rights in TakePOS 2021-04-17 01:06:30 +02:00
Laurent Destailleur
9eaf836c8e Merge pull request #17281 from altairisfr/warehouses_in_project
Warehouses in project
2021-04-16 20:29:21 +02:00
NextGestion
f784114176 Add email template for accepted partnership 2021-04-16 13:53:12 +01:00
NextGestion
22ec79d03c Code optimisation 2021-04-16 12:10:26 +01:00
NextGestion
ba93ccaa01 Decline reason for partnership management 2021-04-16 10:56:01 +01:00
NextGestion
0d4a1d061a Merge branch 'develop' into dolibarr_partnership 2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474 Manage mass action "Send email" for Partnership module 2021-04-16 09:54:11 +01:00
Dorian Vabre
2cbe5b188e wip invoice 2021-04-15 16:57:41 +02:00
Laurent Destailleur
bf547cf20d Debug v14 2021-04-15 14:33:48 +02:00
NextGestion
e8fc6fe293 Code optimization 2021-04-15 11:21:33 +01: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
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
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
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
63d4d83025 Better text 2021-04-14 15:15:52 +02:00
NextGestion
4e45011e45 Manage Partnership for third-party 2021-04-14 13:59:38 +01: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
Christophe Battarel
ccc05a0a43 Merge branch 'develop' into batch_mask_product 2021-04-14 08:30:19 +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
192fcb89d2 Merge pull request #17097 from NextGestion/dolibarr_partnership
Create Partnership Module
2021-04-13 16:33:54 +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
fa47106ed7 Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment 2021-04-13 12:21:27 +02:00
Laurent Destailleur
3439bc4a0f Clean code 2021-04-13 11:30:23 +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
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