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

5201 Commits

Author SHA1 Message Date
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
5d955fa7e0 Update 10.0.0-11.0.0.sql 2019-12-14 13:51:13 +01:00
Laurent Destailleur
7d39554797 FIX Bad type of sql fields 2019-12-13 17:16:21 +01:00
Frédéric FRANCE
57055bad03 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Florian Mortgat
b715ecd7d9 FIX bookmark URLs get truncated to 255 chars 2019-12-11 16:42:03 +01:00
Laurent Destailleur
df7a86dd42 Merge pull request #12652 from frederic34/doxygen_societe 
doxygen societe class
 2019-12-09 13:02:49 +01:00
Laurent Destailleur
2b5866aca2 WIP Complete module MRP 2019-12-08 23:45:06 +01:00
Frédéric FRANCE
48564ea760 doxygen societe class 2019-12-08 14:26:59 +01:00
Laurent Destailleur
3030a9fa2a Fix manifest file was saved but not enabled. 2019-12-07 13:09:55 +01:00
Laurent Destailleur
18464de297 Clean old file 2019-12-04 22:08:32 +01:00
Laurent Destailleur
89dd74c115 Fix clean old files 2019-12-04 22:05:09 +01:00
Frédéric FRANCE
4c5c6b6ff1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
b678100c8d Update website temp 2019-12-02 09:19:20 +01:00
Maxime Kohlhaas
83928b4708 Fix duration must be double(24,8) to store seconds 2019-12-01 18:19:22 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
1c58cc5031 Clean doc 2019-11-30 10:59:47 +01:00
Laurent Destailleur
0083a3aa28 Update website templates 2019-11-28 13:04:44 +01:00
Laurent Destailleur
37a9c2e9ba Look and feel v11 2019-11-28 12:40:53 +01:00
Frédéric FRANCE
b2912e688b Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Laurent Destailleur
b440f2b1f4 Fix a ref is not null 2019-11-26 08:53:54 +01:00
Frédéric FRANCE
4c4ae5b6e1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Laurent Destailleur
6191307865 Debug v11 2019-11-22 12:22:27 +01:00
Laurent Destailleur
11be3b53f3 Fix migration 2019-11-21 18:39:51 +01:00
Laurent Destailleur
e8bc8b68c1 Fix missing field in migration 2019-11-21 18:17:40 +01:00
Laurent Destailleur
f7319aeefb Fix size of field 2019-11-20 18:50:03 +01:00
Frédéric FRANCE
d182eee4bf Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-19 23:26:00 +01:00
Laurent Destailleur
5d7a1f1265 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/en_US/stocks.lang
 2019-11-19 19:02:14 +01:00
Laurent Destailleur
74c85b742e Fix ref must be null until the generation of ref is ok 2019-11-18 18:09:12 +01:00
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f Debug email collector. Missing unique key. Fix initial setup. 2019-11-18 11:55:22 +01:00
Laurent Destailleur
502626156e Work on MRP module 2019-11-17 01:23:19 +01:00
Laurent Destailleur
7a4647b3fb Merge pull request #12458 from frederic34/doxygen_accountancy 
doxygen accountancy class
 2019-11-16 23:31:56 +01:00
Laurent Destailleur
6dcd1f6275 Fix css 2019-11-16 13:50:12 +01:00
Frédéric FRANCE
5c0976a778 doxygen accountancy class 2019-11-16 09:58:14 +01:00
Frédéric FRANCE
6784ea9fae Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
8ef9728470 Fix permission on file 2019-11-14 17:28:23 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Alexandre SPANGARO
1a9c430e00 Add migration 2019-11-14 04:53:13 +01:00
Frédéric FRANCE
9dcf53c65e add tables 2019-11-13 20:56:36 +01:00
Laurent Destailleur
88d2658625 Merge branch 'develop' into scrutinizer-patch-2 2019-11-13 19:14:50 +01:00
Frédéric FRANCE
05ab4f79ef categories for actioncomm 2019-11-13 18:44:11 +01:00
Laurent Destailleur
43ac3dc9e8 Merge pull request #12416 from frederic34/patch-6 
Update llx_c_action_trigger.sql
 2019-11-13 18:41:24 +01:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Laurent Destailleur
56c2dc2614 Reduce need of translations 2019-11-12 22:29:36 +01:00
Frédéric FRANCE
4f90fe0fd2 Update 10.0.0-11.0.0.sql 2019-11-12 21:34:45 +01:00
Frédéric FRANCE
422d893ecc Update llx_c_action_trigger.sql 2019-11-12 21:33:42 +01:00
Laurent Destailleur
1153b81e6f Update templates 2019-11-12 16:08:03 +01:00
Alexandre SPANGARO
812c032754 NEW French new regions 2019-11-12 15:56:11 +01:00