2
0
forked from Wavyzz/dolibarr
Commit Graph

19 Commits

Author SHA1 Message Date
Juanjo Menent
f7ab53be8e Fix test for es. Dumps 3.5 et 3.6 2015-04-22 23:40:43 +02:00
Laurent Destailleur
560fcb1b24 Remove external module 2015-04-19 15:27:30 +02:00
Laurent Destailleur
74d9ada517 Fix: Clean init data 2014-08-06 10:59:09 +02:00
Laurent Destailleur
9c6222a776 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 10:54:31 +02:00
Laurent Destailleur
338c4543fc Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:52:57 +02:00
Laurent Destailleur
272c438431 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:49:22 +02:00
Laurent Destailleur
230b1d4bb8 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	test/phpunit/SqlTest.php
2014-08-06 10:28:37 +02:00
Laurent Destailleur
a430534768 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:22:34 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
90f5f0823f Prepare 3.5.2 2014-04-05 16:32:25 +02:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases.
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
2014-03-21 16:22:41 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
33d55faf6b Fix: error into dump file 2013-11-16 15:42:05 +01:00
Peter Fontaine
3d7d8c7d5d add tests
add default_rib column in mysqldump
2013-11-14 10:48:36 +01:00
Laurent Destailleur
27fede8848 Update demo file 2013-11-07 02:28:32 +01:00
Laurent Destailleur
e88faf0f0f Update sql 2013-11-07 00:46:12 +01:00
Laurent Destailleur
db9e9a3372 Prepare 3.5.0 beta 2013-11-07 00:41:27 +01:00
Laurent Destailleur
7eaffc186b Update demo with new structure 2013-10-22 00:36:53 +02:00
Laurent Destailleur
d191dd98a4 Update demo file for 3.5 2013-09-09 01:16:35 +02:00