Commit Graph

72077 Commits

Author SHA1 Message Date
Laurent Destailleur
6c54ea925b Add token into confirm link so we will be able to check we accept the
confirmation on interface for critical actions
2018-12-22 17:42:33 +01:00
Laurent Destailleur
91f63f025b Add rolling token into confirm url 2018-12-22 17:34:57 +01:00
Laurent Destailleur
3fee4c3309 The delete of a user need the parameter $user 2018-12-22 17:34:27 +01:00
Laurent Destailleur
7d1b48815d Fix css 2018-12-22 11:57:23 +01:00
Laurent Destailleur
9b55cc401e Fix trans 2018-12-22 11:32:27 +01:00
Laurent Destailleur
afee39ea68 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 12:09:27 +01:00
Laurent Destailleur
4859d944d8 Sync transifex 2018-12-21 12:09:03 +01:00
Laurent Destailleur
f09efbf1cd Fix var_dump 2018-12-21 12:07:13 +01:00
Laurent Destailleur
391f916bd5 Fix trans 2018-12-21 10:21:56 +01:00
Laurent Destailleur
b7b69b79dc Fix phpdoc 2018-12-21 09:59:21 +01:00
Laurent Destailleur
ae6596cac7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 09:57:29 +01:00
Laurent Destailleur
9b441dd369 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 09:57:15 +01:00
Laurent Destailleur
8a70cf9ede NEW Add parameter replaceambiguouschars on getRandomPassword function 2018-12-21 09:56:54 +01:00
Laurent Destailleur
d9b8a8c8ae Debug cash fence feature 2018-12-19 16:12:55 +01:00
Laurent Destailleur
b0652494b5 Debug cash fence 2018-12-19 15:40:01 +01:00
Laurent Destailleur
772761e587
Merge pull request #10255 from AXeL-dev/patch-4
fix proposals menu title in auguria menu manager
2018-12-19 13:02:43 +01:00
Laurent Destailleur
86502d881a
Merge pull request #10253 from grandoc/new_branch_18_12_2018
fix align issue
2018-12-19 13:02:25 +01:00
Laurent Destailleur
396dcb0729
Merge pull request #10247 from andreubisquerra/master
Improve responsive design in TakePOS
2018-12-19 12:55:15 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b7f373802 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-18 21:37:34 +01:00
Laurent Destailleur
fb8c3f01a4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/modules/project/doc/pdf_baleine.modules.php
	htdocs/core/modules/project/doc/pdf_beluga.modules.php
2018-12-18 21:35:30 +01:00
Laurent Destailleur
4b6ae9d424 FIX Error reported when creation of thirdparty from member fails
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
2018-12-18 21:32:41 +01:00
Laurent Destailleur
b8429c607e FIX Can't create a thirdparty from member if customer code is mandatory. 2018-12-18 21:29:53 +01:00
Laurent Destailleur
6851232314 Fix removing constant no more required 2018-12-18 21:29:36 +01:00
Laurent Destailleur
f2318716ec FIX Error reported when creation of thirdparty from member fails 2018-12-18 21:27:16 +01:00
Laurent Destailleur
31d032d5d3 FIX Can't create a thirdparty from member if customer code is mandatory. 2018-12-18 21:00:06 +01:00
Laurent Destailleur
2e6a41228f Fix removing constant no more required 2018-12-18 20:49:48 +01:00
AXeL-dev
663a64ccbb fix proposals menu title in auguria menu manager 2018-12-18 20:20:49 +01:00
Laurent Destailleur
65412b77de Default nb of digits for customer code "monkey" template is on 5 digits. 2018-12-18 20:16:02 +01:00
Laurent Destailleur
6e0df5d3cc Default nb of digits for customer code "monkey" template is on 5 digits. 2018-12-18 20:14:36 +01:00
Philippe GRAND
7b84825d2b fix align issue 2018-12-18 17:30:24 +01:00
Laurent Destailleur
2d2b95a082 Fix calculation of top menu entry of user 2018-12-18 17:01:57 +01:00
Laurent Destailleur
90e87fc4d9 Fix cache 2018-12-18 15:15:33 +01:00
Laurent Destailleur
57c41bac56 Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
Laurent Destailleur
cf87aa9be9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 13:30:54 +01:00
Laurent Destailleur
220e72449b Code comment 2018-12-18 13:30:42 +01:00
Laurent Destailleur
c3eb131054 Debug ticket module 2018-12-18 13:30:22 +01:00
Laurent Destailleur
16496218d3 css 2018-12-18 13:21:00 +01:00
Laurent Destailleur
dcdfe5c318 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 11:03:35 +01:00
Laurent Destailleur
3ae03d619d Fix tooltip 2018-12-18 11:03:23 +01:00
andreubisquerra
bce696ee36 Improve responsive design in TakePOS 2018-12-17 22:43:02 +01:00
Laurent Destailleur
9d5a91b6e8
Merge pull request #10235 from torvista/sql-install
Added Andorra, Hungary, Portugal, Slovenia. Spain postcodes
2018-12-17 21:14:48 +01:00
Laurent Destailleur
051853fc00
Merge pull request #10246 from atm-ph/fix_7.0_user_attached_files
Fix attached files from user mail form don't work
2018-12-17 21:11:43 +01:00
Laurent Destailleur
4a22640ae9
Merge pull request #10240 from aspangaro/9.0_agiris
FIX: Accountancy - Missing information on Agiris Export
2018-12-17 21:10:05 +01:00
Laurent Destailleur
eed4d9509b
Merge pull request #10243 from AXeL-dev/patch-3
fix executable files security check regex
2018-12-17 21:09:32 +01:00
Laurent Destailleur
14c249ec0b
Merge pull request #10236 from andreubisquerra/master
Fix some TakePOS small bugs from last third-party commits
2018-12-17 21:08:42 +01:00
Laurent Destailleur
db15f85798
Update setup.php 2018-12-17 21:08:24 +01:00
Laurent Destailleur
48162db33d FIX Rename of image file lose the thumbs 2018-12-17 20:19:11 +01:00
Laurent Destailleur
3a4538f429 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 19:37:56 +01:00