2
0
forked from Wavyzz/dolibarr
Commit Graph

127 Commits

Author SHA1 Message Date
Philippe Grand
b5b79bc36b Merge branch 'develop' into new_branch_24_04 2017-05-04 21:42:43 +02:00
Laurent Destailleur
768df56c07 Uniformize name of standard PDF template 2017-05-04 20:16:55 +02:00
Laurent Destailleur
5e856e6923 More complete tooltip help to describe available substitution vars 2017-04-27 17:16:19 +02:00
philippe grand
0c7cfdb037 Update code using new css class 2017-04-24 16:36:58 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
e58743ea5b Fix regression: Textarea to enter data was crushed. 2017-02-07 01:13:04 +01:00
Marcos García de La Fuente
a94a951a89 Little improvements to admin pages where a FREE_TEXT or a watermark constant was set 2017-02-03 19:38:33 +01:00
Raphaël Doursenaud
052a11a5c0 Fixed interventions from order.
Handling of predefined services was buggy and resulted in an SQL error
because of uninitialized duration.

Generalized services duration handling and exposed it in the module's
admin page.
2016-07-25 17:24:57 +02:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
BENKE Charlie
898f637457 Update fichinter.php 2015-12-08 18:02:25 +01:00
BENKE Charlie
771f7183d4 db close must do AFTER llxFooter() call 2015-12-07 10:56:37 +01:00
philippe grand
d517595f82 [Qual] Uniformize code 2015-10-28 19:28:18 +01:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show.
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
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
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
872b59f568 NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to
enter pdf footer text with wysiwyg editor.
2015-09-18 12:34:36 +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