Commit Graph

58801 Commits

Author SHA1 Message Date
Laurent Destailleur
32678015c9 FIX protection against infinite loop on hierarchy 2017-02-21 23:52:13 +01:00
De Coninck Laurent
2ecf50a6cc generate new pdf when validate billing 2017-02-21 19:33:32 +01:00
florian HENRY
c8de648924 fix unit trad 2017-02-21 19:07:57 +01:00
Laurent Destailleur
089aa1df33 FIX If bank module on, field must be required to register payment of
expense report.
2017-02-21 17:10:32 +01:00
Laurent Destailleur
230bb09c1a Prepare 5.0 2017-02-21 16:59:21 +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
ebe625aa16 Fix debug direct debit module 2017-02-21 13:16:28 +01:00
Laurent Destailleur
63876a1b91 Prepare 5.0 release 2017-02-21 12:09:55 +01:00
Laurent Destailleur
b3a127519b Prepare final 5.0 2017-02-21 12:03:08 +01:00
Laurent Destailleur
7ab600781d NEW Move login information on home page into a widget 2017-02-21 11:57:52 +01:00
Laurent Destailleur
a0873bad29 Fix TZ 2017-02-21 11:34:22 +01:00
Laurent Destailleur
992f292a05 Translation 2017-02-21 10:59:49 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
Laurent Destailleur
6c40110613 Sync transifex 2017-02-21 10:26:11 +01:00
De Coninck Laurent
33d1d78329 FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users 2017-02-21 09:22:50 +01:00
Alexandre SPANGARO
1401e9267b [FP17] Modify menu for multijournal 2017-02-21 07:09:58 +01:00
Laurent Destailleur
68ded1b4c3 Fix language 2017-02-20 19:30:34 +01:00
Laurent Destailleur
3e2c0d26f2 Fix MVC 2017-02-20 11:59:58 +01:00
Laurent Destailleur
a8129ce46e Fix transaction/sql error 2017-02-20 11:49:27 +01:00
Laurent Destailleur
702ad5bcde Fix menus 2017-02-20 11:29:30 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not
admin user.
2017-02-20 11:21:38 +01:00
Laurent Destailleur
020ceacb46 Fix search criterias 2017-02-20 10:36:03 +01:00
arnaud
842859c394 FIX travis bis 2017-02-20 10:16:28 +01:00
jfefe
0a9ffa58c1 FIX : event status is not modified when assign an user 2017-02-20 09:54:20 +01:00
arnaud
26b8112d4e FIX travis check 2017-02-20 09:22:57 +01:00
Laurent Destailleur
d883c3cd8d Fix rendering 2017-02-20 04:25:20 +01:00
Laurent Destailleur
501f118f92 Fix style 2017-02-19 22:53:29 +01:00
Laurent Destailleur
723d8ff106 Fix css 2017-02-18 00:48:17 +01:00
Laurent Destailleur
dbf4eaccb7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-17 20:47:50 +01:00
Laurent Destailleur
847f408508 More complete repair 2017-02-17 20:47:22 +01:00
Laurent Destailleur
cd2f655333 Merge pull request #6440 from GPCsolutions/5.0-escapejsvar
Fix: [Payments] Properly escape variable for JS
2017-02-17 17:16:54 +01:00
Laurent Destailleur
2dbae7b808 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 17:14:00 +01:00
Laurent Destailleur
fd111cb1c6 NEW tooltip can be on hover or on click with textwithpicto function. 2017-02-17 17:11:14 +01:00
arnaud
951ea51285 FIX translate model admin 2017-02-17 16:44:57 +01:00
arnaud
4ec664029d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment 2017-02-17 16:40:14 +01:00
arnaud
fc0abe659a NEW PDF with numbertoword 2017-02-17 16:39:36 +01:00
Raphaël Doursenaud
b697da7399
Fix: [Payments] Properly escape variable for JS
The company name may contain reserved characters such as a quote
which needs proper escaping to prevent upsetting the JavaScript
interpreter.
2017-02-17 16:16:41 +01:00
Laurent Destailleur
49afc83a7f Merge pull request #6437 from defrance/patch-80
"Preview" not translated
2017-02-17 13:28:29 +01:00
Laurent Destailleur
1f156c1716 Merge pull request #6436 from defrance/patch-79
on list, preview tooltip is not displayed correctly
2017-02-17 13:27:31 +01:00
florian HENRY
f7e1927b43 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect 2017-02-17 13:25:19 +01:00
florian HENRY
4521a5d7e0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_NEW_copyeventfiles 2017-02-17 13:24:48 +01:00
florian HENRY
4836fa8f76 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email 2017-02-17 13:24:06 +01:00
Laurent Destailleur
7f21c3f3f2 Fix css email topic 2017-02-17 13:16:29 +01:00
Laurent Destailleur
87cbbadeed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:11:51 +01:00
Laurent Destailleur
8d03f86f45 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:10:46 +01:00
Laurent Destailleur
0e6c329695 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-17 13:10:03 +01:00
Laurent Destailleur
a91d57037e FIX #6433 2017-02-17 13:09:28 +01:00
Laurent Destailleur
10ccb91515 Merge pull request #6432 from defrance/patch-75
Accounting code not display on tooltip
2017-02-17 12:51:19 +01:00
BENKE Charlie
e4ede5aef3 "Preview" not translated 2017-02-17 12:32:06 +01:00
BENKE Charlie
b94312162e on list, preview tooltip is not displayed correctly
it's a problem of alignment, the tooltip is cut by the left part on list (ex : comm/propal/list.php)
think we can do better
2017-02-17 12:05:24 +01:00