Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

127 Commits

Author SHA1 Message Date
Frédéric FRANCE
f4540dddb8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
2d017a6c80 Fix migration 2019-10-17 20:09:24 +02:00
Laurent Destailleur
005b1b12c4 Work on sort of permission per family+module 2019-10-17 19:33:06 +02:00
Laurent Destailleur
87ec1de78e Start to work on solution to sort permissions by module 2019-10-17 18:43:07 +02:00
Laurent Destailleur
e94d47daf7 Work on MRP module 2019-10-15 19:57:23 +02:00
Frédéric FRANCE
2351750d2b Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-14 19:02:46 +02:00
Laurent Destailleur
7973b03201 NEW Add estimated duration on the BOM module 2019-10-14 11:38:36 +02:00
Frédéric FRANCE
367ef4acaf Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
de107fb02e NEW Can set a squarred icon on your company setup 2019-10-11 11:27:05 +02:00
Frédéric FRANCE
02b706f9c0 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-09 13:40:46 +02:00
Laurent Destailleur
29384d9a71 Merge branch 'develop' into patch-187 2019-10-09 13:02:47 +02:00
Laurent Destailleur
a8fbefed8c Update 10.0.0-11.0.0.sql 2019-10-08 19:42:40 +02:00
Laurent Destailleur
dcc4fa6a64 Merge branch 'develop' into patch-255 2019-10-08 19:37:42 +02:00
Frédéric FRANCE
f253315c8d Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
ptibogxiv
17198d59c2 Update 10.0.0-11.0.0.sql 2019-10-08 16:17:31 +02:00
Laurent Destailleur
d55b7689bb Merge pull request #11920 from ptibogxiv/patch-264 
NEW translation for member type
 2019-10-08 09:00:49 +02:00
Frédéric FRANCE
b78187c1eb Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
c6c498fd67 Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
e02794248e Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Frédéric FRANCE
f80fa08a2d Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-07 07:57:05 +02:00
Laurent Destailleur
d4bb6490e9 Fix migration 2019-10-06 16:25:22 +02:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Frédéric FRANCE
0383fdbeee Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 18:37:14 +02:00
Frédéric FRANCE
edf559697a restore unfinished old commit 2019-10-01 23:47:45 +02:00
Frédéric FRANCE
9755d15f52 work on migration script 2019-10-01 17:51:44 +02:00
Laurent Destailleur
22f07fe54d Merge branch 'develop' into patch-234 2019-09-30 18:09:05 +02:00
ptibogxiv
f132f2f947 Update 10.0.0-11.0.0.sql 2019-09-29 15:40:26 +02:00
Frédéric FRANCE
cea3669ffa Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent Destailleur
07b555b965 Merge branch 'develop' into patch-255 2019-09-27 15:23:15 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Frédéric FRANCE
03086026b8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Laurent Destailleur
64fc735340 Fix length of fields to card saved with setupintent 2019-09-23 18:12:58 +02:00
Laurent Destailleur
1584a4bf79 Add trigger event USER_SENTBYMAIL in agenda 2019-09-23 12:27:51 +02:00
ptibogxiv
b969de46bc Update 10.0.0-11.0.0.sql 2019-09-17 14:05:39 +02:00
Frédéric FRANCE
904d0ecaee Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 18:42:31 +02:00
Laurent Destailleur
54f0532073 Work on #4432 2019-09-14 16:51:57 +02:00
Frédéric FRANCE
230c14e189 add social networks 2019-09-12 22:32:41 +02:00
Frédéric FRANCE
bed959bb38 add entity 2019-09-12 21:17:52 +02:00
Frédéric FRANCE
6f33874d75 add entity 2019-09-12 21:13:00 +02:00
Frédéric FRANCE
e0f17cc71c add socialnetworks dictionary 2019-09-11 22:47:23 +02:00
Frédéric FRANCE
3fddef0c9e add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
florian HENRY
617e430998 fix stravis and sticker 2019-09-09 12:31:17 +02:00
florian HENRY
63a83a0fa5 resolve conflict 2019-09-09 11:35:37 +02:00
Laurent Destailleur
8381b93e80 Fix init of public holidays 2019-09-09 11:06:54 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00
florian HENRY
bdb297a380 resolve conflict 2019-09-09 10:15:44 +02:00
Laurent Destailleur
ca71f02d41 Merge branch 'develop' into develop_pdf 2019-09-06 23:30:12 +02:00
Laurent Destailleur
e1ee70fd8f Start to implement date selection of supplier proposals 2019-09-06 12:45:27 +02:00