Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,834 Commits 36 Branches 191 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

4868 Commits

Author SHA1 Message Date
Laurent Destailleur
8cd2235b4b Start to introduce cron for email reminder. 2017-08-03 11:42:22 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
 2017-08-02 17:56:09 +02:00
Laurent Destailleur
47ac770d93 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/expedition/list.php
 2017-08-02 17:51:19 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
b6a7ce6822 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-01 10:22:37 +02:00
Laurent Destailleur
ddee802324 Add second parameter in GETPOST 2017-08-01 10:22:09 +02:00
Laurent Destailleur
cfebbe3cc4 Fix css 2017-07-31 03:16:28 +02:00
Laurent Destailleur
80f096a9d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-31 02:09:15 +02:00
Laurent Destailleur
837afa0e65 Fix better way to get info for contact/thirdparty on agenda 2017-07-29 04:07:46 +02:00
Laurent Destailleur
2a36166839 Fix error method on non object 2017-07-29 02:11:45 +02:00
Laurent Destailleur
cae21d3937 Fix in agenda output per user/type (reduce memory usage) 2017-07-29 01:59:26 +02:00
Laurent Destailleur
60493d0a47 Several fixes (permission, missing method or class) in REST APIs 2017-07-28 11:03:30 +02:00
Laurent Destailleur
ec27eb5b1e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/societe/list.php
 2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Laurent Destailleur
5b9ac2a7a9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/index.php
 2017-07-25 21:11:36 +02:00
Laurent Destailleur
dafe1194c4 Merge pull request #7100 from tuxgasy/develop_addmoresummary_hook 
Close: add new hook addMoreBoxStatsCustomer
 2017-07-25 20:32:10 +02:00
Laurent Destailleur
f4857af7aa Update card.php 2017-07-25 20:31:41 +02:00
Laurent Destailleur
cba898e2b9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-07-25 10:12:28 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Laurent Destailleur
d07741ada1 Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
phf
885fc3c5b7 Fix lost search value in list if come from thirdparty card 2017-07-17 11:04:48 +02:00
Laurent Destailleur
312b153005 Fix phpcs 2017-07-13 23:46:01 +02:00
Laurent Destailleur
4ee70e496e Merge pull request #7143 from hregis/6.0_bug 
Fix: missing entity filter (multicompany)
 2017-07-13 14:33:45 +02:00
Laurent Destailleur
bea3ced763 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-13 14:32:03 +02:00
Laurent Destailleur
58ce8eaf46 Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing 
Fix AdvtargetEmailing
 2017-07-13 14:26:23 +02:00
Laurent Destailleur
743de4e586 FIX Option to classify proposal/order in workflow module must not set 
source object to billed if amount differs.
 2017-07-13 12:42:32 +02:00
Laurent Destailleur
028f1f5133 Fix default currency in creation form. 2017-07-13 10:16:40 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Destailleur
4b4dcf2e01 Fix overload with a protection for rare case with very high nb of event 2017-07-12 23:05:26 +02:00
florian HENRY
816283d1e5 fix SQL 2017-07-12 17:51:32 +02:00
florian HENRY
67664331e3 Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing 2017-07-12 17:49:44 +02:00
Regis Houssin
9430952561 Fix: missing entity filter (multicompany) 2017-07-12 11:00:18 +02:00
florian HENRY
c85bf18f0e Fix AdvtargetEmailing 2017-07-11 14:47:37 +02:00
Laurent Destailleur
10cb7b2524 Fix remove warnings 2017-07-09 20:31:27 +02:00
Laurent Destailleur
e1ba69eee0 Fix edit of automatic event should keep its type. 2017-07-08 00:19:30 +02:00
Laurent Destailleur
34d0c79e32 Merge pull request #7124 from fappels/develop_updateline_notriggerflag 
New add trigger disable to updateline functions
 2017-07-07 20:30:04 +02:00
Laurent Destailleur
640f66f017 Fix SQL syntax 2017-07-07 17:34:56 +02:00
Laurent Destailleur
de1a7042d4 Fix filter on list of actions 2017-07-07 10:55:42 +02:00
fappels
6effcb0829 New add trigger disable to updateline functions 2017-07-06 16:26:15 +02:00
TuxGasy
bec5bde363 Move addMoreBoxStatsCustomer after table tag 2017-07-06 12:18:54 +02:00
TuxGasy
67f11103a3 fix indent 2017-07-04 21:56:47 +02:00
Laurent Destailleur
0ee93fb00c Fix conflict between option login and logina and logint in agenda export 2017-07-04 10:29:38 +02:00
TuxGasy
1f9bd2538e new addMoreBoxStatsCustomer hook 2017-07-02 22:20:07 +02:00
Laurent Destailleur
7ae52d843c Look and feel v6 2017-07-01 14:23:24 +02:00
Laurent Destailleur
b6002bd1f8 Fix bad link 2017-06-28 18:29:57 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
08af9bf365 List before 2017-06-27 10:37:00 +02:00
Laurent Destailleur
34f3552dc7 Fix missing image of user 2017-06-27 04:31:29 +02:00
Laurent Destailleur
3fdfebf7ef Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae Fixing pages warning when value is null 2017-06-24 16:45:45 +02:00