Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
41,586 Commits 36 Branches 189 Tags
dca53accafdf273a20d2ade77caf83e831787de3
Commit Graph

41586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
dca53accaf Fix: translation 2014-05-05 18:30:07 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new 
product.
 2014-05-05 14:30:08 +02:00
Laurent Destailleur
cc8dcacbc9 New: DolEditor can accepts percent instead of nb of cols for textarea 
mode.
 2014-05-05 13:41:25 +02:00
Laurent Destailleur
33ac8cc5f3 Qual: uniformize code for propertie dateh (removed dateadh), for class 
Cotisation.
 2014-05-05 00:42:52 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51 New: The combo list of juridical status is now sorted 2014-05-04 23:46:36 +02:00
Laurent Destailleur
b2da98ea18 Merge pull request #1573 from GPCsolutions/duplicatedeclaration 
Fix: duplicate declaration
 2014-05-04 21:20:41 +02:00
Laurent Destailleur
27b12df103 Fix: CRLF 2014-05-04 21:19:24 +02:00
Laurent Destailleur
2c8e9840c1 Merge branch 'GPCsolutions-composer' into develop 2014-05-04 21:16:13 +02:00
Laurent Destailleur
2bba72640b Merge branch 'composer' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-composer

Conflicts:
	composer.json
 2014-05-04 21:15:41 +02:00
Laurent Destailleur
d584d29ecf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-04 21:11:40 +02:00
Laurent Destailleur
95906a9acd Merge branch 'GPCsolutions-adodbtimeupdate' into develop 2014-05-04 21:11:14 +02:00
Laurent Destailleur
61e1500d12 Merge branch 'adodbtimeupdate' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-adodbtimeupdate

Conflicts:
	COPYRIGHT
 2014-05-04 21:10:54 +02:00
Raphaël Doursenaud
eb384bd7a8 Fix: duplicate declaration 2014-05-04 19:33:24 +02:00
Raphaël Doursenaud
0e8e5b083b Fixed typo 2014-05-04 19:29:36 +02:00
Laurent Destailleur
93393db991 Merge pull request #1539 from defrance69/patch-7 
Update index.php
 2014-05-04 19:15:21 +02:00
Laurent Destailleur
9ebcec5b4e Fix: duplicate declaration of property 2014-05-04 19:07:30 +02:00
Raphaël Doursenaud
bf73f863d5 Added support links to composer 2014-05-04 19:06:49 +02:00
Raphaël Doursenaud
4303f8612d Fixed typo 2014-05-04 19:06:48 +02:00
BENKE Charles
cefc62b20f Update index.php 2014-05-04 18:42:58 +02:00
BENKE Charles
b12e87abc3 Update index.php 
add the categories pie graph on product too (and correct some bug)
 2014-05-04 18:42:00 +02:00
BENKE Charles
769c793580 Update products.lang 2014-05-04 18:36:45 +02:00
Laurent Destailleur
7a5030826b Need 'DateTimeZone.getOffset', so now minimum version of dolibarr is 
5.3.0
 2014-05-04 18:31:57 +02:00
Laurent Destailleur
292c2eb4ba Merge pull request #1571 from GPCsolutions/composer 
Added composer file
 2014-05-04 18:11:05 +02:00
Laurent Destailleur
b3c697def0 Merge pull request #1570 from GPCsolutions/libversionsreview 
Updated libraries and versions in COPYRIGHT
 2014-05-04 18:10:13 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
5b5a894aaf Merge pull request #1567 from marcosgdf/doc 
Improved documentation of Societe and started type hinting variables
 2014-05-04 18:07:08 +02:00
Laurent Destailleur
bdbd619a8e Merge pull request #1566 from marcosgdf/usability 
Improved usability of admin/compta.php page
 2014-05-04 17:58:54 +02:00
BENKE Charles
a090333dbd Update index.php 
if nb of categories > 10 we add "other" on the pie charts
 2014-05-04 17:50:31 +02:00
Laurent Destailleur
4e590e0c5e Merge pull request #1564 from marcosgdf/minor 
Fixed problem with non existing variable $db and removed not used variab...
 2014-05-04 17:46:18 +02:00
Laurent Destailleur
2210972733 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-04 17:43:09 +02:00
Laurent Destailleur
bc35728ea3 Merge pull request #1562 from marcosgdf/translation 
Improved translations
 2014-05-04 17:39:36 +02:00
Laurent Destailleur
156e6d57e4 Merge pull request #1561 from marcosgdf/vagrant 
Updated Puphpet vagrant box to latest version
 2014-05-04 17:39:05 +02:00
Laurent Destailleur
5a9cca62a6 Clean code 2014-05-04 17:38:26 +02:00
Laurent Destailleur
b990d1e891 Fix: testcase to get thirdparty from web service. 2014-05-04 17:33:57 +02:00
Laurent Destailleur
1fc25abf25 Fix: checkstyle on deprecated tag. 2014-05-04 17:31:23 +02:00
Laurent Destailleur
4d783b3934 Qual: Mark class as deprecated 2014-05-04 17:00:37 +02:00
Laurent Destailleur
d25778f12b Qual: Removed duplicate column "datea" into table llx_societe 
(duplicated with column tms).
 2014-05-04 16:59:13 +02:00
Marcos García de La Fuente
862a8626f9 Documenting variables 2014-05-04 11:31:05 +02:00
Raphaël Doursenaud
37907b011a Added composer file 2014-05-03 23:46:20 +02:00
Raphaël Doursenaud
5fd373af80 Updated libraries and versions in COPYRIGHT 2014-05-03 22:46:46 +02:00
Raphaël Doursenaud
6cd5d2724a Updated ADOdb Date Time Library to v0.32 
Includes important fixes for PHP 5
 2014-05-03 19:51:32 +02:00
Raphaël Doursenaud
5bfb06b357 Don't close php tag in generated file 2014-05-03 18:27:00 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
6eae44b766 CS Fix 2014-05-03 17:10:47 +02:00
Marcos García de La Fuente
85c605449e Defined missing used variables of the class and removed unused local vars 2014-05-03 13:45:20 +02:00
Marcos García de La Fuente
105d892d27 Corrected Translate::getLabelFromKey doc 2014-05-03 13:42:34 +02:00
Marcos García de La Fuente
abfb8b2317 Corrected Database.interface doc 2014-05-03 13:27:24 +02:00
Marcos García de La Fuente
0d129617cb Corrected Database.interface::fetch_object doc 2014-05-03 13:24:42 +02:00