From a0de33912ef1274bde7f751a465dfc22795b0c2e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Tue, 7 Apr 2015 18:54:38 +0200
Subject: [PATCH] Closes #2545 Bug: Missing object_margin.png in Amarok theme

Conflicts:
	ChangeLog
---
 ChangeLog                                 |   4 ++++
 htdocs/theme/amarok/img/object_margin.png | Bin 0 -> 579 bytes
 2 files changed, 4 insertions(+)
 create mode 100644 htdocs/theme/amarok/img/object_margin.png

diff --git a/ChangeLog b/ChangeLog
index 6ed93c77235..6617e8af742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -243,6 +243,10 @@ Dolibarr better:
 - Fix: Bad SEPA xml file creation
 - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
 - Fix: Showing system error if not enough stock of product into orders creation with lines
+- Fix: [ bug #2543 ] Untranslated "Contract" origin string when creating an invoice from a contract
+- Fix: [ bug #2534 ] SQL error when editing a supplier invoice line
+- Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project
+- Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/theme/amarok/img/object_margin.png b/htdocs/theme/amarok/img/object_margin.png
new file mode 100644
index 0000000000000000000000000000000000000000..13e4b92c9ce2e0a3698d31fcfc2b82704653f7a0
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006CNkl<Zc$|gO
z&1w@-7{>AcnU72+nI<MJt)WmN3av#j2)dJc1!6Bj5O-dHD{<$}3vlCByaGX?2z6^)
z6f|mVYq3p}PNrWb)_LD?(Hc8y;{ylIf#>~k7O&wbPhKp(25S7yLez;ORgKES<wXEh
zor~j`@4epgt=X%~0M4<2T5YNdazJUwCl;-3wmXn0jn%I=EX(ji&AnDTq+b6BVEzOE
zc(=Mhl7MXja=uR?IL+kL6prH%_%6?$zofab-tYef02GEhKu8=5t-U2ymp16Mwwb+t
zhk9cz)%_>18<q~CQ(ZjY02=@t9PEKHgMm_E5>>^qZMxkS#t4;4mP!Tkxe+YuKR~p#
z$@oMS%NT}+&HxFcfQVpOE|z7b`l*-e*o5sSUdH9q`!{4<hn3F_TsMQW(m<00+qO>z
zY}=+hGKO=k6t<g)3enpIR2A2CPX<Kfa6l9<>l2Go9vMSK*{xkcH6fG93;^_SAQs`<
z{(cH<HP=y9ysS6q2TIs(5{r=Wvcw{Nurxf1sFL$@gMqV?7l>nFI|}=th_KaaqN?Qc
zCjh-}k1uO$6!RW|XLIq=Wef@DrfbBaWOD(c3Aube1@!k|XJ_aB{QRpKpjs>h)nXxF
zV!T4J5a9bh)6?g%EknKjAqAw@>R4{yeRvJ19-WzA_asS(wl*I>ee~caz)y}P@RPTh
R<>vqZ002ovPDHLkV1h?{2Q~lz

literal 0
HcmV?d00001