Laurent Destailleur
|
91caea5707
|
Code was corrupted with very bad commits. I restore files manually.
|
2016-03-25 15:53:44 +01:00 |
|
Marcos García de La Fuente
|
89bd173c2f
|
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 21:51:29 +01:00 |
|
Marcos García de La Fuente
|
5a046125db
|
Missing changes from previous commits
|
2016-03-20 14:24:49 +01:00 |
|
Laurent Destailleur
|
3b595f0247
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
|
2015-12-13 16:23:33 +01:00 |
|
Laurent Destailleur
|
a462cd232d
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-12-13 16:09:09 +01:00 |
|
Laurent Destailleur
|
a209d18649
|
FIX Can use formated float number on old expense report module.
|
2015-12-06 19:51:28 +01:00 |
|
Laurent Destailleur
|
374480043e
|
Add maxwidth300 on combo list for users and sale representatives
|
2015-12-06 00:37:58 +01:00 |
|
philippe grand
|
c712532bf6
|
[Qual] Uniformize code
|
2015-11-12 11:59:15 +01:00 |
|
philippe grand
|
f31ddc23aa
|
[Qual] Uniformize code
|
2015-10-17 16:18:33 +02:00 |
|
Raphaël Doursenaud
|
631ee83745
|
[Qual] Replaced deprecated print_fiche_titre()
|
2015-09-24 18:34:58 +02:00 |
|
Laurent Destailleur
|
1fb40565f4
|
Fix bad parameters of function select_date
|
2015-07-12 12:50:24 +02:00 |
|
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
|
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 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Regis Houssin
|
a2446e51db
|
New: add context "globalcard" for declaring only once all cards
|
2014-10-06 07:20:58 +02:00 |
|
aspangaro
|
0b20369dd7
|
Qual: Renamed all files & links "fiche.php" into "card.php"
|
2014-09-18 21:18:25 +02:00 |
|