Commit Graph

223 Commits

Author SHA1 Message Date
Laurent Destailleur
272c438431 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:49:22 +02:00
Laurent Destailleur
800ded40d3 Fix: Removed table of external modules 2014-08-06 10:40:26 +02:00
Laurent Destailleur
d8fe7b904e Fix: Removed table of external modules 2014-08-06 10:38:14 +02:00
Laurent Destailleur
35d2e4f84c Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 10:30:58 +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
65b7f3d744 Fix: Clean data init 2014-08-06 10:18:32 +02:00
Laurent Destailleur
8c25fdfd2c Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:16:25 +02:00
Laurent Destailleur
86f4b874eb Fix: Clean data init 2014-08-06 10:15:32 +02:00
Laurent Destailleur
7f0baa3d65 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:12:47 +02:00
Laurent Destailleur
bb201010e5 Fix: Clean data init 2014-08-06 10:12:02 +02:00
Laurent Destailleur
86c6709d02 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:10:13 +02:00
Laurent Destailleur
0e2de54660 Fix: Clean data init 2014-08-06 10:02:02 +02:00
Laurent Destailleur
bb8ec0c8f9 Fix: Too many parameter 2014-08-01 14:26:13 +02:00
Florian HENRY
26b74a53a2 Fix initdata 3.6 for CommandeFournisseurTest.php run correctly 2014-05-14 14:17:03 +02:00
Florian HENRY
ff454130de add tobatch into into data product 2014-05-14 12:58:20 +02:00
Florian HENRY
100628622a fix insert data from initdata3.6 form url column into llx_product 2014-05-14 12:53:06 +02:00
Florian HENRY
9cd8b3a2b7 Add url column into llx_product into initdata for 3.6 (else phpunit is
not happy)
2014-05-14 11:49:54 +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
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
b2d9fac993 More complete sql file 2014-03-03 19:39:44 +01:00
Laurent Destailleur
c3bc0cc8d1 Add demo sql file for 3.6 2014-03-02 16:57:37 +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
Raphaël Doursenaud
a7afe07538 Scripts should be executable 2013-11-28 15:17:58 +01:00
Raphaël Doursenaud
9ae9a02b95 SQL files shouldn't be executable 2013-11-28 15:17:39 +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
6c47ee22b4 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	.travis.yml
2013-09-11 23:12:47 +02:00
Laurent Destailleur
301187a117 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	COPYRIGHT
	dev/initdata/mysqldump_dolibarr_3.3.0.sql
	htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
2013-09-11 21:54:57 +02:00
Laurent Destailleur
11992dca9f Fix init data sql 2013-09-09 20:37:44 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
2013-09-09 20:00:12 +02:00
Laurent Destailleur
904f29c7cc Fix: data init 2013-09-09 19:29:47 +02:00
Laurent Destailleur
558dde4c50 Fix: sql init data does not match 3.4 data 2013-09-09 17:33:52 +02:00
Laurent Destailleur
d191dd98a4 Update demo file for 3.5 2013-09-09 01:16:35 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
1ee67bd5b9 Prepare code to uniformize method addline. 2013-07-10 16:07:57 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
ff80e3b031 Fix: latin to utf8 2013-05-03 12:28:28 +02:00
Laurent Destailleur
2b03420445 Add dump for 3.4 2013-03-24 19:41:08 +01:00
Laurent Destailleur
418eeef8b4 Fix: Ton of bugs into renaming fields 2013-03-09 16:19:15 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00