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

194 Commits

Author SHA1 Message Date
Maxime Kohlhaas
8e3a3500c2 Add comments (for travis' sake) 2014-10-16 13:28:39 +02:00
Maxime Kohlhaas
452636b0e4 New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
c69565fd69 Fix: column name should not be an numeric 2014-10-03 03:12:39 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
f7f0059767 Missing hook to add button on intervention 
Prepare to move location into resource
Can select which king of contact show into contact tab.
 2014-09-22 20:16:58 +02:00
Laurent Destailleur
744f370920 Merge remote-tracking branch 'origin/3.6' into develop 2014-09-11 17:47:58 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
Laurent Destailleur
be6f99c10e Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php
 2014-08-17 19:34:12 +02:00
Laurent Destailleur
4f206a2125 Fix: Missing empty field 2014-08-17 19:27:25 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Florian HENRY
aabbc331a4 Fix output extrafield selllist 2014-08-11 13:12:04 +02:00
Florian HENRY
6849f713b5 Fix bug in output extrafields sell list 2014-08-11 13:09:35 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Florian HENRY
b0011d0514 remove debug 2014-08-01 16:50:47 +02:00
Florian HENRY
17e272c8ac Fix extrafield parameters for sellist 2014-08-01 16:48:16 +02:00
Laurent Destailleur
6226d39cda Fix: Pb when option javascript disabled. 2014-07-29 19:45:48 +02:00
Laurent Destailleur
096a61d5c0 Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong 
translate.
 2014-07-28 20:35:32 +02:00
Laurent Destailleur
c20256f702 Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong 
translate.
 2014-07-28 20:12:01 +02:00
Laurent Destailleur
4dbc1dd1c6 Merge remote-tracking branch 'origin/3.6' into develop 2014-07-06 21:09:10 +02:00
Florian HENRY
02574a7af2 Fix Ajax combobox in Extrafeilds 
Add Extrafield on contract
 2014-07-05 11:17:50 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
b56f59b313 Perf: Avoid to isntantiate object 'form' into 'subform' classes when 
already available.
Qual: Better information into xdebug page.
 2014-05-01 16:26:57 +02:00
Raphaël Doursenaud
70c9dda964 Qual: Missing global declaration 2014-04-23 18:23:56 +02:00
Raphaël Doursenaud
a22ead5e97 Qual: Wrong type in method documentation 2014-04-23 18:23:56 +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
Florian Henry
a2a46f9300 Extrafield select form table do not display selected value on edit mode 2014-04-02 11:34:15 +02:00
Laurent Destailleur
62a990d6cc Fix: ajax_combobox function must be included before called. 
New: Feature of module survey are now localized into top menu "Tools".
 2014-03-26 16:02:22 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This 
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
 2014-02-16 23:51:29 +01:00
Laurent Destailleur
ce8d13ead0 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/makepack-dolibarr.pl
	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/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
b714347b6b Fix: Substition of extra field was ko for order. 2014-02-08 01:01:31 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
0e9477167d Fix: Bad output of extrafields when list is used. 2014-01-30 11:47:25 +01:00
Laurent Destailleur
5076e8ce4e Fix: Bad output of extrafields when list is used. 2014-01-30 10:48:10 +01:00
Laurent Destailleur
0b071ac4f1 Merge pull request #1369 from jfefe/fix_extrafield_list 
Fix : when using several field for label into sellist extrafields
 2014-01-09 06:41:27 -08:00
jfefe
77a1d6a43a Bad value display when using several label into sellist extrafield 2014-01-09 02:40:34 +01:00
jfefe
f554464690 New : ajax list for extrafields list and sellist 2014-01-09 02:10:03 +01:00
jfefe
f1d1522478 Fix : when using several field for label into sellist extrafields traduction is not needed. 
Without this, the list display "not defined". The key can't exists because label displayed is build from several field so we show raw data
 2014-01-09 01:49:59 +01:00
Florian Henry
7696730680 Fix output of extrafield select list from table (in case of filter with 
extrafields table)
 2013-11-15 15:44:04 +01:00
Laurent Destailleur
addedb6f15 Merge branch 'develop' of https://github.com/FHenry/dolibarr into 
FHenry-develop

Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-11-05 19:53:49 +01:00
Laurent Destailleur
190dabc3f7 Fix: Tons of bugs with extrafields feature. 2013-11-05 13:11:36 +01:00
Florian Henry
0d2a019c3f Extrafield : better filter on select from table management for 
extrafields table
 2013-11-05 11:26:13 +01:00
Florian Henry
a57afb6d40 [ task #1127 ] Add feature filter on extrafield type : select for table 2013-11-04 19:21:13 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
 2013-10-27 02:33:03 +02:00
Florian Henry
c2def3d0b6 Fix bad display IE for checkbox extrafield readonly 2013-10-25 10:01:41 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
Laurent Destailleur
b95aa1ac7b Fix: select list on external table 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-09-02 00:41:14 +02:00
Laurent Destailleur
3a4896609a Fix: Remove debug print 2013-09-02 00:38:13 +02:00
Laurent Destailleur
51cc957b97 Fix: select list on external table 2013-09-02 00:34:41 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
jfefe
90e245ca5a Merge branch 'extra-listlabel' of github.com:jfefe/dolibarr into extra-listlabel 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-07-27 01:29:05 +02:00
jfefe
95e2f30f6b Can choose several fields to display with extrafield list of table 2013-07-27 01:21:19 +02:00
jfefe
473541f19d Fix : bad test field when checking extrafield is required 2013-07-26 15:41:17 +02:00
jfefe
c431fc716f Check if an required extrafield is filled. 
Method setOptionalsFromPost now return -1 if required field is blank
 2013-07-26 13:18:23 +02:00
Florian Henry
2f112efad5 Avoid php warning if extrafield list from table have bad settings 2013-07-25 20:18:45 +02:00
Laurent Destailleur
644f5149e4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-24 00:42:28 +02:00
Florian Henry
6f262b3a5b Avoid PHP warning 2013-07-23 15:52:41 +02:00
Maxime Kohlhaas
63e6cf5c81 Add possibility to define dependencies between extra lists 2013-07-18 17:42:09 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
jfefe
162fc6e6dd Remove debug info 2013-06-27 13:45:06 +02:00
jfefe
2f6361658a Can choose several fields to display with extrafield list of table 2013-06-27 13:35:28 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the 
parameter currency of method price.
 2013-06-17 11:58:55 +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
8ed5dfeded Fix: Bad styles of html elements 2013-06-14 02:15:43 +02:00
Florian Henry
4f43ec0acf Add extrafield tables 2013-06-10 14:13:44 +02:00
Florian Henry
646be9b984 Fix bug on extrafeild type price and double 2013-06-09 16:56:29 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
fhenry
111fc3153b Fix Extrafield selllist bug in PgSQL 2013-05-12 15:45:23 +02:00
fhenry
30ad2f1609 Fix bug in fetch_optionals 2013-04-26 10:51:17 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
fhenry
d0f44bf25f Add zero entity into extrafeild deletion 2013-04-26 08:46:25 +02:00
fhenry
8c440b3f57 Remove entity check in list table extrafield 2013-04-25 00:14:43 +02:00
fhenry
507da4fc3b Add Zero entity to shared extrafield 2013-04-25 00:09:47 +02:00
fhenry
f1a97d4705 remove ver_export 2013-04-25 00:02:29 +02:00
fhenry
9a0f9477a6 Fix multicompany problem with extrafield list from table 2013-04-25 00:01:38 +02:00
fhenry
7fdf2f3482 Fix for php 5 2013-04-24 23:54:02 +02:00
fhenry
928a1afe18 Fix bug on Extrafield list table type 2013-04-24 21:32:22 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
jfefe
610fed6b3c Fix on extrafields date type : do not show current date when field not required 2013-04-15 18:42:00 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
jfefe
6e66922a6b Fix : in extrafield force output for date selector 2013-04-01 18:46:53 +02:00
jfefe
95d8ee8b41 Revert "Show number with dot to avoid error when update extrafield" 
This reverts commit 76efc04840.
 2013-03-30 10:49:52 +01:00
jfefe
60e72a770a Merge branch 'develop' into extrafields 2013-03-29 22:25:48 +01:00
jfefe
649c1f3721 Try new function to set array_options to object (extrafields values) with date sent by forms 2013-03-29 22:25:02 +01:00
jfefe
1a1aebf793 Display date extrafield with correct format 2013-03-29 14:56:31 +01:00
jfefe
c53564c454 For extrafield with date type show calendar instead basic input field 2013-03-29 14:03:39 +01:00
jfefe
0b7d13d463 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-03-27 20:39:56 +01:00
jfefe
ba0963ea7d Fix : implement separator extrafield - missing check on update 2013-03-16 00:00:57 +01:00
jfefe
b36b776f10 IKM : work on new extrafield separator type 2013-03-15 23:39:18 +01:00
jfefe
654e99df8c Work on new type of extrafield : separator with no field stored in database 2013-03-15 18:56:10 +01:00
jfefe
76efc04840 Show number with dot to avoid error when update extrafield 2013-03-13 22:01:34 +01:00