Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/expedition/fiche.php
2015-04-18 23:55:17 +02:00
Marcos García de La Fuente
8f0c41dbd2
Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
2015-04-12 22:02:25 +02:00
Marcos García de La Fuente
6173706531
Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
2015-04-12 21:55:20 +02:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Laurent Destailleur
30a5111c68
Work on expense report module
2015-02-21 15:18:05 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Frédéric FRANCE
68ccb33def
Update /compta/deplacement/list.php
2014-11-23 17:44:13 +01:00
Frédéric FRANCE
d6e8211018
Update /compta/deplacement/list.php
2014-11-23 09:49:30 +01:00
aspangaro
89296e3011
Typo search list
2014-11-05 22:27:26 +01:00
aspangaro
5bf5b9b16f
Trips list
2014-11-02 21:12:40 +01:00
Laurent Destailleur
2dc1cb7c27
Fix: Use correct permission on correct field.
2014-10-30 12:19:38 +01:00
Laurent Destailleur
47c2dc4fcf
Fix: Can see only trip allowed.
2014-10-30 11:36:04 +01:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
Laurent Destailleur
968b021985
Fix trad and sql error
2014-10-05 05:37:01 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ee4d697172
Fix several bugs reported by scrutinizer
2014-09-19 14:57:31 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
65a69d3019
Fix: Bad field
2014-09-18 16:50:16 +02:00
Laurent Destailleur
bc7d839c64
Fix: Missing status "refunded".
...
Fix: translation
2014-09-06 17:16:24 +02:00
Laurent Destailleur
996977a4a8
Fix: Missing user name
2014-09-06 17:10:52 +02:00
Laurent Destailleur
91a894f459
Fix: Missing user name
2014-09-06 17:10:22 +02:00
aspangaro
9af336b53b
Add accountancy code for trips & fees and renamed libelle field into label
2014-08-10 20:41:52 +02:00
Marcos García de La Fuente
43597c1731
Migrated old error notifications to the """new""" system
2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
KreizIT
c70bdabeda
Fix: [ bug #1501 ] DEPLACEMENT_CREATE trigger do not intercept trigger action
2014-07-04 16:23:10 +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
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +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
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
9e771269c4
Qual: clean code
2014-03-26 20:46:17 +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
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
86ad05c22e
Merge pull request #1461 from marcosgdf/unknown-error
...
Corrected Unknown error message typo
2014-03-11 11:54:08 +01:00
Laurent Destailleur
932b421d1d
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-11 09:46:51 +01:00
Marcos García de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +01:00
Laurent Destailleur
ccc40362e7
Fix: Must use div for columns of index pages. Not table.
2014-03-10 17:19:02 +01:00
Laurent Destailleur
f7fe25e408
Uniformize code to prepare mass update
2014-02-27 10:37:23 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Grand Philippe
c5689b86b4
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 09:43:21 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
283297294b
Fix: Missing definition of status labels
2014-01-05 16:19:25 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
