Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 16:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,672 Commits 36 Branches 190 Tags
eb06f56164ebde04f7d7d3fb14a901b24602840c
Commit Graph

54672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
9114513df2 Revert "remove composer.lock" 
This reverts commit 7ec8557db9.
 2016-05-18 11:42:33 +02:00
Laurent Destailleur
236ecf01b6 Help debug travis 2016-05-18 10:57:03 +02:00
Laurent Destailleur
ac361080fa Debug travis error 2016-05-18 10:53:27 +02:00
Laurent Destailleur
f00414e4f7 Show travis log 2016-05-18 10:50:42 +02:00
Laurent Destailleur
08549304f1 Enhance travis to have phpunit test on modules not available on old 
version by enabling them at end of migration.
 2016-05-18 00:51:15 +02:00
Laurent Destailleur
e6196f69cd Fix Restler bug returning warnings 2016-05-18 00:45:13 +02:00
Laurent Destailleur
cd75b43d58 Can enable modules during migration 2016-05-18 00:44:55 +02:00
Laurent Destailleur
acae888b3a Fix phpunits 2016-05-17 23:38:07 +02:00
Laurent Destailleur
c8a8474b69 Better practice in boolean comparison 2016-05-17 23:19:57 +02:00
Laurent Destailleur
753c5c7fc4 Fix minor error management 2016-05-17 23:14:30 +02:00
Laurent Destailleur
4e46a01d51 Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED 2016-05-17 22:59:46 +02:00
Laurent Destailleur
89d37ccc62 Fix translation 2016-05-17 21:55:39 +02:00
Laurent Destailleur
a36b780c53 Fix phpunit 2016-05-17 20:30:04 +02:00
Laurent Destailleur
92e7177bcb Fix New into new 2016-05-17 19:58:29 +02:00
Laurent Destailleur
86076c2a01 Fix doxygen 2016-05-17 19:49:37 +02:00
Laurent Destailleur
47f003c3fa Restore phpunit tests 2016-05-17 19:40:58 +02:00
Laurent Destailleur
7bbb3a7da1 Supplier proposal was missing 2016-05-17 19:34:23 +02:00
Laurent Destailleur
7063b26018 Debug 4.0 2016-05-17 19:32:19 +02:00
Laurent Destailleur
e2d3f4e27d Supplier proposal was missing 2016-05-17 19:15:44 +02:00
Laurent Destailleur
be251cd2b0 Add high risk sql at end 2016-05-17 18:22:48 +02:00
Laurent Destailleur
d083ad9382 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/resource/class/html.formresource.class.php
 2016-05-17 18:21:22 +02:00
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby 
dates.
 2016-05-17 18:19:36 +02:00
Laurent Destailleur
0e040b166d Fix: When we edit a product to use lot/serial number, we initialize 
records for unknown lots to generic value 'Undefined'.
 2016-05-17 17:55:41 +02:00
Laurent Destailleur
668df6cb7d Debug resource module 2016-05-17 10:51:13 +02:00
Laurent Destailleur
3b99fb01ee Fix duplicate table 2016-05-17 10:51:03 +02:00
Laurent Destailleur
63d0710842 FIX Creation of the second ressource type fails. 2016-05-17 10:44:30 +02:00