lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,095 Commits 43 Branches 150 Tags 886 MiB
21a20cbd2f
Commit Graph

72095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
21a20cbd2f
Merge pull request #10260 from joseplluis/patch-4 
FIX search by fax field
 2018-12-22 18:25:15 +01:00
Laurent Destailleur
d928274c74
Merge pull request #10258 from andreubisquerra/master 
Temporary ticket improvement in TakePOS
 2018-12-22 18:24:30 +01:00
Laurent Destailleur
3d509910dd
Merge branch 'develop' into master 2018-12-22 18:24:23 +01:00
Laurent Destailleur
6007ada026
Merge pull request #10259 from grandoc/new_branch_20_12_2018 
fix typo and add translation
 2018-12-22 18:23:52 +01:00
Laurent Destailleur
ecb790ad8f
Merge branch 'develop' into new_branch_20_12_2018 2018-12-22 18:23:44 +01:00
Laurent Destailleur
ccc7f2e206
Merge pull request #10256 from grandoc/new_branch_19_12_2018 
add comments
 2018-12-22 18:22:57 +01:00
Laurent Destailleur
b8d0e6ed8b
Update index.php 2018-12-22 18:22:12 +01:00
Laurent Destailleur
2b3fbecd49 Fix when random_int is not available 2018-12-22 18:15:49 +01:00
Laurent Destailleur
415fbc19af Fix param 2018-12-22 18:12:29 +01:00
Laurent Destailleur
a5dccd1cc3 Enable by default the test on anti CSRF token 2018-12-22 18:09:26 +01:00
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
Philippe GRAND
27facab545 fix typo and translation 2018-12-20 14:18:22 +01:00
Josep Lluís
f496945677
FIX search by fax field 
Search by fax field is looking for another field
 2018-12-20 14:02:10 +01:00
Philippe GRAND
c3a898daa6 better form display and fix 2018-12-20 13:44:49 +01:00
Philippe GRAND
33d035139f fix typo and add translation 2018-12-20 10:17:52 +01:00
andreubisquerra
c4be1b141d Temporary ticket improvement in TakePOS 2018-12-19 22:52:16 +01:00
Laurent Destailleur
d9b8a8c8ae Debug cash fence feature 2018-12-19 16:12:55 +01:00
Philippe GRAND
1fea8a2968 fix : syntax error 2018-12-19 15:58:23 +01:00
Laurent Destailleur
b0652494b5 Debug cash fence 2018-12-19 15:40:01 +01:00
Philippe GRAND
76e3390c2e fix : bad url 2018-12-19 15:25:25 +01:00
Philippe GRAND
1d59b582d7 add comments 2018-12-19 13:56:51 +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