Commit Graph

74186 Commits

Author SHA1 Message Date
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
f0c2b3a151 Bette error message 2019-03-08 20:07:22 +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
a47cc4ef57 Fix script to delete data 2019-03-08 19:26:16 +01:00
Laurent Destailleur
6b8c2a1d3b Enhance script to purge data 2019-03-08 14:09:22 +01:00
Laurent Destailleur
f6c52578cc Add README file 2019-03-08 13:34:03 +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
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
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
Christophe Battarel
42926404ac Merge https://github.com/Dolibarr/dolibarr into develop 2019-03-07 14:03:49 +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
Laurent Destailleur
a40a08bada
Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid
Fix default contact id for update and clone actions in event card
2019-03-07 13:12:22 +01:00
Laurent Destailleur
3757fa83fd
Merge pull request #10760 from altatof/db
Avoid doing empty queries
2019-03-07 13:04:46 +01:00
Laurent Destailleur
b93a12bf19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 13:03:06 +01:00
Laurent Destailleur
1fb86e12e5 Merge manually some enhancement from #10507 2019-03-07 13:02:51 +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
8685f82a41
Merge pull request #10767 from Toumaniere/9.0
Update libelle of user (making Mailman working correctly)
2019-03-07 12:44:40 +01:00
Laurent Destailleur
a0bc6672d8
Try to avoid to make subquery when not necessary 2019-03-07 12:43:17 +01:00
Laurent Destailleur
b4bdbda9f5
Update mysqli.class.php 2019-03-07 12:36:57 +01:00
Laurent Destailleur
3e40451709
Merge pull request #10761 from frederic34/patch-4
add oldcopy of category before updating
2019-03-07 12:34:04 +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
2c68c98884
Merge pull request #10762 from frederic34/patch-3
Update bom_card.php
2019-03-07 12:32:35 +01:00
Laurent Destailleur
d6cf493880
Merge pull request #10768 from altatof/export
FIX avoid timeout for big export
2019-03-07 12:31:51 +01:00
Laurent Destailleur
40afeebe2d
Merge pull request #10748 from frederic34/patch-2
Update mailinglist_mymodule_myobject.modules.php
2019-03-07 12:31:09 +01:00