lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,912 Commits 43 Branches 150 Tags 886 MiB
be22f7affa
Commit Graph

33912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
be22f7affa Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-29 10:11:40 +01:00
Regis Houssin
705b0c0d52 Fix: better for show signature 2012-10-29 10:00:24 +01:00
Laurent Destailleur
f0f3fc1172 Clean rpm packagers 2012-10-29 09:46:15 +01:00
Laurent Destailleur
9d4471dd67 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
 2012-10-28 19:53:14 +01:00
Laurent Destailleur
3738d3e6be Fix: Better fix for import when field is computed by a function 2012-10-28 18:57:30 +01:00
Regis Houssin
b952a7f9bf Fix: convert line delimiters (use the last eclipse version) 2012-10-28 13:57:21 +01:00
Regis Houssin
d4ec7581ac Fix: best practice if result >= 0 
assertGreaterThanOrEqual(expected, result)
 2012-10-28 13:44:52 +01:00
Regis Houssin
d6a3b76270 Fix: regression 2012-10-28 13:37:09 +01:00
Regis Houssin
6b06b37116 Fix: remove filtered export test for the moment 2012-10-28 13:23:46 +01:00
Regis Houssin
75587b3a15 Fix: wrong delete invoice test 2012-10-28 13:18:15 +01:00
Regis Houssin
c48b91c182 Fix: remove $sql request for test filter 2012-10-28 13:10:01 +01:00
Regis Houssin
2119179226 Fix: field "amount" is obsolete 2012-10-28 12:23:58 +01:00
Regis Houssin
094c062cbd Fix: regression and syntax error 2012-10-28 11:11:45 +01:00
Regis Houssin
fe223e2001 Fix: try the process isolation 2012-10-28 11:02:22 +01:00
Regis Houssin
31ff042e10 Fix: wrong syntax 2012-10-28 10:55:26 +01:00
Regis Houssin
36c3e19349 Fix: regression 2012-10-28 10:44:02 +01:00
Regis Houssin
c819538cda Fix: try to increase max_execution_time 2012-10-28 10:28:28 +01:00
Regis Houssin
82cb0802d0 Fix: broken feature, missing $page 
Fix: bad field name
 2012-10-28 02:14:08 +02:00
Laurent Destailleur
a6bd506bd0 Fix: syntax error 2012-10-27 20:32:33 +02:00
Laurent Destailleur
ee29c65708 Move stock import into stock module (stock module is at a low level than 
product)
 2012-10-27 20:27:07 +02:00
Laurent Destailleur
6c0fb9a1f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-27 20:04:03 +02:00
Laurent Destailleur
a7e35a9308 Fix: If we exclude dirs, we must also clean array to avoid to count 
them.
 2012-10-27 20:02:09 +02:00
Regis Houssin
75863635f1 Merge pull request #467 from cbattarel/develop 
fix wrong insert sql construction in import
 2012-10-27 04:25:02 -07:00
Christophe Battarel
253e3412db fix wrong insert sql construction 
field type detection was made before optional conversions so it might be wrong; i replaced it with a more simple solution
 2012-10-27 12:55:28 +02:00
Regis Houssin
6b07579620 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-27 11:30:36 +02:00
Regis Houssin
2bbfad2460 Fix: missing parameter 2012-10-27 11:30:08 +02:00
Regis Houssin
c6c6c28e25 Merge pull request #466 from cbattarel/develop 
fix error in constant name for SOCIETE_CODEFOURNISSEUR_ADDON in get_code...
 2012-10-27 02:14:45 -07:00
Christophe Battarel
eb4cf359ec fix error in constant name for SOCIETE_CODEFOURNISSEUR_ADDON in get_codefournisseur() 2012-10-27 11:12:41 +02:00
Laurent Destailleur
443f5ca03e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-27 00:23:54 +02:00
Laurent Destailleur
7a48351909 Fix: delete file from ecm module 2012-10-27 00:23:16 +02:00
Laurent Destailleur
833ada4732 Merge pull request #465 from simnandez/develop 
Fix: [ bug #579 ] Multi-Company and imports
 2012-10-26 11:00:52 -07:00
simnandez
9ada60afbc New: More import options. Products categories 2012-10-26 18:53:56 +02:00
simnandez
3821bf8c66 New: More import options. Products categories 2012-10-26 18:43:34 +02:00
simnandez
9a05bc8e83 New: More import options. Products categories 2012-10-26 18:38:34 +02:00
simnandez
d4df585e3c New: More import options. Customer and suppliers categories 2012-10-26 18:34:49 +02:00
simnandez
425ebae802 New: More import options. Products categories 2012-10-26 18:19:04 +02:00
Laurent Destailleur
0d48682eed Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-26 17:59:39 +02:00
simnandez
7aec227694 New: More import options. Products stocks 2012-10-26 17:52:53 +02:00
simnandez
970933ec7f Fix: [ bug #579 ] Multi-Company and imports 2012-10-26 17:29:41 +02:00
Regis Houssin
93c03756ab Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-26 15:21:36 +02:00
Regis Houssin
c521a77e92 New: add key generator in webservices admin page 2012-10-26 15:20:47 +02:00
Regis Houssin
00dbf867ff Merge pull request #464 from simnandez/develop 
Trad: Add ca_ES and es_ES missing translations
 2012-10-26 00:28:44 -07:00
simnandez
4a0336759e Trad: Add ca_ES and es_ES missing translations 2012-10-26 09:21:08 +02:00
Regis Houssin
bc2280e4ab Fix: avoid phpunit warning 2012-10-26 09:12:19 +02:00
Laurent Destailleur
aee92ad3dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-26 00:59:11 +02:00
Laurent Destailleur
7eae998868 Fix: Bad default value 2012-10-26 00:57:51 +02:00
Regis Houssin
b5d70ad17f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1 New: add export filters (thank you Charles Benke) 2012-10-25 22:30:17 +02:00
Regis Houssin
62cbae7985 Merge pull request #463 from simnandez/develop 
Fix: Bad ProfId assignation in imports
 2012-10-25 08:20:35 -07:00
simnandez
e89a06bb9c Fix: Bad ProfId assignation in imports 2012-10-25 17:08:25 +02:00