Commit Graph

55867 Commits

Author SHA1 Message Date
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
Laurent Destailleur
87d26ecef6 Merge pull request #5228 from simnandez/develop
Fix issues with strict mode
2016-05-22 14:20:05 +02:00
Laurent Destailleur
600c0a6cf7 Merge pull request #5235 from frederic34/patch-8
Update commande.class.php
2016-05-22 14:16:26 +02:00
Frédéric FRANCE
7048191815 Update commande.class.php 2016-05-22 08:57:23 +02:00
Laurent Destailleur
db432e2cc4 Fix lot number 2016-05-21 18:12:03 +02:00
Laurent Destailleur
b95981a2be Fix missing ; at end of sql 2016-05-21 18:03:13 +02:00
Laurent Destailleur
634ebaa3b6 Fix into conf.class.php file we must use $this and not $conf 2016-05-21 16:01:14 +02:00
Laurent Destailleur
6987d3db28 Fix css 2016-05-21 15:03:02 +02:00
Laurent Destailleur
a278fd66d0 Fix color of link for categories 2016-05-21 14:51:33 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Laurent Destailleur
5fd64c81a6 Missing translation 2016-05-21 12:21:17 +02:00
Laurent Destailleur
a66901d7d5 Enhance css 2016-05-21 12:09:54 +02:00
Laurent Destailleur
075b92b4c3 FIX Field for opportunities must not be visible if option off 2016-05-21 12:06:33 +02:00
Frédéric FRANCE
9e5db0f3c6 Fix next month or next year in opensurvey
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55209-bug-calendrier-opensurvey-v3-9
2016-05-21 09:18:16 +02:00
Ion Agorria
651b1e1d3a Hook for adding new email templates on list 2016-05-21 03:32:36 +02:00
florian HENRY
acdf781202 change tirrger name to harmonised 2016-05-20 20:12:23 +02:00