Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

3092 Commits

Author SHA1 Message Date
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
4f7d3e794a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47 FIX #9992 2018-11-11 17:28:17 +01:00
Laurent Destailleur
2985d9cfbf Update 8.0.0-9.0.0.sql 2018-11-11 17:27:16 +01:00
delcroix Patrick
52f35d8038 to support proposal_supplier insert 
proposal_supplier has 17 char when the elementtype column can take only 16 char
 2018-11-10 14:59:46 +01:00
Laurent Destailleur
f1287578f3 Work on emailcollector 2018-11-09 18:18:17 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
eb9defcf1d Debug emailcollector 2018-11-05 16:42:29 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-05 09:56:57 +01:00
Laurent Destailleur
98a3af620b FIX #9934 2018-11-05 09:26:23 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
28d5f1d50b Fix sql syntax error 2018-11-03 11:30:32 +01:00
Maxime Kohlhaas
d1133916e0 Fix tracking field in dictionnary should not be mandatory 2018-11-01 15:33:14 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
c9ef298839 Fix setup template emails 2018-10-31 11:38:04 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
622f31fd1e Fix ref 2018-10-26 19:01:42 +02:00
Laurent Destailleur
d3893b8b95 Debug v9 2018-10-26 19:00:24 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Laurent Destailleur
36323752ed Project must be on a dedicated field 2018-10-24 12:00:54 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
b7d91c30d9 FIX missing symbol for indian rupies 2018-10-23 12:38:12 +02:00
Laurent Destailleur
eff0e959b3 Fix duplicate column 2018-10-10 13:06:54 +02:00
Laurent Destailleur
9fe3e7b6c0 Fix phpunit 2018-10-09 17:09:33 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-10-09 17:07:32 +02:00
Laurent Destailleur
dc498173c8 Code comment 2018-10-09 16:58:55 +02:00
Laurent Destailleur
c401739fed Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 16:28:03 +02:00
Laurent Destailleur
b4b82ce3d6 Drop both contraint and index 2018-10-09 16:25:57 +02:00
Laurent Destailleur
bde5ee1232 Merge pull request #9621 from ptibogxiv/patch-69 
Prepare for more stripe function
 2018-10-09 16:15:23 +02:00
Laurent Destailleur
b68f6c0fca Use more generic name 2018-10-09 16:15:12 +02:00
Laurent Destailleur
422af361b4 Merge pull request #9622 from ptibogxiv/patch-68 
Prepare for more stripe function
 2018-10-09 16:14:35 +02:00
Laurent Destailleur
65b48b06d9 Update llx_paiement.sql 2018-10-09 16:14:28 +02:00
Laurent Destailleur
94743d50be Merge pull request #9707 from aspangaro/9.0_FEC 
NEW Add FEC Export in accountancy
 2018-10-09 13:05:20 +02:00
Laurent Destailleur
41f2289ffa Save pos station into invoice 2018-10-08 22:28:30 +02:00
Alexandre SPANGARO
75b9862c14 New : Add FEC Export in accountancy 2018-10-08 21:01:21 +02:00
Laurent Destailleur
f9f93f58df Add field to track source module of invoice 2018-10-07 13:49:09 +02:00
Laurent Destailleur
402a383c83 Uniformize field os social networks 2018-10-07 13:31:40 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
Laurent Destailleur
56cb0763d1 Add maincolor property on website 2018-10-02 16:46:54 +02:00
Frédéric FRANCE
2b8ec8db1f Update llx_takepos_floor_tables.sql 2018-09-30 10:33:52 +02:00
Frédéric FRANCE
6f48f37fa0 Update 8.0.0-9.0.0.sql 2018-09-30 10:31:08 +02:00
Laurent Destailleur
a4ec613d73 Move sql table 2018-09-28 19:40:44 +02:00
ptibogxiv
a05bdccb06 Prepare for more stripe function 2018-09-27 10:47:58 +02:00
ptibogxiv
78b8881c44 Prepare for more stripe function 
support refund, dispute, capture....
 2018-09-27 10:43:43 +02:00
Carsten Brandt
fee46ac845 Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-27 09:39:00 +02:00