Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,561 Commits 36 Branches 189 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

11075 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
2f77181781 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 09:47:18 +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
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
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
Dorian Vabre
15d103e957 subs validation for free conferences added 2021-04-12 15:52:49 +02:00
Christophe Battarel
855e736d32 Merge branch 'develop' into product_masks 2021-04-12 11:42:23 +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
451164ba64 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-10 21:44:23 +02:00
NextGestion
2035b956a6 Fix Sql & translate files 2021-04-10 10:57:23 +01: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
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
altairis-noe
000342c2d8 custom masks : create, edit and display 2021-04-09 13:40:37 +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
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
afca96a8ee Enhance barcode scanner tool 2021-04-09 12:08:56 +02:00
daraelmin
f2a49ef72f New option amount by member type 2021-04-09 02:23:22 +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
af5b623b59 securekey added 2021-04-08 16:32:50 +02:00
Laurent Destailleur
5fd9ee20eb Merge branch 'develop' into develop#4 2021-04-08 15:42:07 +02: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
Dorian Vabre
c6d3510e30 form ok, todo : creation of an attendee 2021-04-07 17:16:26 +02:00
Christophe Battarel
05efc85008 Merge pull request #2 from altairis-noe/product_masks 
Product masks
 2021-04-07 16:20:39 +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
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
Dorian Vabre
07e018dc7d work in progress 2021-04-07 12:30:08 +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
altairis-noe
fc76e06058 Better tooltip, better name, translation 2021-04-07 10:25:30 +02:00
Laurent Destailleur
4ccb27ad40 Work on inventory module 2021-04-07 02:24:15 +02:00
Laurent Destailleur
0219a18a5c trans 2021-04-07 01:27:56 +02:00
Laurent Destailleur
d1df327284 Add tab for import/export profiles 2021-04-06 18:51:43 +02:00