lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,072 Commits 43 Branches 150 Tags 886 MiB
afee39ea68
Commit Graph

193 Commits

Author SHA1 Message Date
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
c218843cdb FIX Save of filters into export profiles failed. 2015-06-24 18:29:29 +02:00
Laurent Destailleur
f97d81701b Add an exit to avoid to have apache hangs. 2015-05-05 13:46:28 +02:00
Laurent Destailleur
530650b857 Make module productbatch stable 2015-04-10 11:59:41 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
1ca95acbd7 Fix pb during export of agenda events 
Conflicts:
	htdocs/exports/export.php
 2015-03-26 11:23:21 +01:00
Laurent Destailleur
ce8bd7a515 Fix pb during export of agenda events 2015-03-26 11:20:39 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Laurent Destailleur
5dc35ec137 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:25:54 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Marcos García de La Fuente
7b05944530 Corrected strings not translated and typos in English language 2014-05-11 13:14:45 +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
50c10d3d1e Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:20:26 +02:00
Laurent Destailleur
43253d877a Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:15:33 +02:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Marcos García de La Fuente
4411908b23 Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +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
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
a9edbf4f24 Fix: Bad size of image 2013-06-14 02:25:44 +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
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
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
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
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
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
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
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
f320ed92cc Translated and upper-cased export formats, improved es_ES translations 
fr_FR exports translations were made by @fhenry and Manuel Pintor (contact@idl-mp.com)
Little refactor too
 2012-08-16 13:07:12 +02:00
Regis Houssin
e44fd4885d Fix: change the last $DB to $db 2012-07-30 18:43:49 +02:00
Laurent Destailleur
0b048ebb94 [ bug #40 ] Export de donnes dangereux 2012-07-27 16:03:20 +02:00
Laurent Destailleur
24c54ccaf1 Start to work on bug export 2012-07-24 16:19:46 +02:00
Laurent Destailleur
2d67802938 Doxygen 2012-01-08 00:52:07 +01:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
5efe1cd470 Fix: Perl-style comments are not allowed. Use "// Comment." or "/* comment */" instead. 2011-09-20 10:30:56 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
5fac7191cf Doxygen 2011-09-10 12:21:41 +00:00
Laurent Destailleur
ab953d6501 Qual: Call static methods as static with no need to create instance 2011-08-27 15:40:08 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
76f1880583 Qual: Removed php_writexcel lib. Replaced with phpexcell. 
Fix: Make script export-contaxts-xls-example.php working.
Qual: removed not used code.
 2011-08-11 19:12:37 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Laurent Destailleur
20fa276e54 A module can define label and picto for export lists 2011-02-05 18:40:52 +00:00
Laurent Destailleur
c360e3808a Qual: Export descriptor in modules are simpler 2011-02-02 20:41:54 +00:00
Philippe Grand
a981577553 according to new tree directory 2010-05-03 08:43:32 +00:00
Philippe Grand
8a9fe373d6 according to new tree directory 2010-05-03 08:43:32 +00:00
Philippe Grand
be059c05f0 according to new tree directory 2010-04-28 12:13:27 +00:00
Laurent Destailleur
bdf4bbaa1f Works on ODT import 2010-03-27 00:33:28 +00:00
Laurent Destailleur
e89c3ba08e New: Enhancement in category module 2010-03-20 20:24:32 +00:00
Laurent Destailleur
0bdd4c922a Fix: Export was broken after ODT support. 2010-03-13 01:09:57 +00:00
Laurent Destailleur
de1d313148 Remove pre.inc.php on module directories. 2010-02-28 15:33:31 +00:00
Laurent Destailleur
2cd1bc975e Fix: Some minors fixes on import module and test to be sure we can enhance module to import when there is several tables. 2009-11-08 19:28:44 +00:00
Regis Houssin
d9dadd9671 Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 2009-10-21 13:09:42 +00:00
Regis Houssin
01291c4a7c Fix: function "split" is deprecated since php 5.3.0 2009-10-20 13:14:44 +00:00
Laurent Destailleur
d9ecd2347a Work on import module 2009-10-03 12:08:48 +00:00
Laurent Destailleur
80d4b9b26c Work on import module 2009-09-28 20:06:15 +00:00
Laurent Destailleur
b0e3b124e0 Work on import module 2009-09-02 23:46:55 +00:00
Laurent Destailleur
c11cef6d47 Add help link to online wiki 2009-08-12 12:59:14 +00:00
Laurent Destailleur
924f541e61 Work on import module 2009-06-07 18:08:41 +00:00
Laurent Destailleur
d8281abae3 Fix: Everybody should be able to make exports 2009-05-22 15:57:47 +00:00
Laurent Destailleur
a588260818 Work on import module 2009-05-19 00:33:57 +00:00
Laurent Destailleur
8b12e7c07b Work on import module 2009-05-19 00:14:27 +00:00
Regis Houssin
e5d222b6cc Fix: rgression sur l'utilisation des niveau du jeton, on test sur les 2 niveaux car 
comportement alatoire avec certaines fonctions
 2009-05-17 08:01:54 +00:00
Regis Houssin
c1c1f8a4d2 Fix: ajout d'un niveau supplmentaire du cache du jeton 2009-05-16 15:45:26 +00:00
Regis Houssin
35072b99bf Fix: ajout d'un jeton alatoire dans les requetes POST 2009-05-15 14:56:03 +00:00
Laurent Destailleur
d154c26011 Can export commercial proposals 2009-05-04 19:55:52 +00:00
Regis Houssin
47cde9d686 New: early development of multi-company module 2009-04-28 08:42:56 +00:00
Laurent Destailleur
c85b9cb017 Add first files for import module 2009-03-25 21:26:15 +00:00
Laurent Destailleur
32faa96ab6 New: For admin users, show the SQL request in export build. 2009-03-03 00:42:40 +00:00
Laurent Destailleur
0823322ba1 Qual: All call to dolibarr_ functions are made on dol_ functions. 2009-02-20 22:53:15 +00:00
Laurent Destailleur
66dafbd201 Show greyed lines for not allowed export filters 2008-12-08 14:31:47 +00:00
Laurent Destailleur
67303a1abf Use correct icon 2008-12-05 11:15:05 +00:00
Laurent Destailleur
78f894ff25 Add categories export dataset 2008-12-04 23:06:45 +00:00
Laurent Destailleur
174dcf24fc Can delete an export profil. 2008-12-04 20:27:01 +00:00
Laurent Destailleur
211be07fb1 Reduce amount of memory. 2008-10-25 17:27:15 +00:00
Laurent Destailleur
8104948dce New: task #7560 : Droit et definition d'un filtre d'export des interventions 2008-10-13 16:39:53 +00:00
Laurent Destailleur
d86be05585 New: Save last choice of format 2008-05-17 00:14:25 +00:00
Laurent Destailleur
2dbd038b2c Added option All/None in export module step 2 2008-05-16 22:50:38 +00:00
Laurent Destailleur
95bd741f4b Fix: Bad translation in exports 2008-04-01 12:09:33 +00:00
Laurent Destailleur
88532cbbfd New: Export stocks 2008-03-31 06:17:48 +00:00
Laurent Destailleur
f4ecf33e20 Fix: Export for bank module always export credit and devit instead of debit or credit 2008-03-30 15:36:19 +00:00