2
0
forked from Wavyzz/dolibarr
Commit Graph

54329 Commits

Author SHA1 Message Date
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
florian HENRY
82d6f4c808 add trigger on set draft order 2016-05-20 20:09:30 +02:00
florian HENRY
32a0f4c530 Add trigger into expedition class 2016-05-20 20:03:29 +02:00
Laurent Destailleur
e677390347 Fix bad property name 2016-05-19 22:04:36 +02:00
Laurent Destailleur
e6a78739bd Fix translation from a key that is a numeric 2016-05-19 21:12:09 +02:00
Juanjo Menent
341c70fa87 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-19 21:03:44 +02:00
Juanjo Menent
d8897214cd Fix issues with strict mode 2016-05-19 21:01:52 +02:00
Laurent Destailleur
453937bdfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-19 20:58:41 +02:00
Laurent Destailleur
4298b685d3 Fix css 2016-05-19 20:58:14 +02:00
Laurent Destailleur
61e824726e Merge pull request #5227 from mrsof/patch-9
Syntax error : bad name of field
2016-05-19 19:12:11 +02:00
Laurent Destailleur
b636451875 Fix php tag 2016-05-19 19:11:31 +02:00
Laurent Destailleur
afdef9a328 Add css 2016-05-19 18:52:22 +02:00
Laurent Destailleur
b82eabe25f Code comment 2016-05-19 18:52:12 +02:00
Sof
da2c9a0f74 Syntax error : bad name of field 2016-05-19 17:42:57 +02:00
Laurent Destailleur
7087b650d0 More precise parameter parameter targetwithdetails 2016-05-19 17:37:06 +02:00
Your Name
106f456c6b Last change 2016-05-19 16:50:18 +02:00
Laurent Destailleur
d723f26661 Fix css 2016-05-19 13:32:06 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
Laurent Destailleur
fd38db388a Rename box into widget 2016-05-19 10:05:02 +02:00
Laurent Destailleur
400572e18a Fix column size 2016-05-18 21:04:37 +02:00
Laurent Destailleur
4c2098b667 Fix duplicate table title 2016-05-18 20:58:29 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/comm/propal.php
2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/propal.php
2016-05-18 20:40:09 +02:00
Laurent Destailleur
7cca4f3e8a Merge pull request #5211 from defrance/patch-4
enhance rappro feature
2016-05-18 20:38:07 +02:00
Laurent Destailleur
12a5fbbea7 Merge pull request #5191 from FHenry/3.8
Fix email template edition
2016-05-18 20:35:42 +02:00
Laurent Destailleur
85cc5cbf02 Merge pull request #5210 from simnandez/3.9
FIX issues with entity in leave creation
2016-05-18 20:28:35 +02:00
Laurent Destailleur
24673d066f Merge pull request #5216 from atm-maxime/fix_dispatch_services_on_supplier_order
FIX services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES
2016-05-18 20:27:31 +02:00
Laurent Destailleur
28e9460a84 Merge pull request #5226 from joseplluis/patch-1
Fix bug: filter third parties without categories
2016-05-18 20:24:22 +02:00
Laurent Destailleur
ee73a91c77 Merge pull request #5218 from atm-florian/develop
Fix : Advanced Accountancy module
2016-05-18 20:22:07 +02:00