Commit Graph

97 Commits

Author SHA1 Message Date
Frédéric FRANCE
84f2b31d46 loadlangs 2018-05-27 09:40:17 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
590bc2948a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
2018-04-11 17:20:49 +02:00
Laurent Destailleur
628b437e28 Update card.php 2018-04-11 16:25:05 +02:00
Laurent Destailleur
9af052602a Fix css 2018-04-11 12:54:57 +02:00
atm-arnaud
848d76ee78 FIX #8023 2018-04-10 14:43:32 +02:00
Laurent Destailleur
54a86dc2b1 Fix CSS 2018-04-09 11:42:43 +02:00
Laurent Destailleur
9314dcb046 Fix regression 2017-12-12 10:13:48 +01:00
Laurent Destailleur
1b3680c200 Fix missing css 2017-12-03 12:21:38 +01:00
Laurent Destailleur
f33182acc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-12 20:49:53 +01:00
Laurent Destailleur
50ed463b9f Merge pull request #7784 from frederic34/patch-3
account number on create bank account
2017-11-11 17:37:29 +01:00
Frédéric FRANCE
1ea6df14d0 Update card.php 2017-11-08 11:35:15 +01:00
Frédéric FRANCE
27ace14fb7 Fetch right account 2017-11-07 16:28:51 +01:00
Laurent Destailleur
9cc923f317 Fix for ch accounting account. 2017-11-06 21:12:29 +01:00
Laurent Destailleur
07d16afe3b Save one space 2017-10-13 23:10:40 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card.
NEW Show expected worked hours on the timesheet form.
2017-10-06 12:08:01 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
502ac19a0a Fix regression on categories 2017-08-27 12:28:59 +02:00
Laurent Destailleur
3f7eea2e0a NEW Can set language on extrafields 2017-08-27 12:12:02 +02:00
Laurent Destailleur
f39fb5187a Fix component to select journal 2017-06-15 20:27:40 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Alexandre SPANGARO
1f079fac9d Move html.formventilation.class.php to html.formaccounting.class.php 2017-05-25 06:57:28 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
143c019905 Fix : Sql error on salaries index for accountancy multijournal + debug 2017-05-14 08:07:34 +02:00
Alexandre SPANGARO
7c4b47f20d Update works 2017-05-06 08:33:12 +02:00
Alexandre SPANGARO
68aaef2f66 Add list to select journal in bank 2017-05-06 08:06:01 +02:00
Alexandre SPANGARO
fa4bb4e80a Remove accounting.lib.php 2017-05-01 21:12:52 +02:00
Alexandre SPANGARO
e1e2481e37 Remove picto 2017-05-01 21:09:09 +02:00
Alexandre SPANGARO
102deccba7 Use getnomUrl on bank accountancy number 2017-05-01 21:06:31 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
florian HENRY
196156a21e fix setEventMessages error insteads of errors 2017-04-13 16:35:29 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
0d07ad8c69 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/compta/bank/class/account.class.php
2017-02-27 11:58:35 +01:00
Laurent Destailleur
10838983b5 FIX error management in bank account deletion. 2017-02-27 11:38:19 +01:00
Laurent Destailleur
024cecec29 FIX Error management during bank account creation 2017-02-27 11:16:46 +01:00
Laurent Destailleur
fc401a9c68 Fix more security fixes 2016-12-18 17:27:06 +01:00
Laurent Destailleur
663f7938f8 Fxi responsive design 2016-11-27 20:02:57 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
97d84ab4ab Better responsive design 2016-11-11 23:47:56 +01:00
Laurent Destailleur
35601775e0 By default we open a new tab on external url link 2016-10-22 17:05:47 +02:00
Laurent Destailleur
f93bca9be9 NEW Can see/make bank conciliation from transaction list 2016-10-21 17:00:31 +02:00
Laurent Destailleur
4cf4090cde Css 2016-10-17 00:21:39 +02:00
Laurent Destailleur
e79a84a89b Uniformize code 2016-10-05 21:49:04 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00