Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
61,071 Commits 36 Branches 189 Tags
8f34de1036680906ebdb8c05e6460077b5dc4b43
Commit Graph

4519 Commits

Author SHA1 Message Date
Laurent Destailleur
4d908c2dd0 Merge pull request #7299 from atm-maxime/new_expense_numbering 
New : add expense report numbering mask
 2017-08-29 18:24:17 +02:00
Laurent Destailleur
a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php
 2017-08-28 12:53:02 +02:00
Laurent Destailleur
21a7fcb01a Fix substitution when sending emails 2017-08-28 12:18:18 +02:00
Maxime Kohlhaas
350b24f32b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_expense_numbering 2017-08-27 17:53:19 +02:00
Maxime Kohlhaas
61fadfd0e1 New numbering module for expense report + admin setup 2017-08-27 10:49:51 +02:00
Laurent Destailleur
77af3b96d3 Showempty on language list 2017-08-26 18:45:10 +02:00
Laurent Destailleur
5ed22b64fb Show if module add objects tables 2017-08-26 16:04:24 +02:00
Laurent Destailleur
632119a5c5 Show if module add dictionary data 2017-08-26 15:46:35 +02:00
Laurent Destailleur
f2a437fa89 Enhance modulebuilder 2017-08-26 15:22:13 +02:00
Laurent Destailleur
7329d21dcd Fix lang selection 2017-08-25 17:13:33 +02:00
Laurent Destailleur
9d380a8b8a NEW Can edit the language into the email templates editor. 2017-08-25 16:38:45 +02:00
Laurent Destailleur
17f44ad980 NEW Can make a specific setup for SMTP sending for emailing module 2017-08-24 02:02:00 +02:00
Laurent Destailleur
9f5718f00a Fix php unit 2017-08-23 19:38:06 +02:00
Laurent Destailleur
90afbcb034 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/bank.php
	htdocs/core/lib/functions.lib.php
 2017-08-23 17:02:53 +02:00
Laurent Destailleur
d90a23efb6 Fix for old php 2017-08-23 17:00:50 +02:00
Laurent Destailleur
f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/supplier_payment.php
	htdocs/core/lib/ajax.lib.php
	htdocs/don/admin/donation.php
	htdocs/product/admin/product.php
 2017-08-23 16:11:51 +02:00
Regis Houssin
2492b9968a Fix: missing scandir 2017-08-23 10:21:10 +02:00
Regis Houssin
6dda2f3670 Fix: "scandir" in url is blocked in some providers 2017-08-23 10:07:00 +02:00
Laurent Destailleur
ec56ff59d6 Fix invalid link after renaming a website key. 2017-08-22 15:32:45 +02:00
Laurent Destailleur
109e0f7179 Fix typo 2017-08-22 15:31:37 +02:00
Laurent Destailleur
a5d210195c Add option MAIN_DISABLE_DOLISTORE_SEARCH 2017-08-22 14:55:01 +02:00
Laurent Destailleur
42666a0146 Fix bad link 2017-08-22 14:51:47 +02:00
Laurent Destailleur
14cd150762 NEW Introduce experimental feature to search dolistore from application 2017-08-22 14:47:01 +02:00
Laurent Destailleur
b3d1cdf84c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2017-08-22 10:11:32 +02:00
Laurent Destailleur
4a310f36d8 Fix help url 2017-08-22 08:12:30 +02:00
Laurent Destailleur
188653a85d Work on website module 2017-08-20 18:50:51 +02:00
Laurent Destailleur
5c5c4046a1 Prepare setup for email reminder 2017-08-20 16:07:22 +02:00
Laurent Destailleur
5d76227948 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-18 23:22:36 +02:00
Laurent Destailleur
097b660c41 Mutualize code 2017-08-18 16:25:00 +02:00
Laurent Destailleur
22a7c9bd6b Merge pull request #7220 from guerrierk/develop 
NEW|Add possibility to propose last num releve in conciliation
 2017-08-17 23:42:07 +02:00
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
GUERRIER Kevin
ded6b40489 Add possibility to propose last num releve in conciliation 2017-07-29 14:21:58 +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