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

33892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Regis Houssin
4a99480da4 Merge pull request #462 from cbattarel/develop 
fix minor bugs in invoice and order creation from another object
 2012-10-25 06:56:49 -07:00
Christophe Battarel
2272d13f5a fix minor bug in invoice creation from another object 2012-10-25 15:50:43 +02:00
Christophe Battarel
135342b085 fix minor bugs in order creation from another object 2012-10-25 15:47:35 +02:00
Regis Houssin
4f1ef1bcf8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 15:01:26 +02:00
Regis Houssin
89b794dcd0 Fix: avoid errors with IE 2012-10-25 15:01:04 +02:00
Laurent Destailleur
a60516ae0d Fix: Show warning only if transaction level not correct 2012-10-25 14:16:06 +02:00
Laurent Destailleur
7b92f66fab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop
 2012-10-25 13:17:35 +02:00
Laurent Destailleur
daeb1029a1 New: Support field required or not 2012-10-25 13:11:55 +02:00
Laurent Destailleur
d142dec69a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-25 12:45:01 +02:00
Regis Houssin
53b9a95742 Merge pull request #461 from cbattarel/develop 
fix wrong test for product type in order->getNbProductsLines()
 2012-10-25 02:49:17 -07:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Christophe Battarel
144b08cac1 fix wrong test for product type in order->getNbProductsLines() 
also add getNbServicesLines() function in order class.
 2012-10-25 11:26:36 +02:00
Laurent Destailleur
2953ef37e6 Methods works with most tables/elements 2012-10-25 10:06:29 +02:00
Regis Houssin
f8f1d3a0df Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement 
mode and paiement method in pdf
 2012-10-25 09:24:05 +02:00
Regis Houssin
1cbd2a1b1c Fix: broken feature 2012-10-25 08:45:35 +02:00
Regis Houssin
23707e2346 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0 Fix: strict mode 2012-10-24 22:50:19 +02:00
Laurent Destailleur
773b082b13 Fix: Restore private: The public method to use by external code is 
addExtraField.
 2012-10-24 21:28:24 +02:00
Laurent Destailleur
1b116c05ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-24 21:21:58 +02:00