Commit Graph

64966 Commits

Author SHA1 Message Date
Laurent Destailleur
052d29d946
Fix phpcs 2019-03-11 20:45:28 +01:00
John BOTELLA
57c6c60118 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-11 14:44:35 +01:00
John BOTELLA
5d7118340b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-11 14:40:19 +01:00
Laurent Destailleur
7e547f3f16 Fix type of parameter 2019-03-11 12:07:28 +01:00
Laurent Destailleur
f3ca69522e Fix phpcs 2019-03-11 01:41:09 +01:00
Laurent Destailleur
a74b1daad1 Fix phpcs 2019-03-11 01:38:52 +01:00
Laurent Destailleur
f2de44ce51 Clean code 2019-03-11 01:11:39 +01:00
Laurent Destailleur
fac329e637 Clean code 2019-03-11 01:01:15 +01:00
Laurent Destailleur
d3479bebbc CSS 2019-03-10 23:47:27 +01:00
Laurent Destailleur
37d692918b CSS 2019-03-10 20:59:50 +01:00
Laurent Destailleur
935fe7c22a Debug and enhance modulebuilder. 2019-03-10 19:33:28 +01:00
Laurent Destailleur
1bd422b8b9 CSS 2019-03-10 14:45:16 +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
John BOTELLA
03724c7ba4 Fix travis errors 2019-03-08 14:41:47 +01:00
John BOTELLA
ccebb8d1a7 Fix travis errors 2019-03-08 14:40:22 +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
John BOTELLA
a0b14b9105 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092 fix travis 2019-03-07 15:49:16 +01:00
John BOTELLA
97544e0aea add new dolGetStatus to LibStatut in common invoice class 2019-03-07 15:24:11 +01:00