Commit Graph

108 Commits

Author SHA1 Message Date
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
2015-10-01 11:16:35 +02:00
Florian HENRY
e209fb23a2 FIX : Admin fiche inter page do not take good action 2015-09-29 18:27:39 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Laurent Destailleur
049174b76f Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/ 2015-03-06 01:53:02 +01:00
frederic34
173d3aaa90 Translation error messages numbering modules 2015-01-11 11:31:53 +01:00
Regis Houssin
3daf06960d Fix: add generic doc and uniformize code 2014-09-25 12:07:11 +02:00
Laurent Destailleur
47c982c506 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
2014-06-10 08:45:08 +02:00
Marcos García de La Fuente
0810e6756a Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration 2014-06-09 22:48:16 +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
Laurent Destailleur
628fbc7b7d Fix: bad picto 2013-11-05 15:14:23 +01:00
simnandez
fa5f09d6e0 [ task #1036 ] Normalized usage of setEventMessage instead of
dol_htmloutput_mesg: Works in admin
2013-08-14 12:48:00 +02:00
Christophe Battarel
4b1ae9e9a9 add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant) 2013-05-21 11:44:11 +02:00
fhenry
5d73ce4023 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 12:53:11 +02:00
Marcos García
edfcfb9bbd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop
Conflicts:
	htdocs/admin/commande.php
	htdocs/admin/expedition.php
	htdocs/admin/facture.php
	htdocs/admin/fichinter.php
	htdocs/admin/livraison.php
	htdocs/admin/supplier_invoice.php
	htdocs/admin/supplier_order.php
	htdocs/societe/admin/societe.php
2013-05-08 15:37:41 +02:00
Marcos García
3d5cb4e8de Style improvements in model document selector 2013-05-07 22:48:03 +02:00
Marcos García
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +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
350bcea183 Merge 2013-03-22 17:10: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
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +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
237d7b744c Including other.lang in files using FeaturesSupported string, also removed duplicated code 2012-07-30 20:39:47 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
d7c8f4d5c3 Fix: compatibility with external modules 2012-04-03 17:09:05 +02:00
simnandez
956eb11172 Fix: Sanitize data 2012-03-28 16:49:36 +01:00
Grand Philippe
b3e55e179f first step to use fichinter within a custom place 2012-03-24 18:15:07 +01:00
Regis Houssin
13f2fe84f9 Fix: missing object $db and missing variables declaration 2012-02-24 16:31:51 +01:00
Regis Houssin
190cc7b13c Fix: uniformize structure 2012-01-23 14:43:31 +01:00
Grand Philippe
ec3fc2c19e fix: specimen wasn't displayed when modele was in custom directory 2011-12-10 11:48:45 +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
Laurent Destailleur
8d46ae1d35 Qual: Better error managment on numbering setup 2011-11-06 15:12:18 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
Laurent Destailleur
e82923b525 Fix: Removed warnings 2011-09-21 13:24:27 +00:00
Laurent Destailleur
507fd89c60 Doxygen 2011-09-12 19:49:40 +00:00
Laurent Destailleur
21451b3a5a New: Add total on interventions 2011-09-12 19:25:40 +00:00
Laurent Destailleur
d74d6fd7ad Better link 2011-09-12 19:40:41 +00:00
Laurent Destailleur
198924a876 Fix: Specimen 2011-09-12 19:21:57 +00:00
Laurent Destailleur
7d5792f1a7 Look: Uniformize view 2011-09-12 19:34:59 +00:00
Laurent Destailleur
9b553db508 Fix: Syntax error 2011-09-12 18:43:01 +00:00
Laurent Destailleur
4892813ed0 Fix: Missing translation 2011-09-12 19:31:32 +00:00
Laurent Destailleur
247fd29662 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:47:29 +00:00
Juanjo Menent
873f5d44b9 Uniformize code 2011-08-31 14:28:42 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
e2c007305c Fix: Avoid errors into rpm packages 2011-07-31 22:21:57 +00:00
Laurent Destailleur
d6abe49da2 Fix: Show error message 2011-05-04 18:34:16 +00:00
Regis Houssin
66992ad45e Fix: possibility to use an alternative path 2011-04-15 07:54:10 +00:00
Laurent Destailleur
0560de9fad Work on ODT generation 2011-02-20 19:04:14 +00:00