Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
81,180 Commits 36 Branches 189 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
VESSILLER
0a125f73b5 NEW add units in product list 2019-11-20 14:21:35 +01:00
Laurent Destailleur
849449517f Fix responsive 2019-11-20 13:31:38 +01:00
Laurent Destailleur
f9092b1b8e Fix responsive 2019-11-20 13:22:40 +01:00
Laurent Destailleur
d7e8c71091 Look and feel v11 2019-11-20 12:45:15 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Laurent Destailleur
1b53375371 Look and feel v11 2019-11-19 21:21:15 +01:00
Laurent Destailleur
07c01a821e FIx #12466 manually (conflict pb) 2019-11-19 19:43:02 +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
7dba9ecdf4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-19 18:56:22 +01:00
Laurent Destailleur
2f3b4d239b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-19 18:56:12 +01:00
Laurent Destailleur
6bfb76d40d Merge pull request #12464 from bb2a/patch-6 
Update getfullname
 2019-11-19 10:55:47 +01:00
Laurent Destailleur
ebd1f74b3b Merge pull request #12469 from frederic34/patch-6 
Update bookkeeping.class.php
 2019-11-19 10:55:11 +01:00
Laurent Destailleur
3c09bbf739 Merge pull request #12468 from atm-florian/10.0 
fix title page linked files user
 2019-11-19 10:54:41 +01:00
Laurent Destailleur
49aa6ef9fa Merge pull request #12467 from atm-greg/Fix_ContactCardCivility 
fix bad getpost for civility_code in edit mode
 2019-11-19 10:54:17 +01:00
Laurent Destailleur
66aa367851 Merge pull request #12465 from aspangaro/10.0_p9 
Missing language key
 2019-11-19 10:53:47 +01:00
Laurent Destailleur
6bee8b32f9 Merge pull request #12470 from Dolibarr/scrutinizer-patch-11 
Scrutinizer Auto-Fixes
 2019-11-19 10:53:27 +01:00
Scrutinizer Auto-Fixer
cd7523318d Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-19 08:30:26 +00:00
Laurent Destailleur
5b6f0cb101 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2019-11-18 21:19:10 +01:00
Frédéric FRANCE
b61a3f1ba9 Update bookkeeping.class.php 2019-11-18 19:59:21 +01:00
florian HENRY
010219bf09 fix title pasge linked files user 2019-11-18 19:47:34 +01:00
Laurent Destailleur
f696998093 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-11-18 19:02:25 +01:00
Laurent Destailleur
918f476c2b Fix backport fix not checking mandatory extrafields of type select 2019-11-18 19:02:12 +01:00
Laurent Destailleur
fffc242484 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-18 18:09:25 +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
Laurent Destailleur
8fd327adbb css 2019-11-18 14:59:55 +01:00
atm-greg
99f93dbbf5 fix bad getpost 2019-11-18 14:33:01 +01:00
Laurent Destailleur
3300446cbf Fix td colspan 2019-11-18 14:13:51 +01:00
Laurent Destailleur
ae0fdf014f Debug email collector. Missing unique key. Fix initial setup. 2019-11-18 11:55:22 +01:00
Alexandre SPANGARO
79ee2b8c4d Missing language key 2019-11-18 11:48:44 +01:00
Laurent Destailleur
b69a7f9709 css 2019-11-17 20:25:39 +01:00
Laurent Destailleur
20b07529cb css 2019-11-17 17:45:00 +01:00
Laurent Destailleur
16d67a1a8e Fix several trouble with some types in modulebuilder 
Fix difference between null and 0
 2019-11-17 17:36:36 +01:00
Anthony Berton
7a5883588c Update commonobject.class.php 2019-11-17 14:07:01 +01:00
Laurent Destailleur
502626156e Work on MRP module 2019-11-17 01:23:19 +01:00
Laurent Destailleur
662c622432 Debug MRP 2019-11-17 00:37:08 +01:00
Laurent Destailleur
e15963688a Merge pull request #12435 from OPEN-DSI/fix-product-virtual-stock-stats-sending 
FIX add product qty in shipment already sent only if reel stock was d…
 2019-11-16 23:34:44 +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
d86eb5cdb1 Merge pull request #12457 from aspangaro/10.0_p20191116 
#12450 Fix accountancy write social contribution in bookkeeping (Need for FEC format)
 2019-11-16 23:31:21 +01:00
Laurent Destailleur
168ec0955c Merge pull request #12461 from Dolibarr/scrutinizer-patch-9 
Scrutinizer Auto-Fixes
 2019-11-16 23:29:32 +01:00
Laurent Destailleur
023f359328 Fix php compatibility 2019-11-16 23:28:56 +01:00
Laurent Destailleur
d58ad0ca86 Merge pull request #12462 from Dolibarr/scrutinizer-patch-10 
Scrutinizer Auto-Fixes
 2019-11-16 23:26:22 +01:00
Scrutinizer Auto-Fixer
eba082320c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-16 22:25:24 +00:00
Scrutinizer Auto-Fixer
1648fc142e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-16 22:24:29 +00:00
Laurent Destailleur
e7276f9044 Fix scrutinizer error 2019-11-16 23:22:28 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Laurent Destailleur
6dcd1f6275 Fix css 2019-11-16 13:50:12 +01:00
Laurent Destailleur
f40fdad06c Fix link between translations 2019-11-16 12:54:05 +01:00
Laurent Destailleur
c5b83ca3d8 Fix link translation of 2019-11-16 12:43:44 +01:00
Laurent Destailleur
53bbfcff6b Fix link translation of 2019-11-16 12:43:32 +01:00
Laurent Destailleur
6cf368189f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-16 12:18:13 +01:00