Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

4976 Commits

Author SHA1 Message Date
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
Regis Houssin
0dc0fe81fc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-31 07:40:01 +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
Regis Houssin
2efb86b5d8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-23 10:36:14 +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
Regis Houssin
26df1389f4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-07-21 20:42:21 +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
Regis Houssin
c8bd11660d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-07-18 15:23:43 +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
Regis Houssin
200f232164 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-16 07:51:20 +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
Regis Houssin
cb6b81d897 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-11 19:10:22 +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