Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,707 Commits 36 Branches 190 Tags
c04812cd15d2bc7c66bfd1bef8a6c0866f28ba0c
Commit Graph

41707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
a4f1c7eb50 Fix: Suppliers invoice mask fails using {tttt} in numbering 
Conflicts:
	ChangeLog
 2014-05-06 10:04:02 +02:00
Juanjo Menent
011fe254a6 Fix: Suppliers invoice mask fails using {tttt} in numbering 2014-05-06 09:59:10 +02:00
Jean-François VIAL
4bcb80960a escape all $id used in sql queries 2014-05-06 00:06:54 +02:00
Jean-François VIAL
60fd9cf463 Update the test_sql_and_script_inject function to block web-shell drops 
block web-whell SQL injections by blocking INTO {outfile | dumpfile} sequences
 2014-05-05 23:46:21 +02:00
Laurent Destailleur
af9d2d7545 Fix: phpunit error 2014-05-05 20:17:11 +02:00
Laurent Destailleur
48bab56697 Transifex sync 2014-05-05 19:12:52 +02:00
philippe
a04cd99090 fix : no room when number of pages sup than 9 2014-05-05 19:03:25 +02:00
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
Marcos García de La Fuente
ae28727fea Improving documentation of Societe class 2014-05-05 12:53:46 +02:00
Marcos García de La Fuente
8532f967af Missing Copyright info 2014-05-05 12:24:39 +02:00
Marcos García de La Fuente
d0e5d9fd1b Improved usability of install wizard 2014-05-05 12:08:19 +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
Laurent Destailleur
c9ebe7729f Merge branch 'bug-1371' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1371

Conflicts:
	ChangeLog
 2014-05-04 17:56:24 +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
e8308e795d Merge branch 'FHenry-3.5' into 3.5 2014-05-04 17:44:08 +02:00
Laurent Destailleur
697f68c9a9 Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5 
Conflicts:
	ChangeLog
 2014-05-04 17:43:47 +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