Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
74,214 Commits 36 Branches 189 Tags
b69f63e7d7a6074c347e0ccd2bcabb97b9b95ca2
Commit Graph

64920 Commits

Author SHA1 Message Date
Frédéric FRANCE
b69f63e7d7 replace html by html5 2019-03-10 09:32:19 +01:00
Frédéric FRANCE
13042ade53 replace html by html5 in expedition 2019-03-10 09:13:13 +01:00
Frédéric FRANCE
43aacbd55a replace html by html5 in donation 2019-03-10 09:00:59 +01:00
Laurent Destailleur
d659543ac0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 19:00:57 +01:00
Laurent Destailleur
fa4467fb5f FIX Tooltip on click was ko on smartphone 2019-03-09 18:37:07 +01:00
Laurent Destailleur
441b577599 Add missing trans 2019-03-09 12:58:52 +01:00
Laurent Destailleur
10b9fdc1fd Fix column definition 2019-03-09 02:05:28 +01:00
Laurent Destailleur
799271daa5 Try to add more log to debug expense report creation error 2019-03-09 01:45:11 +01:00
Laurent Destailleur
b710e28ffa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang
 2019-03-09 01:20:13 +01:00
Laurent Destailleur
3716834b0a Fix bad var name 2019-03-09 01:13:15 +01:00
Laurent Destailleur
d99f4c1726 Fix var not used 2019-03-09 01:08:50 +01:00
Laurent Destailleur
1a715e794c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 01:06:19 +01:00
Laurent Destailleur
c6d7987b57 FIX method db->active does not exists 2019-03-09 01:06:07 +01:00
Scrutinizer Auto-Fixer
68188ffda1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-03-09 00:02:05 +00:00
Laurent Destailleur
73b359c124 Fix class visibility 2019-03-09 00:54:10 +01:00
Laurent Destailleur
57b9be53b3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
 2019-03-09 00:44:31 +01:00
Laurent Destailleur
4022d5f529 FIX Can not create contract with numbering module without autogen rule 2019-03-08 23:58:04 +01:00
Laurent Destailleur
b766031abf Try to fix error on pgsql 2019-03-08 20:06:09 +01:00
Laurent Destailleur
e38427a41f Fix var not initialized 2019-03-08 19:56:21 +01:00
Laurent Destailleur
eded4c9e35 Merge pull request #10777 from frederic34/patch-4 
update doc
 2019-03-08 19:41:05 +01:00
Laurent Destailleur
9a5497b940 Merge pull request #10776 from frederic34/patch-3 
do not trim int
 2019-03-08 19:38:44 +01:00
Laurent Destailleur
fb5757a633 Merge pull request #10775 from frederic34/fourn-html5 
replace html by html5 in fourn
 2019-03-08 19:36:11 +01:00
Laurent Destailleur
86f4e81a6e Merge pull request #10773 from frederic34/patch-2 
Update stats.class.php
 2019-03-08 19:33:40 +01:00
Laurent Destailleur
9c97b2af30 Merge pull request #10769 from altatof/expe 
NEW : add product extrafields to shipping export
 2019-03-08 19:33:09 +01:00
Laurent Destailleur
1a96a7a88f FIX More complete auto setup of barcode module 
Add tooltip help on member setup module
 2019-03-08 11:31:12 +01:00
Frédéric FRANCE
e845b96f2b Update product.class.php 2019-03-07 22:40:16 +01:00
Frédéric FRANCE
3dd4f0bfff do not trim int 2019-03-07 22:17:48 +01:00
Laurent Destailleur
4c75e6644d Fix css 2019-03-07 21:57:03 +01:00
Frédéric FRANCE
f9e671d8a9 replace html by html5 in fichinter 2019-03-07 21:29:15 +01:00
Laurent Destailleur
ebc2289292 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 20:53:16 +01:00
Laurent Destailleur
0798f7b719 NEW Can upload files from the edit page of expense report 2019-03-07 20:53:03 +01:00
Frédéric FRANCE
d96cc53f97 replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
Laurent Destailleur
ef56b020e5 Merge pull request #10736 from OPEN-DSI/fix-margin-agents3 
Fix remove "canceled" invoices in margin by user
 2019-03-07 20:45:40 +01:00
Frédéric FRANCE
1917adb980 Update stats.class.php 
The property _lastfetchdate is declared private in Stats and cannot be accessed from this context.
 2019-03-07 17:35:02 +01:00
Laurent Destailleur
d88fc8cf91 Fix bad link 2019-03-07 17:32:10 +01:00
Laurent Destailleur
4ecc1dac56 Merge pull request #10756 from altatof/fp2 
NEW : add constant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
 2019-03-07 17:29:10 +01:00
Christophe Battarel
d414e3eb48 add product extrafields 2019-03-07 15:00:48 +01:00
Laurent Destailleur
25fa729e4e NEW Add the now link when creating expense report 2019-03-07 14:32:03 +01:00
Laurent Destailleur
31e1ad48e3 css 2019-03-07 14:28:09 +01:00
Laurent Destailleur
b9408baef3 Fix if price net was not saved, we recalculate it at output 2019-03-07 14:27:20 +01:00
Laurent Destailleur
8d0a8d8263 Merge pull request #10758 from altatof/lf 
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
 2019-03-07 14:18:26 +01:00
Laurent Destailleur
975afd014d Merge pull request #10763 from frederic34/patch-6 
Update eldy.lib.php
 2019-03-07 14:15:53 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
0729a3b571 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:11:12 +01:00
Laurent Destailleur
9a9fd15077 Fix doxygen 2019-03-07 14:10:33 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
d2f1d0cc33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-03-07 14:06:11 +01:00
Laurent Destailleur
4f189f4058 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 14:04:11 +01:00
Laurent Destailleur
e96f84a3d6 Merge pull request #10765 from altatof/sd8 
FIX : supplier discount was not retrieved when choosing a product
 2019-03-07 13:26:44 +01:00
Laurent Destailleur
0349f9bfaa Update objectline_create.tpl.php 2019-03-07 13:26:25 +01:00