Commit Graph

79399 Commits

Author SHA1 Message Date
Laurent Destailleur
539f4355c3 Try to fix stickler 2019-10-07 20:48:44 +02:00
Laurent Destailleur
51ef2cd20a FIX #12058 2019-10-07 20:20:06 +02:00
Laurent Destailleur
07d1a3fe8b css 2019-10-07 18:17:22 +02:00
Laurent Destailleur
16eeeecb9a Trans 2019-10-07 17:08:08 +02:00
Laurent Destailleur
297313e7de CSS 2019-10-07 16:01:36 +02:00
Laurent Destailleur
c83f40fc7e Debug contact by default 2019-10-07 15:42:37 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault
NEW : Address/Contact by default on third parties
2019-10-07 15:27:58 +02:00
Laurent Destailleur
3a15485e99
Update interface_90_modSociete_ContactRoles.class.php 2019-10-07 15:27:23 +02:00
Laurent Destailleur
240785922e
Update interface_90_modSociete_ContactRoles.class.php 2019-10-07 15:23:30 +02:00
Laurent Destailleur
b9a92546b6
Update card.php 2019-10-07 15:20:52 +02:00
Laurent Destailleur
a9c844460b Debug use of widget on Accounting home page 2019-10-07 14:39:29 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
2019-10-07 14:24:22 +02:00
Laurent Destailleur
21ab307cd6
Merge pull request #12020 from frederic34/patch-13
Update dav admin
2019-10-07 14:21:30 +02:00
Laurent Destailleur
1a32a3b7f1
Update dav.php 2019-10-07 14:21:22 +02:00
Laurent Destailleur
f56da782ab
Merge pull request #12038 from Ahuahuachi/develop
NEW Add hidden options to send by email even for draft status
2019-10-07 14:18:53 +02:00
Laurent Destailleur
0bd545e1ca
Merge pull request #12026 from oscim/patch-6
Fix error in triggers process
2019-10-07 14:14:36 +02:00
Laurent Destailleur
00df21cf17 Trans 2019-10-07 13:48:09 +02:00
Laurent Destailleur
2bb55200f7 Clean user card 2019-10-07 13:46:13 +02:00
Laurent Destailleur
76aef85ee4
Merge pull request #12015 from atm-maxime/new_validators
NEW expense request and holiday validator fields
2019-10-07 13:31:20 +02:00
Laurent Destailleur
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
Fix : LibStatut missing dolgetstatus usage
2019-10-07 13:08:33 +02:00
Laurent Destailleur
8de5e6898d
Merge pull request #12032 from frederic34/ficheinter_rec
duration of fichinter rec
2019-10-07 13:04:34 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
71e922635b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:57:52 +02:00
Laurent Destailleur
68a4ab87a2 Fix can set min repeat to 0 for password 2019-10-07 12:57:24 +02:00
Laurent Destailleur
a604fb9afb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 12:54:57 +02:00
Laurent Destailleur
022c67ee68
Merge pull request #12045 from laudeco/hotfix/12041-security-generate-password
[fix #12041] - Generate password mode perso
2019-10-07 12:54:45 +02:00
Laurent Destailleur
91a922a454
Update security.php 2019-10-07 12:54:28 +02:00
Laurent Destailleur
7015e71105 FIX #12041 2019-10-07 12:53:32 +02:00
Laurent Destailleur
e7aa78cb4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:37:20 +02:00
Laurent Destailleur
23de8694fa Fix module files 2019-10-07 12:37:01 +02:00
Laurent Destailleur
f4b752ee81 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/expedition/card.php
2019-10-07 12:33:13 +02:00
Laurent Destailleur
b9ac8295d4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 12:28:06 +02:00
Laurent Destailleur
55508e25ec Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-07 12:27:06 +02:00
VESSILLER
219b0d8925 FIX Import of product using units 2019-10-07 12:26:02 +02:00
Laurent Destailleur
ecd7d1208d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 10:42:49 +02:00
Laurent Destailleur
fc90638b2b Code comment 2019-10-07 10:42:18 +02:00
Laurent Destailleur
0484b105de
Merge pull request #12039 from OPEN-DSI/new-import-product-country-code
NEW add country code in import product model
2019-10-07 10:42:09 +02:00
Laurent Destailleur
b85c4f0864
Merge branch 'develop' into new-import-product-country-code 2019-10-07 10:41:35 +02:00
Laurent Destailleur
ae2d92a797
Merge pull request #12050 from frederic34/patch-18
Update contrat.class.php for doxygen
2019-10-07 10:24:07 +02:00
Laurent Destailleur
d4f4f33122
Merge pull request #12048 from frederic34/patch-17
Update card.php
2019-10-07 10:23:51 +02:00
Laurent Destailleur
3d20766392
Merge pull request #12047 from frederic34/patch-15
translation for holidays actioncomm
2019-10-07 10:23:29 +02:00
Laurent Destailleur
80cbc09f21
Merge pull request #12046 from frederic34/apisupplierproduct
api supplier price delete
2019-10-07 10:22:48 +02:00
Laurent Destailleur
c3ae87816f
Merge pull request #12049 from frederic34/holidayz
lang file for holidays is holiday
2019-10-07 10:21:36 +02:00
Frédéric FRANCE
0b9213f4f1
Update contrat.class.php 2019-10-07 08:11:23 +02:00
Laurent Destailleur
edfedbb818 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:13:55 +02:00
Laurent Destailleur
80c1a92872 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:11:29 +02:00
Laurent Destailleur
52c06c1815 Fix css 2019-10-06 19:28:08 +02:00
Laurent Destailleur
a3d0b9e374 Fix syntax error 2019-10-06 18:11:28 +02:00
Laurent Destailleur
1285f71ceb Clean code of extrafields 2019-10-06 16:50:04 +02:00
Laurent Destailleur
753da4791e FIX Pb in units of shipments
Conflicts:
	htdocs/expedition/card.php
2019-10-06 16:31:17 +02:00