Commit Graph

4488 Commits

Author SHA1 Message Date
Laurent Destailleur
f058fa1938 Better detection if a module provide triggers 2017-08-03 12:19:31 +02:00
Laurent Destailleur
00a1893d93 Better help 2017-08-03 12:04:13 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
69357dd91c Merge pull request #7113 from atm-ph/new_develop_expense_report
NEW Add expense report rules and ik
2017-07-31 02:33:49 +02:00
Laurent Destailleur
80f096a9d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-31 02:09:15 +02:00
Laurent Destailleur
bb8d458468 Fix menu editor 2017-07-30 19:41:45 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Laurent Destailleur
854a6ca3d5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-22 16:40:45 +02:00
Laurent Destailleur
5207b84e8b Fix compatibility with indian IGST/CSGST/SGST 2017-07-22 01:56:38 +02:00
Laurent Destailleur
1851080b31 Merge pull request #7152 from dolibarr95/patch-14
'int' for $rate variable
2017-07-21 15:07:00 +02:00
Laurent Destailleur
5965bec501 Update multicurrency.php 2017-07-21 15:06:53 +02:00
Laurent Destailleur
168f167934 Tooltip 2017-07-21 12:42:21 +02:00
Laurent Destailleur
df61a5f045 Debug module website 2017-07-20 20:05:49 +02:00
Laurent Destailleur
1e7aa4d9b4 Work on module website 2017-07-19 16:38:00 +02:00
Laurent Destailleur
1ef70b387d Fix bad limit 2017-07-17 16:45:24 +02:00
Laurent Destailleur
7b2a71802b Do some TODO on modulebuilder module. 2017-07-16 13:00:35 +02:00
Laurent Destailleur
15cf15f47f Look and feel v6 2017-07-14 02:07:01 +02:00
dolibarr95
de24c0e367 Keep alpha for $rate var 2017-07-13 16:21:02 +02:00
dolibarr95
c36c2408c2 'int' for $rate variable
see : 
https://github.com/Dolibarr/dolibarr/pull/7149#issuecomment-315076031
2017-07-13 15:31:46 +02:00
Laurent Destailleur
743de4e586 FIX Option to classify proposal/order in workflow module must not set
source object to billed if amount differs.
2017-07-13 12:42:32 +02:00
Laurent Destailleur
028f1f5133 Fix default currency in creation form. 2017-07-13 10:16:40 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Destailleur
23fbef3dae Fix the delete dir functions does not return real nb of deleted files. 2017-07-13 00:26:05 +02:00
Laurent Destailleur
0d4d4516c8 Fix template for css and js 2017-07-12 22:52:56 +02:00
Laurent Destailleur
be09c911ce Debug module websites 2017-07-10 23:44:46 +02:00
Laurent Destailleur
fd89535037 Debug module website 2017-07-09 22:30:19 +02:00
Laurent Destailleur
3c576dcf21 Fix bad name of tables 2017-07-09 20:57:45 +02:00
Laurent Destailleur
10cb7b2524 Fix remove warnings 2017-07-09 20:31:27 +02:00
Laurent Destailleur
71d360b4a0 Merge pull request #7105 from hregis/develop_bug2
Fix: check if action type is different of 'user' (external module)
2017-07-07 19:57:26 +02:00
Laurent Destailleur
2be9f402c6 Fix order of tab 2017-07-07 10:58:18 +02:00
phf
6ab0ec4b1b Fix travis and rename 2 fields 2017-07-07 10:22:37 +02:00
phf
b8865c425f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-05 10:48:01 +02:00
phf
1beec51928 New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE 2017-07-05 10:44:52 +02:00
Laurent Destailleur
0ee93fb00c Fix conflict between option login and logina and logint in agenda export 2017-07-04 10:29:38 +02:00
Regis Houssin
d9d9b748ad Fix: check if action type is different of 'user' (external module) 2017-07-03 19:27:21 +02:00
Laurent Destailleur
9e26e6b0a3 Fix bad value for ref of old contracts 2017-07-03 11:42:17 +02:00
Laurent Destailleur
658fe93d8c Fix menu editor (data not aligned) 2017-07-01 12:42:49 +02:00
Laurent Destailleur
5f00fb5df8 Merge pull request #7059 from jfefe/patch-13
Add missing end tag `form` into fichinter setup
2017-06-27 17:36:33 +02:00
Laurent Destailleur
3b7667292b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-27 11:59:40 +02:00
Laurent Destailleur
10eda66735 Fix alignement 2017-06-27 11:32:52 +02:00
jfefe
9b951c5d1b Add missing end tag form into fichinter setup
The setup for option `FICHINTER_PRINT_PRODUCTS` was broken.
2017-06-26 21:37:36 +02:00
Laurent Destailleur
85ce1f3332 Fix missing var init 2017-06-26 09:20:16 +02:00
Laurent Destailleur
e97a4d953d Merge pull request #7052 from hidupcloud/develop
FIX Fixing pages warning when value is null
2017-06-25 03:03:34 +02:00
Laurent Destailleur
778e581aca Fix: avoid warning on permission if there is only admin users 2017-06-24 22:14:04 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae Fixing pages warning when value is null 2017-06-24 16:45:45 +02:00
Laurent Destailleur
b0c5616ff0 Fix in the way markdown README and ChangeLog are output on module page. 2017-06-24 16:01:18 +02:00
Laurent Destailleur
014cb4b004 Fix navigation on security event list 2017-06-21 12:03:49 +02:00
Laurent Destailleur
ec9bbe2b52 Help/Need debug of some online instances with the log view 2017-06-20 16:54:37 +02:00
Laurent Destailleur
4dda771079 FIX #6973 2017-06-20 12:54:26 +02:00