Commit Graph

72382 Commits

Author SHA1 Message Date
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00
Laurent Destailleur
638be67f96 Fix tooltip 2019-01-16 13:56:13 +01:00
Laurent Destailleur
f4dd8a4e50 Update myobject_card.php 2019-01-16 12:47:44 +01:00
Bahfir Abbes
66f17ac422 simplification 2019-01-16 12:47:36 +01:00
Abbes Bahfir
6b808acfbb linl back to list if cancelled on create 2019-01-16 12:47:31 +01:00
Laurent Destailleur
c357cb8c4e Clean code 2019-01-16 12:42:54 +01:00
Laurent Destailleur
3e86ec83e2
Merge pull request #10335 from ptibogxiv/patch-104
NEW add page to setup opening hours of the company
2019-01-16 12:21:07 +01:00
Laurent Destailleur
30ea978130
Merge pull request #10339 from a-schild/develop
Fix for issue #10333
2019-01-16 12:07:09 +01:00
Laurent Destailleur
1f87b8bb18 FIX Position of price symbol (before) for nl_NL 2019-01-16 01:54:08 +01:00
Laurent Destailleur
d6b0f852c5 Work on invoicing time spent 2019-01-15 21:01:01 +01:00
Laurent Destailleur
734d022305 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-15 21:00:20 +01:00
Laurent Destailleur
adc6c1d2d1 Work on invoicing time spent 2019-01-15 20:59:56 +01:00
André Schild
1c0e15192d Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
2019-01-15 20:43:16 +01:00
André Schild
31575af54d
Merge pull request #1 from Dolibarr/develop
Upgrade to current dev
2019-01-15 20:24:10 +01:00
Laurent Destailleur
ff2764bb09
Merge pull request #10320 from ATM-Marc/NEW_actionlist_desc
NEW: actioncomm list: add description column (hidden by default)
2019-01-15 18:00:13 +01:00
Laurent Destailleur
da0cbbc823
Merge pull request #10338 from delcroip/patch-19
Fix compatibiliy issue with pgSQL
2019-01-15 17:50:16 +01:00
delcroix Patrick
9d2d4bc91d
Fix compatibiliy issue with pgSQL 2019-01-15 17:06:48 +01:00
Laurent Destailleur
f8ca44e42c NEW Preview of images into the filemanager component 2019-01-15 15:48:28 +01:00
Laurent Destailleur
d814b66b36 Fix pb in token check 2019-01-15 15:04:15 +01:00
ptibogxiv
c96f349c21
update head with schedule 2019-01-15 14:55:15 +01:00
Laurent Destailleur
45a24df679 More complete message 2019-01-15 14:07:05 +01:00
Laurent Destailleur
ebf3ea39bf Fix missing token in POST 2019-01-15 13:55:14 +01:00
ptibogxiv
a4d1c663ef
NEW add company schedule 2019-01-15 13:29:53 +01:00
Laurent Destailleur
6159703116 Fix warning and date 2019-01-15 11:14:01 +01:00
Laurent Destailleur
0f2406c202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-15 10:55:28 +01:00
Laurent Destailleur
2ec2daa18d FIX Edit blog meta post 2019-01-15 10:53:28 +01:00
Laurent Destailleur
db593bf45d CSS v10 2019-01-14 00:32:52 +01:00
Laurent Destailleur
8c6fde72f8 Several fixes in look and feel of module survey 2019-01-13 19:36:00 +01:00
Laurent Destailleur
48e7fcd821 Remove not used keys 2019-01-13 16:55:46 +01:00
Laurent Destailleur
ab3365440c Fix translation 2019-01-13 16:51:34 +01:00
Laurent Destailleur
e0d11edb6b FIX Sql error on filter of project preview with date 2019-01-13 14:09:40 +01:00
Laurent Destailleur
3ba4c4dde0 Remove annoying warnings 2019-01-12 19:08:19 +01:00
Laurent Destailleur
4b32e214de Fix phpcs 2019-01-12 18:53:50 +01:00
Laurent Destailleur
ca8534c850 Fix syntax error 2019-01-12 16:44:43 +01:00
Laurent Destailleur
cd6c883989 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-12 14:36:03 +01:00
Laurent Destailleur
87609f3f57 NEW Add hook 'addHtmlHeader' 2019-01-12 14:35:51 +01:00
Laurent Destailleur
f78e6adb2b
Merge pull request #10328 from joseplluis/patch-3
FIX: only show products with status for sell
2019-01-12 14:16:55 +01:00
Laurent Destailleur
bc741fae0e
Merge pull request #10330 from AXeL-dev/patch-6
FIX auguria menu entries
2019-01-12 14:14:54 +01:00
AXeL-dev
1147f2a883 fix duplicate rowid for product - reception menu entries in auguria menu handler 2019-01-12 12:43:24 +01:00
AXeL-dev
546dd1b148 fix mainmenu values for auguria menu entries 2019-01-12 12:21:33 +01:00
Laurent Destailleur
19be47dbf7 Code comment 2019-01-12 01:22:08 +01:00
Josep Lluís
88a2b73ae7
FIX: only show products with status for sell
On TakePos, only show products with status=1 (for sell)
2019-01-11 20:09:38 +01:00
Laurent Destailleur
2040ca1141 FIX Warning 2019-01-11 18:17:51 +01:00
Laurent Destailleur
38ebb4ce4e Fix XFRAMEOPTIONS_ALLOWALL 2019-01-11 17:05:50 +01:00
Laurent Destailleur
c399d2d13e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-11 17:03:42 +01:00
Laurent Destailleur
79e3fcc109 NEW Add constant XFRAMEOPTIONS_ALLOWALL 2019-01-11 17:03:29 +01:00
Laurent Destailleur
fecccaa8ed
Merge pull request #10323 from mapiolca/patch-7
FIX Multicompany
2019-01-10 14:04:30 +01:00
Laurent Destailleur
d5426730cb
Merge pull request #10318 from mapiolca/patch-6
FIX Multicompany
2019-01-10 14:01:19 +01:00
Laurent Destailleur
8ffe4db853
Merge pull request #10317 from mapiolca/patch-1
FIX Multicompany
2019-01-10 14:00:48 +01:00
mapiolca
320467d791
Update productMargins.php 2019-01-10 13:56:41 +01:00