Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 16:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,672 Commits 36 Branches 190 Tags
eb06f56164ebde04f7d7d3fb14a901b24602840c
Commit Graph

54672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0c6e8b626a Fix var not initialized 2016-05-29 11:20:27 +02:00
Laurent Destailleur
22d6d9497e Fix ambiguous test on ldap return of getAttributes 2016-05-29 11:20:12 +02:00
Laurent Destailleur
ba43297936 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-28 14:10:41 +02:00
Juanjo Menent
caca9f0dd2 Merge pull request #5247 from simnandez/develop 
Fix: Bad encoding and use original function 'implode' instead aliases 'join'
 2016-05-28 11:53:51 +02:00
Juanjo Menent
fb5eef3163 Merge pull request #5246 from IonAgorria/patch-1 
Fix: Fill ref_supplier in product supplier price
 2016-05-28 11:53:25 +02:00
Juanjo Menent
f9e855d477 Merge pull request #5243 from oliverpool/patch-2 
Fix contributing link
 2016-05-28 11:52:18 +02:00
Juanjo Menent
a63dac3a9c Merge pull request #5240 from fmarcet/peru 
Fix: Update Peru regions and departaments
 2016-05-28 11:51:46 +02:00
Laurent Destailleur
ef1e4d05ec Doc comment 2016-05-27 17:01:23 +02:00
Laurent Destailleur
9511187f6e FIX Change to status "Shipment in progress" for orders is done whane 
validating and not creating a shipment.
 2016-05-27 16:49:55 +02:00
Laurent Destailleur
c653acd4ce Minor fixes 2016-05-27 14:56:59 +02:00
Juanjo Menent
5dec8f1935 Fix: Bad encoding and use original function 'implode' instead aliases 'join' 2016-05-27 10:56:39 +02:00
Laurent Destailleur
7278d1f2c6 NEW Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check 
deposit feature.
 2016-05-27 10:38:15 +02:00
Laurent Destailleur
27da82df1f FIX Missing columns in migration 2016-05-26 21:20:10 +02:00
Laurent Destailleur
9a3251bcc9 FIX Missing columns in migration 2016-05-26 21:18:08 +02:00
Laurent Destailleur
db56e1b8a1 FIX Missing columns in migration 2016-05-26 21:17:43 +02:00
Laurent Destailleur
97278c254e Doc comment 2016-05-26 21:12:36 +02:00
Ion Agorria
6ba86e9d03 Fill ref_supplier in product supplier price 2016-05-26 20:53:01 +02:00
Laurent Destailleur
b8d5d6a383 Fix bad placeholder 2016-05-26 19:38:52 +02:00
Juanjo Menent
071a230000 Merge remote-tracking branch 'upstream/3.9' into 3.9 
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
 2016-05-26 10:46:44 +02:00
Laurent Destailleur
b410aa57b9 Fix: Fetching category on label is not enough. We must introduce type 2016-05-25 15:36:48 +02:00
gauthier
71ee941cf8 FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty 2016-05-25 12:25:39 +02:00
gauthier
1ce91bac06 FIX : same page added several times on mergepropal option 2016-05-25 11:25:19 +02:00
Laurent Destailleur
b476153b8b Move POS at end of top menu 2016-05-25 00:02:48 +02:00
Laurent Destailleur
1617f3c62a Fix colspan 2016-05-24 20:24:51 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43:35 +02:00
Laurent Destailleur
9bd9cda224 Move to HTML5 2016-05-24 16:02:43 +02:00
Laurent Destailleur
e0812dddd2 Enhance css 2016-05-24 15:59:56 +02:00
oliverpool
e55da4f262 Fix contributing link 2016-05-24 11:25:27 +02:00
Your Name
c581b05c26 Fix: Update Peru regions and departaments 2016-05-23 18:38:55 +02:00
florian HENRY
37d366478f change trigger position 2016-05-23 14:18:29 +02:00
Laurent Destailleur
24d7c6aae7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-23 12:27:15 +02:00
Laurent Destailleur
e2e95641a3 FIX Search supplier ref on contract 2016-05-23 12:27:02 +02:00
florian HENRY
4e707af0fd Add demo information and transsaction management 2016-05-23 09:16:47 +02:00
florian HENRY
8afaf07810 Merge remote-tracking branch 'origin/develop' into develop 2016-05-23 08:55:39 +02:00
Laurent Destailleur
f398174772 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/auguria_menu.php
	htdocs/core/menus/standard/eldy.lib.php
 2016-05-22 19:34:27 +02:00
Laurent Destailleur
426454a67b Prepare the hide left menu icon 2016-05-22 19:32:08 +02:00
Laurent Destailleur
9b5dc9da3c Merge pull request #5237 from EuskalMoneta/bug-5236 
FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu.
 2016-05-22 19:31:42 +02:00
Xebax
2355a0c38c FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu. 2016-05-22 17:15:22 +02:00
Laurent Destailleur
3119d77565 Add warning on deprecated param 2016-05-22 16:36:48 +02:00
Laurent Destailleur
3df464270c Remove useless code 2016-05-22 16:12:42 +02:00
Laurent Destailleur
ac84ae0ff5 Clean explorer 2016-05-22 15:29:12 +02:00
Laurent Destailleur
382df0d8f1 NEW Rest API token is no more reset at each call. We can reset it with 
param reset=1 on login call.
 2016-05-22 15:20:21 +02:00
Laurent Destailleur
ee3d25d9fa Clean code for REST API. 2016-05-22 15:10:43 +02:00
Laurent Destailleur
11ae76f4fb More neutral picto for EDM module 2016-05-22 14:39:34 +02:00
Laurent Destailleur
5e9809ccb6 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-05-22 14:34:31 +02:00
Laurent Destailleur
d8f717a6e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-22 14:31:50 +02:00
Laurent Destailleur
a9cd73b215 Fix css 2016-05-22 14:31:34 +02:00
Laurent Destailleur
b86b464931 Merge pull request #5233 from IonAgorria/email-template-hook 
NEW Hook for adding new email templates on list
 2016-05-22 14:25:06 +02:00
Laurent Destailleur
ebf31d87ea Merge pull request #5234 from frederic34/patch-7 
Fix next month or next year in opensurvey
 2016-05-22 14:23:30 +02:00
Laurent Destailleur
3abe1d8e81 Merge pull request #5220 from fmarcet/expenses 
The approved status is enough to expense appear in the report
 2016-05-22 14:22:38 +02:00