Commit Graph

72930 Commits

Author SHA1 Message Date
Laurent Destailleur
c690b92410
Merge pull request #10277 from aspangaro/9.0_accountancy_html
FIX: #10221 Html codes in accounting export
2019-01-02 19:52:18 +01:00
Laurent Destailleur
752b73cb0d
Merge pull request #10276 from aspangaro/9.0_accountancy
FIX: Generation of FEC:CompteLib
2019-01-02 19:51:57 +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
Laurent Destailleur
1202bb3173
Merge pull request #10274 from fmarcet/8.0
FIX: Loan impossible to account
2019-01-02 19:50:46 +01:00
Laurent Destailleur
a39336c80d
Simple join is better than RIGHT JOIN 2019-01-02 19:50:23 +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
gauthier
fc3da0f5be FIX : holidays get natural_search if search params are set only 2019-01-02 10:02:30 +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
Alexandre SPANGARO
c4dbf41530 Look & feel 2018-12-30 21:21:40 +01:00
Alexandre SPANGARO
a2075b9d2c V9 look & Feel, etc 2018-12-30 20:32:44 +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
cbcf097ec1 FIX: #10221 Html codes in accounting export 2018-12-29 23:20:30 +01:00
Alexandre SPANGARO
3eb5b06472 FIX: Generation of FEC:CompteLib 2018-12-29 22:26:06 +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
Juanjo Menent
cf64053fa5 Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-12-29 15:07:09 +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
Ferran Marcet
dc93cccbe1 FIX: Loan impossible to account 2018-12-28 12:57:04 +01:00
Laurent Destailleur
713d71bd95 Fix menu 2018-12-28 12:51:54 +01:00
Laurent Destailleur
e0f94bbb59 Add role=navigation 2018-12-28 12:50:23 +01:00
Laurent Destailleur
3cd91d7c66 Fix look and feel v9 (autofocus) 2018-12-28 00:41:05 +01:00