Laurent Destailleur
|
453937bdfd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-05-19 20:58:41 +02:00 |
|
Laurent Destailleur
|
4298b685d3
|
Fix css
|
2016-05-19 20:58:14 +02:00 |
|
Laurent Destailleur
|
61e824726e
|
Merge pull request #5227 from mrsof/patch-9
Syntax error : bad name of field
|
2016-05-19 19:12:11 +02:00 |
|
Laurent Destailleur
|
b636451875
|
Fix php tag
|
2016-05-19 19:11:31 +02:00 |
|
Laurent Destailleur
|
afdef9a328
|
Add css
|
2016-05-19 18:52:22 +02:00 |
|
Laurent Destailleur
|
b82eabe25f
|
Code comment
|
2016-05-19 18:52:12 +02:00 |
|
Sof
|
da2c9a0f74
|
Syntax error : bad name of field
|
2016-05-19 17:42:57 +02:00 |
|
Laurent Destailleur
|
7087b650d0
|
More precise parameter parameter targetwithdetails
|
2016-05-19 17:37:06 +02:00 |
|
Laurent Destailleur
|
d723f26661
|
Fix css
|
2016-05-19 13:32:06 +02:00 |
|
Laurent Destailleur
|
9c3b9a8494
|
NEW: Link on user in leave context reach to leave tab.
|
2016-05-19 13:25:16 +02:00 |
|
Laurent Destailleur
|
fd38db388a
|
Rename box into widget
|
2016-05-19 10:05:02 +02:00 |
|
Laurent Destailleur
|
400572e18a
|
Fix column size
|
2016-05-18 21:04:37 +02:00 |
|
Laurent Destailleur
|
4c2098b667
|
Fix duplicate table title
|
2016-05-18 20:58:29 +02:00 |
|
Laurent Destailleur
|
e7072185ab
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/comm/propal.php
|
2016-05-18 20:47:57 +02:00 |
|
Laurent Destailleur
|
49c2549400
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/comm/propal.php
|
2016-05-18 20:40:09 +02:00 |
|
Laurent Destailleur
|
7cca4f3e8a
|
Merge pull request #5211 from defrance/patch-4
enhance rappro feature
|
2016-05-18 20:38:07 +02:00 |
|
Laurent Destailleur
|
12a5fbbea7
|
Merge pull request #5191 from FHenry/3.8
Fix email template edition
|
2016-05-18 20:35:42 +02:00 |
|
Laurent Destailleur
|
85cc5cbf02
|
Merge pull request #5210 from simnandez/3.9
FIX issues with entity in leave creation
|
2016-05-18 20:28:35 +02:00 |
|
Laurent Destailleur
|
24673d066f
|
Merge pull request #5216 from atm-maxime/fix_dispatch_services_on_supplier_order
FIX services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES
|
2016-05-18 20:27:31 +02:00 |
|
Laurent Destailleur
|
28e9460a84
|
Merge pull request #5226 from joseplluis/patch-1
Fix bug: filter third parties without categories
|
2016-05-18 20:24:22 +02:00 |
|
Laurent Destailleur
|
ee73a91c77
|
Merge pull request #5218 from atm-florian/develop
Fix : Advanced Accountancy module
|
2016-05-18 20:22:07 +02:00 |
|
Laurent Destailleur
|
91181293ae
|
PHP 7 is now required to be ok for CI
|
2016-05-18 20:20:35 +02:00 |
|
Josep Lluís
|
0ad21be132
|
Fix bug: filter third parties without categories
There is a bug on filter third parties without categories. No records found.
|
2016-05-18 19:27:57 +02:00 |
|
Laurent Destailleur
|
b1bd6b5d6e
|
Fix regression
|
2016-05-18 18:23:38 +02:00 |
|
Laurent Destailleur
|
7f06e1780f
|
Test travis
|
2016-05-18 18:08:15 +02:00 |
|
Laurent Destailleur
|
982b478d11
|
Travis test
|
2016-05-18 18:03:55 +02:00 |
|
Laurent Destailleur
|
90590b49d3
|
Travis test
|
2016-05-18 17:41:59 +02:00 |
|
Laurent Destailleur
|
517b189df2
|
Merge pull request #5225 from hregis/3.8_bug
Fix: doublon (merge problem?)
|
2016-05-18 17:39:14 +02:00 |
|
Laurent Destailleur
|
e53cc8fc5f
|
Travis test
|
2016-05-18 17:34:41 +02:00 |
|
Regis Houssin
|
c7dda59fbc
|
Fix: doublon (merge problem?)
|
2016-05-18 17:33:51 +02:00 |
|
Laurent Destailleur
|
f1e59299df
|
Try to delete dolibarr composer file
|
2016-05-18 17:16:44 +02:00 |
|
Laurent Destailleur
|
a1fc8245b5
|
Travis test
|
2016-05-18 17:04:48 +02:00 |
|
Laurent Destailleur
|
5f7078a9a3
|
Maj composer.lock
|
2016-05-18 16:56:22 +02:00 |
|
Laurent Destailleur
|
38d0d85233
|
Test travis without this fu... composer
|
2016-05-18 16:53:17 +02:00 |
|
Laurent Destailleur
|
cf8c180fa4
|
Fix perm and CRLF
|
2016-05-18 16:26:15 +02:00 |
|
Laurent Destailleur
|
67f3fda984
|
Fix travis with old php
|
2016-05-18 14:59:52 +02:00 |
|
Laurent Destailleur
|
f3cd4b3ee8
|
Fix doxygen
|
2016-05-18 14:43:56 +02:00 |
|
Laurent Destailleur
|
94dba35190
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-05-18 14:11:09 +02:00 |
|
Laurent Destailleur
|
3f3b0126a4
|
Add log
|
2016-05-18 14:10:45 +02:00 |
|
Laurent Destailleur
|
7e66a4cd1d
|
Merge pull request #5221 from atm-florian/dev_fixwarning
FIX : php strict warning
|
2016-05-18 13:58:08 +02:00 |
|
Laurent Destailleur
|
43cb646779
|
Merge pull request #5219 from fmarcet/3.8
Fix: Expensereport not compatible with multicompany
|
2016-05-18 13:52:45 +02:00 |
|
Laurent Destailleur
|
a4b497ef81
|
Merge pull request #5212 from atm-alexis/3.8_fix_hook_called_but_not_initialized
FIX 3.8 hook on group card called but not initialized
|
2016-05-18 13:50:21 +02:00 |
|
Laurent Destailleur
|
035efd514c
|
Still fighting with this fuc... composer.
|
2016-05-18 13:48:35 +02:00 |
|
Laurent Destailleur
|
be34432af4
|
Add --no-update to composer commands of travis
|
2016-05-18 13:43:26 +02:00 |
|
Laurent Destailleur
|
bba3dc7dcd
|
Make composer cleaner
|
2016-05-18 13:39:57 +02:00 |
|
Laurent Destailleur
|
9f20779136
|
Revert "Update escpos-php"
This reverts commit 2f42a226d0.
|
2016-05-18 13:18:55 +02:00 |
|
Laurent Destailleur
|
e571741ef8
|
Add doc on composer
|
2016-05-18 12:58:50 +02:00 |
|
Laurent Destailleur
|
ea8bb1f022
|
Fix composer.lock
|
2016-05-18 12:27:45 +02:00 |
|
Laurent Destailleur
|
83f3b7305a
|
Fix travis file
|
2016-05-18 12:26:46 +02:00 |
|
Laurent Destailleur
|
e7385c9e4f
|
Try to solve side effect of this fuck... autoload creating a big mess in
a lot of features.
|
2016-05-18 11:57:13 +02:00 |
|