Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
43,243 Commits 36 Branches 189 Tags
4da8fb901b0d28385fb5f94dd52f412b8c1e15fe
Commit Graph

2132 Commits

Author SHA1 Message Date
Laurent Destailleur
f4da53c300 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/product/liste.php
	htdocs/product/price.php
 2015-06-14 17:04:24 +02:00
Marcos García de La Fuente
0335892521 FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 2015-06-12 18:31:49 +02:00
Laurent Destailleur
a668d163fd Repair corrupted data 2015-01-06 00:27:35 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
Laurent Destailleur
9c54dc57df Save some usefull cleaning requests into repair.sql 2014-09-17 12:31:35 +02:00
aspangaro
b7daef10c6 Fix llx_c_type_resource when you update from a 3.6-beta 2014-08-26 04:35:22 +02:00
aspangaro
2aa3995b73 Fix :: Sql problem for fresh install on resource table // Ok in migration script 2014-08-21 06:01:47 +02:00
Laurent Destailleur
b5bb4c639c Fix: Clean data 2014-08-04 00:15:23 +02:00
Laurent Destailleur
bf7a33494e Run request to clean data 2014-08-03 23:55:33 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
Laurent Destailleur
32c15132df Fix: sql syntax error 2014-07-08 23:19:46 +02:00
Laurent Destailleur
f0056b3b95 Fix: Migration does not match tables 2014-07-08 22:40:06 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden. 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
 2014-07-08 21:50:29 +02:00
Laurent Destailleur
de527365a8 Fix: [ bug #1517 ] Packages sizes 2014-07-02 20:10:44 +02:00
aspangaro
25f2fec473 Fix :: acount_parent must be an int - Final step 2014-06-29 07:02:13 +02:00
aspangaro
27f0cbdb83 Merge branch 'Upstream/develop' 2014-05-30 21:01:01 +02:00
Laurent Destailleur
4060dfe8f2 Code comment to remind goal of field. 2014-05-30 11:46:16 +02:00
aspangaro
aa4e9d5965 Merge branch 'Upstream/develop' 2014-05-29 21:44:03 +02:00
aspangaro
22bb789374 Chart of accounts BE PCMN-BASE - Account_parent must be an int. 2014-05-29 21:35:29 +02:00
Laurent Destailleur
882fc42ea1 Fix: 3.5 migration that was not complete. Second chance into 3.6. 2014-05-29 20:39:51 +02:00
Laurent Destailleur
b15c79845e Merge remote-tracking branch 'origin/3.5' into develop 2014-05-29 20:27:21 +02:00
Laurent Destailleur
67bd18f5cc Fix: [ bug #1406 ] Impossible de modifier une facture fournisseur 2014-05-29 20:25:41 +02:00
Laurent Destailleur
1e2c452b95 Fix: If not choice at all we show all of them. 2014-05-29 18:11:14 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
aspangaro
22bd18486b Merge branch 'upstream/develop' 2014-05-23 02:25:41 +02:00
aspangaro
0a670092d5 Fix :: Account_parent must be an int - Step 1 2014-05-23 02:23:32 +02:00
Raphaël Doursenaud
0fd994a687 Install: english comments 2014-05-19 14:33:39 +02:00
Raphaël Doursenaud
ba8676dc61 Install: unlimitted memory is ok 2014-05-19 14:33:39 +02:00
Florian HENRY
26b74a53a2 Fix initdata 3.6 for CommandeFournisseurTest.php run correctly 2014-05-14 14:17:03 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Florian HENRY
45c96e169f fix install 2014-05-13 19:17:50 +02:00
Jean-François Ferry
7fbcb4fe7d Missing auto-increlent attribute when table c_resource_type create 2014-05-10 22:07:12 +02:00
Jean-François Ferry
5f74b86b18 Add dictionary to define type of resources 2014-05-10 22:07:12 +02:00
Jean-François Ferry
1d929d267c Move table creation instruction into migration tables 2014-05-10 22:07:12 +02:00
Jean-François Ferry
03f0851e7d Add database tables for resource module 2014-05-10 22:06:23 +02:00
Jean-François Ferry
6c75a0cb11 Add database tables for resource module 2014-05-10 22:06:22 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
503924fbbc Fix: Missing cleaning orphelins for contact categories. 2014-05-06 21:56:31 +02:00
Laurent Destailleur
959b104b78 Fix: the pdf template name for typhon as not correctly set when enabling 
module.
 2014-05-06 13:31:30 +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
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08: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
Laurent Destailleur
03f9f0bada Fix: Pb of records not correctly cleaned when module marge is 
uninstalled (conflict between 'margin' and 'margins').
 2014-05-03 20:21:35 +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
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
4a23a8a789 Merge branch 'category_translate' of github.com:aternatik/dolibarr into 
aternatik-category_translate

Conflicts:
	ChangeLog
 2014-04-28 02:39:56 +02:00