Commit Graph

6681 Commits

Author SHA1 Message Date
Laurent Destailleur
b3dc6d7d1d NEW Generation of doc by modulebuilder can include README and CHANGELOG 2019-03-17 19:33:25 +01:00
Laurent Destailleur
39b9ca2397 Work on documentation generation by modulebuilder 2019-03-17 15:45:50 +01:00
Laurent Destailleur
d44be341a5 NEW Add property 'noteditable' in modulebuilder 2019-03-17 01:45:46 +01:00
Laurent Destailleur
95c1275efc Fix phpcs 2019-03-16 20:10:22 +01:00
Laurent Destailleur
e5567c7ee4 Fix typo 2019-03-16 14:48:41 +01:00
Laurent Destailleur
7a5a561170 Fix label of status of invoice record when using smartphone 2019-03-15 23:00:50 +01:00
Laurent Destailleur
a1adcc785c Clean code 2019-03-15 19:11:24 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
8f65ee2296 Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
f50638b7d8 Update html.form.class.php 2019-03-14 17:44:54 +01:00
Laurent Destailleur
69bfac7eef Update html.form.class.php 2019-03-14 17:36:35 +01:00
Laurent Destailleur
c6b3d81d61 Update html.form.class.php 2019-03-14 17:35:44 +01:00
Laurent Destailleur
d4f2a16abf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
2019-03-14 17:10:58 +01:00
Frédéric FRANCE
b67429218d Update html.formmail.class.php
Conflicts:
	htdocs/core/class/html.formmail.class.php
2019-03-14 16:52:16 +01:00
Laurent Destailleur
965f4702b0 Merge pull request #10830 from frederic34/patch-4
Update html.formmail.class.php
2019-03-14 16:49:34 +01:00
Laurent Destailleur
9f6610a421 Merge pull request #10831 from frederic34/patch-5
phpcs fix
2019-03-14 14:04:44 +01:00
Laurent Destailleur
f8a4d9075b Fix css for fontawesome 5 2019-03-14 11:48:25 +01:00
Frédéric FRANCE
965f5861b3 Update commoninvoice.class.php 2019-03-14 09:10:26 +01:00
Frédéric FRANCE
d8599b52d9 Update html.formmail.class.php 2019-03-14 08:19:22 +01:00
Laurent Destailleur
7e31e6b4f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
e0208cb3d6 Generation of PDF doc 2019-03-13 18:11:15 +01:00
Laurent Destailleur
9da84f68c7 Bad language file for civility order 2019-03-13 14:23:27 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Laurent Destailleur
da2aba96eb Can setup tool to build html or pdf for module builder documentation 2019-03-12 11:51:20 +01:00
Laurent Destailleur
3559d600e2 Merge pull request #10770 from atm-john/theme_badge_status
Add badge status css part1
2019-03-11 20:49:31 +01:00
Laurent Destailleur
6daa262779 Files for variables of themes were renamed from graph-color.php into
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
2019-03-11 20:32:25 +01:00
Laurent Destailleur
540a1026f6 Merge pull request #10786 from frederic34/patch-4
update doc in commonobject class
2019-03-11 16:47:40 +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
Laurent Destailleur
7e547f3f16 Fix type of parameter 2019-03-11 12:07:28 +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
Frédéric FRANCE
b47a54c652 update doc in commonobject class 2019-03-09 18:05:48 +01:00
Laurent Destailleur
c6d7987b57 FIX method db->active does not exists 2019-03-09 01:06:07 +01:00
Laurent Destailleur
73b359c124 Fix class visibility 2019-03-09 00:54:10 +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
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
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
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
97544e0aea add new dolGetStatus to LibStatut in common invoice class 2019-03-07 15:24:11 +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
daaa4ca0c2 Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed
PSR2.Classes.PropertyDeclaration.VarUsed
2019-03-07 12:49:13 +01:00
Laurent Destailleur
8ffab05f67 Merge pull request #10759 from altatof/ml
NEW : sort list of models alphabetically
2019-03-07 12:47:50 +01:00
Laurent Destailleur
fc87090669 Merge pull request #10764 from frederic34/patch-7
New format type 5 for email
2019-03-07 12:33:24 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Frédéric FRANCE
d39b600ff4 Update CMailFile.class.php 2019-03-06 20:29:58 +01:00
Christophe Battarel
8f8fe0648e fix bad copy paste 2019-03-06 17:24:50 +01:00