Commit Graph

72219 Commits

Author SHA1 Message Date
mapiolca
aa10d345bd
Update societe.class.php
Ajoute la sélection de l'entité avec Multicompagny pour les encours clients.
2019-01-04 17:57:16 +01:00
ldestailleur
5094b6bcfc WIP Work on split of timespent 2019-01-04 16:24:56 +01:00
ldestailleur
b928a49b1b FIX Update of timespent when date is empty 2019-01-04 15:44:09 +01:00
ldestailleur
b4fc4b0178 FIX title on picto no more visible 2019-01-04 15:22:59 +01:00
ldestailleur
66a99be097 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-03 21:15:13 +01:00
ldestailleur
ab9fe1a757 Add option to use fontawesome 5 with fontawesome 4 2019-01-03 21:14:59 +01:00
Laurent Destailleur
62ba4ba2cb
Merge pull request #10291 from joseplluis/patch-5
FIX: delete all contact categories
2019-01-03 12:58:11 +01:00
Laurent Destailleur
5ebada065f
Merge pull request #10284 from ptibogxiv/patch-101
New Use ajax switch into setup of TakePos
2019-01-02 20:01:16 +01:00
Laurent Destailleur
8c1d362e8d
Merge pull request #10286 from ptibogxiv/patch-103
New Use ajax switch into on socialnetworks.php
2019-01-02 20:00:44 +01:00
ldestailleur
f5b3ba231f Fix phpcs 2019-01-02 20:00:08 +01:00
Laurent Destailleur
d2ad38f998
Merge pull request #10283 from ptibogxiv/patch-100
NEW Use ajax switch into setup of donation.php
2019-01-02 19:59:25 +01:00
Laurent Destailleur
d613041703
Merge pull request #10282 from ptibogxiv/patch-99
NEW: Use ajax swith button on setup of multi-currency module
2019-01-02 19:58:20 +01:00
Laurent Destailleur
e1094e6465
Merge pull request #10279 from glu000/develop
Update commonobject.class.php
2019-01-02 19:54:08 +01:00
Laurent Destailleur
85d60b93d6
Update commonobject.class.php 2019-01-02 19:53:59 +01:00
Laurent Destailleur
08b1e67e5c
Merge pull request #10275 from aspangaro/10.0_accountancy_member
NEW: Accountancy - Add default accounting account for member subcription
2019-01-02 19:51:30 +01:00
ldestailleur
7cb3b8dfec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:26 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
a9e8e13bb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	ChangeLog
	htdocs/user/param_ihm.php
2019-01-02 19:41:39 +01:00
ldestailleur
d8d47763aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-02 19:39:42 +01:00
ldestailleur
3d8479291d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-02 19:39:35 +01:00
JC Prieto
99e2f893fd Fix: loadBatchInfo() 2019-01-02 19:38:44 +01:00
Laurent Destailleur
f965e9ec7a
Merge pull request #10270 from prietojc/patch-3
FIX: loadBatchInfo()
2019-01-02 19:38:25 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
Laurent Destailleur
ea76f02a25
Merge pull request #10285 from ptibogxiv/patch-102
Use ajax on constnt change in setup stock.php
2019-01-02 19:36:38 +01:00
Laurent Destailleur
c8b807a0c6
Merge pull request #10288 from andreubisquerra/master
Add header and footer to TakePOS receipt
2019-01-02 19:35:36 +01:00
Laurent Destailleur
bab501a1aa
Merge pull request #10294 from frederic34/patch-2
Update societe.class.php
2019-01-02 19:35:10 +01:00
Laurent Destailleur
bbd81d7f69
Merge pull request #10293 from hregis/develop_mc
FIX wrong field name for WEBSITE_VIRTUALHOST
2019-01-02 19:00:02 +01:00
ldestailleur
8645a7f524 FIX Interface regression for bind people. Fix option
MAIN_OPTIMIZEFORTEXTBROWSER
2019-01-02 18:58:45 +01:00
Frédéric FRANCE
cad95c7dc2
Update societe.class.php 2019-01-02 15:39:22 +01:00
Regis Houssin
483c6ef257 FIX wrong field name for WEBSITE_VIRTUALHOST
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-02 14:43:54 +01:00
Josep Lluís
932e5ef0b5
FIX: delete all contact categories
Delete all contact categories is not necessary on contact card.
Current function setCategories will do it when necessary.
2019-01-02 08:37:26 +01:00
andreubisquerra
8dee9de8f5 Add header and footer to TakePOS receipt 2018-12-30 22:20:55 +01:00
ptibogxiv
511579a24b
FIX: Ajax on socialnetworks.php 2018-12-30 19:48:04 +01:00
ptibogxiv
82d597ade2
FIX: ajax on stock.php 2018-12-30 19:07:21 +01:00
ptibogxiv
d2f54bb41c
Fix ajax toogle 2018-12-30 17:51:09 +01:00
ptibogxiv
4b1ea18e32
Update donation.php 2018-12-30 17:35:50 +01:00
ptibogxiv
e503e7e698
Fix ajax toogle in donation.php 2018-12-30 17:34:44 +01:00
ptibogxiv
b9baaafe19
Update multicurrency.php 2018-12-30 17:15:11 +01:00
ptibogxiv
8adecf0689
Update multicurrency.php 2018-12-30 17:09:38 +01:00
ptibogxiv
dec4e1f6a6
New option use currency on document + toggle
- change with toogle
- new option use currency on document for online payment
2018-12-30 16:49:54 +01:00
Günter Lukas
2857447aee
Update commonobject.class.php 2018-12-30 00:20:38 +01:00
Alexandre SPANGARO
41c7af590d NEW: Accountancy - Add default accounting account for member subcriptions 2018-12-29 22:11:24 +01:00
Alexandre SPANGARO
bb01523192 Merge remote-tracking branch 'upstream/develop' into develop 2018-12-29 21:08:45 +01:00
ldestailleur
3af418349a FIX Can't empty the payment mode 2018-12-29 07:54:30 +01:00
ldestailleur
0353bd5302 FIX sql error when resetting payment mode / term 2018-12-29 07:48:47 +01:00
ldestailleur
2225d0a41e FIX sql error when resetting payment mode / term 2018-12-28 23:16:44 +01:00
ldestailleur
7b91c14cb3 FIX sql error when resetting payment mode / term 2018-12-28 23:14:41 +01:00
ldestailleur
c0eef25b31 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:14:36 +01:00
ldestailleur
2fef2b633a FIX sql error when resetting payment mode / term 2018-12-28 23:13:39 +01:00
ldestailleur
8ad06463e0 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:06:04 +01:00