Commit Graph

72415 Commits

Author SHA1 Message Date
Philippe Grand
dfceecc04f
Update index.php.install 2019-01-16 19:14:24 +01:00
Philippe GRAND
3168c76946 update with html5 compliant code 2019-01-16 17:39:40 +01:00
Philippe GRAND
ab23fe044a update with html5 compliant code 2019-01-16 17:34:36 +01:00
Philippe GRAND
97f22c58bb Merge remote-tracking branch 'upstream/develop' into new_branch_16_01_2019 2019-01-16 16:58:36 +01:00
Laurent Destailleur
e7943ae844 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
688311c761 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-16 16:45:38 +01:00
Laurent Destailleur
698222c769 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/adherents/subscription.php
2019-01-16 16:45:30 +01:00
Laurent Destailleur
476527e71e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-01-16 16:34:46 +01:00
Laurent Destailleur
6becdc8af4 Fix missing substitution of ID 2019-01-16 16:34:36 +01:00
Laurent Destailleur
21741b6409 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:42 +01:00
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
Philippe GRAND
31a83701ba Fix translation 2019-01-16 13:44:49 +01:00
Philippe GRAND
64875b670c Clean code 2019-01-16 13:40:44 +01:00
Philippe GRAND
88e90f9020 Clean and update code 2019-01-16 13:36:38 +01:00
Philippe GRAND
2aa04e7f9c Clean code and fix translation file 2019-01-16 13:28:13 +01:00
Laurent Destailleur
1f9d0799b6
Merge pull request #10344 from grandoc/new_branch_16_01_2019
Clean code and add translation
2019-01-16 13:17:05 +01:00
Philippe GRAND
c743b7803e Clean code and add translation 2019-01-16 13:15:10 +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
8b2c4fbf82
Merge pull request #10321 from bafbes/abb80046
link back to list if cancelled on create
2019-01-16 12:46:51 +01:00
Laurent Destailleur
2ce5c89a14
Update myobject_card.php 2019-01-16 12:46:14 +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
346028c8d5
Merge pull request #10340 from atm-quentin/FIX_Credit_Note_Free_Line
FIX credit note can have negative value
2019-01-16 12:11:21 +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
atm-quentin
0d384eea00 FIX credit note can have negative value 2019-01-16 09:33:24 +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
f51b4288da
Merge pull request #10336 from hregis/8.0_bug
FIX avoid php warning
2019-01-15 17:59:09 +01:00
Laurent Destailleur
6dd905048c
Merge pull request #10334 from hregis/8.0_mc
FIX problem with multicompany transverse mode
2019-01-15 17:57:45 +01:00
Laurent Destailleur
adc4422323
Update card.php 2019-01-15 17:57:30 +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
Regis Houssin
41a38b3a0a FIX avoid php warning
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-15 15:44:45 +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
Regis Houssin
7c9d85d091 FIX problem with multicompany transverse mode
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-15 12:18:04 +01:00
Laurent Destailleur
6159703116 Fix warning and date 2019-01-15 11:14:01 +01:00