Laurent Destailleur
26ba0a9ec2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cashdesk/index.php
htdocs/compta/index.php
htdocs/core/lib/security.lib.php
htdocs/societe/list.php
2018-01-16 20:23:32 +01:00
atm-quentin
6feacab4f5
FIX missing hook invoice index
2018-01-15 14:24:19 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
mistraloz
36adda92c2
Feature Request : Name of invoice when they are Draft (instead of "Prov....") #7669
...
Feature Request : Name of invoice when they are Draft (instead of "Prov....") #7669
-> Change only the tooltip with ref_supplier or ref_client
2017-10-24 11:17:02 +02:00
Laurent Destailleur
5e1dbdc608
Update index.php
2017-07-18 14:35:11 +02:00
Articoder InfoSec Team
0179160f6c
Reason: similar change is present elsewhere in the code
...
Notes: please review carefully before accepting. patch propagation. manual test run.
Reviewed By: https://github.com/dchichkov
Cherry picked from:
===
From 0d62bd704e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Wed, 22 Jun 2016 18:59:51 +0200
Subject: [PATCH] Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
2017-07-18 14:34:57 +02:00
Laurent Destailleur
ba660a041c
Update index.php
2017-07-18 14:33:32 +02:00
Articoder InfoSec Team
8ef5fcd90a
Reason: similar change is present elsewhere in the code
...
Notes: please review carefully before accepting. patch propagation. manual test run.
Reviewed By: https://github.com/dchichkov
Cherry picked from:
===
From 0d62bd704e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Wed, 22 Jun 2016 18:59:51 +0200
Subject: [PATCH] Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
2017-07-14 15:57:22 -07: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
ea44e14b60
Start debug the variant module
2017-04-07 11:01:12 +02:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
Laurent Destailleur
4c310964a9
Fix list of supplier proposals
2017-02-17 01:41:33 +01:00
Laurent Destailleur
ab269bd7a6
Better responsive
2016-11-11 01:15:41 +01:00
Laurent Destailleur
6ceb79cf5a
Uniformise look and feel
2016-11-03 20:55:55 +01:00
Laurent Destailleur
8cfac3b5c3
FIX Several problems when using smartphone
2016-08-31 12:38:54 +02:00
Laurent Destailleur
4b854fb33d
Fix better error message when possible refering objects list is empty.
2016-07-16 14:37:35 +02:00
Laurent Destailleur
2e4c6597d8
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2016-06-23 21:05:00 +02:00
Juanjo Menent
0d62bd704e
Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
2016-06-22 18:59:51 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Juanjo Menent
66c73015b2
Fix issues with strict mode
2016-06-03 23:58:54 +02:00
Frédéric FRANCE
2f3a2303d4
put colspan in td instead tr
2016-05-04 16:49:15 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Marcos García de La Fuente
9169adf4ce
FIX #4766 VAT not shown in supplier invoice popup
...
Close #4766
2016-04-09 22:34:55 +02:00
Laurent Destailleur
619ebf9a3e
Enhance css of search fields
2016-03-13 20:38:16 +01:00
Laurent Destailleur
fd2166ed11
Minor enhancement on new recurring invoice generation
2016-03-03 10:42:49 +01:00
Laurent Destailleur
4cf59d3f9b
Fix if option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER is on, we must
...
not show unpaid orders.
2016-02-26 19:13:25 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
Laurent Destailleur
192fdbdcc4
Minor look uniformization
2015-11-14 23:10:12 +01:00
Laurent Destailleur
7fd6d8839a
Uniformize code and use a new generic search architecture
2015-10-17 01:40:46 +02:00
Laurent Destailleur
d1d6c72d7d
NEW Uniformize way of working for search filters. One filter per object.
2015-10-16 22:21:26 +02:00
Regis Houssin
8912e111a3
Fix: wrong date format
2015-10-02 11:21:23 +02:00
Frédéric FRANCE
6e947add92
Update index.php
2015-10-02 08:58:09 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Marcos García de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
3c5159f497
Created Facture::hasDelay function
2015-09-05 10:56:13 +02:00
Laurent Destailleur
19ac160696
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_prospect.php
htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.z
htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmono.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
2015-09-03 10:49:41 +02:00
Laurent Destailleur
d64a87d980
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/index.php
2015-09-03 10:44:40 +02:00
Laurent Destailleur
001f1b4c31
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-03 10:41:44 +02:00
Raphaël Doursenaud
870882257d
Fix #3448 Pass expected date format
2015-09-01 11:06:44 +02:00
aspangaro
5f5388a52a
Fix: wrong link
2015-05-27 07:19:10 +02:00
jfefe
23e5bc4f53
Add title image for bank section
2015-04-18 23:17:47 +02:00
jfefe
22c3406498
Change title images for accountancy section
2015-04-18 23:17:47 +02:00
Juanjo Menent
2f8ed32f76
Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated
2015-04-18 14:17:00 +02:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
aspangaro
fa41132372
Move module Don in htdocs->donations
2015-03-19 05:22:42 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Frédéric FRANCE
6e69d5c4bd
Typo
2014-12-27 11:28:10 +01:00
Frédéric FRANCE
7001cd0283
Update index.php
2014-12-23 20:11:13 +01:00
Frédéric FRANCE
fbdd851875
Fix remove </a> not needed
2014-11-25 18:54:56 +01:00
Marcos García de La Fuente
f7a44347cb
Lowecased booleans to fit with PSR-2 specification.
2014-10-12 00:23:19 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
Raphaël Doursenaud
f6848e8655
Add label on search boxes
2014-07-11 13:26:02 +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
aspangaro
07d6464720
Trips & expenses move into hrm area
2014-03-20 06:38:07 +01:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
Raphaël Doursenaud
5ba9a1134b
Removed dead code
2013-12-10 11:38:02 +01:00
Laurent Destailleur
a6e4ba7001
Fix: No limits for drafts lists
2013-12-01 19:40:36 +01:00
Laurent Destailleur
6e96d60c6c
Fix: No limits for drafts lists
2013-12-01 18:53:16 +01:00
Laurent Destailleur
c4d3307bfa
Qual: Normalize file name.
2013-07-26 11:36:36 +02:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
80e470a4ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
Laurent Destailleur
36b314a2d6
Try to solve some problems with table (replaced by div).
2013-04-25 20:27:45 +02:00
fhenry
bc7015a431
fix [ bug #850 ] Dolibarr PGSQL
2013-04-25 12:55:40 +02:00
Laurent Destailleur
3c5520f418
Fix: missing translation
2013-04-25 01:17:45 +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
ae01285fe9
Look: Replace table with div.
...
Look: Optimize for smartphone
2013-04-12 16:16:39 +02:00
Grand Philippe
20fb7f79c0
fix: some issue on the road to numbering supplier invoice
2013-04-01 22:58:54 +02:00
Laurent Destailleur
7d32db73c6
Fix: Restore lost commit.
2013-04-01 20:59:51 +02:00
Grand Philippe
e2623c6ad5
try to fix :supplier invoice numbering
2013-04-01 16:04:15 +02:00
Laurent Destailleur
f52fe71018
Fix: Bad div closing
2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
55f9879a6c
Replace table with div. Prepare work for android application.
2013-03-16 14:53:15 +01:00
Laurent Destailleur
d8af59756d
New: Add function dolGetFirstLastname
2013-03-11 10:11:43 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +01:00
Grand Philippe
8d7654916f
english language standardization
2013-02-23 15:46:12 +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
67f40fcd1e
Fix: works on security
2012-10-13 10:39:16 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71
Fix: use getDocumentsLink method
2012-09-15 09:02:20 +02:00
Laurent Destailleur
2c2d17b101
Fix: Try a fix to avoid having the hover on array that should not have
...
it.
2012-09-09 13:13:24 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02: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
Regis Houssin
cd7bf41ae0
Fix: php 5.4 strict mode warning
2012-07-09 10:08:56 +02:00
Laurent Destailleur
e6cd400bc3
Qual: List of elements must be into a page called "list.php".
2012-06-09 19:16:31 +02:00
Regis Houssin
73487a6aec
Fix: replace mktime() by dol_now()
2012-04-30 15:01:25 +02:00
Laurent Destailleur
39630db91a
New: Add filter to search on suplier ref
2012-03-31 14:21:36 +02:00
Regis Houssin
c6e4206907
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4
Fix: use entity field of object
2012-02-01 11:32:55 +01:00
Laurent Destailleur
f3a966a313
Fix: Missing name
2012-01-29 23:24:47 +01:00