Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,052 Commits 36 Branches 189 Tags
abc96b51fa815cd039f340984927e14b768aeead
Commit Graph

206 Commits

Author SHA1 Message Date
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
3378855694 New: Can cancel holidays that were previously validated 2013-09-24 18:06:07 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Florian Henry
42f165af15 Export module : Allow user define "field as field name" 2013-08-28 23:08:12 +02:00
BENKE Charles
0c249c2127 Update export.class.php 
bug fix
 2013-08-23 10:46:53 +02:00
Laurent Destailleur
a8784faa1e Fix: Removed debug print 2013-08-06 13:24:12 +02:00
Laurent Destailleur
2750b1a298 Fix: Tons of regression after renaming note field into note_private. 
Qual: Add phpunit test to test all exports descriptors.
 2013-08-06 13:22:00 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-06-14 19:56:07 +02:00
Laurent Destailleur
a9edbf4f24 Fix: Bad size of image 2013-06-14 02:25:44 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
b17fe9fc00 New: Export support now autosize of column for excel export. 
Fix: Bad charset when using script export-bank-receipts.
 2013-05-15 13:37:31 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
7f15154c6b Qual: Uniformize skins code. 2013-04-03 15:45:06 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
6163503b48 Fix: Missing lang 2013-03-24 14:01:03 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
 2013-03-16 17:07:35 +01:00
Laurent Destailleur
95c9d19d5e Fix: Restore ability to filter on '0' 2013-03-15 11:31:49 +01:00
Laurent Destailleur
298ba17e8f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/exports/class/export.class.php
	htdocs/webservices/server_user.php
 2013-03-15 01:10:56 +01:00
Regis Houssin
d6c18c1789 Fix: for avoid sql errors with predefined export models 2013-03-14 07:08:44 +01:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Laurent Destailleur
5eb728ae43 Fix: Usage of order into export broken when filters are used 2013-03-11 14:09:54 +01:00
eldy
e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-06 21:28:50 +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
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
50206bbd73 Fix: avoid errors 2012-12-06 10:43:27 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
35a887f869 Clean code 2012-11-21 20:24:15 +01:00
Laurent Destailleur
e6d7ce1ab6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-21 19:04:51 +01:00
Laurent Destailleur
c49fea217f Fix: Another fix on sql request generation. 2012-11-21 19:00:06 +01:00
Regis Houssin
ce4feffd1f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-21 18:56:07 +01:00
Regis Houssin
31ecc1987e Fix: remove old code 2012-11-21 18:52:25 +01:00
Laurent Destailleur
06a8ba2be2 Fix: for combo list that use text key. 2012-11-21 18:51:49 +01:00
Laurent Destailleur
6a11016a21 Fix: var_dump must be commented 2012-11-21 18:45:52 +01:00
Laurent Destailleur
8f0b548714 Debug export filters. Seems to be enougth stable so it is now enabled by 
default.
 2012-11-20 15:56:44 +01:00
Laurent Destailleur
d9cdb542d5 Debug filter during export 2012-11-20 14:07:52 +01:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Laurent Destailleur
df42dda452 Doxygen 2012-11-14 01:20:36 +01:00
Laurent Destailleur
06c77576b7 New: Maxi debug on feature to filter lines on export. Removed a lot of 
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
 2012-11-14 00:27:25 +01:00
Laurent Destailleur
66755fb166 Fix: Avoid confusion between method getXXX into parent class with 
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
 2012-11-11 18:11:10 +01:00
Regis Houssin
44f591e600 Fix: can't delete an export 2012-10-29 10:36:26 +01:00
Regis Houssin
bc2280e4ab Fix: avoid phpunit warning 2012-10-26 09:12:19 +02:00
Regis Houssin
48ce43d6f1 New: add export filters (thank you Charles Benke) 2012-10-25 22:30:17 +02:00
Marcos García
cb4044755b Fixed export translations 
Added missing strings
Corrected some translations
 2012-09-12 19:11:03 +02:00
Regis Houssin
d7f3deffce Fix: convert line delimiters 2012-09-09 16:32:03 +02:00